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.

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

tenderStatus, awardStatus contractStatus: update codes #1509

Merged
merged 37 commits into from
Oct 24, 2023
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fcf2e50
Chronologically reordered
JachymHercher May 13, 2022
0ab6579
Remove 'planning' from `tenderStatus`
JachymHercher May 13, 2022
c916e90
Update status codelists
JachymHercher May 13, 2022
c24b42f
Update changelog.md
JachymHercher May 13, 2022
c93eb57
Typo
JachymHercher May 13, 2022
1e8fe3f
release-schema: Add new codes to status enums. Restore deprecated cod…
jpmckinney May 20, 2022
eb933c7
`tenderStatus` 'active' Add comma and change tense
JachymHercher May 23, 2022
1d804f7
tenderStatus 'unsuccessful' Change tense
JachymHercher May 23, 2022
ffe76df
tenderStatus 'cancelled': Change tense
JachymHercher May 23, 2022
ec0ce21
`awardStatus` 'active': Change tense
JachymHercher May 23, 2022
e238cb6
`awardStatus` 'cancelled': Change tense
JachymHercher May 23, 2022
f13de9e
`awardStatus` 'unsuccessful': Change tense
JachymHercher May 23, 2022
bc4331f
`awardStatus` 'complete': Change tense
JachymHercher May 23, 2022
366bb13
`contractStatus` 'active': Change tense
JachymHercher May 23, 2022
4d70268
`contractStatus` 'cancelled': Change tense
JachymHercher May 23, 2022
efa2694
`contractStatus` 'unsuccessful': Change tense
JachymHercher May 23, 2022
f5aa66f
Add deprecation notes and improve changelog
JachymHercher May 23, 2022
7722294
`tenderStatus` 'planned' Remove reference to different field
JachymHercher May 23, 2022
ee1630e
Fix "signed" to "concluded"
JachymHercher May 23, 2022
8aee474
`tenderStatus` 'unsuccessful' put parentheses consistently
JachymHercher May 23, 2022
eac08ae
Fix formatting
JachymHercher May 23, 2022
3f35c23
Change "procurement documents" to "contracting documents (for example…
JachymHercher May 26, 2022
1699662
Change "Publication" to "being available to potential suppliers"
JachymHercher May 26, 2022
e33c21c
`tenderStatus` update 'planned'
JachymHercher May 26, 2022
939d491
Fix "e.g." to "for example,"
JachymHercher May 26, 2022
469e540
`status` codelists: remove new draft codes, update wording with seman…
JachymHercher May 28, 2022
aa5c706
Deprecate the status fields and the codes in status codelists
JachymHercher May 28, 2022
286c94f
Merge branch '1.2-dev' into 1160-update-status-codelists
jpmckinney Jun 20, 2023
e181708
chore: Lint CSV and schema files. Run ./manage.py pre-commit.
jpmckinney Jun 20, 2023
5fd7ac0
Apply suggestions from code review
duncandewhurst Oct 12, 2023
10a4612
Update changelog
duncandewhurst Oct 12, 2023
813f162
Merge branch '1.2-dev' into 1160-update-status-codelists
duncandewhurst Oct 12, 2023
f6217cc
Update schema/codelists/tenderStatus.csv
duncandewhurst Oct 23, 2023
34ee135
schema/codelists/tenderStatus.csv: Update description of 'planned'
duncandewhurst Oct 23, 2023
e9a8019
schema/codelists: Use dot notation in deprecation notices
duncandewhurst Oct 23, 2023
e9dfad7
Apply suggestions from code review
duncandewhurst Oct 24, 2023
7747008
schema/codelists/tenderStatus.csv: Quote deprecation note for withdrawn
duncandewhurst Oct 24, 2023
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
Prev Previous commit
Next Next commit
chore: Lint CSV and schema files. Run ./manage.py pre-commit.
  • Loading branch information
