fix in docs description of contract disqualification

ProzorroUKR · Sep 8, 2021 · 6710c15 · 6710c15
1 parent ce0801d
commit 6710c15
Show file tree

Hide file tree

Showing 42 changed files with 235 additions and 129 deletions.
diff --git a/docs/source/agreements/http/frameworks/mailestone-view.http b/docs/source/agreements/http/frameworks/mailestone-view.http
@@ -0,0 +1,19 @@
+GET /api/2.5/agreements/2c88cbfb9f454f82976cb11006b46885/contracts/391acac5215446eeb6fc77beaa747403/milestones?acc_token=dd875ed1c80d40c38602ee0c12d1374b HTTP/1.0
+Authorization: Bearer token
+Host: lb-api-sandbox.prozorro.gov.ua
+
+Response: 200 OK
+Content-Type: application/json
+X-Content-Type-Options: nosniff
+{
+  "data": [
+    {
+      "id": "3fe881cc13824149bb8f655de17cae47",
+      "type": "activation",
+      "status": "scheduled",
+      "dueDate": "2021-05-16T00:00:00+02:00",
+      "dateModified": "2021-04-01T01:00:00+03:00"
+    }
+  ]
+}
+
diff --git a/docs/source/agreements/http/frameworks/patch-milestone-met.http b/docs/source/agreements/http/frameworks/patch-milestone-met.http
@@ -0,0 +1,25 @@
+PATCH /api/2.5/agreements/2c88cbfb9f454f82976cb11006b46885/contracts/391acac5215446eeb6fc77beaa747403/milestones/3fe881cc13824149bb8f655de17cae47?acc_token=dd875ed1c80d40c38602ee0c12d1374b HTTP/1.0
+Authorization: Bearer token
+Content-Length: 27
+Content-Type: application/json
+Host: lb-api-sandbox.prozorro.gov.ua
+DATA:
+{
+  "data": {
+    "status": "met"
+  }
+}
+
+Response: 200 OK
+Content-Type: application/json
+X-Content-Type-Options: nosniff
+{
+  "data": {
+    "id": "3fe881cc13824149bb8f655de17cae47",
+    "type": "activation",
+    "status": "met",
+    "dueDate": "2021-05-16T00:00:00+02:00",
+    "dateModified": "2021-04-01T01:00:00+03:00"
+  }
+}
+
diff --git a/docs/source/agreements/http/frameworks/post-milestone-disqualification.http b/docs/source/agreements/http/frameworks/post-milestone-disqualification.http
@@ -1,23 +1,25 @@
-POST /api/2.5/agreements/2c88cbfb9f454f82976cb11006b46885/contracts/391acac5215446eeb6fc77beaa747403/milestones?acc_token=dd875ed1c80d40c38602ee0c12d1374b HTTP/1.0
+PATCH /api/2.5/agreements/2c88cbfb9f454f82976cb11006b46885/contracts/391acac5215446eeb6fc77beaa747403/milestones/3fe881cc13824149bb8f655de17cae47?acc_token=dd875ed1c80d40c38602ee0c12d1374b HTTP/1.0
 Authorization: Bearer token
-Content-Length: 506
+Content-Length: 27
 Content-Type: application/json
 Host: lb-api-sandbox.prozorro.gov.ua
 DATA:
 {
   "data": {
-    "type": "disqualification",
-    "documents": [
-      {
-        "hash": "md5:00000000000000000000000000000000",
-        "title": "milestone.doc",
-        "format": "application/msword",
-        "datePublished": "2020-09-08T01:00:00+03:00",
-        "id": "cd52b90af77e4f5b8cb0f210e83987b5",
-        "dateModified": "2020-09-08T01:00:00+03:00",
-        "url": "http://public-docs-sandbox.prozorro.gov.ua/get/a117dbccdbe947eb832962bc34a243b2?Signature=7UD43Grdv0LqSgZPiWN8c73GzI9n4P7qRXNGKGWk2zpiW4%2BFQzKx%2Fw2Qt1Nz2vH8UUYz8GS6ykrhhVDJAMVGDQ%3D%3D&KeyID=a8968c46"
-      }
-    ]
+    "status": "met"
+  }
+}
+
+Response: 200 OK
+Content-Type: application/json
+X-Content-Type-Options: nosniff
+{
+  "data": {
+    "id": "3fe881cc13824149bb8f655de17cae47",
+    "type": "activation",
+    "status": "met",
+    "dueDate": "2021-05-16T00:00:00+02:00",
+    "dateModified": "2021-04-01T01:00:00+03:00"
   }
 }
 
