Added procuringentity kind in docs

openprocurement · Apr 15, 2016 · d28ac7a · d28ac7a
1 parent c7d0021
commit d28ac7a
Show file tree

Hide file tree

Showing 82 changed files with 845 additions and 790 deletions.
diff --git a/docs.py b/docs.py
@@ -6,7 +6,7 @@
 import openprocurement.tender.openua.tests.base as base_test
 from openprocurement.api.models import get_now
 from openprocurement.api.tests.base import PrefixedRequestClass
-from openprocurement.tender.openua.tests.tender import BaseTenderUAWebTest, test_tender_ua_data
+from openprocurement.tender.openua.tests.tender import BaseTenderUAWebTest
 from webtest import TestApp
 
 test_tender_ua_data = {
@@ -24,6 +24,7 @@
     "amount": 500
   },
   "procuringEntity": {
+    "kind": "special",
     "address": {
         "countryName": "Україна",
         "locality": "м. Вінниця",

diff --git a/docs/source/standard/procuringentity.rst b/docs/source/standard/procuringentity.rst
@@ -0,0 +1,41 @@
+.. . Kicking page rebuild 2014-10-30 17:00:08
+.. include:: defs.hrst
+
+.. index:: ProcuringEntity
+
+.. _ProcuringEntity:
+
+ProcuringEntity
+===============
+
+Schema
+------
+
+:name:
+    string, multilingual
+
+    |ocdsDescription|
+    The common name of the organization.
+
+:identifier:
+    :ref:`Identifier`
+
+    |ocdsDescription|
+    The primary identifier for this organization.
+
+:additionalIdentifiers:
+    List of :ref:`identifier` objects
+
+:address:
+    :ref:`Address`, required
+
+:contactPoint:
+    :ref:`ContactPoint`, required
+
+:kind:
+    string, Type of customer
+
+    choices:
+        - 'general' - Customer (general)
+        - 'special' - The customer that operates in specific areas of management
+        - 'defense' - Customer carrying out procurement for defense
diff --git a/docs/source/standard/tender.rst b/docs/source/standard/tender.rst
@@ -39,7 +39,7 @@ Schema
     value: ``aboveThresholdUA``
 
 :procuringEntity:
-   :ref:`organization`, required
+   :ref:`ProcuringEntity`, required
 
    Organization conducting the tender.
 

diff --git a/docs/source/tutorial/active-cancellation.http b/docs/source/tutorial/active-cancellation.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/cancellations/abfff3ba3661432db92501093eeafc6f?acc_token=598d0fba58f349ab822741755b3d45ce HTTP/1.0
+PATCH /api/2.0/tenders/056822c2e05240c3b8324958a852baa6/cancellations/4ab5962a85164c3b814836928fdb4639?acc_token=3c34b595f20b4578afd1f88581fd5663 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 30
 Content-Type: application/json
@@ -19,29 +19,29 @@ Content-Type: application/json; charset=UTF-8
       {
         "description": "Changed description", 
         "title": "Notice.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/cancellations/abfff3ba3661432db92501093eeafc6f/documents/158f235a678e401eb1056daa045603e3?download=9a78342d29764583b7b4b8445dfd7564", 
+        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/056822c2e05240c3b8324958a852baa6/cancellations/4ab5962a85164c3b814836928fdb4639/documents/9409af11e75b473cb7f905b24dd3ec66?download=e1e60ce707b94b9b8d24e848844180f8", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-21T15:54:36.898504+02:00", 
-        "id": "158f235a678e401eb1056daa045603e3", 
-        "dateModified": "2016-03-21T15:54:36.898549+02:00"
+        "datePublished": "2016-04-15T12:29:11.353064+03:00", 
+        "id": "9409af11e75b473cb7f905b24dd3ec66", 
+        "dateModified": "2016-04-15T12:29:11.353109+03:00"
       }, 
       {
         "description": "Changed description", 
         "title": "Notice-2.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/cancellations/abfff3ba3661432db92501093eeafc6f/documents/158f235a678e401eb1056daa045603e3?download=7aff67093c2f4112bdc7df522ca0e449", 
+        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/056822c2e05240c3b8324958a852baa6/cancellations/4ab5962a85164c3b814836928fdb4639/documents/9409af11e75b473cb7f905b24dd3ec66?download=c54eabf000fe427e993c9fda7d297d5d", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-21T15:54:36.898504+02:00", 
-        "id": "158f235a678e401eb1056daa045603e3", 
-        "dateModified": "2016-03-21T15:54:37.409443+02:00"
+        "datePublished": "2016-04-15T12:29:11.353064+03:00", 
+        "id": "9409af11e75b473cb7f905b24dd3ec66", 
+        "dateModified": "2016-04-15T12:29:12.196348+03:00"
       }
     ], 
     "reason": "cancellation reason", 
     "reasonType": "unsuccessful", 
-    "date": "2016-03-21T15:54:36.409110+02:00", 
+    "date": "2016-04-15T12:29:10.567702+03:00", 
     "cancellationOf": "tender", 
-    "id": "abfff3ba3661432db92501093eeafc6f"
+    "id": "4ab5962a85164c3b814836928fdb4639"
   }
 }
 
