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
Show file tree
Hide file tree
Changes from 29 commits
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
10 changes: 9 additions & 1 deletion docs/history/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,15 @@ Per the [normative and non-normative content and changes policy](https://docs.go
* [#1238](https://github.com/open-contracting/standard/pull/1238) Open the `releaseTag` codelist.
* [#1415](https://github.com/open-contracting/standard/pull/1415) Align descriptions of 'planning', 'tender', 'award' and 'contract' with the corresponding schema fields.

* [#1201](https://github.com/open-contracting/standard/pull/1201) Add 'terminatedEarly' and 'terminatedSuccessfully' codes to the `contractStatus` codelist, to distinguish between successful completion and early termination of the contract.
* `tenderStatus`, `awardStatus` and `contractStatus`:
* [#1509](https://github.com/open-contracting/standard/pull/1509) Major change of descriptions, adding and deprecating the following codes.
* Deprecated: 'planning' in `tenderStatus`. Deprecated because it is unnecessary since contracting processes are now split from planning processes (which do not have any states themselves).
* Deprecated: 'pending' in `awardStatus` and `contractStatus`. Deprecated because the code (which would follow 'active') does not provide any additional information compared to `awardDate` and `dateSigned` and, in the case of `contractStatus` has unclear semantics ("proposed").
* Added: 'withdrawn' in `awardStatus` and `contractStatus`, as information can stop being published at any moment also for only individual awards / contracts.
* Added: 'complete' in `awardStatus`, as there was no code suggesting that the award successfully happened and was done (the equivalent in `contractStatus` is 'terminated'.)
* Added 'unsuccessful' in `contractStatus`, as a failure not caused by the buyer can happen also in the contract stage (e.g. the winning bidder(s) refuses to sign the contract).
* [#1201](https://github.com/open-contracting/standard/pull/1201) Add 'terminatedEarly' and 'terminatedSuccessfully' to the `contractStatus` codelist, to distinguish between successful completion and early termination of the contract.

jpmckinney marked this conversation as resolved.
Show resolved Hide resolved
* [#1200](https://github.com/open-contracting/standard/pull/1200) Deprecate the `submissionMethod` codelist, because its codes were either not submission methods, or not supported by use cases.
* [#1389](https://github.com/open-contracting/standard/pull/1389) Deprecate the `initiationType` codelist, because the approach to data modelling that it supports was not pursued.
* [#1209](https://github.com/open-contracting/standard/pull/1209) Replace "electronic goods" with "digital goods" in the description of 'goods' from the `procurementCategory` codelist, to align with the description in the World Trade Organization's Agreement on Government Procurement, and to avoid confusion between electronic goods like computers and digital goods like software.
Expand Down
10 changes: 5 additions & 5 deletions schema/codelists/awardStatus.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Code,Title,Description
pending,Pending,"This award has been proposed, but is not yet in force. This can be due to a cooling off period, or some other process."
jpmckinney marked this conversation as resolved.
Show resolved Hide resolved
active,Active,"This award has been made, and is currently in force."
cancelled,Cancelled,This award has been cancelled.
unsuccessful,Unsuccessful,"This award could not be successfully made. If items or supplier details are included within the award section, then these narrow the scope of the unsuccessful award (i.e. the award of noted items, or an award to the noted supplier, was unsuccessful, but there can be other successful awards for different items listed in the tender, or to different suppliers)."
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.
12 changes: 5 additions & 7 deletions schema/codelists/contractStatus.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Code,Title,Description
pending,Pending,"This contract has been proposed, but is not yet in force. It might be awaiting signature."
active,Active,"This contract has been concluded by all the parties, and is now legally in force."
cancelled,Cancelled,This contract has been cancelled prior to being concluded.
terminated,Terminated,"This contract was concluded and in force, 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."
terminatedEarly,Terminated early,"This contract was concluded and in force, and is terminated early due to some non-completion."
terminatedSuccessfully,Terminated successfully,"This contract was concluded and in force, and is terminated due to its successful completion."
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`.
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
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`.
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
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.
4 changes: 2 additions & 2 deletions schema/codelists/releaseTag.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Code,Title,Description
planning,Planning,"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."
planning,Planning,"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."
planningUpdate,Planning update,"Details of a proposed or planned contracting process are being updated. This might include addition of information and documents from consultation engagement activities, revised details or timelines for a proposed contracting process, or a tender.status update to indicate that a pipeline proposal has been withdrawn."
tender,Tender,"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."
tender,Tender,"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 the contracting documents are available to potential suppliers."
tenderAmendment,Tender amendment,"An amendment to an existing tender release. There should be at least one tender release with the same ocid, but an earlier release date, before a tenderAmendment is published. The term amendment has legal meaning in many jurisdictions."
tenderUpdate,Tender update,"An update to an existing tender release. There should be at least one tender release with the same ocid, but an earlier release date, before a tenderUpdate is published. An update may add new information or make corrections to prior published information. It should not be used for formal legal amendments to a tender, for which the tenderAmendment tag should be used."
tenderCancellation,Tender cancellation,"The cancellation of an existing tender. There should be at least one release with the same ocid, but an earlier release date, which provides details of the tender being cancelled."
Expand Down
16 changes: 8 additions & 8 deletions schema/codelists/tenderStatus.csv
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Code,Title,Description
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."
planned,Planned,"A contracting process is scheduled, but is not yet taking place. Details of the anticipated dates can be provided in the tender block."
active,Active,A tender process is currently taking place.
cancelled,Cancelled,The tender process has been cancelled.
unsuccessful,Unsuccessful,The tender process was unsuccessful.
complete,Complete,The tender process is complete.
withdrawn,Withdrawn,No further information on this process is available under this ocid.
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)."
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
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)
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
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`
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
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.
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
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.
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
56 changes: 38 additions & 18 deletions schema/dereferenced-release-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2454,12 +2454,16 @@
"planning",
"planned",
"active",
"complete",
"cancelled",
"unsuccessful",
"complete",
"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",
Expand Down Expand Up @@ -6464,7 +6468,11 @@
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",
Expand Down Expand Up @@ -9043,14 +9051,16 @@
"enum": [
"pending",
"active",
"cancelled",
"terminated",
"terminatedEarly",
"terminatedSuccessfully",
"cancelled",
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",
Expand Down Expand Up @@ -14407,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": {
Expand Down Expand Up @@ -15593,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"
Expand Down Expand Up @@ -15668,12 +15678,16 @@
"planning",
"planned",
"active",
"complete",
"cancelled",
"unsuccessful",
"complete",
"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",
Expand Down Expand Up @@ -19674,7 +19688,11 @@
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",
Expand Down Expand Up @@ -22247,14 +22265,16 @@
"enum": [
"pending",
"active",
"cancelled",
"terminated",
"terminatedEarly",
"terminatedSuccessfully",
"cancelled",
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",
Expand Down
Loading