Skip to content

Commit

Permalink
Merge pull request #33 from VolVoz/master
Browse files Browse the repository at this point in the history
added multilingual fields for tender data
  • Loading branch information
vmaksymiv committed Mar 24, 2016
2 parents 00058f2 + f77e1d4 commit d97628e
Show file tree
Hide file tree
Showing 48 changed files with 558 additions and 486 deletions.
14 changes: 12 additions & 2 deletions docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"scheme": "CPV"
},
"description": "Послуги шкільних їдалень",
"description_en": "Services in school canteens",
"description_ru": "Услуги школьных столовых",
"id": "2dc54675d6364e2baffbc0f8e74432ac",
"deliveryDate": {
"startDate": (now + timedelta(days=2)).isoformat(),
Expand Down Expand Up @@ -70,6 +72,10 @@
"valueAddedTaxIncluded": True
},
"title": "Послуги шкільних їдалень",
"title_en": "Services in school canteens",
"title_ru": "Услуги школьных столовых",
"description_en": "Services in school canteens",
"description_ru": "Услуги школьных столовых",
}

supplier = {'data':
Expand Down Expand Up @@ -145,11 +151,15 @@
test_tender_negotiation_data = deepcopy(test_tender_data)
test_tender_negotiation_data['procurementMethodType'] = "negotiation"
test_tender_negotiation_data['cause'] = "twiceUnsuccessful"
test_tender_negotiation_data['causeDescription'] = "original tender has failed twice"
test_tender_negotiation_data['causeDescription'] = "оригінальний тендер не вдався двічі"
test_tender_negotiation_data['causeDescription_en'] = "original tender has failed twice"
test_tender_negotiation_data['causeDescription_ru'] = "оригинальный тендер не получился дважды"

test_tender_negotiation_quick_data = deepcopy(test_tender_data)
test_tender_negotiation_quick_data['procurementMethodType'] = "negotiation.quick"
test_tender_negotiation_quick_data['causeDescription'] = "chupacabra"
test_tender_negotiation_quick_data['causeDescription'] = "оригінальний тендер не вдався двічі"
test_tender_negotiation_quick_data['causeDescription_en'] = "original tender has failed twice"
test_tender_negotiation_quick_data['causeDescription_ru'] = "оригинальный тендер не получился дважды"

class DumpsTestAppwebtest(TestApp):

Expand Down
22 changes: 11 additions & 11 deletions docs/source/tutorial/active-cancellation.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/0.12/tenders/958e22d2b07d42b68d56982dd38930bb/cancellations/0e172d750d494cb2a18073da7f26eb17?acc_token=8d72f594776d443391d33e3bce29b060 HTTP/1.0
PATCH /api/2.1/tenders/7f9dc0bae5644166a4197fd104c5537a/cancellations/9e47b8281e5447718633dc2cd35f81c0?acc_token=620b93c6fc8149da9a1e17bbc2654519 HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 30
Content-Type: application/json
Expand All @@ -19,29 +19,29 @@ Content-Type: application/json; charset=UTF-8
{
"description": "Changed description",
"title": "Notice.pdf",
"url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/958e22d2b07d42b68d56982dd38930bb/cancellations/0e172d750d494cb2a18073da7f26eb17/documents/6dcb59132b644779a6e97d492db70b99?download=e74235491a1644a393a88ff1ee509933",
"url": "http://api-sandbox.openprocurement.org/api/2.1/tenders/7f9dc0bae5644166a4197fd104c5537a/cancellations/9e47b8281e5447718633dc2cd35f81c0/documents/836ef1b5d97a4fe4a972321dc43b34c8?download=b20c8032dcb949ed8885d0c6e72657d2",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2016-03-21T17:41:19.511939+02:00",
"id": "6dcb59132b644779a6e97d492db70b99",
"dateModified": "2016-03-21T17:41:19.511981+02:00"
"datePublished": "2016-03-24T13:56:55.677842+02:00",
"id": "836ef1b5d97a4fe4a972321dc43b34c8",
"dateModified": "2016-03-24T13:56:55.677884+02:00"
},
{
"description": "Changed description",
"title": "Notice-2.pdf",
"url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/958e22d2b07d42b68d56982dd38930bb/cancellations/0e172d750d494cb2a18073da7f26eb17/documents/6dcb59132b644779a6e97d492db70b99?download=3514c7e940e64c6190eac3cc1efdf209",
"url": "http://api-sandbox.openprocurement.org/api/2.1/tenders/7f9dc0bae5644166a4197fd104c5537a/cancellations/9e47b8281e5447718633dc2cd35f81c0/documents/836ef1b5d97a4fe4a972321dc43b34c8?download=76b87ef82939454ca32c5ac2a94e8e37",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2016-03-21T17:41:19.511939+02:00",
"id": "6dcb59132b644779a6e97d492db70b99",
"dateModified": "2016-03-21T17:41:19.874525+02:00"
"datePublished": "2016-03-24T13:56:55.677842+02:00",
"id": "836ef1b5d97a4fe4a972321dc43b34c8",
"dateModified": "2016-03-24T13:56:56.134982+02:00"
}
],
"reason": "cancellation reason",
"reasonType": "unsuccessful",
"date": "2016-03-21T17:41:19.211258+02:00",
"date": "2016-03-24T13:56:55.265674+02:00",
"cancellationOf": "tender",
"id": "0e172d750d494cb2a18073da7f26eb17"
"id": "9e47b8281e5447718633dc2cd35f81c0"
}
}

