From 6a1cdbef51c3ebd83c5e095560f7ea4153ca0825 Mon Sep 17 00:00:00 2001 From: smithumble Date: Wed, 4 Sep 2024 10:38:28 +0300 Subject: [PATCH] Add duration and other configs. Change lots value/minimalStep --- .../2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../aboveThreshold/2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../aboveThresholdEU/2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../aboveThresholdUA/2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../belowThreshold/2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 27 ++++++++++++---- .../2000_tender_create.json | 32 ++++++++++++------- .../2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../2000_tender_create.json | 30 +++++++++++------ .../esco.features/2000_tender_create.json | 10 +++++- .../data/esco/2000_tender_create.json | 10 +++++- .../negotiation.quick/2000_tender_create.json | 22 +++++++++---- .../data/negotiation/2000_tender_create.json | 22 +++++++++---- .../data/reporting/2000_tender_create.json | 22 +++++++++---- .../simple.defense/2000_tender_create.json | 30 +++++++++++------ 23 files changed, 423 insertions(+), 202 deletions(-) diff --git a/procedure_tools/data/aboveThreshold.features/2000_tender_create.json b/procedure_tools/data/aboveThreshold.features/2000_tender_create.json index 1e6ad93..8f1f47c 100644 --- a/procedure_tools/data/aboveThreshold.features/2000_tender_create.json +++ b/procedure_tools/data/aboveThreshold.features/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 3, + "qualificationComplainDuration": 0, + "awardComplainDuration": 5, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 0 }, "data": { "features": [ @@ -160,6 +168,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -233,10 +251,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "aboveThreshold", "mode": "test", "procuringEntity": { @@ -268,10 +282,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/aboveThreshold.lcc/2000_tender_create.json b/procedure_tools/data/aboveThreshold.lcc/2000_tender_create.json index 462ade4..3439cb6 100644 --- a/procedure_tools/data/aboveThreshold.lcc/2000_tender_create.json +++ b/procedure_tools/data/aboveThreshold.lcc/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 3, + "qualificationComplainDuration": 0, + "awardComplainDuration": 5, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 0 }, "data": { "awardCriteria": "lifeCycleCost", @@ -115,6 +123,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -188,10 +206,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "aboveThreshold", "mode": "test", "procuringEntity": { @@ -223,10 +237,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/aboveThreshold/2000_tender_create.json b/procedure_tools/data/aboveThreshold/2000_tender_create.json index 754390d..7d41863 100644 --- a/procedure_tools/data/aboveThreshold/2000_tender_create.json +++ b/procedure_tools/data/aboveThreshold/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 3, + "qualificationComplainDuration": 0, + "awardComplainDuration": 5, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 0 }, "data": { "items": [ @@ -114,6 +122,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -187,10 +205,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "aboveThreshold", "mode": "test", "procuringEntity": { @@ -222,10 +236,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/aboveThresholdEU.features/2000_tender_create.json b/procedure_tools/data/aboveThresholdEU.features/2000_tender_create.json index 73ad610..1a6fe70 100644 --- a/procedure_tools/data/aboveThresholdEU.features/2000_tender_create.json +++ b/procedure_tools/data/aboveThresholdEU.features/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "features": [ @@ -193,6 +201,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -285,10 +303,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "aboveThresholdEU", "mode": "test", "procuringEntity": { @@ -324,10 +338,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2000_tender_create.json b/procedure_tools/data/aboveThresholdEU.lcc/2000_tender_create.json index 3009d34..ba7ca14 100644 --- a/procedure_tools/data/aboveThresholdEU.lcc/2000_tender_create.json +++ b/procedure_tools/data/aboveThresholdEU.lcc/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "awardCriteria": "lifeCycleCost", @@ -148,6 +156,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -240,10 +258,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "aboveThresholdEU", "mode": "test", "procuringEntity": { @@ -279,10 +293,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/aboveThresholdEU/2000_tender_create.json b/procedure_tools/data/aboveThresholdEU/2000_tender_create.json index 0f8fcf6..8dd6950 100644 --- a/procedure_tools/data/aboveThresholdEU/2000_tender_create.json +++ b/procedure_tools/data/aboveThresholdEU/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "items": [ @@ -147,6 +155,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -239,10 +257,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "aboveThresholdEU", "mode": "test", "procuringEntity": { @@ -278,10 +292,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/aboveThresholdUA.features/2000_tender_create.json b/procedure_tools/data/aboveThresholdUA.features/2000_tender_create.json index aa1cb3c..642213d 100644 --- a/procedure_tools/data/aboveThresholdUA.features/2000_tender_create.json +++ b/procedure_tools/data/aboveThresholdUA.features/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 0, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 0 }, "data": { "features": [ @@ -193,6 +201,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -285,10 +303,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "aboveThresholdUA", "mode": "test", "procuringEntity": { @@ -320,10 +334,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2000_tender_create.json b/procedure_tools/data/aboveThresholdUA.lcc/2000_tender_create.json index 859d74a..01be203 100644 --- a/procedure_tools/data/aboveThresholdUA.lcc/2000_tender_create.json +++ b/procedure_tools/data/aboveThresholdUA.lcc/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 0, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 0 }, "data": { "awardCriteria": "lifeCycleCost", @@ -148,6 +156,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -240,10 +258,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 0.6, - "currency": "UAH" - }, "procurementMethodType": "aboveThresholdUA", "mode": "test", "procuringEntity": { @@ -275,10 +289,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 60.0, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/aboveThresholdUA/2000_tender_create.json b/procedure_tools/data/aboveThresholdUA/2000_tender_create.json index f2c200a..33a592f 100644 --- a/procedure_tools/data/aboveThresholdUA/2000_tender_create.json +++ b/procedure_tools/data/aboveThresholdUA/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 0, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 0 }, "data": { "items": [ @@ -147,6 +155,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -239,10 +257,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "aboveThresholdUA", "mode": "test", "procuringEntity": { @@ -274,10 +288,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/belowThreshold.central/2000_tender_create.json b/procedure_tools/data/belowThreshold.central/2000_tender_create.json index 7a1fa4c..e4dca11 100644 --- a/procedure_tools/data/belowThreshold.central/2000_tender_create.json +++ b/procedure_tools/data/belowThreshold.central/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": false, "hasAwardComplaints": false, "hasCancellationComplaints": false, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 0, + "qualificationComplainDuration": 0, + "awardComplainDuration": 2, + "cancellationComplainDuration": 0, + "clarificationUntilDuration": 1, + "qualificationDuration": 20 }, "data": { "buyers": [ @@ -276,6 +284,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -349,10 +367,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "belowThreshold", "mode": "test", "procuringEntity": { @@ -386,10 +400,6 @@ "endDate": "{{ from_now_iso(days=60) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/belowThreshold.features/2000_tender_create.json b/procedure_tools/data/belowThreshold.features/2000_tender_create.json index 5e2502c..5226cfa 100644 --- a/procedure_tools/data/belowThreshold.features/2000_tender_create.json +++ b/procedure_tools/data/belowThreshold.features/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": false, "hasAwardComplaints": false, "hasCancellationComplaints": false, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 0, + "qualificationComplainDuration": 0, + "awardComplainDuration": 2, + "cancellationComplainDuration": 0, + "clarificationUntilDuration": 1, + "qualificationDuration": 20 }, "data": { "features": [ @@ -193,6 +201,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -266,10 +284,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "belowThreshold", "mode": "test", "procuringEntity": { @@ -303,10 +317,6 @@ "endDate": "{{ from_now_iso(days=60) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/belowThreshold/2000_tender_create.json b/procedure_tools/data/belowThreshold/2000_tender_create.json index ba24e88..ef57fe5 100644 --- a/procedure_tools/data/belowThreshold/2000_tender_create.json +++ b/procedure_tools/data/belowThreshold/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": false, "hasAwardComplaints": false, "hasCancellationComplaints": false, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 0, + "qualificationComplainDuration": 0, + "awardComplainDuration": 2, + "cancellationComplainDuration": 0, + "clarificationUntilDuration": 1, + "qualificationDuration": 20 }, "data": { "items": [ @@ -114,6 +122,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -187,10 +205,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "belowThreshold", "mode": "test", "procuringEntity": { @@ -224,10 +238,6 @@ "endDate": "{{ from_now_iso(days=60) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2000_tender_create.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2000_tender_create.json index 4902216..cbd7889 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA.central/2000_tender_create.json +++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "agreementDuration": "P3Y3M3D", @@ -170,6 +178,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -240,11 +258,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH", - "valueAddedTaxIncluded": true - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2000_tender_create.json b/procedure_tools/data/closeFrameworkAgreementUA/2000_tender_create.json index d795c84..c64fcd0 100644 --- a/procedure_tools/data/closeFrameworkAgreementUA/2000_tender_create.json +++ b/procedure_tools/data/closeFrameworkAgreementUA/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "agreementDuration": "P3Y3M3D", @@ -104,6 +112,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -136,11 +154,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH", - "valueAddedTaxIncluded": true - }, "procurementMethodType": "closeFrameworkAgreementUA", "mode": "test", "procuringEntity": { @@ -174,11 +187,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH", - "valueAddedTaxIncluded": true - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/competitiveDialogueEU/2000_tender_create.json b/procedure_tools/data/competitiveDialogueEU/2000_tender_create.json index 2d7dfe6..cbd0ec3 100644 --- a/procedure_tools/data/competitiveDialogueEU/2000_tender_create.json +++ b/procedure_tools/data/competitiveDialogueEU/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": false, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 0, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "items": [ @@ -147,6 +155,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -223,10 +241,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "competitiveDialogueEU", "mode": "test", "procuringEntity": { @@ -262,10 +276,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/competitiveDialogueUA.features/2000_tender_create.json b/procedure_tools/data/competitiveDialogueUA.features/2000_tender_create.json index dea5b31..70fca90 100644 --- a/procedure_tools/data/competitiveDialogueUA.features/2000_tender_create.json +++ b/procedure_tools/data/competitiveDialogueUA.features/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": false, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 0, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "features": [ @@ -193,6 +201,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -269,10 +287,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "competitiveDialogueUA", "mode": "test", "procuringEntity": { @@ -304,10 +318,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/competitiveDialogueUA/2000_tender_create.json b/procedure_tools/data/competitiveDialogueUA/2000_tender_create.json index 3c63976..d4853eb 100644 --- a/procedure_tools/data/competitiveDialogueUA/2000_tender_create.json +++ b/procedure_tools/data/competitiveDialogueUA/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": false, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 0, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "items": [ @@ -147,6 +155,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -223,10 +241,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "competitiveDialogueUA", "mode": "test", "procuringEntity": { @@ -258,10 +272,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/esco.features/2000_tender_create.json b/procedure_tools/data/esco.features/2000_tender_create.json index a419fb9..1abf737 100644 --- a/procedure_tools/data/esco.features/2000_tender_create.json +++ b/procedure_tools/data/esco.features/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": false, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "features": [ diff --git a/procedure_tools/data/esco/2000_tender_create.json b/procedure_tools/data/esco/2000_tender_create.json index d814f6d..46fe875 100644 --- a/procedure_tools/data/esco/2000_tender_create.json +++ b/procedure_tools/data/esco/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": false, + "hasQualificationComplaints": true, + "tenderComplainRegulation": 4, + "qualificationComplainDuration": 5, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 20 }, "data": { "NBUdiscountRate": 0.22986, diff --git a/procedure_tools/data/negotiation.quick/2000_tender_create.json b/procedure_tools/data/negotiation.quick/2000_tender_create.json index 2a7a544..395a112 100644 --- a/procedure_tools/data/negotiation.quick/2000_tender_create.json +++ b/procedure_tools/data/negotiation.quick/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": false, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 0, + "qualificationComplainDuration": 0, + "awardComplainDuration": 5, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 0, + "qualificationDuration": 0 }, "data": { "cause": "twiceUnsuccessful", @@ -86,6 +94,11 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -149,11 +162,6 @@ "status": "draft", "procurementMethodDetails": "{% if acceleration %}quick, accelerator={{ acceleration }}{% endif %}", "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH", - "valueAddedTaxIncluded": true - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/negotiation/2000_tender_create.json b/procedure_tools/data/negotiation/2000_tender_create.json index c9be298..778b0a1 100644 --- a/procedure_tools/data/negotiation/2000_tender_create.json +++ b/procedure_tools/data/negotiation/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": false, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 0, + "qualificationComplainDuration": 0, + "awardComplainDuration": 10, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 0, + "qualificationDuration": 0 }, "data": { "cause": "twiceUnsuccessful", @@ -86,6 +94,11 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -149,11 +162,6 @@ "status": "draft", "procurementMethodDetails": "{% if acceleration %}quick, accelerator={{ acceleration }}{% endif %}", "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH", - "valueAddedTaxIncluded": true - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/reporting/2000_tender_create.json b/procedure_tools/data/reporting/2000_tender_create.json index 993cf4a..5f142b1 100644 --- a/procedure_tools/data/reporting/2000_tender_create.json +++ b/procedure_tools/data/reporting/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": false, "hasAwardComplaints": false, "hasCancellationComplaints": false, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 0, + "qualificationComplainDuration": 0, + "awardComplainDuration": 0, + "cancellationComplainDuration": 0, + "clarificationUntilDuration": 0, + "qualificationDuration": 0 }, "data": { "cause": "openUnsuccessful", @@ -51,6 +59,11 @@ } } ], + "value": { + "amount": 500000, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "mainProcurementCategory": "services", "milestones": [ { @@ -92,11 +105,6 @@ "status": "draft", "procurementMethodDetails": "{% if acceleration %}quick, accelerator={{ acceleration }}{% endif %}", "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500000, - "currency": "UAH", - "valueAddedTaxIncluded": true - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } } diff --git a/procedure_tools/data/simple.defense/2000_tender_create.json b/procedure_tools/data/simple.defense/2000_tender_create.json index e48127d..338d77b 100644 --- a/procedure_tools/data/simple.defense/2000_tender_create.json +++ b/procedure_tools/data/simple.defense/2000_tender_create.json @@ -10,7 +10,15 @@ "hasTenderComplaints": true, "hasAwardComplaints": true, "hasCancellationComplaints": true, - "restricted": false + "restricted": false, + "hasValueEstimation": true, + "hasQualificationComplaints": false, + "tenderComplainRegulation": 2, + "qualificationComplainDuration": 0, + "awardComplainDuration": 4, + "cancellationComplainDuration": 10, + "clarificationUntilDuration": 3, + "qualificationDuration": 0 }, "data": { "items": [ @@ -81,6 +89,16 @@ } } ], + "value": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, + "minimalStep": { + "amount": 0, + "currency": "UAH", + "valueAddedTaxIncluded": true + }, "lots": [ { "description": "Опис Лот №1", @@ -135,10 +153,6 @@ "type": "financing" } ], - "minimalStep": { - "amount": 10, - "currency": "UAH" - }, "procurementMethodType": "simple.defense", "mode": "test", "procuringEntity": { @@ -170,10 +184,6 @@ "endDate": "{{ from_now_iso(days=30) }}" }, "title": "Тестовий опис предмету закупівлі у заголовку тендеру (created with procedure_tools)", - "title_en": "Procurement item test description in procedure title (created with procedure_tools)", - "value": { - "amount": 500, - "currency": "UAH" - } + "title_en": "Procurement item test description in procedure title (created with procedure_tools)" } }