New chronograph mechanism of auction planning and replanning

ITVaan · Feb 11, 2016 · 46b98eb · 46b98eb
1 parent 9912da9
commit 46b98eb
Show file tree

Hide file tree

Showing 16 changed files with 133 additions and 155 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ python:
   - "2.7"
 services:
   - couchdb
+env:
+  - TZ=Europe/Kiev
 cache:
   directories:
     - eggs

diff --git a/bootstrap.py b/bootstrap.py
diff --git a/docs.py b/docs.py
diff --git a/docs/source/tutorial/award-complaint-accept.http b/docs/source/tutorial/award-complaint-accept.http
@@ -1,4 +1,4 @@
-PATCH /api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/fa17d99108524c658940302e3591e2b4 HTTP/1.0
+PATCH /api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/0b79acf448cf497683bbd453bccc3137 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/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/fa17d99108524c658940302e3591e2b4/documents/28cbb7a576a6413495bbbde1679820ef?download=e4308e9037a64cf48068cbfba4d98ca6", 
+        "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/0b79acf448cf497683bbd453bccc3137/documents/91909b0f4b4c45eeb381310eb50d454a?download=62340542d3c64d97b44c53d20b1458cd", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-02-01T16:18:59.084081+02:00", 
-        "id": "28cbb7a576a6413495bbbde1679820ef", 
-        "dateModified": "2016-02-01T16:18:59.084119+02:00"
+        "datePublished": "2016-02-11T16:47:21.340754+02:00", 
+        "id": "91909b0f4b4c45eeb381310eb50d454a", 
+        "dateModified": "2016-02-11T16:47:21.340804+02:00"
       }
     ], 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
@@ -50,10 +50,10 @@ Content-Type: application/json; charset=UTF-8
       }
     }, 
     "title": "Недостатньо інформації", 
-    "dateSubmitted": "2016-02-01T16:18:59.224423+02:00", 
-    "date": "2016-02-01T16:18:58.753880+02:00", 
+    "dateSubmitted": "2016-02-11T16:47:21.528703+02:00", 
+    "date": "2016-02-11T16:47:20.903103+02:00", 
     "type": "complaint", 
-    "id": "fa17d99108524c658940302e3591e2b4"
+    "id": "0b79acf448cf497683bbd453bccc3137"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-complaint.http b/docs/source/tutorial/award-complaint-complaint.http
@@ -1,4 +1,4 @@
-PATCH /api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/fa17d99108524c658940302e3591e2b4?acc_token=a03b162b9cf84d14bd3f113795c35e6f HTTP/1.0
+PATCH /api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/0b79acf448cf497683bbd453bccc3137?acc_token=7e7b337eb069455dadda6f2981651233 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 31
 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/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/fa17d99108524c658940302e3591e2b4/documents/28cbb7a576a6413495bbbde1679820ef?download=e4308e9037a64cf48068cbfba4d98ca6", 
+        "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/0b79acf448cf497683bbd453bccc3137/documents/91909b0f4b4c45eeb381310eb50d454a?download=62340542d3c64d97b44c53d20b1458cd", 
         "format": "application/pdf", 
         "documentOf": "tender", 
-        "datePublished": "2016-02-01T16:18:59.084081+02:00", 
-        "id": "28cbb7a576a6413495bbbde1679820ef", 
-        "dateModified": "2016-02-01T16:18:59.084119+02:00"
+        "datePublished": "2016-02-11T16:47:21.340754+02:00", 
+        "id": "91909b0f4b4c45eeb381310eb50d454a", 
+        "dateModified": "2016-02-11T16:47:21.340804+02:00"
       }
     ], 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
@@ -50,10 +50,10 @@ Content-Type: application/json; charset=UTF-8
       }
     }, 
     "title": "Недостатньо інформації", 
-    "dateSubmitted": "2016-02-01T16:18:59.224423+02:00", 
-    "date": "2016-02-01T16:18:58.753880+02:00", 
+    "dateSubmitted": "2016-02-11T16:47:21.528703+02:00", 
+    "date": "2016-02-11T16:47:20.903103+02:00", 
     "type": "complaint", 
-    "id": "fa17d99108524c658940302e3591e2b4"
+    "id": "0b79acf448cf497683bbd453bccc3137"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-reject.http b/docs/source/tutorial/award-complaint-reject.http
@@ -1,4 +1,4 @@
-PATCH /api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/6329300ffc6a4ccdae63413e02f4e457 HTTP/1.0
+PATCH /api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/91a18893883a40cfaa063561a353abac HTTP/1.0
 Authorization: Basic cmV2aWV3ZXI6
 Content-Length: 31
 Content-Type: application/json