diff --git a/docs/source/tutorial/answer-question.http b/docs/source/tutorial/answer-question.http
@@ -1,4 +1,4 @@
-PATCH /api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/questions/757bda120b9343ba992ee7021b6b2265?acc_token=598d0fba58f349ab822741755b3d45ce HTTP/1.0
+PATCH /api/2.0/tenders/056822c2e05240c3b8324958a852baa6/questions/c8a27570c1b24abba0436d346ed30cad?acc_token=3c34b595f20b4578afd1f88581fd5663 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 162
 Content-Type: application/json
@@ -16,9 +16,9 @@ Content-Type: application/json; charset=UTF-8
   "data": {
     "description": "Просимо додати таблицю потрібної калорійності харчування", 
     "title": "Калорійність", 
-    "date": "2016-03-21T15:54:31.847236+02:00", 
+    "date": "2016-04-15T12:29:05.116213+03:00", 
     "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", 
-    "id": "757bda120b9343ba992ee7021b6b2265", 
+    "id": "c8a27570c1b24abba0436d346ed30cad", 
     "questionOf": "tender"
   }
 }

diff --git a/docs/source/tutorial/ask-question-after-enquiry-period.http b/docs/source/tutorial/ask-question-after-enquiry-period.http
@@ -1,4 +1,4 @@
-POST /api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/questions HTTP/1.0
+POST /api/2.0/tenders/056822c2e05240c3b8324958a852baa6/questions HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 1506
 Content-Type: application/json

diff --git a/docs/source/tutorial/ask-question.http b/docs/source/tutorial/ask-question.http
@@ -1,4 +1,4 @@
-POST /api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/questions HTTP/1.0
+POST /api/2.0/tenders/056822c2e05240c3b8324958a852baa6/questions HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 1506
 Content-Type: application/json
@@ -34,7 +34,7 @@ DATA:
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/questions/757bda120b9343ba992ee7021b6b2265
+Location: http://api-sandbox.openprocurement.org/api/2.0/tenders/056822c2e05240c3b8324958a852baa6/questions/c8a27570c1b24abba0436d346ed30cad
 {
   "data": {
     "description": "Просимо додати таблицю потрібної калорійності харчування", 
@@ -60,8 +60,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.0/tenders/e2b439a8a7a5473
       }
     }, 
     "title": "Калорійність", 
-    "date": "2016-03-21T15:54:31.847236+02:00", 
-    "id": "757bda120b9343ba992ee7021b6b2265", 
+    "date": "2016-04-15T12:29:05.116213+03:00", 
+    "id": "c8a27570c1b24abba0436d346ed30cad", 
     "questionOf": "tender"
   }
 }

diff --git a/docs/source/tutorial/auction-url.http b/docs/source/tutorial/auction-url.http
@@ -1,4 +1,4 @@
-GET /api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a HTTP/1.0
+GET /api/2.0/tenders/056822c2e05240c3b8324958a852baa6 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Host: api-sandbox.openprocurement.org
 