20 changes: 10 additions & 10 deletions docs/source/tutorial/award-complaint-accept.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11 HTTP/1.0
PATCH /api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf HTTP/1.0
Authorization: Basic cmV2aWV3ZXI6
Content-Length: 32
Content-Type: application/json
Expand All @@ -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/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11/documents/7d8355d28e9e461593fb8c9a849752ed?download=0f403039a4c94853b31344e7ac2a1d56",
"url": "http://api-sandbox.openprocurement.org/api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf/documents/e255b448519f489698d916ef751c24e3?download=1ae44ee025c34b6894cdbcbe7f74d761",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2016-03-21T17:41:27.397346+02:00",
"id": "7d8355d28e9e461593fb8c9a849752ed",
"dateModified": "2016-03-21T17:41:27.397391+02:00"
"datePublished": "2016-03-24T13:57:03.256145+02:00",
"id": "e255b448519f489698d916ef751c24e3",
"dateModified": "2016-03-24T13:57:03.256187+02:00"
}
],
"description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.",
Expand All @@ -50,13 +50,13 @@ Content-Type: application/json; charset=UTF-8
"locality": "м. Вінниця"
}
},
"dateAccepted": "2016-03-21T17:41:28.277801+02:00",
"dateSubmitted": "2016-03-21T17:41:27.618225+02:00",
"complaintID": "UA-2016-03-21-000001.1",
"date": "2016-03-21T17:41:27.250991+02:00",
"dateAccepted": "2016-03-24T13:57:04.458950+02:00",
"dateSubmitted": "2016-03-24T13:57:03.511392+02:00",
"complaintID": "UA-2016-03-24-000001.1",
"date": "2016-03-24T13:57:03.038605+02:00",
"acceptance": true,
"type": "complaint",
"id": "73416f4e378746f087082eb6a0ba3f11"
"id": "c75fe191826246b18374e85e602fb8bf"
}
}

12 changes: 6 additions & 6 deletions docs/source/tutorial/award-complaint-cancel.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/fbef2a45520d4a859febecfcfd2b7827?acc_token=0e3faa87a8214e4bbd9b3076b8898a4b HTTP/1.0
PATCH /api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/32938f23739d43adb083347b7868f725?acc_token=a53b02b8f2974abfa9863fb55f60f7a9 HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 150
Content-Type: application/json
Expand Down Expand Up @@ -40,12 +40,12 @@ Content-Type: application/json; charset=UTF-8
},
"title": "Недостатньо інформації",
"cancellationReason": "Умови виправлено",
"dateCanceled": "2016-03-21T17:41:29.401656+02:00",
"dateSubmitted": "2016-03-21T17:41:29.235669+02:00",
"complaintID": "UA-2016-03-21-000001.4",
"date": "2016-03-21T17:41:29.234287+02:00",
"dateCanceled": "2016-03-24T13:57:06.101068+02:00",
"dateSubmitted": "2016-03-24T13:57:05.866131+02:00",
"complaintID": "UA-2016-03-24-000001.4",
"date": "2016-03-24T13:57:05.864736+02:00",
"type": "complaint",
"id": "fbef2a45520d4a859febecfcfd2b7827"
"id": "32938f23739d43adb083347b7868f725"
}
}