@@ -15,7 +15,7 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "invalid", 
-    "dateDecision": "2016-02-01T16:18:59.654266+02:00", 
+    "dateDecision": "2016-02-11T16:47:21.978407+02:00", 
     "description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.", 
     "author": {
       "contactPoint": {
@@ -39,10 +39,10 @@ Content-Type: application/json; charset=UTF-8
       }
     }, 
     "title": "Недостатньо інформації", 
-    "dateSubmitted": "2016-02-01T16:18:59.354242+02:00", 
-    "date": "2016-02-01T16:18:59.352815+02:00", 
+    "dateSubmitted": "2016-02-11T16:47:21.677576+02:00", 
+    "date": "2016-02-11T16:47:21.676090+02:00", 
     "type": "complaint", 
-    "id": "6329300ffc6a4ccdae63413e02f4e457"
+    "id": "91a18893883a40cfaa063561a353abac"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-submission-complaint.http b/docs/source/tutorial/award-complaint-submission-complaint.http
@@ -1,4 +1,4 @@
-POST /api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints?acc_token=dacd3526c7624fa5acd025138c2149a9 HTTP/1.0
+POST /api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints?acc_token=a2378a8829b148fdaf207238f78e126a HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 1703
 Content-Type: application/json
@@ -35,10 +35,10 @@ DATA:
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/6329300ffc6a4ccdae63413e02f4e457
+Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/91a18893883a40cfaa063561a353abac
 {
   "access": {
-    "token": "c44e2abb06a440b6a4795a4040597939"
+    "token": "6aa7d528dd3b4a08ae521a1e910c094e"
   }, 
   "data": {
     "status": "pending", 
@@ -65,10 +65,10 @@ Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/f8fd2ed4120348
       }
     }, 
     "title": "Недостатньо інформації", 
-    "dateSubmitted": "2016-02-01T16:18:59.354242+02:00", 
-    "date": "2016-02-01T16:18:59.352815+02:00", 
+    "dateSubmitted": "2016-02-11T16:47:21.677576+02:00", 
+    "date": "2016-02-11T16:47:21.676090+02:00", 
     "type": "complaint", 
-    "id": "6329300ffc6a4ccdae63413e02f4e457"
+    "id": "91a18893883a40cfaa063561a353abac"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-submission-upload.http b/docs/source/tutorial/award-complaint-submission-upload.http
@@ -1,22 +1,22 @@
-POST /api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/fa17d99108524c658940302e3591e2b4/documents?acc_token=a03b162b9cf84d14bd3f113795c35e6f HTTP/1.0
+POST /api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/0b79acf448cf497683bbd453bccc3137/documents?acc_token=7e7b337eb069455dadda6f2981651233 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 199
-Content-Type: multipart/form-data; boundary=----------a_BoUnDaRy52629908468$
+Content-Length: 201
+Content-Type: multipart/form-data; boundary=----------a_BoUnDaRy848218209748$
 Host: api-sandbox.openprocurement.org
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/fa17d99108524c658940302e3591e2b4/documents/28cbb7a576a6413495bbbde1679820ef
+Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/0b79acf448cf497683bbd453bccc3137/documents/91909b0f4b4c45eeb381310eb50d454a
 {
   "data": {
     "author": "complaint_owner", 
     "title": "Complaint_Attachement.pdf", 
-    "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/fa17d99108524c658940302e3591e2b4/documents/28cbb7a576a6413495bbbde1679820ef?download=e4308e9037a64cf48068cbfba4d98ca6", 
+    "url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/0b79acf448cf497683bbd453bccc3137/documents/91909b0f4b4c45eeb381310eb50d454a?download=62340542d3c64d97b44c53d20b1458cd", 
     "format": "application/pdf", 
     "documentOf": "tender", 
-    "datePublished": "2016-02-01T16:18:59.084081+02:00", 
-    "id": "28cbb7a576a6413495bbbde1679820ef", 
-    "dateModified": "2016-02-01T16:18:59.084119+02:00"
+    "datePublished": "2016-02-11T16:47:21.340754+02:00", 
+    "id": "91909b0f4b4c45eeb381310eb50d454a", 
+    "dateModified": "2016-02-11T16:47:21.340804+02:00"
   }
 }
 
diff --git a/docs/source/tutorial/award-complaint-submission.http b/docs/source/tutorial/award-complaint-submission.http
@@ -1,4 +1,4 @@
-POST /api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints?acc_token=dacd3526c7624fa5acd025138c2149a9 HTTP/1.0
+POST /api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints?acc_token=a2378a8829b148fdaf207238f78e126a HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 1682
 Content-Type: application/json