@@ -8,16 +8,17 @@ Content-Type: application/json; charset=UTF-8
   "data": {
     "procurementMethod": "open", 
     "complaintPeriod": {
-      "startDate": "2016-03-05T15:54:17.579417+02:00", 
-      "endDate": "2016-03-17T15:54:17.579417+02:00"
+      "startDate": "2016-03-30T12:28:37.516573+03:00", 
+      "endDate": "2016-04-11T12:28:37.516573+03:00"
     }, 
-    "auctionUrl": "http://auction-sandbox.openprocurement.org/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a", 
+    "auctionUrl": "http://auction-sandbox.openprocurement.org/tenders/056822c2e05240c3b8324958a852baa6", 
     "enquiryPeriod": {
-      "startDate": "2016-03-05T15:54:17.579417+02:00", 
-      "endDate": "2016-03-11T15:54:17.579417+02:00"
+      "startDate": "2016-03-30T12:28:37.516573+03:00", 
+      "clarificationsUntil": "2016-04-08T12:28:37.516573+03:00", 
+      "endDate": "2016-04-05T12:28:37.516573+03:00"
     }, 
     "submissionMethod": "electronicAuction", 
-    "next_check": "2016-03-21T16:30:17.579417+02:00", 
+    "next_check": "2016-04-15T13:04:37.516573+03:00", 
     "procuringEntity": {
       "contactPoint": {
         "url": "http://sch10.edu.vn.ua/", 
@@ -30,6 +31,7 @@ Content-Type: application/json; charset=UTF-8
         "legalName": "Заклад \"Загальноосвітня школа І-ІІІ ступенів № 10 Вінницької міської ради\""
       }, 
       "name": "ЗОСШ #10 м.Вінниці", 
+      "kind": "special", 
       "address": {
         "postalCode": "21027", 
         "countryName": "Україна", 
@@ -42,58 +44,58 @@ Content-Type: application/json; charset=UTF-8
       {
         "description": "Просимо додати таблицю потрібної калорійності харчування", 
         "title": "Калорійність", 
-        "date": "2016-03-21T15:54:31.847236+02:00", 
+        "date": "2016-04-15T12:29:05.116213+03:00", 
         "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", 
-        "id": "757bda120b9343ba992ee7021b6b2265", 
+        "id": "c8a27570c1b24abba0436d346ed30cad", 
         "questionOf": "tender"
       }
     ], 
     "owner": "broker", 
-    "id": "e2b439a8a7a5473b9b0bb65a8f97b74a", 
+    "id": "056822c2e05240c3b8324958a852baa6", 
     "guarantee": {
       "currency": "USD", 
       "amount": 8.0
     }, 
     "documents": [
       {
         "title": "Notice.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/documents/ee8fb187df494fdb8ea2d60ba419c00d?download=7860a745f0ad4f69aa0ff501eeb496fd", 
+        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/056822c2e05240c3b8324958a852baa6/documents/32733049cc6c48429d096aca6fa22187?download=c7fe2ab607a644c88259157b0085bab8", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-21T15:54:31.368584+02:00", 
-        "id": "ee8fb187df494fdb8ea2d60ba419c00d", 
-        "dateModified": "2016-03-21T15:54:31.368627+02:00"
+        "datePublished": "2016-04-15T12:29:04.489046+03:00", 
+        "id": "32733049cc6c48429d096aca6fa22187", 
+        "dateModified": "2016-04-15T12:29:04.490183+03:00"
       }, 
       {
         "title": "AwardCriteria.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/documents/332b5d251fec417c9ee463b5719c35d7?download=8175974e715a4661a1e75e72e85751c2", 
+        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/056822c2e05240c3b8324958a852baa6/documents/aec9fb6acee84615a26703bd128c79f9?download=30f28c4275914d89b2f607d277638c5f", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-21T15:54:31.511928+02:00", 
-        "id": "332b5d251fec417c9ee463b5719c35d7", 
-        "dateModified": "2016-03-21T15:54:31.511969+02:00"
+        "datePublished": "2016-04-15T12:29:04.745854+03:00", 
+        "id": "aec9fb6acee84615a26703bd128c79f9", 
+        "dateModified": "2016-04-15T12:29:04.745902+03:00"
       }, 
       {
         "title": "AwardCriteria-2.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/e2b439a8a7a5473b9b0bb65a8f97b74a/documents/332b5d251fec417c9ee463b5719c35d7?download=9ba2438151f2469ebea444a7af099daf", 
+        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/056822c2e05240c3b8324958a852baa6/documents/aec9fb6acee84615a26703bd128c79f9?download=e6a0a0c6da5642fd82f6646f7e9db534", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-21T15:54:31.511928+02:00", 
-        "id": "332b5d251fec417c9ee463b5719c35d7", 
-        "dateModified": "2016-03-21T15:54:31.699780+02:00"
+        "datePublished": "2016-04-15T12:29:04.745854+03:00", 
+        "id": "aec9fb6acee84615a26703bd128c79f9", 
+        "dateModified": "2016-04-15T12:29:04.905593+03:00"
       }
     ], 
     "title": "футляри до державних нагород", 
-    "tenderID": "UA-2016-03-21-000001", 
-    "dateModified": "2016-03-21T15:54:34.120110+02:00", 
+    "tenderID": "UA-2016-04-15-000001", 
+    "dateModified": "2016-04-15T12:29:07.281279+03:00", 
     "status": "active.auction", 
     "tenderPeriod": {
-      "startDate": "2016-03-05T15:54:17.579417+02:00", 
-      "endDate": "2016-03-21T15:54:17.579417+02:00"
+      "startDate": "2016-03-30T12:28:37.516573+03:00", 
+      "endDate": "2016-04-15T12:28:37.516573+03:00"
     }, 
     "auctionPeriod": {
-      "startDate": "2016-03-21T15:54:17.579417+02:00", 
-      "shouldStartAfter": "2016-03-21T15:54:17.579417+02:00"
+      "startDate": "2016-04-15T12:28:37.516573+03:00", 
+      "shouldStartAfter": "2016-04-15T12:28:37.516573+03:00"
     }, 
     "procurementMethodType": "aboveThresholdUA", 
     "minimalStep": {
@@ -124,10 +126,10 @@ Content-Type: application/json; charset=UTF-8
           "locality": "м. Київ"
         }, 
         "deliveryDate": {
-          "startDate": "2016-04-10T15:54:17.581675+02:00", 
-          "endDate": "2016-05-10T15:54:17.581740+02:00"
+          "startDate": "2016-05-05T12:28:37.518087+03:00", 
+          "endDate": "2016-06-04T12:28:37.518144+03:00"
         }, 
-        "id": "e40f0bc8f76042d5af0185ad44d8779a", 
+        "id": "2725b978679343039b197df4f98011e6", 
         "unit": {
           "code": "44617100-9", 
           "name": "item"

diff --git a/docs/source/tutorial/award-complaint-accept.http b/docs/source/tutorial/award-complaint-accept.http
@@ -1,4 +1,4 @@
-PATCH /api/2.2/tenders/8aaa66fa9640482cb80089e67510009c/awards/426c148fd7ad463e857f5ca44200250a/complaints/edc556aed3bf42079d5d1989b88a330c HTTP/1.0
+PATCH /api/2.0/tenders/31a7ad6371424d82b4a46d715bd588e1/awards/fd0b70422c21456f9a932e808ddd2474/complaints/8b62953da4bb4cc5a88203f0982072f6 HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 32
 Content-Type: application/json
@@ -19,12 +19,12 @@ Content-Type: application/json; charset=UTF-8
       {
         "author": "complaint_owner", 
         "title": "Complaint_Attachement.pdf", 
-        "url": "http://api-sandbox.openprocurement.org/api/2.2/tenders/8aaa66fa9640482cb80089e67510009c/awards/426c148fd7ad463e857f5ca44200250a/complaints/edc556aed3bf42079d5d1989b88a330c/documents/0b52eb1bd3e541ca991c5a5caeff84e9?download=d810843e22d54ee8865f1dc6dfd5b0b3", 
+        "url": "http://api-sandbox.openprocurement.org/api/2.0/tenders/31a7ad6371424d82b4a46d715bd588e1/awards/fd0b70422c21456f9a932e808ddd2474/complaints/8b62953da4bb4cc5a88203f0982072f6/documents/1fb7cbb4360b4f6ab695142793eef700?download=cfc8e0b964994929b4daafb05219e100", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-03-30T12:42:33.161737+03:00", 
-        "id": "0b52eb1bd3e541ca991c5a5caeff84e9", 
-        "dateModified": "2016-03-30T12:42:33.161783+03:00"
+        "datePublished": "2016-04-15T12:28:42.538987+03:00", 
+        "id": "1fb7cbb4360b4f6ab695142793eef700", 
+        "dateModified": "2016-04-15T12:28:42.539034+03:00"
       }
     ], 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
@@ -50,13 +50,13 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "dateAccepted": "2016-03-30T12:42:34.411709+03:00", 
-    "dateSubmitted": "2016-03-30T12:42:33.334419+03:00", 
-    "complaintID": "UA-2016-03-30-000001.1", 
-    "date": "2016-03-30T12:42:32.852615+03:00", 
+    "dateAccepted": "2016-04-15T12:28:45.477215+03:00", 
+    "dateSubmitted": "2016-04-15T12:28:42.889972+03:00", 
+    "complaintID": "UA-2016-04-15-000001.1", 
+    "date": "2016-04-15T12:28:41.563359+03:00", 
     "acceptance": true, 
     "type": "complaint", 
-    "id": "edc556aed3bf42079d5d1989b88a330c"
+    "id": "8b62953da4bb4cc5a88203f0982072f6"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-accepted-stopped.http b/docs/source/tutorial/award-complaint-accepted-stopped.http
@@ -1,4 +1,4 @@
-PATCH /api/2.2/tenders/8aaa66fa9640482cb80089e67510009c/awards/426c148fd7ad463e857f5ca44200250a/complaints/ecc3dde0689b4faf888c5ad9dd81d5e2 HTTP/1.0
+PATCH /api/2.0/tenders/31a7ad6371424d82b4a46d715bd588e1/awards/fd0b70422c21456f9a932e808ddd2474/complaints/64c71bb5352c4ce69f2dd7904b83da3d HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 217
 Content-Type: application/json
@@ -16,13 +16,13 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "stopped", 
-    "dateDecision": "2016-03-30T12:42:35.898381+03:00", 
+    "dateDecision": "2016-04-15T12:28:48.276330+03:00", 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
     "title": "Недостатньо інформації", 
     "decision": "Тендер скасовується замовником", 
     "acceptance": true, 
-    "dateCanceled": "2016-03-30T12:42:35.898407+03:00", 
-    "dateAccepted": "2016-03-30T12:42:35.030832+03:00", 
+    "dateCanceled": "2016-04-15T12:28:48.276369+03:00", 
+    "dateAccepted": "2016-04-15T12:28:46.931547+03:00", 
     "author": {
       "contactPoint": {
         "email": "soleksuk@gmail.com", 
@@ -44,11 +44,11 @@ Content-Type: application/json; charset=UTF-8
         "locality": "м. Вінниця"
       }
     }, 
-    "dateSubmitted": "2016-03-30T12:42:34.006116+03:00", 
-    "complaintID": "UA-2016-03-30-000001.5", 
-    "date": "2016-03-30T12:42:34.004566+03:00", 
+    "dateSubmitted": "2016-04-15T12:28:44.504622+03:00", 
+    "complaintID": "UA-2016-04-15-000001.5", 
+    "date": "2016-04-15T12:28:44.499567+03:00", 
     "type": "complaint", 
-    "id": "ecc3dde0689b4faf888c5ad9dd81d5e2"
+    "id": "64c71bb5352c4ce69f2dd7904b83da3d"
   }
 }