diff --git a/docs/source/agreements/tutorial_frameworks.rst b/docs/source/agreements/tutorial_frameworks.rst
@@ -60,8 +60,12 @@ For ban contract, you just need to add milestone to contract with status `ban`:
 
 Contract disqualification
 ~~~~~~~~~~~~~~~~~~~~~~~~~
+Let's see our created mailestone. In our mailestone you can see the ``id``.
 
-For disqualification contract, you just need to add milestone to contract with status `disqualification`:
+.. include:: http/frameworks/mailestone-view.http
+   :code:
+
+When we know ``id`` of our mailestone we can patch contract for disqualification, you just need to patch milestone 'type' : 'activation' to status ``met``:
 
-.. include:: http/frameworks/post-milestone-disqualification.http
+.. include:: http/frameworks/patch-milestone-met.http
    :code:
diff --git a/docs/source/centralized-procurements/http/tender-get.http b/docs/source/centralized-procurements/http/tender-get.http
@@ -12,6 +12,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2019-05-12T12:01:00+03:00",
     "tenderID": "UA-2019-05-12-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "mainProcurementCategory": "goods",
     "milestones": [
       {

diff --git a/docs/source/contracting/http/create-multiple-buyers-tender.http b/docs/source/contracting/http/create-multiple-buyers-tender.http
@@ -1,6 +1,6 @@
 POST /api/2.5/tenders HTTP/1.0
 Authorization: Bearer broker
-Content-Length: 6008
+Content-Length: 6063
 Content-Type: application/json
 Host: lb-api-sandbox.prozorro.gov.ua
 DATA:
@@ -176,6 +176,7 @@ DATA:
         "percentage": 54.45
       }
     ],