@@ -34,10 +34,10 @@ DATA:
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/f8fd2ed41203486bb37008eac4f06e41/awards/a85cbc348f524e4aa6bdd93dd448fda2/complaints/fa17d99108524c658940302e3591e2b4
+Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/83985b0f5ea54e53bbac9a5cc512a569/awards/49d5348a60a3429995bdfba908412b88/complaints/0b79acf448cf497683bbd453bccc3137
 {
   "access": {
-    "token": "a03b162b9cf84d14bd3f113795c35e6f"
+    "token": "7e7b337eb069455dadda6f2981651233"
   }, 
   "data": {
     "status": "draft", 
@@ -64,9 +64,9 @@ Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/f8fd2ed4120348
       }
     }, 
     "title": "Недостатньо інформації", 
-    "date": "2016-02-01T16:18:58.753880+02:00", 
+    "date": "2016-02-11T16:47:20.903103+02:00", 
     "type": "complaint", 
-    "id": "fa17d99108524c658940302e3591e2b4"
+    "id": "0b79acf448cf497683bbd453bccc3137"
   }
 }
 
diff --git a/docs/source/tutorial/tender-post-attempt-json-data.http b/docs/source/tutorial/tender-post-attempt-json-data.http
@@ -7,7 +7,7 @@ DATA:
 {
   "data": {
     "tenderPeriod": {
-      "endDate": "2016-02-14T18:54:24.696596+02:00"
+      "endDate": "2016-02-27T16:59:32.137349+02:00"
     }, 
     "title": "футляри до державних нагород", 
     "minimalStep": {
@@ -64,90 +64,3 @@ DATA:
   }
 }
 
-Response: 201 Created
-Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/0.12/tenders/b337832d657e4a07bdd0f6572b431fbd
-{
-  "access": {
-    "token": "0d8b9c3b5b5c4551829844cbbe979700"
-  }, 
-  "data": {
-    "procurementMethod": "open", 
-    "status": "active.tendering", 
-    "tenderID": "UA-2016-01-29-000001", 
-    "tenderPeriod": {
-      "startDate": "2016-01-29T18:54:26.346017+02:00", 
-      "endDate": "2016-02-14T18:54:24.696596+02:00"
-    }, 
-    "title": "футляри до державних нагород", 
-    "minimalStep": {
-      "currency": "UAH", 
-      "amount": 35.0, 
-      "valueAddedTaxIncluded": true
-    }, 
-    "items": [
-      {
-        "description": "Послуги шкільних їдалень", 
-        "classification": {
-          "scheme": "CPV", 
-          "description": "Test", 
-          "id": "37810000-9"
-        }, 
-        "additionalClassifications": [
-          {
-            "scheme": "ДКПП", 
-            "id": "17.21.1", 
-            "description": "Послуги шкільних їдалень"
-          }
-        ], 
-        "id": "03636c21a8f943dcb8fac93d020240f3", 
-        "unit": {
-          "code": "44617100-9", 
-          "name": "item"
-        }, 
-        "quantity": 1
-      }
-    ], 
-    "complaintPeriod": {
-      "startDate": "2016-01-29T18:54:26.346017+02:00", 
-      "endDate": "2016-02-10T18:54:24.696596+02:00"
-    }, 
-    "procurementMethodType": "aboveThresholdUA", 
-    "value": {
-      "currency": "UAH", 
-      "amount": 500.0, 
-      "valueAddedTaxIncluded": true
-    }, 
-    "submissionMethod": "electronicAuction", 
-    "next_check": "2016-02-14T18:54:24.696596+02:00", 
-    "procuringEntity": {
-      "contactPoint": {
-        "url": "http://sch10.edu.vn.ua/", 
-        "name": "Куца Світлана Валентинівна", 
-        "telephone": "+380 (432) 46-53-02"
-      }, 
-      "identifier": {
-        "scheme": "UA-EDR", 
-        "id": "21725150", 
-        "legalName": "Заклад \"Загальноосвітня школа І-ІІІ ступенів № 10 Вінницької міської ради\""
-      }, 
-      "name": "ЗОСШ #10 м.Вінниці", 
-      "address": {
-        "postalCode": "21027", 
-        "countryName": "Україна", 
-        "streetAddress": "вул. Стахурського. 22", 
-        "region": "м. Вінниця", 
-        "locality": "м. Вінниця"
-      }
-    }, 
-    "enquiryPeriod": {
-      "startDate": "2016-01-29T18:54:26.346017+02:00", 
-      "endDate": "2016-02-11T18:54:24.696596+02:00"
-    }, 
-    "owner": "broker", 
-    "dateModified": "2016-01-29T18:54:26.421907+02:00", 
-    "id": "b337832d657e4a07bdd0f6572b431fbd", 
-    "awardCriteria": "lowestCost"
-  }
-}
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ python: @@
       - "2.7"
     services:
       - couchdb
+    env:
+      - TZ=Europe/Kiev
     cache:
       directories:
         - eggs
@@ Expand Down @@