18 changes: 9 additions & 9 deletions docs/source/tutorial/award-complaint-complaint.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11?acc_token=992c4aedc1ff438698435dcd923ef68d HTTP/1.0
PATCH /api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf?acc_token=8645d823ddf6451a9b21aa78f030a033 HTTP/1.0
Authorization: Basic YnJva2VyOg==
Content-Length: 31
Content-Type: application/json
Expand All @@ -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/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11/documents/7d8355d28e9e461593fb8c9a849752ed?download=0f403039a4c94853b31344e7ac2a1d56",
"url": "http://api-sandbox.openprocurement.org/api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf/documents/e255b448519f489698d916ef751c24e3?download=1ae44ee025c34b6894cdbcbe7f74d761",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2016-03-21T17:41:27.397346+02:00",
"id": "7d8355d28e9e461593fb8c9a849752ed",
"dateModified": "2016-03-21T17:41:27.397391+02:00"
"datePublished": "2016-03-24T13:57:03.256145+02:00",
"id": "e255b448519f489698d916ef751c24e3",
"dateModified": "2016-03-24T13:57:03.256187+02:00"
}
],
"description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.",
Expand All @@ -50,11 +50,11 @@ Content-Type: application/json; charset=UTF-8
"locality": "м. Вінниця"
}
},
"dateSubmitted": "2016-03-21T17:41:27.618225+02:00",
"complaintID": "UA-2016-03-21-000001.1",
"date": "2016-03-21T17:41:27.250991+02:00",
"dateSubmitted": "2016-03-24T13:57:03.511392+02:00",
"complaintID": "UA-2016-03-24-000001.1",
"date": "2016-03-24T13:57:03.038605+02:00",
"type": "complaint",
"id": "73416f4e378746f087082eb6a0ba3f11"
"id": "c75fe191826246b18374e85e602fb8bf"
}
}

14 changes: 7 additions & 7 deletions docs/source/tutorial/award-complaint-decline.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/71e3ae7c861347c3a64f4d24c7c1a4d1 HTTP/1.0
PATCH /api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/5fc026bbc884451c835a001b0c8d4558 HTTP/1.0
Authorization: Basic cmV2aWV3ZXI6
Content-Length: 32
Content-Type: application/json
Expand All @@ -15,7 +15,7 @@ Content-Type: application/json; charset=UTF-8
{
"data": {
"status": "declined",
"dateDecision": "2016-03-21T17:41:28.912784+02:00",
"dateDecision": "2016-03-24T13:57:05.387087+02:00",
"description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.",
"author": {
"contactPoint": {
Expand All @@ -39,13 +39,13 @@ Content-Type: application/json; charset=UTF-8
}
},
"acceptance": true,
"dateAccepted": "2016-03-21T17:41:28.438860+02:00",
"dateSubmitted": "2016-03-21T17:41:27.926690+02:00",
"complaintID": "UA-2016-03-21-000001.3",
"date": "2016-03-21T17:41:27.924936+02:00",
"dateAccepted": "2016-03-24T13:57:04.686877+02:00",
"dateSubmitted": "2016-03-24T13:57:04.003268+02:00",
"complaintID": "UA-2016-03-24-000001.3",
"date": "2016-03-24T13:57:04.001849+02:00",
"title": "Недостатньо інформації",
"type": "complaint",
"id": "71e3ae7c861347c3a64f4d24c7c1a4d1"
"id": "5fc026bbc884451c835a001b0c8d4558"
}
}

12 changes: 6 additions & 6 deletions docs/source/tutorial/award-complaint-reject.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/c5a411d1854a4496987f3135cd769054 HTTP/1.0
PATCH /api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/80850d32c185495bb84e20442eb9c53d HTTP/1.0
Authorization: Basic cmV2aWV3ZXI6
Content-Length: 31
Content-Type: application/json
Expand All @@ -15,7 +15,7 @@ Content-Type: application/json; charset=UTF-8
{
"data": {
"status": "invalid",
"dateDecision": "2016-03-21T17:41:28.130095+02:00",
"dateDecision": "2016-03-24T13:57:04.230728+02:00",
"description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.",
"author": {
"contactPoint": {
Expand All @@ -39,12 +39,12 @@ Content-Type: application/json; charset=UTF-8
}
},
"acceptance": false,
"dateSubmitted": "2016-03-21T17:41:27.757054+02:00",
"complaintID": "UA-2016-03-21-000001.2",
"date": "2016-03-21T17:41:27.755141+02:00",
"dateSubmitted": "2016-03-24T13:57:03.747531+02:00",
"complaintID": "UA-2016-03-24-000001.2",
"date": "2016-03-24T13:57:03.746134+02:00",
"title": "Недостатньо інформації",
"type": "complaint",
"id": "c5a411d1854a4496987f3135cd769054"
"id": "80850d32c185495bb84e20442eb9c53d"
}
}