+    "procurementMethodDetails": "quick, accelerator=1440",
     "buyers": [
       {
         "id": "11111111111111111111111111111111",
@@ -212,6 +213,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "mainProcurementCategory": "goods",
     "milestones": [
       {

diff --git a/docs/source/contracting/http/example_tender.http b/docs/source/contracting/http/example_tender.http
@@ -12,6 +12,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:01+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "mainProcurementCategory": "goods",
     "milestones": [
       {
@@ -125,16 +126,16 @@ X-Content-Type-Options: nosniff
       "valueAddedTaxIncluded": true
     },
     "enquiryPeriod": {
-      "startDate": "2021-02-18T00:00:00+02:00",
-      "endDate": "2021-02-26T00:00:00+02:00"
+      "startDate": "2021-03-15T23:34:00+02:00",
+      "endDate": "2021-03-15T23:42:00+02:00"
     },
     "tenderPeriod": {
-      "startDate": "2021-02-26T00:00:00+02:00",
-      "endDate": "2021-03-05T00:00:00+02:00"
+      "startDate": "2021-03-15T23:42:00+02:00",
+      "endDate": "2021-03-15T23:49:00+02:00"
     },
     "awardPeriod": {
-      "startDate": "2021-03-06T00:00:00+02:00",
-      "endDate": "2021-03-06T00:00:00+02:00"
+      "startDate": "2021-03-15T23:50:00+02:00",
+      "endDate": "2021-03-15T23:50:00+02:00"
     },
     "bids": [
       {
@@ -348,8 +349,8 @@ X-Content-Type-Options: nosniff
       }
     ],
     "auctionPeriod": {
-      "startDate": "2021-03-05T00:00:00+02:00",
-      "endDate": "2021-03-06T00:00:00+02:00"
+      "startDate": "2021-03-15T23:49:00+02:00",
+      "endDate": "2021-03-15T23:50:00+02:00"
     },
     "minimalStep": {
       "amount": 15.0,

diff --git a/docs/source/locale/uk/LC_MESSAGES/agreements/tutorial_frameworks.po b/docs/source/locale/uk/LC_MESSAGES/agreements/tutorial_frameworks.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openprocurement.api 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 14:32+0300\n"
+"POT-Creation-Date: 2021-09-08 01:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
 msgid "Tutorial"
 msgstr "Туторіал"
@@ -35,14 +35,8 @@ msgstr "Угода автоматично переноситься з модул
 msgid "Creating agreement"
 msgstr "Створення реєстру"
 
-msgid ""
-"Let's say that we have conducted framework, submission and qualification and it has ``active`` status. "
-"When the framework is active and you change qualification status to active, system **automatically** created agreement(from framework) with contract(from qualification)."
-
-msgstr ""
-"Припустимо, що є кваліфікація, заявка та рішення по заявці в статусах ``active``. "
-"Коли заявка в стаусі `active` і ви оновлюєте рішення по заявці до `active` статусу "
-"система **автоматично** створює реєстр(з кваліфікації) з контрактом(з рішення по заявці)."
+msgid "Let's say that we have conducted framework, submission and qualification and it has ``active`` status. When the framework is active and you change qualification status to active, system **automatically** created agreement(from framework) with contract(from qualification)."
+msgstr "Припустимо, що є кваліфікація, заявка та рішення по заявці в статусах ``active``. Коли заявка в стаусі `active` і ви оновлюєте рішення по заявці до `active` статусу система **автоматично** створює реєстр(з кваліфікації) з контрактом(з рішення по заявці)."
 
 msgid "Getting agreement"
 msgstr "Отримання реєстру"
@@ -74,5 +68,8 @@ msgstr "Для того щоб забанити контракт, потрібн
 msgid "Contract disqualification"
 msgstr "Дискваліфікація контракту"
 
-msgid "For disqualification contract, you just need to add milestone to contract with status `disqualification`:"
-msgstr "Для дискваліфікації контракту, потрібно додати майлстон до контракту в статусі `disqualification`:"
+msgid "Let's see our created mailestone. In our mailestone you can see the ``id``."
+msgstr "Давайте подивимось на створиний майлстон. В ньому міститься ``id``"
+
+msgid "When we know ``id`` of our mailestone we can patch contract for disqualification, you just need to patch milestone 'type' : 'activation' to status ``met``:"
+msgstr "Для дискваліфікації використовуючи майлстон ``id`` можно пропатчити контракт з 'type' : 'activation' переводом статус  в ``met``:"
diff --git a/docs/source/planning/tutorial/tender-from-plan-breakdown.http b/docs/source/planning/tutorial/tender-from-plan-breakdown.http
@@ -1,6 +1,6 @@
 POST /api/2.5/plans/18d6b21a07094c71b423e91c5e28579b/tenders HTTP/1.0
 Authorization: Bearer broker
-Content-Length: 3377
+Content-Length: 3432
 Content-Type: application/json
 Host: lb-api-sandbox.prozorro.gov.ua
 DATA:
@@ -139,6 +139,7 @@ DATA:
         "percentage": 54.45
       }
     ],
+    "procurementMethodDetails": "quick, accelerator=1440",
     "status": "draft"
   }
 }

diff --git a/docs/source/planning/tutorial/tender-from-plan.http b/docs/source/planning/tutorial/tender-from-plan.http
@@ -1,6 +1,6 @@
 POST /api/2.5/plans/18d6b21a07094c71b423e91c5e28579b/tenders HTTP/1.0
 Authorization: Bearer broker
-Content-Length: 3377
+Content-Length: 3432
 Content-Type: application/json
 Host: lb-api-sandbox.prozorro.gov.ua
 DATA:
@@ -139,6 +139,7 @@ DATA:
         "percentage": 54.45
       }
     ],
+    "procurementMethodDetails": "quick, accelerator=1440",
     "status": "draft"
   }
 }
