Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release-schema: Add finalStatus to tender, award and contract. Clarify tender.datePublished. #1648

Merged
merged 43 commits into from
Mar 25, 2024
Merged

release-schema: Add finalStatus to tender, award and contract. Clarify tender.datePublished. #1648

Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
765acb5
release-schema: Add finalStatus to tender, award and contract
duncandewhurst Oct 12, 2023
6f18051
release-schema: Clarify the description of tender.datePublished
duncandewhurst Oct 12, 2023
7915354
release-schema: Update description of tender.datePublished
duncandewhurst Oct 23, 2023
4e28513
Update changelog
duncandewhurst Oct 23, 2023
1438e30
schema/codelists: Remove withdrawn codes from finalStatus codelists
duncandewhurst Oct 24, 2023
04efe16
release-schema: Update enum for finalStatus fields
duncandewhurst Oct 24, 2023
6f6d45b
Merge branch '1.2-dev' into 1160-add-finalStatus-fields
duncandewhurst Oct 24, 2023
667077b
Merge branch '1.2-dev' into 1160-add-finalStatus-fields
duncandewhurst Nov 13, 2023
2c85368
Update schema/codelists/awardFinalStatus.csv
duncandewhurst Nov 13, 2023
aff8a44
Update schema/codelists/awardFinalStatus.csv
duncandewhurst Nov 13, 2023
97cde59
Update schema/codelists/contractFinalStatus.csv
duncandewhurst Nov 13, 2023
995b9d5
Update schema/codelists/contractFinalStatus.csv
duncandewhurst Nov 13, 2023
082fef9
Update schema/release-schema.json
duncandewhurst Nov 13, 2023
0788ac8
Update schema/release-schema.json
duncandewhurst Nov 13, 2023
d6e6e8e
Update schema/release-schema.json
duncandewhurst Nov 13, 2023
4bab921
schema/dereferenced-release-schema.json: Run ./manage.py pre-commit
duncandewhurst Nov 13, 2023
e69f773
Merge branch '1.2-dev' into 1160-add-finalStatus-fields
duncandewhurst Nov 13, 2023
7351315
docs/schema/codelists.md: Capitalize headings
duncandewhurst Feb 26, 2024
47c5ab0
release-schema: Update field titles
duncandewhurst Feb 26, 2024
6b50bdd
Update schema/codelists/tenderFinalStatus.csv
duncandewhurst Feb 26, 2024
df3ca4e
release-schema: Rename statusDetails to finalStatusDetails
duncandewhurst Feb 26, 2024
6ad1ff7
schema/codelists/contractFinalStatus.csv: Rename codes
duncandewhurst Feb 26, 2024
71f3226
docs/examples: Update status fields
duncandewhurst Feb 26, 2024
9e32f1f
docs/guidance: Update references to status fields in Markdown examples
duncandewhurst Feb 27, 2024
3fc8aa8
examples: Remove contract_suspension
duncandewhurst Feb 27, 2024
1b9c1ca
docs/schema/codelists.md: Add deprecation directives, remove paragraphs
duncandewhurst Feb 27, 2024
50598ca
schema/codelists/releaseTag.csv: Update planningUpdate description
duncandewhurst Feb 27, 2024
52d108c
docs/examples: Reindent
duncandewhurst Feb 27, 2024
7c80d70
schema: Update codelist enums, run pre-commit script
duncandewhurst Feb 27, 2024
d1eee00
Merge branch '1.2-dev' into 1160-add-finalStatus-fields
duncandewhurst Feb 27, 2024
a3ef96f
docs/examples: Reinstate tender.finalStatus = complete
duncandewhurst Feb 27, 2024
38ba8c6
schema: Update enum, run pre-commit script
duncandewhurst Feb 27, 2024
0da5c89
schema/codelists/tenderStatus.csv: Update deprecation note for 'compl…
duncandewhurst Feb 27, 2024
05b5c44
guidance/build/change_history: Normalize language for versioned release
jpmckinney Mar 25, 2024
9bb16ed
guidance/map/unsuccessful_processes: Restore simple quotes
jpmckinney Mar 25, 2024
69117db
changelog: Remove contract suspension changelog entry 3fc8aa8
jpmckinney Mar 25, 2024
cbe3e9a
release-schema: Move finalStatus and finalStatusDetails after status
jpmckinney Mar 25, 2024
4ae8303
codelists: Remove versionchanged directive from deprecated contractSt…
jpmckinney Mar 25, 2024
b0defa9
release-schema,tenderStatus(typo): Change favour to favor
jpmckinney Mar 25, 2024
ba48500
tenderStatus: Use same Deprecated wording for 'complete' as for others
jpmckinney Mar 25, 2024
2fa5242
guidance/build/change_history: Use note admonition for sidenote. Add …
jpmckinney Mar 25, 2024
7c4759b
changelog: Remove second entry about tender.datePublished, which is n…
jpmckinney Mar 25, 2024
ca62458
Apply suggestions from code review
jpmckinney Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions docs/examples/amendments/contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
],
"contracts": [
{
"status": "active",
"description": "Appliances for Tuvalu PPB Residence",
"title": "4501062723",
"items": [
Expand Down Expand Up @@ -97,7 +96,6 @@
],
"contracts": [
{
"status": "active",
"amendments": [
{
"id": "1",
Expand Down Expand Up @@ -183,7 +181,6 @@
"contracts": [
{
"id": "CN3562241",
"status": "active",
"description": "Appliances for Tuvalu PPB Residence",
"title": "4501062723",
"items": [
Expand Down Expand Up @@ -280,16 +277,6 @@
"contracts": [
{
"id": "CN3562241",
"status": [
{
"releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24",
"releaseDate": "2019-02-15T01:00:58Z",
"releaseTag": [
"contract"
],
"value": "active"
}
],
"description": [
{
"releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24",
Expand Down
19 changes: 3 additions & 16 deletions docs/examples/amendments/easy_releases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,13 @@
"procurementMethod": "limited",
"procurementMethodDetails": "Limited tender",
"id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319",
"status": "complete"
"finalStatus": "complete"
},
"id": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z"
},
{
"contracts": [
{
"status": "active",
"description": "Drupal websites in govCMS Platform Solution.",
"title": "4400027941",
"items": [
Expand Down Expand Up @@ -209,12 +208,11 @@
"procurementMethod": "limited",
"procurementMethodDetails": "Limited tender",
"id": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319",
"status": "complete"
"finalStatus": "complete"
},
"contracts": [
{
"id": "CN3437424",
"status": "active",
"description": "Drupal websites in govCMS Platform Solution.",
"title": "4400027941",
"items": [
Expand Down Expand Up @@ -480,7 +478,7 @@
"value": "ocds-d2phr6-6dcfcc44c9933c18d7f3cfa088de3319"
}
],
"status": [
"finalStatus": [
{
"releaseID": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z",
"releaseDate": "2015-04-04T00:00:00Z",
Expand All @@ -494,17 +492,6 @@
"contracts": [
{
"id": "CN3437424",
"status": [
{
"releaseID": "ocds-d2phr6-1000035663-contract-2015-05-04T00:00:00Z",
"releaseDate": "2015-05-04T00:00:00Z",
"releaseTag": [
"award",
"contract"
],
"value": "active"
}
],
"description": [
{
"releaseID": "ocds-d2phr6-1000035663-contract-2015-05-04T00:00:00Z",
Expand Down
14 changes: 0 additions & 14 deletions docs/examples/amendments/tender.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"id": "ocds-213czf-000-00002-01-tender",
"title": "Data merging tool",
"description": "Data merge tool.",
"status": "active",
"value": {
"amount": 1000,
"currency": "USD"
Expand Down Expand Up @@ -81,7 +80,6 @@
"id": "ocds-213czf-000-00002-01-tender",
"title": "Data merging tool",
"description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.",
"status": "active",
"value": {
"amount": 1000,
"currency": "USD"
Expand Down Expand Up @@ -128,7 +126,6 @@
"id": "ocds-213czf-000-00002-01-tender",
"title": "Data merging tool",
"description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.",
"status": "active",
"value": {
"amount": 2000,
"currency": "USD"
Expand Down Expand Up @@ -185,7 +182,6 @@
"id": "ocds-213czf-000-00002-01-tender",
"title": "Data merging tool",
"description": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail.",
"status": "active",
"value": {
"amount": 2000,
"currency": "USD"
Expand Down Expand Up @@ -343,16 +339,6 @@
"value": "Creation of a data merging tool. The tool should by written in Python. Proposals should be submitted by e-mail."
}
],
"status": [
{
"releaseID": "ocds-213czf-000-00002-01-tender",
"releaseDate": "2016-01-01T09:30:00Z",
"releaseTag": [
"tender"
],
"value": "active"
}
],
"value": {
"amount": [
{
Expand Down
1 change: 0 additions & 1 deletion docs/examples/beneficial_ownership/award.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"awards": [
{
"id": "6031d3f9-f86b-462c-80b2-4a02c760ddcd",
"status": "active",
"date": "2021-06-07T00:00:00Z",
"value": {
"amount": 32191,
Expand Down
1 change: 0 additions & 1 deletion docs/examples/beneficial_ownership/beneficial_owners_extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"awards": [
{
"id": "f867a510-0edf-11eb-a6ca-b5f4fa6e44dc",
"status": "active",
"date": "2020-10-18T12:21:56Z",
"value": {
"amount": 56660,
Expand Down
3 changes: 1 addition & 2 deletions docs/examples/change_history/award.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"id": "ocds-213czf-000-00001-01-tender",
"title": "Planned cycle lane improvements",
"description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
"status": "complete",
"finalStatus": "complete",
"items": [
{
"id": "0001",
Expand Down Expand Up @@ -173,7 +173,6 @@
"id": "ocds-213czf-000-00001-award-01",
"title": "Award of contract to build new cycle lanes in the centre of town.",
"description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
"status": "pending",
"date": "2010-05-10T09:30:00Z",
"value": {
"amount": 11000000,
Expand Down
2 changes: 0 additions & 2 deletions docs/examples/change_history/contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"id": "ocds-213czf-000-00001-award-01",
"title": "Award of contract to build new cycle lanes in the centre of town.",
"description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
"status": "active",
"date": "2010-05-10T09:30:00Z",
"value": {
"amount": 11000000,
Expand Down Expand Up @@ -142,7 +141,6 @@
"awardID": "ocds-213czf-000-00001-award-01",
"title": "Contract to build new cycle lanes in the centre of town.",
"description": "A contract has been signed between the Council and Balfour Beatty Plc for construction of new cycle lanes in the centre of town.",
"status": "active",
"period": {
"startDate": "2010-07-01T00:00:00Z",
"endDate": "2011-08-01T23:59:00Z"
Expand Down
2 changes: 0 additions & 2 deletions docs/examples/change_history/contractAmendment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"id": "ocds-213czf-000-00001-award-01",
"title": "Award of contract to build new cycle lanes in the centre of town.",
"description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
"status": "active",
"date": "2010-05-10T10:30:00Z",
"value": {
"amount": 11000000,
Expand Down Expand Up @@ -142,7 +141,6 @@
"awardID": "ocds-213czf-000-00001-award-01",
"title": "Contract to build new cycle lanes in the centre of town.",
"description": "Contract monitoring for cycle lane construction.",
"status": "active",
"period": {
"startDate": "2010-07-01T00:00:00Z",
"endDate": "2011-10-30T23:59:00Z"
Expand Down
28 changes: 3 additions & 25 deletions docs/examples/change_history/records/award.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"id": "ocds-213czf-000-00001-01-tender",
"title": "Planned cycle lane improvements",
"description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
"status": "active",
"items": [
{
"id": "0001",
Expand Down Expand Up @@ -166,7 +165,6 @@
"id": "ocds-213czf-000-00001-01-tender",
"title": "Planned cycle lane improvements",
"description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
"status": "active",
"items": [
{
"id": "0001",
Expand Down Expand Up @@ -333,7 +331,7 @@
"id": "ocds-213czf-000-00001-01-tender",
"title": "Planned cycle lane improvements",
"description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
"status": "complete",
"finalStatus": "complete",
"items": [
{
"id": "0001",
Expand Down Expand Up @@ -428,7 +426,6 @@
"id": "ocds-213czf-000-00001-award-01",
"title": "Award of contract to build new cycle lanes in the centre of town.",
"description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
"status": "pending",
"date": "2010-05-10T09:30:00Z",
"value": {
"amount": 11000000,
Expand Down Expand Up @@ -563,7 +560,7 @@
"id": "ocds-213czf-000-00001-01-tender",
"title": "Planned cycle lane improvements",
"description": "Tenders solicited for work to build new cycle lanes in the centre of town.",
"status": "complete",
"finalStatus": "complete",
"items": [
{
"id": "0001",
Expand Down Expand Up @@ -658,7 +655,6 @@
"id": "ocds-213czf-000-00001-award-01",
"title": "Award of contract to build new cycle lanes in the centre of town.",
"description": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town.",
"status": "pending",
"date": "2010-05-10T09:30:00Z",
"value": {
"amount": 11000000,
Expand Down Expand Up @@ -1131,15 +1127,7 @@
"value": "Tenders solicited for work to build new cycle lanes in the centre of town."
}
],
"status": [
{
"releaseID": "ocds-213czf-000-00001-02-tender",
"releaseDate": "2010-03-15T09:30:00Z",
"releaseTag": [
"tender"
],
"value": "active"
},
"finalStatus": [
{
"releaseID": "ocds-213czf-000-00001-04-award",
"releaseDate": "2010-05-10T09:30:00Z",
Expand Down Expand Up @@ -1674,16 +1662,6 @@
"value": "Balfour Beatty Plc has been awarded the contract to build new cycle lanes in the centre of town."
}
],
"status": [
{
"releaseID": "ocds-213czf-000-00001-04-award",
"releaseDate": "2010-05-10T09:30:00Z",
"releaseTag": [
"award"
],
"value": "pending"
}
],
"date": [
{
"releaseID": "ocds-213czf-000-00001-04-award",
Expand Down
Loading
Loading