16 changes: 8 additions & 8 deletions docs/source/tutorial/award-complaint-resolution-upload.http
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
POST /api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11/documents HTTP/1.0
POST /api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf/documents HTTP/1.0
Authorization: Basic cmV2aWV3ZXI6
Content-Length: 199
Content-Type: multipart/form-data; boundary=----------a_BoUnDaRy462045196692$
Content-Length: 197
Content-Type: multipart/form-data; boundary=----------a_BoUnDaRy68743447374$
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/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11/documents/b523610198314907ada320e2021ed28c
Location: http://api-sandbox.openprocurement.org/api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf/documents/586778dacecd42be9fe922959e9a1311
{
"data": {
"author": "aboveThresholdReviewers",
"title": "ComplaintResolution.pdf",
"url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11/documents/b523610198314907ada320e2021ed28c?download=fad6ba7123f742398a2c702996172b3e",
"url": "http://api-sandbox.openprocurement.org/api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf/documents/586778dacecd42be9fe922959e9a1311?download=7f0c5569900b4ec5afacb911cb6bf0db",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2016-03-21T17:41:28.605328+02:00",
"id": "b523610198314907ada320e2021ed28c",
"dateModified": "2016-03-21T17:41:28.605367+02:00"
"datePublished": "2016-03-24T13:57:04.925678+02:00",
"id": "586778dacecd42be9fe922959e9a1311",
"dateModified": "2016-03-24T13:57:04.925719+02:00"
}
}

30 changes: 15 additions & 15 deletions docs/source/tutorial/award-complaint-resolve.http
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PATCH /api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11 HTTP/1.0
PATCH /api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf HTTP/1.0
Authorization: Basic cmV2aWV3ZXI6
Content-Length: 33
Content-Type: application/json
Expand All @@ -15,27 +15,27 @@ Content-Type: application/json; charset=UTF-8
{
"data": {
"status": "satisfied",
"dateDecision": "2016-03-21T17:41:28.763902+02:00",
"dateDecision": "2016-03-24T13:57:05.156192+02:00",
"documents": [
{
"author": "complaint_owner",
"title": "Complaint_Attachement.pdf",
"url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11/documents/7d8355d28e9e461593fb8c9a849752ed?download=0f403039a4c94853b31344e7ac2a1d56",
"url": "http://api-sandbox.openprocurement.org/api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf/documents/e255b448519f489698d916ef751c24e3?download=1ae44ee025c34b6894cdbcbe7f74d761",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2016-03-21T17:41:27.397346+02:00",
"id": "7d8355d28e9e461593fb8c9a849752ed",
"dateModified": "2016-03-21T17:41:27.397391+02:00"
"datePublished": "2016-03-24T13:57:03.256145+02:00",
"id": "e255b448519f489698d916ef751c24e3",
"dateModified": "2016-03-24T13:57:03.256187+02:00"
},
{
"author": "aboveThresholdReviewers",
"title": "ComplaintResolution.pdf",
"url": "http://api-sandbox.openprocurement.org/api/0.12/tenders/0fb6f95bf1314a81a446b77944cf9daf/awards/779fe48542fb473f8a047893c67d968d/complaints/73416f4e378746f087082eb6a0ba3f11/documents/b523610198314907ada320e2021ed28c?download=fad6ba7123f742398a2c702996172b3e",
"url": "http://api-sandbox.openprocurement.org/api/2.1/tenders/ec698b5d583a42d0881a2f005e1005fe/awards/9d974d46d72b4a5c939da22c590c3dfb/complaints/c75fe191826246b18374e85e602fb8bf/documents/586778dacecd42be9fe922959e9a1311?download=7f0c5569900b4ec5afacb911cb6bf0db",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2016-03-21T17:41:28.605328+02:00",
"id": "b523610198314907ada320e2021ed28c",
"dateModified": "2016-03-21T17:41:28.605367+02:00"
"datePublished": "2016-03-24T13:57:04.925678+02:00",
"id": "586778dacecd42be9fe922959e9a1311",
"dateModified": "2016-03-24T13:57:04.925719+02:00"
}
],
"description": "Умови виставлені замовником не містять достатньо інформації, щоб заявка мала сенс.",
Expand All @@ -61,13 +61,13 @@ Content-Type: application/json; charset=UTF-8
"locality": "м. Вінниця"
}
},
"dateAccepted": "2016-03-21T17:41:28.277801+02:00",
"dateSubmitted": "2016-03-21T17:41:27.618225+02:00",
"complaintID": "UA-2016-03-21-000001.1",
"date": "2016-03-21T17:41:27.250991+02:00",
"dateAccepted": "2016-03-24T13:57:04.458950+02:00",
"dateSubmitted": "2016-03-24T13:57:03.511392+02:00",
"complaintID": "UA-2016-03-24-000001.1",
"date": "2016-03-24T13:57:03.038605+02:00",
"acceptance": true,
"type": "complaint",
"id": "73416f4e378746f087082eb6a0ba3f11"
"id": "c75fe191826246b18374e85e602fb8bf"
}
}

0 comments on commit d97628e

Please sign in to comment.