@@ -154,6 +155,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "mainProcurementCategory": "goods",
     "milestones": [
       {

diff --git a/docs/source/relocation/tutorial/change-tender-ownership.http b/docs/source/relocation/tutorial/change-tender-ownership.http
@@ -21,6 +21,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker1",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "mainProcurementCategory": "goods",
     "milestones": [
       {

diff --git a/docs/source/relocation/tutorial/create-tender.http b/docs/source/relocation/tutorial/create-tender.http
@@ -1,6 +1,6 @@
 POST /api/2.5/tenders?opt_pretty=1 HTTP/1.0
 Authorization: Bearer broker
-Content-Length: 2975
+Content-Length: 3030
 Content-Type: application/json
 Host: lb-api-sandbox.prozorro.gov.ua
 DATA:
@@ -104,7 +104,8 @@ DATA:
         "sequenceNumber": 0,
         "percentage": 54.45
       }
-    ]
+    ],
+    "procurementMethodDetails": "quick, accelerator=1440"
   }
 }
 
@@ -119,6 +120,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "mainProcurementCategory": "goods",
     "milestones": [
       {

diff --git a/docs/source/relocation/tutorial/modify-tender.http b/docs/source/relocation/tutorial/modify-tender.http
@@ -21,6 +21,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker1",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "mainProcurementCategory": "goods",
     "milestones": [
       {

diff --git a/docs/source/tendering/cfaselectionua/tutorial/blank-tender-view.http b/docs/source/tendering/cfaselectionua/tutorial/blank-tender-view.http
@@ -12,6 +12,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "awardCriteria": "lowestCost",
     "submissionMethod": "electronicAuction",
     "items": [

diff --git a/docs/source/tendering/cfaselectionua/tutorial/tender-in-active-enquiries.http b/docs/source/tendering/cfaselectionua/tutorial/tender-in-active-enquiries.http
@@ -12,6 +12,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "awardCriteria": "lowestCost",
     "submissionMethod": "electronicAuction",
     "items": [
@@ -62,11 +63,11 @@ X-Content-Type-Options: nosniff
     },
     "enquiryPeriod": {
       "startDate": "2021-03-16T00:00:00+02:00",
-      "endDate": "2021-03-17T00:00:00+02:00"
+      "endDate": "2021-03-16T00:01:00+02:00"
     },
     "tenderPeriod": {
-      "startDate": "2021-03-17T00:00:00+02:00",
-      "endDate": "2021-03-20T00:00:00+02:00"
+      "startDate": "2021-03-16T00:01:00+02:00",
+      "endDate": "2021-03-16T00:04:00+02:00"
     },
     "procuringEntity": {
       "name": "Державне управління справами",
@@ -506,7 +507,7 @@ X-Content-Type-Options: nosniff
     "procurementMethod": "selective",
     "procurementMethodType": "closeFrameworkAgreementSelectionUA",
     "id": "86632d7f051f455881abee60f4fef31d",
-    "next_check": "2021-03-17T00:00:00+02:00"
+    "next_check": "2021-03-16T00:01:00+02:00"
   }
 }
 
diff --git a/docs/source/tendering/cfaselectionua/tutorial/tender-post-attempt-json-data.http b/docs/source/tendering/cfaselectionua/tutorial/tender-post-attempt-json-data.http
@@ -1,6 +1,6 @@
 POST /api/2.5/tenders?opt_pretty=1 HTTP/1.0
 Authorization: Bearer broker
-Content-Length: 2837
+Content-Length: 2892
 Content-Type: application/json
 Host: lb-api-sandbox.prozorro.gov.ua
 DATA:
@@ -80,6 +80,7 @@ DATA:
         "relatedLot": "f2599a519a45416db792d9ee833a8e5a"
       }
     ],
+    "procurementMethodDetails": "quick, accelerator=1440",
     "lots": [
       {
         "title": "Лот №1",
@@ -101,6 +102,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "awardCriteria": "lowestCost",
     "submissionMethod": "electronicAuction",
     "items": [

diff --git a/docs/source/tendering/cfaselectionua/tutorial/tender-switch-draft-pending.http b/docs/source/tendering/cfaselectionua/tutorial/tender-switch-draft-pending.http
@@ -20,6 +20,7 @@ X-Content-Type-Options: nosniff
     "dateModified": "2021-03-16T00:00:00+02:00",
     "tenderID": "UA-2021-03-16-000001",
     "owner": "broker",
+    "procurementMethodDetails": "quick, accelerator=1440",
     "awardCriteria": "lowestCost",
     "submissionMethod": "electronicAuction",
     "items": [