Merge pull request #72 from tarasvaskiv/a341510451360072_tutorial_gen…

…eration Fix tutorial for esco procedure
openprocurement · Sep 28, 2017 · 080b591 · 080b591
2 parents 02c9c1b + 3be4b9e
commit 080b591
Show file tree

Hide file tree

Showing 148 changed files with 3,938 additions and 2,903 deletions.
diff --git a/docs.py b/docs.py
diff --git a/docs/source/multiple_lots_tutorial/bid-lot1-invalid-view.http b/docs/source/multiple_lots_tutorial/bid-lot1-invalid-view.http
@@ -1,4 +1,4 @@
-GET /api/2.3/tenders/280597ddd8b840fbbd91ce17c8b50ee7/bids/fecabf8bbfaf42d994b71814efcc5ce6?acc_token=7f29cc377a5643f59df9f0bd09510c64 HTTP/1.0
+GET /api/2.4/tenders/ae550ff97b034f8391b117ff7a1f7c69/bids/40a83840a8e1400d8bcaa1bd1d0aad18?acc_token=4df8379b16e04cf59ad0cd5f34a295b4 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Host: api-sandbox.openprocurement.org
 
@@ -7,7 +7,7 @@ Content-Type: application/json; charset=UTF-8
 {
   "data": {
     "status": "invalid", 
-    "id": "fecabf8bbfaf42d994b71814efcc5ce6"
+    "id": "40a83840a8e1400d8bcaa1bd1d0aad18"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/bid-lot1-update-view.http b/docs/source/multiple_lots_tutorial/bid-lot1-update-view.http
@@ -1,4 +1,4 @@
-PATCH /api/2.3/tenders/280597ddd8b840fbbd91ce17c8b50ee7/bids/fecabf8bbfaf42d994b71814efcc5ce6?acc_token=7f29cc377a5643f59df9f0bd09510c64 HTTP/1.0
+PATCH /api/2.4/tenders/ae550ff97b034f8391b117ff7a1f7c69/bids/40a83840a8e1400d8bcaa1bd1d0aad18?acc_token=4df8379b16e04cf59ad0cd5f34a295b4 HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 214
 Content-Type: application/json
@@ -9,7 +9,7 @@ DATA:
     "status": "pending", 
     "lotValues": [
       {
-        "relatedLot": "3e270fdf1d3343feb0e2b26f7e2267fd", 
+        "relatedLot": "1af1f23fd5af42f19d8bb4f7893c924c", 
         "value": {
           "amount": 500
         }, 
@@ -27,16 +27,42 @@ Content-Type: application/json; charset=UTF-8
     "selfEligible": true, 
     "lotValues": [
       {
-        "relatedLot": "3e270fdf1d3343feb0e2b26f7e2267fd", 
-        "date": "2017-06-02T13:01:05.161926+03:00", 
+        "relatedLot": "1af1f23fd5af42f19d8bb4f7893c924c", 
+        "date": "2017-09-28T18:39:20.648464+03:00", 
         "status": "pending", 
         "value": {
-          "yearlyPayments": 0.9, 
+          "amountPerfomance": 1482.3384524678127, 
+          "yearlyPaymentsPercentage": 0.87, 
           "valueAddedTaxIncluded": true, 
           "currency": "UAH", 
-          "amount": 698.444, 
-          "contractDuration": 10, 
-          "annualCostsReduction": 751.5
+          "amount": 6039.945205479452, 
+          "contractDuration": {
+            "days": 0, 
+            "years": 7
+          }, 
+          "annualCostsReduction": [
+            200.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0
+          ]
         }, 
         "subcontractingDetails": "ДКП «Орфей»"
       }
@@ -64,8 +90,8 @@ Content-Type: application/json; charset=UTF-8
         }
       }
     ], 
-    "date": "2017-06-02T13:01:05.161031+03:00", 
-    "id": "fecabf8bbfaf42d994b71814efcc5ce6"
+    "date": "2017-09-28T18:39:20.647953+03:00", 
+    "id": "40a83840a8e1400d8bcaa1bd1d0aad18"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/bid-lot1.http b/docs/source/multiple_lots_tutorial/bid-lot1.http
@@ -1,6 +1,6 @@
-POST /api/2.3/tenders/280597ddd8b840fbbd91ce17c8b50ee7/bids HTTP/1.0
+POST /api/2.4/tenders/ae550ff97b034f8391b117ff7a1f7c69/bids HTTP/1.0
 Authorization: Basic YnJva2VyOg==
-Content-Length: 1047
+Content-Length: 1188
 Content-Type: application/json
 Host: api-sandbox.openprocurement.org
 DATA:
@@ -10,11 +10,35 @@ DATA:
     "selfQualified": true, 
     "lotValues": [
       {
-        "relatedLot": "3e270fdf1d3343feb0e2b26f7e2267fd", 
+        "relatedLot": "1af1f23fd5af42f19d8bb4f7893c924c", 
         "value": {
-          "contractDuration": 10, 
-          "annualCostsReduction": 751.5, 
-          "yearlyPayments": 0.9
+          "contractDuration": {
+            "years": 7
+          }, 
+          "yearlyPaymentsPercentage": 0.87, 
+          "annualCostsReduction": [
+            200, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000, 
+            1000
+          ]
         }, 
         "subcontractingDetails": "ДКП «Орфей», Україна"
       }
@@ -46,26 +70,52 @@ DATA:
 
 Response: 201 Created
 Content-Type: application/json; charset=UTF-8
-Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/280597ddd8b840fbbd91ce17c8b50ee7/bids/fecabf8bbfaf42d994b71814efcc5ce6
+Location: http://api-sandbox.openprocurement.org/api/2.4/tenders/ae550ff97b034f8391b117ff7a1f7c69/bids/40a83840a8e1400d8bcaa1bd1d0aad18
 {
   "access": {
-    "token": "7f29cc377a5643f59df9f0bd09510c64"
+    "token": "4df8379b16e04cf59ad0cd5f34a295b4"
   }, 
   "data": {
     "status": "pending", 
     "selfEligible": true, 
     "lotValues": [
       {
-        "relatedLot": "3e270fdf1d3343feb0e2b26f7e2267fd", 
-        "date": "2017-06-02T13:01:05.161926+03:00", 
+        "relatedLot": "1af1f23fd5af42f19d8bb4f7893c924c", 
+        "date": "2017-09-28T18:39:20.648464+03:00", 
         "status": "pending", 
         "value": {
-          "yearlyPayments": 0.9, 
+          "amountPerfomance": 1482.3384524678127, 
+          "yearlyPaymentsPercentage": 0.87, 
           "valueAddedTaxIncluded": true, 
           "currency": "UAH", 
-          "amount": 698.444, 
-          "contractDuration": 10, 
-          "annualCostsReduction": 751.5
+          "amount": 6039.945205479452, 
+          "contractDuration": {
+            "days": 0, 
+            "years": 7
+          }, 
+          "annualCostsReduction": [
+            200.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0, 
+            1000.0
+          ]
         }, 
         "subcontractingDetails": "ДКП «Орфей», Україна"
       }
@@ -93,8 +143,8 @@ Location: http://api-sandbox.openprocurement.org/api/2.3/tenders/280597ddd8b840f
         }
       }
     ], 
-    "date": "2017-06-02T13:01:05.161031+03:00", 
-    "id": "fecabf8bbfaf42d994b71814efcc5ce6"
+    "date": "2017-09-28T18:39:20.647953+03:00", 
+    "id": "40a83840a8e1400d8bcaa1bd1d0aad18"
   }
 }
 
diff --git a/docs/source/multiple_lots_tutorial/bid-lot2-update-view.http b/docs/source/multiple_lots_tutorial/bid-lot2-update-view.http
@@ -1,4 +1,4 @@
-PATCH /api/2.3/tenders/280597ddd8b840fbbd91ce17c8b50ee7/bids/c9b2a39e6121440cb5fc10828e12a8ed?acc_token=ef275dcfe99d44698395fb1c1561df3b HTTP/1.0
+PATCH /api/2.4/tenders/ae550ff97b034f8391b117ff7a1f7c69/bids/7f5df8e4b7ba48d5af8393f5fbc02428?acc_token=85559a1593f14d5dbac035b62fdf71be HTTP/1.0
 Authorization: Basic YnJva2VyOg==
 Content-Length: 124
 Content-Type: application/json
@@ -9,7 +9,7 @@ DATA:
     "status": "pending", 
     "lotValues": [
       {
-        "relatedLot": "3e270fdf1d3343feb0e2b26f7e2267fd", 
+        "relatedLot": "1af1f23fd5af42f19d8bb4f7893c924c", 
         "value": {
           "amount": 500
         }
@@ -26,16 +26,42 @@ Content-Type: application/json; charset=UTF-8
     "selfEligible": true, 
     "lotValues": [
       {
-        "relatedLot": "3e270fdf1d3343feb0e2b26f7e2267fd", 
-        "date": "2017-06-02T13:01:05.319919+03:00", 
+        "relatedLot": "1af1f23fd5af42f19d8bb4f7893c924c", 
+        "date": "2017-09-28T18:39:20.797821+03:00", 
         "status": "pending", 
         "value": {
-          "yearlyPayments": 0.9, 
+          "amountPerfomance": 2246.373237166645, 
+          "yearlyPaymentsPercentage": 0.9, 
           "valueAddedTaxIncluded": true, 
           "currency": "UAH", 
-          "amount": 698.444, 
-          "contractDuration": 10, 
-          "annualCostsReduction": 751.5
+          "amount": 10339.150684931506, 
+          "contractDuration": {
+            "days": 0, 
+            "years": 7
+          }, 
+          "annualCostsReduction": [
+            700.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0, 
+            1600.0
+          ]
         }
       }
     ], 
@@ -62,8 +88,8 @@ Content-Type: application/json; charset=UTF-8
         }
       }
     ], 
-    "date": "2017-06-02T13:01:05.319286+03:00", 
-    "id": "c9b2a39e6121440cb5fc10828e12a8ed"
+    "date": "2017-09-28T18:39:20.797275+03:00", 
+    "id": "7f5df8e4b7ba48d5af8393f5fbc02428"
   }
 }