From 57bb7d803b51d8d2254dfbaa6aff7c950d7ba04b Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 23 Aug 2023 03:23:08 +0300 Subject: [PATCH 1/6] Add DPS tender config --- .../TenderConfig/dynamicPurchasingSystem.json | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 data_model/schema/TenderConfig/dynamicPurchasingSystem.json diff --git a/data_model/schema/TenderConfig/dynamicPurchasingSystem.json b/data_model/schema/TenderConfig/dynamicPurchasingSystem.json new file mode 100644 index 00000000..5b27baf9 --- /dev/null +++ b/data_model/schema/TenderConfig/dynamicPurchasingSystem.json @@ -0,0 +1,56 @@ +{ + "type": "object", + "properties": { + "hasAuction": { + "type": "boolean", + "enum": [ + true, + false + ], + "default": true + }, + "hasAwardingOrder": { + "type": "boolean", + "enum": [ + true + ], + "default": true + }, + "hasValueRestriction": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "valueCurrencyEquality": { + "type": "boolean", + "enum": [ + true + ], + "default": true + }, + "hasPrequalification": { + "type": "boolean", + "enum": [ + false + ], + "default": false + }, + "minBidsNumber": { + "type": "integer", + "minimum": 1, + "maximum": 1, + "default": 1 + } + }, + "required": [ + "hasAuction", + "hasAwardingOrder", + "hasValueRestriction", + "valueCurrencyEquality", + "hasPrequalification", + "minBidsNumber" + ], + "additionalProperties": false +} From 8b5ff3b355fca2f95fec897819b89d5f64ecfcf0 Mon Sep 17 00:00:00 2001 From: smithumble Date: Tue, 5 Sep 2023 20:57:25 +0300 Subject: [PATCH 2/6] Add preSelection tender configuration --- data_model/schema/TenderConfig/aboveThreshold.json | 10 +++++++++- data_model/schema/TenderConfig/aboveThresholdEU.json | 10 +++++++++- .../schema/TenderConfig/aboveThresholdUA.defense.json | 10 +++++++++- data_model/schema/TenderConfig/aboveThresholdUA.json | 10 +++++++++- data_model/schema/TenderConfig/belowThreshold.json | 10 +++++++++- .../closeFrameworkAgreementSelectionUA.json | 10 +++++++++- .../schema/TenderConfig/closeFrameworkAgreementUA.json | 10 +++++++++- .../schema/TenderConfig/competitiveDialogueEU.json | 10 +++++++++- .../TenderConfig/competitiveDialogueEU.stage2.json | 10 +++++++++- .../schema/TenderConfig/competitiveDialogueUA.json | 10 +++++++++- .../TenderConfig/competitiveDialogueUA.stage2.json | 10 +++++++++- .../schema/TenderConfig/dynamicPurchasingSystem.json | 10 +++++++++- data_model/schema/TenderConfig/esco.json | 10 +++++++++- data_model/schema/TenderConfig/negotiation.json | 10 +++++++++- data_model/schema/TenderConfig/negotiation.quick.json | 10 +++++++++- data_model/schema/TenderConfig/priceQuotation.json | 10 +++++++++- data_model/schema/TenderConfig/reporting.json | 10 +++++++++- data_model/schema/TenderConfig/simple.defense.json | 10 +++++++++- 18 files changed, 162 insertions(+), 18 deletions(-) diff --git a/data_model/schema/TenderConfig/aboveThreshold.json b/data_model/schema/TenderConfig/aboveThreshold.json index 5b27baf9..3e371efb 100644 --- a/data_model/schema/TenderConfig/aboveThreshold.json +++ b/data_model/schema/TenderConfig/aboveThreshold.json @@ -42,6 +42,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -50,7 +57,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdEU.json b/data_model/schema/TenderConfig/aboveThresholdEU.json index 732a04d6..ebd9ba9c 100644 --- a/data_model/schema/TenderConfig/aboveThresholdEU.json +++ b/data_model/schema/TenderConfig/aboveThresholdEU.json @@ -42,6 +42,13 @@ "minimum": 2, "maximum": 2, "default": 2 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -50,7 +57,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdUA.defense.json b/data_model/schema/TenderConfig/aboveThresholdUA.defense.json index 2af728f4..880ac811 100644 --- a/data_model/schema/TenderConfig/aboveThresholdUA.defense.json +++ b/data_model/schema/TenderConfig/aboveThresholdUA.defense.json @@ -42,6 +42,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -50,7 +57,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdUA.json b/data_model/schema/TenderConfig/aboveThresholdUA.json index ad7a9bb0..54b5cf52 100644 --- a/data_model/schema/TenderConfig/aboveThresholdUA.json +++ b/data_model/schema/TenderConfig/aboveThresholdUA.json @@ -42,6 +42,13 @@ "minimum": 2, "maximum": 2, "default": 2 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -50,7 +57,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/belowThreshold.json b/data_model/schema/TenderConfig/belowThreshold.json index d659885e..fef8b00a 100644 --- a/data_model/schema/TenderConfig/belowThreshold.json +++ b/data_model/schema/TenderConfig/belowThreshold.json @@ -46,6 +46,13 @@ "minimum": 1, "maximum": 9, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -54,7 +61,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json b/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json index 4dee78ca..062414b7 100644 --- a/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json +++ b/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json @@ -41,6 +41,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json b/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json index 4e2ddb24..3a017f7b 100644 --- a/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json +++ b/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json @@ -41,6 +41,13 @@ "minimum": 3, "maximum": 3, "default": 3 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueEU.json b/data_model/schema/TenderConfig/competitiveDialogueEU.json index 47e9be58..5f1750a8 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueEU.json +++ b/data_model/schema/TenderConfig/competitiveDialogueEU.json @@ -41,6 +41,13 @@ "minimum": 3, "maximum": 3, "default": 3 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json b/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json index 8e98a805..e265e1f0 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json +++ b/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json @@ -41,6 +41,13 @@ "minimum": 2, "maximum": 2, "default": 2 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueUA.json b/data_model/schema/TenderConfig/competitiveDialogueUA.json index 47e9be58..5f1750a8 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueUA.json +++ b/data_model/schema/TenderConfig/competitiveDialogueUA.json @@ -41,6 +41,13 @@ "minimum": 3, "maximum": 3, "default": 3 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json b/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json index f5ee5bad..1d4b6009 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json +++ b/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json @@ -41,6 +41,13 @@ "minimum": 2, "maximum": 2, "default": 2 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/dynamicPurchasingSystem.json b/data_model/schema/TenderConfig/dynamicPurchasingSystem.json index 5b27baf9..1554215d 100644 --- a/data_model/schema/TenderConfig/dynamicPurchasingSystem.json +++ b/data_model/schema/TenderConfig/dynamicPurchasingSystem.json @@ -42,6 +42,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -50,7 +57,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/esco.json b/data_model/schema/TenderConfig/esco.json index 8e98a805..e265e1f0 100644 --- a/data_model/schema/TenderConfig/esco.json +++ b/data_model/schema/TenderConfig/esco.json @@ -41,6 +41,13 @@ "minimum": 2, "maximum": 2, "default": 2 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/negotiation.json b/data_model/schema/TenderConfig/negotiation.json index b671033c..2551d179 100644 --- a/data_model/schema/TenderConfig/negotiation.json +++ b/data_model/schema/TenderConfig/negotiation.json @@ -41,6 +41,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/negotiation.quick.json b/data_model/schema/TenderConfig/negotiation.quick.json index b671033c..2551d179 100644 --- a/data_model/schema/TenderConfig/negotiation.quick.json +++ b/data_model/schema/TenderConfig/negotiation.quick.json @@ -41,6 +41,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/priceQuotation.json b/data_model/schema/TenderConfig/priceQuotation.json index b671033c..c95972d4 100644 --- a/data_model/schema/TenderConfig/priceQuotation.json +++ b/data_model/schema/TenderConfig/priceQuotation.json @@ -41,6 +41,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + true + ], + "default": true } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/reporting.json b/data_model/schema/TenderConfig/reporting.json index b671033c..2551d179 100644 --- a/data_model/schema/TenderConfig/reporting.json +++ b/data_model/schema/TenderConfig/reporting.json @@ -41,6 +41,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -49,7 +56,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/simple.defense.json b/data_model/schema/TenderConfig/simple.defense.json index 2af728f4..880ac811 100644 --- a/data_model/schema/TenderConfig/simple.defense.json +++ b/data_model/schema/TenderConfig/simple.defense.json @@ -42,6 +42,13 @@ "minimum": 1, "maximum": 1, "default": 1 + }, + "preSelection": { + "type": "boolean", + "enum": [ + false + ], + "default": false } }, "required": [ @@ -50,7 +57,8 @@ "hasValueRestriction", "valueCurrencyEquality", "hasPrequalification", - "minBidsNumber" + "minBidsNumber", + "preSelection" ], "additionalProperties": false } From 6b83677db54b2f2976a696e69ba24c5f62ac0f6b Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 13 Sep 2023 22:00:39 +0300 Subject: [PATCH 3/6] Rename preSelection to hasPreSelectionAgreement --- data_model/schema/TenderConfig/aboveThreshold.json | 4 ++-- data_model/schema/TenderConfig/aboveThresholdEU.json | 4 ++-- data_model/schema/TenderConfig/aboveThresholdUA.defense.json | 4 ++-- data_model/schema/TenderConfig/aboveThresholdUA.json | 4 ++-- data_model/schema/TenderConfig/belowThreshold.json | 4 ++-- .../TenderConfig/closeFrameworkAgreementSelectionUA.json | 4 ++-- data_model/schema/TenderConfig/closeFrameworkAgreementUA.json | 4 ++-- data_model/schema/TenderConfig/competitiveDialogueEU.json | 4 ++-- .../schema/TenderConfig/competitiveDialogueEU.stage2.json | 4 ++-- data_model/schema/TenderConfig/competitiveDialogueUA.json | 4 ++-- .../schema/TenderConfig/competitiveDialogueUA.stage2.json | 4 ++-- data_model/schema/TenderConfig/dynamicPurchasingSystem.json | 4 ++-- data_model/schema/TenderConfig/esco.json | 4 ++-- data_model/schema/TenderConfig/negotiation.json | 4 ++-- data_model/schema/TenderConfig/negotiation.quick.json | 4 ++-- data_model/schema/TenderConfig/priceQuotation.json | 4 ++-- data_model/schema/TenderConfig/reporting.json | 4 ++-- data_model/schema/TenderConfig/simple.defense.json | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/data_model/schema/TenderConfig/aboveThreshold.json b/data_model/schema/TenderConfig/aboveThreshold.json index 3e371efb..9a8a34d5 100644 --- a/data_model/schema/TenderConfig/aboveThreshold.json +++ b/data_model/schema/TenderConfig/aboveThreshold.json @@ -43,7 +43,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -58,7 +58,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdEU.json b/data_model/schema/TenderConfig/aboveThresholdEU.json index ebd9ba9c..ca5e7f8c 100644 --- a/data_model/schema/TenderConfig/aboveThresholdEU.json +++ b/data_model/schema/TenderConfig/aboveThresholdEU.json @@ -43,7 +43,7 @@ "maximum": 2, "default": 2 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -58,7 +58,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdUA.defense.json b/data_model/schema/TenderConfig/aboveThresholdUA.defense.json index 880ac811..7322637c 100644 --- a/data_model/schema/TenderConfig/aboveThresholdUA.defense.json +++ b/data_model/schema/TenderConfig/aboveThresholdUA.defense.json @@ -43,7 +43,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -58,7 +58,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/aboveThresholdUA.json b/data_model/schema/TenderConfig/aboveThresholdUA.json index 54b5cf52..f867ef7d 100644 --- a/data_model/schema/TenderConfig/aboveThresholdUA.json +++ b/data_model/schema/TenderConfig/aboveThresholdUA.json @@ -43,7 +43,7 @@ "maximum": 2, "default": 2 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -58,7 +58,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/belowThreshold.json b/data_model/schema/TenderConfig/belowThreshold.json index fef8b00a..744d15b3 100644 --- a/data_model/schema/TenderConfig/belowThreshold.json +++ b/data_model/schema/TenderConfig/belowThreshold.json @@ -47,7 +47,7 @@ "maximum": 9, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -62,7 +62,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json b/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json index 062414b7..f2658ea7 100644 --- a/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json +++ b/data_model/schema/TenderConfig/closeFrameworkAgreementSelectionUA.json @@ -42,7 +42,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ true @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json b/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json index 3a017f7b..16ef6d50 100644 --- a/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json +++ b/data_model/schema/TenderConfig/closeFrameworkAgreementUA.json @@ -42,7 +42,7 @@ "maximum": 3, "default": 3 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueEU.json b/data_model/schema/TenderConfig/competitiveDialogueEU.json index 5f1750a8..e8f25089 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueEU.json +++ b/data_model/schema/TenderConfig/competitiveDialogueEU.json @@ -42,7 +42,7 @@ "maximum": 3, "default": 3 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json b/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json index e265e1f0..4ff69958 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json +++ b/data_model/schema/TenderConfig/competitiveDialogueEU.stage2.json @@ -42,7 +42,7 @@ "maximum": 2, "default": 2 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueUA.json b/data_model/schema/TenderConfig/competitiveDialogueUA.json index 5f1750a8..e8f25089 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueUA.json +++ b/data_model/schema/TenderConfig/competitiveDialogueUA.json @@ -42,7 +42,7 @@ "maximum": 3, "default": 3 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json b/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json index 1d4b6009..273ec2af 100644 --- a/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json +++ b/data_model/schema/TenderConfig/competitiveDialogueUA.stage2.json @@ -42,7 +42,7 @@ "maximum": 2, "default": 2 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/dynamicPurchasingSystem.json b/data_model/schema/TenderConfig/dynamicPurchasingSystem.json index 1554215d..d0b2d37d 100644 --- a/data_model/schema/TenderConfig/dynamicPurchasingSystem.json +++ b/data_model/schema/TenderConfig/dynamicPurchasingSystem.json @@ -43,7 +43,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ true @@ -58,7 +58,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/esco.json b/data_model/schema/TenderConfig/esco.json index e265e1f0..4ff69958 100644 --- a/data_model/schema/TenderConfig/esco.json +++ b/data_model/schema/TenderConfig/esco.json @@ -42,7 +42,7 @@ "maximum": 2, "default": 2 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/negotiation.json b/data_model/schema/TenderConfig/negotiation.json index 2551d179..156ad36e 100644 --- a/data_model/schema/TenderConfig/negotiation.json +++ b/data_model/schema/TenderConfig/negotiation.json @@ -42,7 +42,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/negotiation.quick.json b/data_model/schema/TenderConfig/negotiation.quick.json index 2551d179..156ad36e 100644 --- a/data_model/schema/TenderConfig/negotiation.quick.json +++ b/data_model/schema/TenderConfig/negotiation.quick.json @@ -42,7 +42,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/priceQuotation.json b/data_model/schema/TenderConfig/priceQuotation.json index c95972d4..422a4d57 100644 --- a/data_model/schema/TenderConfig/priceQuotation.json +++ b/data_model/schema/TenderConfig/priceQuotation.json @@ -42,7 +42,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ true @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/reporting.json b/data_model/schema/TenderConfig/reporting.json index 2551d179..156ad36e 100644 --- a/data_model/schema/TenderConfig/reporting.json +++ b/data_model/schema/TenderConfig/reporting.json @@ -42,7 +42,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -57,7 +57,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } diff --git a/data_model/schema/TenderConfig/simple.defense.json b/data_model/schema/TenderConfig/simple.defense.json index 880ac811..7322637c 100644 --- a/data_model/schema/TenderConfig/simple.defense.json +++ b/data_model/schema/TenderConfig/simple.defense.json @@ -43,7 +43,7 @@ "maximum": 1, "default": 1 }, - "preSelection": { + "hasPreSelectionAgreement": { "type": "boolean", "enum": [ false @@ -58,7 +58,7 @@ "valueCurrencyEquality", "hasPrequalification", "minBidsNumber", - "preSelection" + "hasPreSelectionAgreement" ], "additionalProperties": false } From 9a889f74ee3f50eeffa0087b66ae7aaefc383aaa Mon Sep 17 00:00:00 2001 From: smithumble Date: Fri, 22 Sep 2023 01:50:50 +0300 Subject: [PATCH 4/6] Add blank hasPreSelectionAgreement to tender config codelists --- codelists/tender/tender_config.json | 6 ++++++ ...ynamicPurchasingSystem.json => competitiveOrdering.json} | 0 2 files changed, 6 insertions(+) rename data_model/schema/TenderConfig/{dynamicPurchasingSystem.json => competitiveOrdering.json} (100%) diff --git a/codelists/tender/tender_config.json b/codelists/tender/tender_config.json index 96659419..01b62490 100644 --- a/codelists/tender/tender_config.json +++ b/codelists/tender/tender_config.json @@ -34,5 +34,11 @@ "description_uk": "Параметр, що визначає у закупівлі кількість пропозицій достатню для того, щоб вона відбулась", "name_en": "Minimum number of bids", "description_en": "The parameter that determines the number of bids in procurement sufficient for it to take place" + }, + "hasPreSelectionAgreement": { + "name_uk": "TBD", + "description_uk": "TBD", + "name_en": "TBD", + "description_en": "TBD" } } diff --git a/data_model/schema/TenderConfig/dynamicPurchasingSystem.json b/data_model/schema/TenderConfig/competitiveOrdering.json similarity index 100% rename from data_model/schema/TenderConfig/dynamicPurchasingSystem.json rename to data_model/schema/TenderConfig/competitiveOrdering.json From f904e7156f40f11d75f10990b8842f7ee1320970 Mon Sep 17 00:00:00 2001 From: smithumble Date: Fri, 29 Sep 2023 02:13:52 +0300 Subject: [PATCH 5/6] Add hasPreSelectionAgreement names and descriptions to tender config codelists --- codelists/tender/tender_config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codelists/tender/tender_config.json b/codelists/tender/tender_config.json index 01b62490..ef690098 100644 --- a/codelists/tender/tender_config.json +++ b/codelists/tender/tender_config.json @@ -36,9 +36,9 @@ "description_en": "The parameter that determines the number of bids in procurement sufficient for it to take place" }, "hasPreSelectionAgreement": { - "name_uk": "TBD", - "description_uk": "TBD", - "name_en": "TBD", - "description_en": "TBD" + "name_uk": "Відбір з попередньо кваліфікованими учасниками", + "description_uk": "Параметр, що визначає наявність або відсутність у закупівлі попереднього етапу кваліфікаційного відбору учасників", + "name_en": "Selection with pre-qualified participants", + "description_en": "The parameter that determines the presence or absence of the preliminary stage of the qualification selection of participants in the procurement" } } From 83dde2c30cde505be1973c2ef31e924f0b96e5a5 Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 11 Oct 2023 23:07:35 +0300 Subject: [PATCH 6/6] competitiveOrdering pmt --- codelists/tender/tender_procurement_method_type.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/codelists/tender/tender_procurement_method_type.json b/codelists/tender/tender_procurement_method_type.json index 6c489f7a..08ca0bfa 100644 --- a/codelists/tender/tender_procurement_method_type.json +++ b/codelists/tender/tender_procurement_method_type.json @@ -15,6 +15,14 @@ "description_uk": "Ця процедура застосовується в рамках дії постанови \"Про особливості здійснення закупівель товарів, робіт і послуг на період дії правового режиму воєнного стану в Україні та протягом 90 днів з дня його припинення або скасування\" і регулює закупівлі вище граничних сум, встановлених цією постановою: для товарів та послуг - більше 100 тисяч гривень; для послуг з поточного ремонту більше - 200 тисяч; гривень; для робіт більше - 1,5 мільйона гривень. Процес закупівлі: уточнення умов та прийняття пропозиції (не менше 7 днів), проведення аукціону, кваліфікація учасників (в тому числі однієї пропозиції), визначення переможця та укладення договору про закупівлю (не раніше, ніж на 6 день після визначення переможця).", "name_uk": "Відкриті торги з особливостями" }, + "competitiveOrdering": { + "autoInitiated": false, + "procurementMethod": "selective", + "description_en": "A procedure used within a dynamic procurement system.", + "name_en": "Tender", + "description_uk": "Процедура, що використовується в рамках динамічної системи закупівель.", + "name_uk": "Тендер" + }, "aboveThresholdUA": { "autoInitiated": false, "procurementMethod": "open",