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

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

Merged
merged 43 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from 7 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
2 changes: 2 additions & 0 deletions docs/history/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ Per the [normative and non-normative content and changes policy](../governance/n
* [#1421](https://github.com/open-contracting/standard/pull/1421) `tender.standstillPeriod`
* [#1492](https://github.com/open-contracting/standard/pull/1492) `awards.datePublished`
* [#1165](https://github.com/open-contracting/standard/pull/1165) `statusDetails` to `Tender`, `Award` and `Contract`
* [#1648](https://github.com/open-contracting/standard/pull/1648) `finalStatus` to `Tender`, `Award` and `Contract`
* [#1208](https://github.com/open-contracting/standard/pull/1326) The estimated and maximum values of framework agreeemnts:
* `tender.maximumValue`. Previously, `tender.value` was used for the maximum value. However, this led to double-counting.
* `awards.maximumValue`. Previously, `awards.value` was used for the maximum value. However, this led to double-counting.
Expand Down Expand Up @@ -225,6 +226,7 @@ Per the [normative and non-normative content and changes policy](../governance/n
* [#1519](https://github.com/open-contracting/standard/pull/1519) `value.amount`, to clarify amount taken from system or document.
* [#1618](https://github.com/open-contracting/standard/pull/1618) `tender.enquiryPeriod`, to remove the suggestion to use `tender.submissionMethodDetails` for information about how to submit enquiries.
* [#1618](https://github.com/open-contracting/standard/pull/1618) Normalize field descriptions according to a style guide.
* [#1648](https://github.com/open-contracting/standard/pull/1648) `tender.datePublished`, to clarify its relation to procurement documents.
* [#1509](https://github.com/open-contracting/standard/pull/1509) `planning`, `Planning`, `tender` and `Tender` to clarify relationships with the availability of documents.

* Remove confusing terminology:
Expand Down
30 changes: 30 additions & 0 deletions docs/schema/codelists.md
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,33 @@ For enterprises without employees, use the 'micro' code.
:header-rows: 1
:file: ../../build/current_lang/codelists/partyScale.csv
```

### Tender final status
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved

```{versionadded} 1.2
```

```{csv-table-no-translate}
:header-rows: 1
:file: ../../build/current_lang/codelists/tenderFinalStatus.csv
```

### Award final status

```{versionadded} 1.2
```

```{csv-table-no-translate}
:header-rows: 1
:file: ../../build/current_lang/codelists/awardFinalStatus.csv
```

### Contract final status

```{versionadded} 1.2
```

```{csv-table-no-translate}
:header-rows: 1
:file: ../../build/current_lang/codelists/contractFinalStatus.csv
```
4 changes: 4 additions & 0 deletions schema/codelists/awardFinalStatus.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Code,Title,Description
complete,Complete,"The award was made and the standstill period, if any, has ended."
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."
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
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."
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions schema/codelists/contractFinalStatus.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Code,Title,Description
terminatedSuccessfully,Terminated successfully,"The contract was concluded and in force, and is terminated due to its successful completion."
terminatedEarly,Terminated early,"The contract was concluded and in force, and is terminated early due to some non-completion."
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."
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
unsuccessful,Unsuccessful,"The contract failed (e.g. the winning bidder(s) refused to sign the contract) after the award was made and the standstill period, if any, had ended, but before the contract was concluded and in force."
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions schema/codelists/tenderFinalStatus.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Code,Title,Description
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."
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."
100 changes: 98 additions & 2 deletions schema/dereferenced-release-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4730,7 +4730,7 @@
]
},
"datePublished": {
"description": "The date on which the tender was published.",
"description": "The date on which the contracting documents (for example, procurement documents) were published.",
"format": "date-time",
"title": "Date published",
"type": [
Expand Down Expand Up @@ -6481,6 +6481,21 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Tender final status",
"description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.",
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "tenderFinalStatus.csv",
"openCodelist": false,
"enum": [
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down Expand Up @@ -9120,6 +9135,22 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Award final status",
"description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.",
jpmckinney marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "awardFinalStatus.csv",
"openCodelist": false,
"enum": [
"complete",
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down Expand Up @@ -14588,6 +14619,23 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Contract final status",
"description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.",
jpmckinney marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "contractFinalStatus.csv",
"openCodelist": false,
"enum": [
"terminatedSuccessfully",
"terminatedEarly",
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down Expand Up @@ -18258,7 +18306,7 @@
]
},
"datePublished": {
"description": "The date on which the tender was published.",
"description": "The date on which the contracting documents (for example, procurement documents) were published.",
"format": "date-time",
"title": "Date published",
"type": [
Expand Down Expand Up @@ -20009,6 +20057,21 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Tender final status",
"description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.",
jpmckinney marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "tenderFinalStatus.csv",
"openCodelist": false,
"enum": [
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down Expand Up @@ -22644,6 +22707,22 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Award final status",
"description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.",
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "awardFinalStatus.csv",
"openCodelist": false,
"enum": [
"complete",
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down Expand Up @@ -28106,6 +28185,23 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Contract final status",
"description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.",
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "contractFinalStatus.csv",
"openCodelist": false,
"enum": [
"terminatedSuccessfully",
"terminatedEarly",
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down
50 changes: 49 additions & 1 deletion schema/release-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
]
},
"datePublished": {
"description": "The date on which the tender was published.",
"description": "The date on which the contracting documents (for example, procurement documents) were published.",
"format": "date-time",
"title": "Date published",
"type": [
Expand Down Expand Up @@ -517,6 +517,21 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Tender final status",
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"description": "The final status of the tender, from the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.",
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "tenderFinalStatus.csv",
"openCodelist": false,
"enum": [
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down Expand Up @@ -708,6 +723,22 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Award final status",
"description": "The final status of the award, from the closed [awardFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-final-status) codelist.",
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "awardFinalStatus.csv",
"openCodelist": false,
"enum": [
"complete",
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down Expand Up @@ -893,6 +924,23 @@
"description": "The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.",
"deprecatedVersion": "1.1"
}
},
"finalStatus": {
"title": "Contract final status",
"description": "The final status of the contract, from the closed [contractFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-final-status) codelist.",
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string",
"null"
],
"codelist": "contractFinalStatus.csv",
"openCodelist": false,
"enum": [
"terminatedSuccessfully",
"terminatedEarly",
"cancelled",
"unsuccessful",
null
]
}
},
"patternProperties": {
Expand Down
Loading