jpmckinney committed Jun 20, 2023
commit e18170859b70d9064a198b4e67f52c498bd02e85
8 changes: 4 additions & 4 deletions schema/codelists/awardStatus.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Code,Title,Description,Deprecated,Deprecation note
pending,Pending,"The award was made, but the standstill period has not yet ended.",1.2,"Deprecated because the same information can be determined by comparing the sum of `awards/date` and `tender/standstillPeriod/durationInDays` (new in 1.2) to `date`."
active,Active,"The award was made and the standstill period, if any, has ended.",1.2,"Deprecated because the same information can be determined by comparing the sum of `awards/date` and `tender/standstillPeriod/durationInDays` (new in 1.2) to `date`."
cancelled,Cancelled,"The award was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended.",1.2,"OCDS 1.2 replaces this code with a new field for final states."
unsuccessful,Unsuccessful,"The award failed (e.g. a review body cancelled the process during the standstill period) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended.",1.2,"OCDS 1.2 replaces this code with a new field for final states."
pending,Pending,"The award was made, but the standstill period has not yet ended.",1.2,Deprecated because the same information can be determined by comparing the sum of `awards/date` and `tender/standstillPeriod/durationInDays` (new in 1.2) to `date`.
active,Active,"The award was made and the standstill period, if any, has ended.",1.2,Deprecated because the same information can be determined by comparing the sum of `awards/date` and `tender/standstillPeriod/durationInDays` (new in 1.2) to `date`.
cancelled,Cancelled,"The award was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended.",1.2,OCDS 1.2 replaces this code with a new field for final states.
unsuccessful,Unsuccessful,"The award failed (e.g. a review body cancelled the process during the standstill period) after the bid submission deadline, but before the award was made or before the standstill period, if any, had ended.",1.2,OCDS 1.2 replaces this code with a new field for final states.
8 changes: 4 additions & 4 deletions schema/codelists/contractStatus.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Code,Title,Description,Deprecated,Deprecation note
pending,Pending,"The award was made and the standstill period, if any, has ended. The contract is not yet concluded (for example, not signed by all parties).",1.2,"Deprecated because the same information can be determined by the absence of a `contracts.dateSigned`."
active,Active,"The contract was concluded (for example, signed by all parties). The contract is not yet terminated.",1.2,"Deprecated because the same information can be determined by comparing `contracts.period` to `date`."
terminated,Terminated,"The contract was concluded (for example, signed), and has now come to a close. This might be due to the successful completion of the contract, or might be early termination due to some non-completion.",1.2,"OCDS 1.2 replaces this code with a new field for final states."
cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the award was made and the standstill period, if any, had ended.",1.2,"OCDS 1.2 replaces this code with a new field for final states."
pending,Pending,"The award was made and the standstill period, if any, has ended. The contract is not yet concluded (for example, not signed by all parties).",1.2,Deprecated because the same information can be determined by the absence of a `contracts.dateSigned`.
active,Active,"The contract was concluded (for example, signed by all parties). The contract is not yet terminated.",1.2,Deprecated because the same information can be determined by comparing `contracts.period` to `date`.
terminated,Terminated,"The contract was concluded (for example, signed), and has now come to a close. This might be due to the successful completion of the contract, or might be early termination due to some non-completion.",1.2,OCDS 1.2 replaces this code with a new field for final states.
cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (e.g. because of a change in needs, insufficient funds, or technical or procedural errors) after the award was made and the standstill period, if any, had ended.",1.2,OCDS 1.2 replaces this code with a new field for final states.
12 changes: 6 additions & 6 deletions schema/codelists/tenderStatus.csv
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Code,Title,Description,Deprecated,Deprecation note
planning,Planning,"A future contracting process is being considered. Early information about the process can be provided in the tender section. A process with this status might provide information on early engagement or consultation opportunities, during which the details of a subsequent tender can be shaped.",1.2,"This code has been deprecated, because it is unnecessary since contracting processes are split from planning processes (which do not have any states themselves)."
planned,Planned,"The contracting process is scheduled, but contracting documents (for example, planning documents) are not yet available to potential suppliers.",1.2,"Deprecated because the same information can be determined by comparing `tender/datePublished` (new in 1.2) to `date` (or its absence)"
active,Active,"The contracting documents (for example, procurement documents) are available to potential suppliers, and the bid submission deadline has not yet passed.",1.2,"Deprecated because the same information can be determined by comparing `tender/datePublished` (new in 1.2) and `tender/tenderPeriod/endDate` to `date`."
complete,Complete,The bid submission deadline has passed.,1.2,"Deprecated because the same information can be determined by comparing `tender/tenderPeriod/endDate` to `date`"
cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the contracting documents (for example, procurement documents) were available to potential supppliers, but not later than the bid submission deadline.",1.2,"OCDS 1.2 replaces this code with a new field for final states."
unsuccessful,Unsuccessful,"The contracting process failed (for example, no bids were received, all bids were withdrawn by the bidders, all bids were rejected by the buyer or the procuring entity) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline.",1.2,"OCDS 1.2 replaces this code with a new field for final states."
withdrawn,Withdrawn,No further information on the contracting process is available under this ocid.,1.2,"OCDS 1.2 replaces this code with a new field for final states."
planned,Planned,"The contracting process is scheduled, but contracting documents (for example, planning documents) are not yet available to potential suppliers.",1.2,Deprecated because the same information can be determined by comparing `tender/datePublished` (new in 1.2) to `date` (or its absence)
active,Active,"The contracting documents (for example, procurement documents) are available to potential suppliers, and the bid submission deadline has not yet passed.",1.2,Deprecated because the same information can be determined by comparing `tender/datePublished` (new in 1.2) and `tender/tenderPeriod/endDate` to `date`.
complete,Complete,The bid submission deadline has passed.,1.2,Deprecated because the same information can be determined by comparing `tender/tenderPeriod/endDate` to `date`
cancelled,Cancelled,"The contracting process was cancelled by the buyer or the procuring entity (for example, because of a change in needs, insufficient funds, or technical or procedural errors) after the contracting documents (for example, procurement documents) were available to potential supppliers, but not later than the bid submission deadline.",1.2,OCDS 1.2 replaces this code with a new field for final states.
unsuccessful,Unsuccessful,"The contracting process failed (for example, no bids were received, all bids were withdrawn by the bidders, all bids were rejected by the buyer or the procuring entity) after the contracting documents (for example, procurement documents) were available to potential suppliers, but not later than the bid submission deadline.",1.2,OCDS 1.2 replaces this code with a new field for final states.
withdrawn,Withdrawn,No further information on the contracting process is available under this ocid.,1.2,OCDS 1.2 replaces this code with a new field for final states.
56 changes: 34 additions & 22 deletions schema/dereferenced-release-schema.json
Original file line number Diff line number Diff line change
@@ -1193,7 +1193,7 @@
},
"planning": {
"title": "Planning",
"description": "Information about, for example, needs identification, budget planning and market research. This information concerns the planning process. This information typically concerns the period before the publication of procurement documents.",
"description": "Information about, for example, needs identification, budget planning and market research. This information concerns the planning process. This information typically concerns the period before contracting documents (for example, procurement documents) are available to potential suppliers.",
"type": "object",
"properties": {
"id": {
@@ -2379,7 +2379,7 @@
},
"tender": {
"title": "Tender",
"description": "Information about, for example, the needed items and their estimated value, procurement method, award criteria, and various deadlines. This information concerns either the contracting process or the planning process. For a contracting process, this information typically concerns the period starting with the publication of procurement documents and ending with the bid submission deadline. For a planning process, this information typically concerns the period before the publication of procurement documents.",
"description": "Information about, for example, the needed items and their estimated value, procurement method, award criteria, and various deadlines. This information concerns either the contracting process or the planning process. For a contracting process, this information typically concerns the period starting with contracting documents (for example, procurement documents) being available to potential suppliers and ending with the bid submission deadline. For a planning process, this information typically concerns the period before contracting documents are available to potential suppliers.",
"type": "object",
"required": [
"id"
@@ -2459,7 +2459,11 @@
"unsuccessful",
"withdrawn",
null
]
],
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"statusDetails": {
"title": "Status details",
@@ -6459,14 +6463,16 @@
"enum": [
"pending",
"active",
"complete",
"cancelled",
"unsuccessful",
"withdrawn",
null
],
"codelist": "awardStatus.csv",
"openCodelist": false
"openCodelist": false,
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"statusDetails": {
"title": "Status details",
@@ -9046,15 +9052,15 @@
"pending",
"active",
"terminated",
"terminatedEarly",
"terminatedSuccessfully",
"cancelled",
"unsuccessful",
"withdrawn",
null
],
"codelist": "contractStatus.csv",
"openCodelist": false
"openCodelist": false,
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"statusDetails": {
"title": "Status details",
@@ -14411,7 +14417,7 @@
"definitions": {
"Planning": {
"title": "Planning",
"description": "Information about, for example, needs identification, budget planning and market research. This information concerns the planning process. This information typically concerns the period before the publication of procurement documents.",
"description": "Information about, for example, needs identification, budget planning and market research. This information concerns the planning process. This information typically concerns the period before contracting documents (for example, procurement documents) are available to potential suppliers.",
"type": "object",
"properties": {
"id": {
@@ -15597,7 +15603,7 @@
},
"Tender": {
"title": "Tender",
"description": "Information about, for example, the needed items and their estimated value, procurement method, award criteria, and various deadlines. This information concerns either the contracting process or the planning process. For a contracting process, this information typically concerns the period starting with the publication of procurement documents and ending with the bid submission deadline. For a planning process, this information typically concerns the period before the publication of procurement documents.",
"description": "Information about, for example, the needed items and their estimated value, procurement method, award criteria, and various deadlines. This information concerns either the contracting process or the planning process. For a contracting process, this information typically concerns the period starting with contracting documents (for example, procurement documents) being available to potential suppliers and ending with the bid submission deadline. For a planning process, this information typically concerns the period before contracting documents are available to potential suppliers.",
"type": "object",
"required": [
"id"
@@ -15677,7 +15683,11 @@
"unsuccessful",
"withdrawn",
null
]
],
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"statusDetails": {
"title": "Status details",
@@ -19673,14 +19683,16 @@
"enum": [
"pending",
"active",
"complete",
"cancelled",
"unsuccessful",
"withdrawn",
null
],
"codelist": "awardStatus.csv",
"openCodelist": false
"openCodelist": false,
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"statusDetails": {
"title": "Status details",
@@ -22254,15 +22266,15 @@
"pending",
"active",
"terminated",
"terminatedEarly",
"terminatedSuccessfully",
"cancelled",
"unsuccessful",
"withdrawn",
null
],
"codelist": "contractStatus.csv",
"openCodelist": false
"openCodelist": false,
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"statusDetails": {
"title": "Status details",
6 changes: 0 additions & 6 deletions schema/release-schema.json
Original file line number Diff line number Diff line change
@@ -607,10 +607,8 @@
"enum": [
"pending",
"active",
"complete",
"cancelled",
"unsuccessful",
"withdrawn",
null
],
"codelist": "awardStatus.csv",
@@ -791,11 +789,7 @@
"pending",
"active",
"terminated",
"terminatedEarly",
"terminatedSuccessfully",
"cancelled",
"unsuccessful",
"withdrawn",
null
],
"codelist": "contractStatus.csv",
24 changes: 15 additions & 9 deletions schema/versioned-release-validation-schema.json
Original file line number Diff line number Diff line change
@@ -244,7 +244,11 @@
"unsuccessful",
"withdrawn",
null
]
],
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"releaseTag": {
"type": "array",
@@ -683,14 +687,16 @@
"enum": [
"pending",
"active",
"complete",
"cancelled",
"unsuccessful",
"withdrawn",
null
],
"codelist": "awardStatus.csv",
"openCodelist": false
"openCodelist": false,
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"releaseTag": {
"type": "array",
@@ -870,15 +876,15 @@
"pending",
"active",
"terminated",
"terminatedEarly",
"terminatedSuccessfully",
"cancelled",
"unsuccessful",
"withdrawn",
null
],
"codelist": "contractStatus.csv",
"openCodelist": false
"openCodelist": false,
"deprecated": {
"description": "Deprecated because the same information can be provided by filling in the relevant date fields.",
"deprecatedVersion": "1.2"
}
},
"releaseTag": {
"type": "array",