From acbb99381c7a8d0300b657c488cb24b325c2c517 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 23 Sep 2021 16:12:35 +1200 Subject: [PATCH 1/5] Add tender.standstillPeriod field --- schema/dereferenced-release-schema.json | 84 +++++++++++++++++++ schema/release-schema.json | 5 ++ .../versioned-release-validation-schema.json | 3 + 3 files changed, 92 insertions(+) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index ac56b87de..36f42589d 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -4388,6 +4388,48 @@ } } }, + "standstillPeriod": { + "title": "Standstill period", + "description": "The period starting from the dispatch of the notice of intention to award, during which suppliers can challenge the award decision.", + "type": "object", + "properties": { + "startDate": { + "title": "Start date", + "description": "The start date for the period. When known, a precise start date must be provided.", + "type": [ + "string", + "null" + ], + "format": "date-time" + }, + "endDate": { + "title": "End date", + "description": "The end date for the period. When known, a precise end date must be provided.", + "type": [ + "string", + "null" + ], + "format": "date-time" + }, + "maxExtentDate": { + "description": "The period cannot be extended beyond this date. This field can be used to express the maximum available date for extension or renewal of this period.", + "format": "date-time", + "title": "Maximum extent", + "type": [ + "string", + "null" + ] + }, + "durationInDays": { + "description": "The maximum duration of this period in days. A user interface can collect or display this data in months or years as appropriate, and then convert it into days when storing this field. This field can be used when exact dates are not known. If a startDate and endDate are set, this field, if used, must be equal to the difference between startDate and endDate. Otherwise, if a startDate and maxExtentDate are set, this field, if used, must be equal to the difference between startDate and maxExtentDate.", + "title": "Duration (days)", + "type": [ + "integer", + "null" + ] + } + } + }, "contractPeriod": { "title": "Contract period", "description": "The period over which the contract is estimated or required to be active. If the tender does not specify explicit dates, the duration field may be used.", @@ -15983,6 +16025,48 @@ } } }, + "standstillPeriod": { + "title": "Standstill period", + "description": "The period starting from the dispatch of the notice of intention to award, during which suppliers can challenge the award decision.", + "type": "object", + "properties": { + "startDate": { + "title": "Start date", + "description": "The start date for the period. When known, a precise start date must be provided.", + "type": [ + "string", + "null" + ], + "format": "date-time" + }, + "endDate": { + "title": "End date", + "description": "The end date for the period. When known, a precise end date must be provided.", + "type": [ + "string", + "null" + ], + "format": "date-time" + }, + "maxExtentDate": { + "description": "The period cannot be extended beyond this date. This field can be used to express the maximum available date for extension or renewal of this period.", + "format": "date-time", + "title": "Maximum extent", + "type": [ + "string", + "null" + ] + }, + "durationInDays": { + "description": "The maximum duration of this period in days. A user interface can collect or display this data in months or years as appropriate, and then convert it into days when storing this field. This field can be used when exact dates are not known. If a startDate and endDate are set, this field, if used, must be equal to the difference between startDate and endDate. Otherwise, if a startDate and maxExtentDate are set, this field, if used, must be equal to the difference between startDate and maxExtentDate.", + "title": "Duration (days)", + "type": [ + "integer", + "null" + ] + } + } + }, "contractPeriod": { "title": "Contract period", "description": "The period over which the contract is estimated or required to be active. If the tender does not specify explicit dates, the duration field may be used.", diff --git a/schema/release-schema.json b/schema/release-schema.json index 1716459e9..c9bda767a 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -443,6 +443,11 @@ "description": "The period for decision making regarding the contract award. The end date should be the date on which an award decision is due to be finalized. The start date may be used to indicate the start of an evaluation period.", "$ref": "#/definitions/Period" }, + "standstillPeriod": { + "title": "Standstill period", + "description": "The period starting from the dispatch of the notice of intention to award, during which suppliers can challenge the award decision.", + "$ref": "#/definitions/Period" + }, "contractPeriod": { "description": "The period over which the contract is estimated or required to be active. If the tender does not specify explicit dates, the duration field may be used.", "title": "Contract period", diff --git a/schema/versioned-release-validation-schema.json b/schema/versioned-release-validation-schema.json index eaebe6c12..3eed6d9be 100644 --- a/schema/versioned-release-validation-schema.json +++ b/schema/versioned-release-validation-schema.json @@ -508,6 +508,9 @@ "awardPeriod": { "$ref": "#/definitions/Period" }, + "standstillPeriod": { + "$ref": "#/definitions/Period" + }, "contractPeriod": { "$ref": "#/definitions/Period" }, From 15e753e470a8190e676a63ed8b62798dc7087a65 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Thu, 23 Sep 2021 16:14:09 +1200 Subject: [PATCH 2/5] Update changelog --- docs/history/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index bb7d00e51..8c3e2a082 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -160,6 +160,7 @@ Per the [normative and non-normative content and changes policy](https://docs.go * `contracts.maximumValue` * `contracts.estimatedValue` * [#1372](https://github.com/open-contracting/standard/pull/1372) `Address.country` + * [#1421](https://github.com/open-contracting/standard/pull/1421) `tender.standstillPeriod` * Deprecate some fields: * [#1200](https://github.com/open-contracting/standard/pull/1200) `tender.submissionMethod`, because all codes from the `submissionMethod` codelist are deprecated. From a2fde4a3ba5926105daee2d46e2264d394ba6267 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Tue, 19 Oct 2021 15:18:43 +1300 Subject: [PATCH 3/5] Preserve schema order in changelog --- docs/history/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/history/changelog.md b/docs/history/changelog.md index ec56e3e84..dfa51db98 100644 --- a/docs/history/changelog.md +++ b/docs/history/changelog.md @@ -149,6 +149,7 @@ Per the [normative and non-normative content and changes policy](https://docs.go * Add new fields: * [#1335](https://github.com/open-contracting/standard/pull/1335) `planning.id` * [#1324](https://github.com/open-contracting/standard/pull/1324) `tender.datePublished` + * [#1421](https://github.com/open-contracting/standard/pull/1421) `tender.standstillPeriod` * [#1165](https://github.com/open-contracting/standard/pull/1165) `statusDetails` to `Tender`, `Award` and `Contract` * [#1125](https://github.com/open-contracting/standard/pull/1125) `Item.unit.weight` * [#1326](https://github.com/open-contracting/standard/pull/1326) `links` @@ -160,7 +161,6 @@ Per the [normative and non-normative content and changes policy](https://docs.go * `contracts.maximumValue` * `contracts.estimatedValue` * [#1372](https://github.com/open-contracting/standard/pull/1372) `Address.country` - * [#1421](https://github.com/open-contracting/standard/pull/1421) `tender.standstillPeriod` * [#1380](https://github.com/open-contracting/standard/pull/1380) `Document.languages` * Deprecate some fields: From 566384d8330aedc26cbe1d6eef77278702bf0315 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 8 Dec 2021 11:41:56 +1300 Subject: [PATCH 4/5] Update tender.standstillPeriod description --- schema/release-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/release-schema.json b/schema/release-schema.json index 56c1b9e50..16667b651 100644 --- a/schema/release-schema.json +++ b/schema/release-schema.json @@ -445,7 +445,7 @@ }, "standstillPeriod": { "title": "Standstill period", - "description": "The period starting from the dispatch of the notice of intention to award, during which suppliers can challenge the award decision.", + "description": "The period before the contract signature during which the award decision can be challenged. This period typically starts on the date on which the tenderers are informed about the award decision.", "$ref": "#/definitions/Period" }, "contractPeriod": { From fa91885aacefbf0f387fd061d9f0716e93ac1d55 Mon Sep 17 00:00:00 2001 From: Duncan Dewhurst Date: Wed, 8 Dec 2021 12:01:42 +1300 Subject: [PATCH 5/5] Run manage.py pre-commit --- schema/dereferenced-release-schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schema/dereferenced-release-schema.json b/schema/dereferenced-release-schema.json index 1b1b91c65..f9706f94a 100644 --- a/schema/dereferenced-release-schema.json +++ b/schema/dereferenced-release-schema.json @@ -4424,7 +4424,7 @@ }, "standstillPeriod": { "title": "Standstill period", - "description": "The period starting from the dispatch of the notice of intention to award, during which suppliers can challenge the award decision.", + "description": "The period before the contract signature during which the award decision can be challenged. This period typically starts on the date on which the tenderers are informed about the award decision.", "type": "object", "properties": { "startDate": { @@ -16214,7 +16214,7 @@ }, "standstillPeriod": { "title": "Standstill period", - "description": "The period starting from the dispatch of the notice of intention to award, during which suppliers can challenge the award decision.", + "description": "The period before the contract signature during which the award decision can be challenged. This period typically starts on the date on which the tenderers are informed about the award decision.", "type": "object", "properties": { "startDate": {