From 74260fd378cb54dc36a058749d57cdddb8f70989 Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 20 Oct 2023 10:39:59 +0100 Subject: [PATCH 1/4] add nonElectronicSubmissionAddress object --- README.md | 13 ++++++++++++- release-schema.json | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d5134f..94c2c7e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,14 @@ In the European Union, this extension's fields correspond to [eForms BG-102 (Sub "depositsGuarantees": "An on-demand performance bond issued by an entity that the Contracting Entity judges to be acceptable (e.g. a bank or insurance company) and whose value is a percentage of the total contract price.", "subcontractingClauses": [ "subc-oblig" - ] + ], + "nonElectronicSubmissionAddress": { + "streetAddress": "Town Hall, St Aldate's", + "region": "Oxfordshire", + "locality": "Oxford", + "postalCode": "OX1 1BX", + "countryName": "United Kingdom" + } } } } @@ -42,6 +49,10 @@ Report issues for this extension in the [ocds-extensions repository](https://git ## Changelog +### 2023-10-20 + +* Add `nonElectronicSubmissionAddress` field. + ### 2023-06-07 * Define "electronic catalog" for the `electronicCataloguePolicy` field. diff --git a/release-schema.json b/release-schema.json index 2a631f5..3adeed7 100644 --- a/release-schema.json +++ b/release-schema.json @@ -137,6 +137,11 @@ }, "uniqueItems": true, "minItems": 1 + }, + "nonElectronicSubmissionAddress": { + "title": "Non-electronic submission address", + "description": "The address the which non-electronic bids should be submitted.", + "$ref": "#/definitions/Address" } }, "minProperties": 1 From 7ae944e8385a309322e829b690f7f1d272297720 Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 17 Nov 2023 09:37:39 +0000 Subject: [PATCH 2/4] address review comments, create nonElectronicSubmission object --- README.md | 21 ++++++++++++--------- release-schema.json | 34 +++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 94c2c7e..4404567 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ In the European Union, this extension's fields correspond to [eForms BG-102 (Sub "tender": { "submissionTerms": { "electronicSubmissionPolicy": "notAllowed", - "nonElectronicSubmissionRationale": "Inclusion of a physical model", "advancedElectronicSignatureRequired": false, "electronicCataloguePolicy": "notAllowed", "variantPolicy": "notAllowed", @@ -31,12 +30,15 @@ In the European Union, this extension's fields correspond to [eForms BG-102 (Sub "subcontractingClauses": [ "subc-oblig" ], - "nonElectronicSubmissionAddress": { - "streetAddress": "Town Hall, St Aldate's", - "region": "Oxfordshire", - "locality": "Oxford", - "postalCode": "OX1 1BX", - "countryName": "United Kingdom" + "nonElectronicSubmission": { + "address": { + "streetAddress": "Town Hall, St Aldate's", + "region": "Oxfordshire", + "locality": "Oxford", + "postalCode": "OX1 1BX", + "countryName": "United Kingdom" + }, + "rationale": "Inclusion of a physical model" } } } @@ -51,7 +53,8 @@ Report issues for this extension in the [ocds-extensions repository](https://git ### 2023-10-20 -* Add `nonElectronicSubmissionAddress` field. +* Add `nonElectronicSubmission` object. +* Remove nonElectronicSubmissionRationale field. ### 2023-06-07 @@ -62,7 +65,7 @@ Report issues for this extension in the [ocds-extensions repository](https://git * Add fields for eForms: * `SubmissionTerms.advancedElectronicSignatureRequired` * `SubmissionTerms.multipleBidsAllowed` - * `SubmissionTerms.nonElectronicSubmissionRationale` + * SubmissionTerms.nonElectronicSubmissionRationale * `SubmissionTerms.subcontractingClauses` ### 2020-09-29 diff --git a/release-schema.json b/release-schema.json index 3adeed7..89f4449 100644 --- a/release-schema.json +++ b/release-schema.json @@ -115,15 +115,6 @@ "null" ] }, - "nonElectronicSubmissionRationale": { - "title": "Non-electronic submission rationale", - "description": "The rationale for electronic submission not being allowed.", - "type": [ - "string", - "null" - ], - "minLength": 1 - }, "subcontractingClauses": { "title": "Subcontracting clauses", "description": "The information about subcontracting that needs to be provided in the bid.", @@ -138,10 +129,27 @@ "uniqueItems": true, "minItems": 1 }, - "nonElectronicSubmissionAddress": { - "title": "Non-electronic submission address", - "description": "The address the which non-electronic bids should be submitted.", - "$ref": "#/definitions/Address" + "nonElectronicSubmission": { + "title": "Non-electronic submission", + "description": "Information about non-electronic submission requirements.", + "type": "object", + "properties": { + "rationale": { + "title": "Non-electronic submission rationale", + "description": "The rationale for electronic submission not being allowed.", + "type": [ + "string", + "null" + ], + "minLength": 1 + }, + "address": { + "title": "Non-electronic submission address", + "description": "The address to which non-electronic bids should be submitted.", + "$ref": "#/definitions/Address" + } + }, + "minProperties": 1 } }, "minProperties": 1 From eb658837a50e03fb8b9b3c235fce7ca0fa4d50b4 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Tue, 21 Nov 2023 16:40:58 -0500 Subject: [PATCH 3/4] readme: Restore Markdown formatting --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4404567..30b1c19 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,8 @@ Report issues for this extension in the [ocds-extensions repository](https://git ### 2023-10-20 -* Add `nonElectronicSubmission` object. -* Remove nonElectronicSubmissionRationale field. +* Add `SubmissionTerms.nonElectronicSubmission` field. +* Remove `SubmissionTerms.nonElectronicSubmissionRationale` field. ### 2023-06-07 @@ -65,7 +65,7 @@ Report issues for this extension in the [ocds-extensions repository](https://git * Add fields for eForms: * `SubmissionTerms.advancedElectronicSignatureRequired` * `SubmissionTerms.multipleBidsAllowed` - * SubmissionTerms.nonElectronicSubmissionRationale + * `SubmissionTerms.nonElectronicSubmissionRationale` * `SubmissionTerms.subcontractingClauses` ### 2020-09-29 From b94543558aa213b39aa360f6cfce39f092270b71 Mon Sep 17 00:00:00 2001 From: odscjen <95221058+odscjen@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:20:08 +0000 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com> --- release-schema.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-schema.json b/release-schema.json index 89f4449..87732d5 100644 --- a/release-schema.json +++ b/release-schema.json @@ -135,7 +135,7 @@ "type": "object", "properties": { "rationale": { - "title": "Non-electronic submission rationale", + "title": "Rationale", "description": "The rationale for electronic submission not being allowed.", "type": [ "string", @@ -144,7 +144,7 @@ "minLength": 1 }, "address": { - "title": "Non-electronic submission address", + "title": "Address", "description": "The address to which non-electronic bids should be submitted.", "$ref": "#/definitions/Address" }