From 3cd6d5b92006043ec1f5d3391f77de7e04983757 Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Fri, 25 May 2018 12:47:51 +0300 Subject: [PATCH 01/14] Update configuration to lease purposes --- docs/source/conf.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 6c79199..8d9a067 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # -# openprocurement.auctions.dgf documentation build configuration file, created by -# sphinx-quickstart on Wed Oct 1 02:29:13 2014. +# openprocurement.auctions.lease documentation build configuration file, created by +# sphinx-quickstart on Wed Oct 1 02:29:13 2014; +# manually modified in May 2018. # # This file is execfile()d with the current directory set to its # containing dir. @@ -31,7 +32,7 @@ # ones. import cornice extensions = [ - 'cornice.ext.sphinxext', + # 'cornice.ext.sphinxext', disabled due to import error 'sphinx.ext.intersphinx', 'sphinx.ext.graphviz', 'sphinxcontrib.httpdomain', @@ -50,8 +51,8 @@ master_doc = 'index' # General information about the project. -project = u'openprocurement.auctions.dgf' -copyright = u'2016, Quintagroup, Ltd' +project = u'openprocurement.auctions.lease' +copyright = u'2018, Quintagroup, Ltd' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -183,7 +184,7 @@ #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'openprocurementauctionsdgfdoc' +htmlhelp_basename = 'openprocurementauctionsleasedoc' # -- Options for LaTeX output --------------------------------------------- @@ -203,7 +204,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'openprocurementauctionsdgf.tex', u'openprocurement.auctions.dgf Documentation', + ('index', 'openprocurementauctionslease.tex', u'openprocurement.auctions.lease Documentation', u'Myroslav Opyr', 'manual'), ] @@ -233,7 +234,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'openprocurementauctionsdgf', u'openprocurement.auctions.dgf Documentation', + ('index', 'openprocurementauctionslease', u'openprocurement.auctions.lease Documentation', [u'Myroslav Opyr'], 1) ] @@ -247,8 +248,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'openprocurementauctionsdgf', u'openprocurement.auctions.dgf Documentation', - u'Myroslav Opyr', 'openprocurementauctionsdgf', 'One line description of project.', + ('index', 'openprocurementauctionslease', u'openprocurement.auctions.lease Documentation', + u'Myroslav Opyr', 'openprocurementauctionslease', 'One line description of project.', 'Miscellaneous'), ] From bd6443a800bb7bbda679431389b234b3b5dd92bf Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Fri, 25 May 2018 15:29:26 +0300 Subject: [PATCH 02/14] Fix building complaints --- docs/source/locale/uk/LC_MESSAGES/standard/auction.po | 4 ++-- docs/source/tutorial.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/auction.po b/docs/source/locale/uk/LC_MESSAGES/standard/auction.po index 26f2235..032ee14 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/auction.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/auction.po @@ -68,11 +68,11 @@ msgstr "" "Якщо поле залишилось незаповненим, то порядок дій такий же, як і при наявності двох учасників." msgid "" -"You can also fill in the field, assigning the value "1". This will show " +"You can also fill in the field, assigning the value \"1\". This will show " "that the only one bidder is needed for the procedure to be successful. " "Therewith the auction is omitted and that bid turns to a qualified award." msgstr "" -"При присвоєнні полю значення "1" пропозиція учасника торгів автоматично стає " +"При присвоєнні полю значення \"1\" пропозиція учасника торгів автоматично стає " "award'ом, що пройшов етап кваліфікації. Сам же аукціон в такому випадку відсутній. Процедура вважається успішною." msgid "Bid guarantee" diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst index abba785..cb2546d 100644 --- a/docs/source/tutorial.rst +++ b/docs/source/tutorial.rst @@ -119,7 +119,7 @@ Organizer can edit procedure only during *enquiryPeriod*. When this period ends 403 error will be returned on editing attempt: -.. include:: tutorial/out-of-enquiryperiod-editing-denied.http +.. .. include:: tutorial/out-of-enquiryperiod-editing-denied.http :code: From 8f187cb53d3e9f5d61e31f7927ef466c54463271 Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Fri, 25 May 2018 15:36:59 +0300 Subject: [PATCH 03/14] Remove redundant comments from po-files --- docs/source/locale/uk/LC_MESSAGES/2pc.po | 2 +- .../locale/uk/LC_MESSAGES/acceleration.po | 2 +- .../locale/uk/LC_MESSAGES/award_workflow.po | 36 +---------- .../locale/uk/LC_MESSAGES/fintutorial.po | 2 +- docs/source/locale/uk/LC_MESSAGES/index.po | 2 +- docs/source/locale/uk/LC_MESSAGES/overview.po | 2 +- .../locale/uk/LC_MESSAGES/standard/auction.po | 61 +------------------ .../locale/uk/LC_MESSAGES/standard/award.po | 30 +-------- .../locale/uk/LC_MESSAGES/standard/bid.po | 29 +-------- .../uk/LC_MESSAGES/standard/cancellation.po | 18 +----- .../uk/LC_MESSAGES/standard/complaint.po | 54 +--------------- .../uk/LC_MESSAGES/standard/contract.po | 31 +--------- .../uk/LC_MESSAGES/standard/document.po | 2 +- .../locale/uk/LC_MESSAGES/standard/index.po | 4 +- .../locale/uk/LC_MESSAGES/standard/item.po | 36 +---------- .../uk/LC_MESSAGES/standard/organization.po | 48 +-------------- .../LC_MESSAGES/standard/procuringentity.po | 17 +----- .../uk/LC_MESSAGES/standard/question.po | 19 +----- .../locale/uk/LC_MESSAGES/standard/util.po | 24 +------- docs/source/locale/uk/LC_MESSAGES/tutorial.po | 2 +- docs/source/locale/uk/LC_MESSAGES/upload.po | 2 +- 21 files changed, 21 insertions(+), 402 deletions(-) diff --git a/docs/source/locale/uk/LC_MESSAGES/2pc.po b/docs/source/locale/uk/LC_MESSAGES/2pc.po index fd70e00..7c3c328 100644 --- a/docs/source/locale/uk/LC_MESSAGES/2pc.po +++ b/docs/source/locale/uk/LC_MESSAGES/2pc.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-20 15:07+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/acceleration.po b/docs/source/locale/uk/LC_MESSAGES/acceleration.po index ee226cf..5140127 100644 --- a/docs/source/locale/uk/LC_MESSAGES/acceleration.po +++ b/docs/source/locale/uk/LC_MESSAGES/acceleration.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-16 18:19+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/award_workflow.po b/docs/source/locale/uk/LC_MESSAGES/award_workflow.po index fa97bf1..e909188 100644 --- a/docs/source/locale/uk/LC_MESSAGES/award_workflow.po +++ b/docs/source/locale/uk/LC_MESSAGES/award_workflow.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 1.0.5\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-12-16 17:10+0200\n" "PO-Revision-Date: 2017-02-16 13:34+0200\n" @@ -14,43 +14,33 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/award_workflow.rst:4 msgid "Award Workflow" msgstr "Схема роботи кваліфікації" -#: ../../source/award_workflow.rst:6 msgid "For a more detailed information see :ref:`award`" msgstr "Для більш детальної інформації зверніться до секції :ref:`award`" -#: ../../source/award_workflow.rst:8 msgid ":ref:`Qualification`" msgstr "" -#: ../../source/award_workflow.rst:9 msgid ":ref:`Confirming_qualification`" msgstr "" -#: ../../source/award_workflow.rst:10 msgid ":ref:`Candidate_disqualification`" msgstr "" -#: ../../source/award_workflow.rst:11 msgid ":ref:`Waiting_refusal`" msgstr "" -#: ../../source/award_workflow.rst:62 msgid "Roles" msgstr "Ролі" -#: ../../source/award_workflow.rst:66 msgid "dashed" msgstr "пунктирна лінія" -#: ../../source/award_workflow.rst:90 msgid "Statuses" msgstr "Статуси" -#: ../../source/award_workflow.rst:93 msgid "" "The second highest valid bidder awaits for the qualification of the first " "highest valid bidder. The former can choose to refuse to wait and withdraw " @@ -61,7 +51,6 @@ msgstr "" " не чекати, та забрати свій гарантійний внесок, автоматично " "дискваліфікувавшись." -#: ../../source/award_workflow.rst:96 msgid "" "Terminal status. The second highest valid bidder chose to withdraw his " "security deposit and not to wait for the highest valid bidder to be " @@ -71,7 +60,6 @@ msgstr "" "забрати свій гарантійний внесок та не чекати на дискваліфікацію учасника з " "найвищою ставкою." -#: ../../source/award_workflow.rst:99 msgid "" "Awaiting protocol upload and confirmation by the liquidator. The highest " "valid bidder is able to submit the protocol as well, although it is not " @@ -81,7 +69,6 @@ msgstr "" "найвищою валідною ставкою може також завантажити протокол, але цього " "недостатньо для переходу до наступного статусу." -#: ../../source/award_workflow.rst:102 msgid "" "Awaiting payment. Organizer can change the status to active by confirming " "the payment has been received." @@ -150,7 +137,6 @@ msgstr "" msgid "Notes" msgstr "Примітки" -#: ../../source/award_workflow.rst:108 msgid "" "Terminal status. The auction was unsuccessful. Can be switched to either " "automatically, from any of the previous statuses or by the organizer." @@ -159,31 +145,24 @@ msgstr "" "здійснене ліквідатором, або автоматично по закінченню відповідно-" "передбачених періодів." -#: ../../source/award_workflow.rst:46 msgid "Legend" msgstr "Умовні Позначення" -#: ../../source/award_workflow.rst:48 msgid "Blue nodes represent statuses for the 2nd award ONLY" msgstr "Світло-сині об'єкти на рисунку відображають статуси лише для award #2" -#: ../../source/award_workflow.rst:50 msgid "\\* no protocol" msgstr "\\* протокол відсутній" -#: ../../source/award_workflow.rst:52 msgid "\\*\\* protocol required" msgstr "\\*\\* необхідний протокол аукціону" -#: ../../source/award_workflow.rst:54 msgid "\\*\\*\\* payment approved by the organizer" msgstr "\\*\\*\\* отримання оплати підтвердженно організатором" -#: ../../source/award_workflow.rst:68 msgid "dotted" msgstr "лінія з крапками" -#: ../../source/award_workflow.rst:72 msgid "Procedure Description" msgstr "Опис Процедури" @@ -196,7 +175,6 @@ msgstr "" "дорівнювати або бути більшою ніж стартова ціна аукціону + мінімальний крок " "(т.зв. валідна ставка). " -#: ../../source/award_workflow.rst:82 msgid "" "1.1. In case the first two highest bids do not exceed the amount of starting" " price + the minimal step, the awards are not being formed at all, and the " @@ -207,7 +185,6 @@ msgstr "" "формуються взагалі, а процедура кваліфікації переходить в статус неуспішної " "(\"unsuccessful)." -#: ../../source/award_workflow.rst:76 msgid "" "The second highest qualifying bidder, immediately after the auction ending " "receives the \"pending.waiting\" status, in which by default he/she agrees " @@ -237,11 +214,9 @@ msgstr "" "він проходить процедуру кваліфікації по такому самому принципу як і перший " "авард. " -#: ../../source/award_workflow.rst:79 msgid "Notes" msgstr "Примітки" -#: ../../source/award_workflow.rst:80 msgid "" "For the bidder to be qualified and not invalidated, his/her bid should be in" " the amount of more or equal to the starting price of the auction + the " @@ -251,7 +226,6 @@ msgstr "" "дорівнювати або бути більшою ніж стартова ціна аукціону + мінімальний крок " "(т.зв. валідна ставка)" -#: ../../source/award_workflow.rst:84 msgid "" "1.2 In case the second highest bid is smaller than the starting price + the " "minimal step, two awards are formed with the smaller one becoming " @@ -265,7 +239,6 @@ msgstr "" "більша ніж стартова ціна аукціону + мінімальний крок) проходить через " "процедуру кваліфікації та може стати переможною." -#: ../../source/award_workflow.rst:85 msgid "" "The organizer can disqualify the award at any stage of the awarding process " "up until the moment, when the contract has been uploaded and activated in " @@ -275,7 +248,6 @@ msgstr "" "процесу кваліфікації аж до моменту завантаження та активування контракту в " "системі." -#: ../../source/award_workflow.rst:86 msgid "" "The second highest qualifying bidder can disqualify himself/herself at any " "point in time BEFORE the start of his/her qualification process." @@ -284,21 +256,17 @@ msgstr "" " аукціону) може самодискваліфікуватись в будь-який момент часу ПЕРЕД " "початком його кваліфікації." -#: ../../source/award_workflow.rst:64 msgid "solid" msgstr "суцільна лінія" -#: ../../source/award_workflow.rst:56 msgid "\\*\\*\\*\\* no payment approval" msgstr "\\*\\*\\*\\* немає підтвердження оплати" -#: ../../source/award_workflow.rst:58 msgid "\\*\\*\\*\\*\\* contract activation = false by the end of \"signingPeriod\"" msgstr "" "\\*\\*\\*\\*\\* контракт не було активовано в системі до завершення періоду " "підписання контракту" -#: ../../source/award_workflow.rst:105 msgid "" "Awaiting for the contract to be signed (uploaded and activated in the system" " by the organizer). After the end of the \"signingPeriod\", the status " @@ -308,7 +276,6 @@ msgstr "" "системі організатором). Після закінчення періоду підписання " "(\"signingPeriod\"), статус \"active\" стає термінальним." -#: ../../source/award_workflow.rst:75 msgid "" "It is then when the qualification procedure enters the \"paymentPeriod\" " "stage, which lasts up to 20 days from the beginning of the highest bidder " @@ -343,7 +310,6 @@ msgstr "" "валідною ставкою (у випадку якщо до того моменту другий авард не " "самодискваліфікувався)." -#: ../../source/award_workflow.rst:74 msgid "" "The award with the highest qualifying bid initially receives a " "\"pending.verification\" status. The procedure enters the " diff --git a/docs/source/locale/uk/LC_MESSAGES/fintutorial.po b/docs/source/locale/uk/LC_MESSAGES/fintutorial.po index d02e6c9..4fa20be 100644 --- a/docs/source/locale/uk/LC_MESSAGES/fintutorial.po +++ b/docs/source/locale/uk/LC_MESSAGES/fintutorial.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-16 16:42+0300\n" "PO-Revision-Date: 2016-09-20 17:47+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/index.po b/docs/source/locale/uk/LC_MESSAGES/index.po index 0dd014e..dec9e5e 100644 --- a/docs/source/locale/uk/LC_MESSAGES/index.po +++ b/docs/source/locale/uk/LC_MESSAGES/index.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-13 12:12+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/overview.po b/docs/source/locale/uk/LC_MESSAGES/overview.po index 5a128af..ae1e9a3 100644 --- a/docs/source/locale/uk/LC_MESSAGES/overview.po +++ b/docs/source/locale/uk/LC_MESSAGES/overview.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-11-18 13:51+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/auction.po b/docs/source/locale/uk/LC_MESSAGES/standard/auction.po index 032ee14..da1a7ca 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/auction.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/auction.po @@ -2,7 +2,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-13 15:36+0300\n" "PO-Revision-Date: 2016-10-19 12:51+0200\n" @@ -90,43 +90,33 @@ msgstr "" "спискові елементи, де це можливо. Елементи не повинні дублюватись, замість " "цього вкажіть кількість 2." -#: ../../source/standard/auction.rst:69 msgid "list of :ref:`Feature` objects" msgstr "список об’єктів :ref:`Feature`" -#: ../../source/standard/auction.rst:71 msgid "Features of auction." msgstr "Властивості аукціону." -#: ../../source/standard/auction.rst:74 msgid "List of :ref:`document` objects" msgstr "Список об’єктів :ref:`document`" -#: ../../source/standard/auction.rst:76 msgid "|ocdsDescription| All documents and attachments related to the auction." msgstr "|ocdsDescription| Всі документи та додатки пов’язані із аукціоном." -#: ../../source/standard/auction.rst:80 msgid "List of :ref:`question` objects" msgstr "Список об’єктів :ref:`question`" -#: ../../source/standard/auction.rst:82 msgid "Questions to ``procuringEntity`` and answers to them." msgstr "Питання до організатора ``procuringEntity`` і відповіді на них." -#: ../../source/standard/auction.rst:85 msgid "List of :ref:`complaint` objects" msgstr "Список об’єктів :ref:`complaint`" -#: ../../source/standard/auction.rst:87 msgid "Complaints to auction conditions and their resolutions." msgstr "Скарги на умови аукціону та їх вирішення." -#: ../../source/standard/auction.rst:90 msgid "List of :ref:`bid` objects" msgstr "Список об’єктів :ref:`bid`" -#: ../../source/standard/auction.rst:94 msgid "" "|ocdsDescription| A list of all the companies who entered submissions for " "the auction." @@ -134,13 +124,11 @@ msgstr "" "|ocdsDescription| Список усіх компаній, які подали заявки для участі в " "аукціоні." -#: ../../source/standard/auction.rst:103 msgid "`currency` should either be absent or match `Auction.value.currency`" msgstr "" "Значення `currency` повинно бути або відсутнім, або співпадати з " "`Auction.value.currency`" -#: ../../source/standard/auction.rst:104 msgid "" "`valueAddedTaxIncluded` should either be absent or match " "`Auction.value.valueAddedTaxIncluded`" @@ -148,23 +136,18 @@ msgstr "" "Значення `valueAddedTaxIncluded` повинно бути або відсутнім, або співпадати " "з `Auction.value.valueAddedTaxIncluded`" -#: ../../source/standard/auction.rst:107 msgid "List of :ref:`award` objects" msgstr "Список об’єктів :ref:`award`" -#: ../../source/standard/auction.rst:109 msgid "All qualifications (disqualifications and awards)." msgstr "Всі кваліфікації (дискваліфікації та визначення переможця)." -#: ../../source/standard/auction.rst:112 msgid "List of :ref:`Contract` objects" msgstr "Список об’єктів :ref:`Contract`" -#: ../../source/standard/auction.rst:131 msgid ":ref:`period`, required" msgstr ":ref:`period`, обов'язково" -#: ../../source/standard/auction.rst:119 msgid "" "|ocdsDescription| The period during which enquiries may be made and will be " "answered." @@ -172,7 +155,6 @@ msgstr "" "|ocdsDescription| Період, коли можна задати питання (уточнення) та отримати " "відповіді на них." -#: ../../source/standard/auction.rst:127 msgid "" "|ocdsDescription| The period when the auction is open for submissions. The " "end date is the closing date for auction submissions." @@ -180,92 +162,72 @@ msgstr "" "|ocdsDescription| Період, коли аукціон відкритий для подачі пропозицій. " "Кінцева дата - це дата, коли перестають прийматись пропозиції." -#: ../../source/standard/auction.rst:141 msgid ":ref:`period`, read-only" msgstr ":ref:`period`, лише для читання" -#: ../../source/standard/auction.rst:136 msgid "url" msgstr "URL-адреса" -#: ../../source/standard/auction.rst:143 msgid "Awarding process period." msgstr "Період, коли відбувається визначення переможця." -#: ../../source/standard/auction.rst:145 msgid "" "|ocdsDescription| The date or period on which an award is anticipated to be " "made." msgstr "" "|ocdsDescription| Дата або період, коли очікується визначення переможця." -#: ../../source/standard/auction.rst:32 ../../source/standard/auction.rst:149 msgid "string" msgstr "рядок" -#: ../../source/standard/auction.rst:152 msgid "Tendering period (tendering)" msgstr "Очікування пропозицій (пропозиції)" -#: ../../source/standard/auction.rst:154 msgid "Auction period (auction)" msgstr "Період аукціону (аукціон)" -#: ../../source/standard/auction.rst:156 msgid "Winner qualification (qualification)" msgstr "Кваліфікація переможця (кваліфікація)" -#: ../../source/standard/auction.rst:158 msgid "Standstill period (standstill)" msgstr "Пропозиції розглянуто (розглянуто)" -#: ../../source/standard/auction.rst:160 msgid "Unsuccessful auction (unsuccessful)" msgstr "Аукціон не відбувся (не відбувся)" -#: ../../source/standard/auction.rst:162 msgid "Complete auction (complete)" msgstr "Завершений аукціон (завершений)" -#: ../../source/standard/auction.rst:164 msgid "Cancelled auction (cancelled)" msgstr "Відмінений аукціон (відмінений)" -#: ../../source/standard/auction.rst:187 msgid "List of :ref:`cancellation` objects." msgstr "Список об’єктів :ref:`cancellation`." -#: ../../source/standard/auction.rst:189 msgid "Contains 1 object with `active` status in case of cancelled Auction." msgstr "" "Містить 1 об’єкт зі статусом `active` на випадок, якщо аукціон буде " "відмінено." -#: ../../source/standard/auction.rst:195 msgid "List of :ref:`revision` objects, auto-generated" msgstr "" "Список об’єктів :ref:`revision`, генерується автоматично, лише для читання" -#: ../../source/standard/auction.rst:50 msgid "" "Total available auction budget. Bids lower than ``value`` will be rejected." msgstr "" "Повний доступний бюджет аукціону. Пропозиції, що нижчі за ``value`` будуть " "відхилені." -#: ../../source/standard/auction.rst:102 msgid "`amount` should be greater than `Auction.value.amount`" msgstr "`amount` повинна бути більша за `Auction.value.amount`" -#: ../../source/standard/auction.rst:63 msgid "List that contains single item being sold." msgstr "Список містить елементи, що продаються." -#: ../../source/standard/auction.rst:21 msgid "Detailed auction description." msgstr "Детальний опис аукціону." -#: ../../source/standard/auction.rst:92 msgid "" "A list of all bids placed in the auction with information about " "participants, their proposals and other qualification documentation." @@ -273,19 +235,15 @@ msgstr "" "Список усіх пропозицій поданих до аукціону разом із інформацією про " "учасників аукціону, їхні пропозиції та інша кваліфікаційна документація." -#: ../../source/standard/auction.rst:100 msgid "The minimal step of auction. Validation rules:" msgstr "Мінімальний крок аукціону. Правила валідації:" -#: ../../source/standard/auction.rst:138 msgid "A web address where auction is accessible for view." msgstr "Веб-адреса для перегляду аукціону." -#: ../../source/standard/auction.rst:166 msgid "Auction status." msgstr "Статус аукціону." -#: ../../source/standard/auction.rst:191 msgid "" "The :ref:`cancellation` object describes the reason of auction cancellation " "and contains accompanying documents if there are any." @@ -293,11 +251,9 @@ msgstr "" "Об’єкт :ref:`cancellation` описує причину скасування аукціону та надає " "відповідні документи, якщо такі є." -#: ../../source/standard/auction.rst:197 msgid "Historical changes to `Auction` object properties." msgstr "Зміни властивостей об’єктів `Auction`." -#: ../../source/standard/auction.rst:28 msgid "" "|ocdsDescription| AuctionID should always be the same as the OCID. It is " "included to make the flattened data structure more convenient." @@ -306,7 +262,6 @@ msgstr "" "співпадати з OCID. Його включають, щоб зробити структуру даних більш " "зручною." -#: ../../source/standard/auction.rst:43 msgid "" "|ocdsDescription| The entity managing the procurement, which may be " "different from the buyer who is paying / using the items being procured." @@ -314,43 +269,34 @@ msgstr "" "|ocdsDescription| Об’єкт, що управляє закупівлею. Він не обов’язково є " "покупцем, який платить / використовує закуплені елементи." -#: ../../source/standard/auction.rst:52 msgid "|ocdsDescription| The total estimated value of the procurement." msgstr "|ocdsDescription| Загальна кошторисна вартість закупівлі." -#: ../../source/standard/auction.rst:115 ../../source/standard/auction.rst:123 msgid ":ref:`period`" msgstr ":ref:`period`" -#: ../../source/standard/auction.rst:117 msgid "Period when questions are allowed." msgstr "Період, коли дозволено задавати питання." -#: ../../source/standard/auction.rst:125 msgid "Period when bids can be submitted." msgstr "Період, коли подаються пропозиції." -#: ../../source/standard/auction.rst:133 msgid "Period when Auction is conducted. `startDate` should be provided." msgstr "" "Період, коли проводиться аукціон. Значення `startDate` (дата початку торгів)" " повинно бути вказано обов'язково." -#: ../../source/standard/auction.rst:169 msgid "string, read-only" msgstr "рядок, лише для читання" -#: ../../source/standard/auction.rst:171 msgid "Required for `dgfFinancialAssets` procedure." msgstr "" "Обов'язково для `dgfFinancialAssets` процедури (продаж права вимоги за " "кредитними договорами)." -#: ../../source/standard/auction.rst:173 msgid "This field is multilingual:" msgstr "Це поле багатомовне:" -#: ../../source/standard/auction.rst:175 msgid "" "Ukrainian by default - До участі допускаються лише ліцензовані фінансові " "установи." @@ -358,7 +304,6 @@ msgstr "" "За замовчуванням українською мовою - До участі допускаються лише ліцензовані" " фінансові установи." -#: ../../source/standard/auction.rst:177 msgid "" "``eligibilityCriteria_ru`` (Russian) - К участию допускаются только " "лицензированные финансовые учреждения." @@ -366,7 +311,6 @@ msgstr "" "``eligibilityCriteria_ru`` (російською) - К участию допускаются только " "лицензированные финансовые учреждения." -#: ../../source/standard/auction.rst:179 msgid "" "``eligibilityCriteria_en`` (English) - Only licensed financial institutions " "are eligible to participate." @@ -374,15 +318,12 @@ msgstr "" "``eligibilityCriteria_en`` (англійською) - Only licensed financial " "institutions are eligible to participate." -#: ../../source/standard/auction.rst:14 msgid "string, multilingual, read-only" msgstr "рядок, багатомовний, лише для читання" -#: ../../source/standard/auction.rst:16 msgid "Auction number in the Deposit Guarantee Fund." msgstr "Номер аукціону у Фонді Гарантування Вкладів." -#: ../../source/standard/auction.rst:34 msgid "" "Identification number of the auction (also referred to as `lot`) in the XLS " "of Deposit Guarantee Fund." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/award.po b/docs/source/locale/uk/LC_MESSAGES/standard/award.po index da40243..b377821 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/award.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/award.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 13:26+0200\n" @@ -14,35 +14,27 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/award.rst:8 msgid "Award" msgstr "Award" -#: ../../source/standard/award.rst:11 msgid "Schema" msgstr "Схема" -#: ../../source/standard/award.rst:14 ../../source/standard/award.rst:20 msgid "string, auto-generated, read-only" msgstr "рядок, генерується автоматично, лише для читання" -#: ../../source/standard/award.rst:25 ../../source/standard/award.rst:31 msgid "string, multilingual" msgstr "рядок, багатомовний" -#: ../../source/standard/award.rst:27 msgid "|ocdsDescription| Award title." msgstr "|ocdsDescription| Назва рішення." -#: ../../source/standard/award.rst:33 msgid "|ocdsDescription| Award description." msgstr "|ocdsDescription| Опис рішення." -#: ../../source/standard/award.rst:37 msgid "string" msgstr "рядок" -#: ../../source/standard/award.rst:39 msgid "" "|ocdsDescription| The current status of the award drawn from the " "`awardStatus` codelist." @@ -50,66 +42,52 @@ msgstr "" "|ocdsDescription| Поточний статус рішення, взятий зі списку кодів " "`awardStatus`." -#: ../../source/standard/award.rst:42 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/award.rst:44 msgid "`pending` - the award is under review of qualification committee" msgstr "`pending` - переможець розглядається кваліфікаційною комісією" -#: ../../source/standard/award.rst:45 msgid "" "`unsuccessful` - the award has been rejected by qualification committee" msgstr "`unsuccessful` - кваліфікаційна комісія відмовила переможцю" -#: ../../source/standard/award.rst:46 msgid "`active` - the auction is awarded to the bidder from the `bid_id`" msgstr "`active` - аукціон виграв учасник з пропозицією `bid_id`" -#: ../../source/standard/award.rst:47 msgid "`cancelled` - the award has been cancelled by complaint review body" msgstr "" "`cancelled` - орган, що розглядає скарги, відмінив результати закупівлі" -#: ../../source/standard/award.rst:50 msgid "string, :ref:`Date`, auto-generated, read-only" msgstr "рядок, :ref:`Date`, генерується автоматично, лише для читання" -#: ../../source/standard/award.rst:52 msgid "|ocdsDescription| The date of the contract award." msgstr "|ocdsDescription| Дата рішення про підписання договору." -#: ../../source/standard/award.rst:56 msgid "`Value` object, auto-generated, read-only" msgstr "О’єкт :ref:`Value`, генерується автоматично, лише для читання" -#: ../../source/standard/award.rst:58 msgid "|ocdsDescription| The total value of this award." msgstr "|ocdsDescription| Загальна вартість згідно цього рішення." -#: ../../source/standard/award.rst:62 msgid "List of :ref:`Organization` objects, auto-generated, read-only" msgstr "" "Список об’єктів :ref:`Organization`, генерується автоматично, лише для " "читання" -#: ../../source/standard/award.rst:64 msgid "|ocdsDescription| The suppliers awarded with this award." msgstr "" "|ocdsDescription| Постачальники, що були визнані переможцями згідно цього " "рішення." -#: ../../source/standard/award.rst:68 msgid "List of :ref:`Item` objects, auto-generated, read-only" msgstr "" "Список об’єктів :ref:`Item`, генерується автоматично, лише для читання" -#: ../../source/standard/award.rst:74 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/award.rst:76 msgid "" "|ocdsDescription| All documents and attachments related to the award, " "including any notices." @@ -117,23 +95,18 @@ msgstr "" "|ocdsDescription| Усі документи та додатки пов’язані з рішенням, включно з " "будь-якими повідомленнями." -#: ../../source/standard/award.rst:80 msgid "List of :ref:`Complaint` objects" msgstr "Список об’єктів :ref:`Complaint`" -#: ../../source/standard/award.rst:83 msgid ":ref:`period`" msgstr ":ref:`period`" -#: ../../source/standard/award.rst:16 msgid "|ocdsDescription| Identifier for this award." msgstr "|ocdsDescription| Ідентифікатор цього рішення." -#: ../../source/standard/award.rst:22 msgid "The ID of a bid that the award relates to." msgstr "ID пропозиції, що виграла закупівлю" -#: ../../source/standard/award.rst:70 msgid "" "|ocdsDescription| The goods and services awarded in this award, broken into " "line items wherever possible. Items should not be duplicated, but the " @@ -143,7 +116,6 @@ msgstr "" "на окремі рядки, де це можливо. Елементи не повинні бути продубльовані, а " "повинні мати вказану кількість." -#: ../../source/standard/award.rst:85 msgid "The time frame when complaints can be submitted." msgstr "Період часу, під час якого можна подавати скарги." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/bid.po b/docs/source/locale/uk/LC_MESSAGES/standard/bid.po index 6c23beb..ffa3bec 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/bid.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/bid.po @@ -1,7 +1,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-13 17:52+0200\n" @@ -14,57 +14,44 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/bid.rst:8 msgid "Bid" msgstr "Bid" -#: ../../source/standard/bid.rst:11 ../../source/standard/bid.rst:69 msgid "Schema" msgstr "Схема" -#: ../../source/standard/bid.rst:14 msgid "List of :ref:`Organization` objects" msgstr "Список об’єктів :ref:`Organization` " -#: ../../source/standard/bid.rst:17 msgid "string, :ref:`date`, auto-generated" msgstr "рядок, :ref:`date`, генерується автоматично" -#: ../../source/standard/bid.rst:25 msgid "string" msgstr "рядок" -#: ../../source/standard/bid.rst:27 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/bid.rst:29 msgid "`draft`" msgstr "`draft` - чернетка" -#: ../../source/standard/bid.rst:30 msgid "`active`" msgstr "`active` - активна ставка" -#: ../../source/standard/bid.rst:33 msgid ":ref:`Value`, required" msgstr ":ref:`Value`, обов’язково" -#: ../../source/standard/bid.rst:35 msgid "Validation rules:" msgstr "Правила валідації:" -#: ../../source/standard/bid.rst:37 msgid "`amount` should be less than `Auction.value.amout`" msgstr "`amount` повинно бути меншим, ніж `Auction.value.amount`" -#: ../../source/standard/bid.rst:38 msgid "`currency` should either be absent or match `Auction.value.currency`" msgstr "" "`currency` повинно або бути відсутнім, або відповідати " "`Auction.value.currency`" -#: ../../source/standard/bid.rst:39 msgid "" "`valueAddedTaxIncluded` should either be absent or match " "`Auction.value.valueAddedTaxIncluded`" @@ -72,59 +59,45 @@ msgstr "" "Значення `valueAddedTaxIncluded` повинно бути або відсутнім, або співпадати " "з `Auction.value.valueAddedTaxIncluded`" -#: ../../source/standard/bid.rst:42 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/bid.rst:45 msgid "List of :ref:`Parameter` objects" msgstr "Список об’єктів :ref:`Parameter`" -#: ../../source/standard/bid.rst:53 msgid "A web address for participation in auction." msgstr "Веб-адреса для участі в аукціоні." -#: ../../source/standard/bid.rst:66 msgid "Parameter" msgstr "Parameter" -#: ../../source/standard/bid.rst:72 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/bid.rst:77 msgid "float, required" msgstr "float, обов’язково" -#: ../../source/standard/bid.rst:22 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/bid.rst:51 msgid "URL" msgstr "URL-адреса" -#: ../../source/standard/bid.rst:74 msgid "Feature code." msgstr "Код критерію." -#: ../../source/standard/bid.rst:79 msgid "Feature value." msgstr "Значення критерію." -#: ../../source/standard/bid.rst:56 msgid "bool, required" msgstr "булеве значення, обов'язково" -#: ../../source/standard/bid.rst:59 msgid "bool" msgstr "булеве значення" -#: ../../source/standard/bid.rst:19 msgid "Date when bid has been submitted." msgstr "Дата подачі пропозиції." -#: ../../source/standard/bid.rst:61 msgid "Required for `dgfFinancialAssets` procedure." msgstr "" "Необхідно для `dgfFinancialAssets` процедури (продаж права вимоги за " diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po b/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po index 2820dab..222ca85 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 14:36+0200\n" @@ -14,41 +14,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/cancellation.rst:8 msgid "Cancellation" msgstr "Cancellation" -#: ../../source/standard/cancellation.rst:11 msgid "Schema" msgstr "Схема" -#: ../../source/standard/cancellation.rst:17 msgid "string, multilingual, required" msgstr "рядок, багатомовний, обов’язковий" -#: ../../source/standard/cancellation.rst:22 -#: ../../source/standard/cancellation.rst:42 msgid "string" msgstr "рядок" -#: ../../source/standard/cancellation.rst:28 -#: ../../source/standard/cancellation.rst:44 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/cancellation.rst:26 msgid "Default. The request is being prepared." msgstr "За замовчуванням. Запит оформляється." -#: ../../source/standard/cancellation.rst:28 msgid "Cancellation activated." msgstr "Скасування активоване." -#: ../../source/standard/cancellation.rst:31 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/cancellation.rst:33 msgid "" "Documents accompanying the Cancellation: Protocol of Auction Committee with " "decision to cancel the Auction." @@ -56,23 +45,18 @@ msgstr "" "Супровідна документація скасування: Протокол рішення Аукціонного комітету " "організатора про скасування аукціону." -#: ../../source/standard/cancellation.rst:37 msgid "string, :ref:`date`" msgstr "рядок, :ref:`date`" -#: ../../source/standard/cancellation.rst:39 msgid "Cancellation date." msgstr "Дата скасування" -#: ../../source/standard/cancellation.rst:46 msgid "`auction`" msgstr "`auction`" -#: ../../source/standard/cancellation.rst:14 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/cancellation.rst:19 msgid "The reason, why auction is being cancelled." msgstr "Причина, з якої скасовується аукціон." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po b/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po index 1fd0060..5e211a1 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 14:25+0200\n" @@ -14,19 +14,15 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/complaint.rst:9 msgid "Complaint" msgstr "Complaint" -#: ../../source/standard/complaint.rst:12 msgid "Schema" msgstr "Схема" -#: ../../source/standard/complaint.rst:18 msgid ":ref:`Organization`, required" msgstr ":ref:`Organization`, обов’язково" -#: ../../source/standard/complaint.rst:20 msgid "" "Organization filing a complaint (contactPoint - person, identification - " "organization that person represents)." @@ -34,147 +30,99 @@ msgstr "" "Організація, яка подає скаргу (contactPoint - людина, identification - " "організація, яку ця людина представляє)." -#: ../../source/standard/complaint.rst:23 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/complaint.rst:25 msgid "Title of the complaint." msgstr "Заголовок скарги." -#: ../../source/standard/complaint.rst:28 msgid "Description of the issue." msgstr "Опис запитання." -#: ../../source/standard/complaint.rst:31 -#: ../../source/standard/complaint.rst:36 -#: ../../source/standard/complaint.rst:41 -#: ../../source/standard/complaint.rst:46 -#: ../../source/standard/complaint.rst:51 -#: ../../source/standard/complaint.rst:56 -#: ../../source/standard/complaint.rst:125 msgid "string, :ref:`date`, auto-generated" msgstr "рядок, :ref:`date`, генерується автоматично" -#: ../../source/standard/complaint.rst:33 msgid "Date of posting." msgstr "Дата подання." -#: ../../source/standard/complaint.rst:38 msgid "Date when claim was submitted." msgstr "Дата, коли вимога була подана." -#: ../../source/standard/complaint.rst:48 msgid "Date of claim to complaint escalation." msgstr "Дата ескалації (перетворення вимоги на скаргу)." -#: ../../source/standard/complaint.rst:53 msgid "Date of complaint decision." msgstr "День прийняття рішення по скарзі." -#: ../../source/standard/complaint.rst:58 msgid "Date of cancelling." msgstr "Дата відхилення." -#: ../../source/standard/complaint.rst:61 -#: ../../source/standard/complaint.rst:75 -#: ../../source/standard/complaint.rst:83 -#: ../../source/standard/complaint.rst:88 -#: ../../source/standard/complaint.rst:102 -#: ../../source/standard/complaint.rst:107 -#: ../../source/standard/complaint.rst:120 msgid "string" msgstr "рядок" -#: ../../source/standard/complaint.rst:63 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/complaint.rst:65 msgid "`draft`" msgstr "`draft` - чорновик, початковий етап" -#: ../../source/standard/complaint.rst:66 -#: ../../source/standard/complaint.rst:79 msgid "`claim`" msgstr "`claim` - вимога" -#: ../../source/standard/complaint.rst:67 msgid "`answered`" msgstr "`answered` - дано відповідь" -#: ../../source/standard/complaint.rst:68 msgid "`pending`" msgstr "`pending` - не вирішено, ще обробляється" -#: ../../source/standard/complaint.rst:69 -#: ../../source/standard/complaint.rst:92 msgid "`invalid`" msgstr "`invalid` - недійсно" -#: ../../source/standard/complaint.rst:70 -#: ../../source/standard/complaint.rst:93 msgid "`declined`" msgstr "`declined` - відхилено" -#: ../../source/standard/complaint.rst:71 -#: ../../source/standard/complaint.rst:94 msgid "`resolved`" msgstr "`resolved` - вирішено" -#: ../../source/standard/complaint.rst:72 msgid "`cancelled`" msgstr "`cancelled` - скасовано" -#: ../../source/standard/complaint.rst:77 msgid "Possible values of type are:" msgstr "Можливі значення типу:" -#: ../../source/standard/complaint.rst:80 msgid "`complaint`" msgstr "`complaint` - скарга" -#: ../../source/standard/complaint.rst:90 msgid "Possible values of resolution type are:" msgstr "Можливі значення типу вирішення:" -#: ../../source/standard/complaint.rst:97 msgid "bool" msgstr "булеве значення" -#: ../../source/standard/complaint.rst:99 msgid "Claim is satisfied?" msgstr "Вимога задовільнена?" -#: ../../source/standard/complaint.rst:109 msgid "Cancellation reason." msgstr "Причини відхилення." -#: ../../source/standard/complaint.rst:112 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/complaint.rst:43 msgid "Date when Organizer answered the claim." msgstr "Дата, коли організатор відповів на вимогу." -#: ../../source/standard/complaint.rst:85 msgid "Organizer's resolution." msgstr "Рішення організатора." -#: ../../source/standard/complaint.rst:122 msgid "Participants's action." msgstr "Дія учасника." -#: ../../source/standard/complaint.rst:127 msgid "Date of participant's action." msgstr "Дата дії учасника." -#: ../../source/standard/complaint.rst:15 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/complaint.rst:104 msgid "Reviewer's decision." msgstr "Рішення органу оскарження." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/contract.po b/docs/source/locale/uk/LC_MESSAGES/standard/contract.po index c5bfaf2..0a4742c 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/contract.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/contract.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 13:28+0200\n" @@ -14,24 +14,18 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/contract.rst:8 msgid "Contract" msgstr "Contract" -#: ../../source/standard/contract.rst:11 msgid "Schema" msgstr "Схема" -#: ../../source/standard/contract.rst:16 msgid "|ocdsDescription| The identifier for this contract." msgstr "|ocdsDescription| Ідентифікатор цього договору." -#: ../../source/standard/contract.rst:20 ../../source/standard/contract.rst:32 -#: ../../source/standard/contract.rst:59 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/contract.rst:22 msgid "" "|ocdsDescription| The `Award.id` against which this contract is being " "issued." @@ -39,50 +33,39 @@ msgstr "" "|ocdsDescription| `Award.id` вказує на рішення, згідно якого видається " "договір." -#: ../../source/standard/contract.rst:26 msgid "string, auto-generated, read-only" msgstr "рядок, генерується автоматично, лише для читання" -#: ../../source/standard/contract.rst:29 ../../source/standard/contract.rst:38 msgid "string" msgstr "рядок" -#: ../../source/standard/contract.rst:34 msgid "|ocdsDescription| Contract title" msgstr "|ocdsDescription| Назва договору" -#: ../../source/standard/contract.rst:40 msgid "|ocdsDescription| Contract description" msgstr "|ocdsDescription| Опис договору" -#: ../../source/standard/contract.rst:44 msgid "`Value` object, auto-generated, read-only" msgstr "Об’єкт `Value`, генерується автоматично, лише для читання" -#: ../../source/standard/contract.rst:46 msgid "|ocdsDescription| The total value of this contract." msgstr "|ocdsDescription| Загальна вартість договору." -#: ../../source/standard/contract.rst:50 msgid "List of :ref:`Item` objects, auto-generated, read-only" msgstr "" "Список об’єктів :ref:`Item`, генерується автоматично, лише для читання" -#: ../../source/standard/contract.rst:56 msgid "List of :ref:`Organization` objects, auto-generated, read-only" msgstr "" "Список об’єктів :ref:`Organization`, генерується автоматично, лише для " "читання" -#: ../../source/standard/contract.rst:61 msgid "|ocdsDescription| The current status of the contract." msgstr "|ocdsDescription| Поточний статус договору." -#: ../../source/standard/contract.rst:64 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/contract.rst:66 msgid "" "`pending` - this contract has been proposed, but is not yet in force. It may" " be awaiting signature." @@ -90,7 +73,6 @@ msgstr "" "`pending` - цей договір запропоновано, але він ще не діє. Можливо очікується" " його підписання." -#: ../../source/standard/contract.rst:68 msgid "" "`active` - this contract has been signed by all the parties, and is now " "legally in force." @@ -98,11 +80,9 @@ msgstr "" "`active` - цей договір підписаний всіма учасниками, і зараз діє на законних " "підставах." -#: ../../source/standard/contract.rst:70 msgid "`cancelled` - this contract has been cancelled prior to being signed." msgstr "`cancelled` - цей договір було скасовано до підписання." -#: ../../source/standard/contract.rst:71 msgid "" "`terminated` - this contract was signed and in force, and has now come to a " "close. This may be due to a successful completion of the contract, or may " @@ -112,19 +92,15 @@ msgstr "" "може бути пов'язано з виконанням договору, або з достроковим припиненням " "через якусь незавершеність." -#: ../../source/standard/contract.rst:76 msgid ":ref:`Period`" msgstr ":ref:`Period`" -#: ../../source/standard/contract.rst:78 msgid "|ocdsDescription| The start and end date for the contract." msgstr "|ocdsDescription| Дата початку та завершення договору." -#: ../../source/standard/contract.rst:82 ../../source/standard/contract.rst:88 msgid "string, :ref:`date`" msgstr "рядок, :ref:`date`" -#: ../../source/standard/contract.rst:84 msgid "" "|ocdsDescription| The date the contract was signed. In the case of multiple " "signatures, the date of the last signature." @@ -132,15 +108,12 @@ msgstr "" "|ocdsDescription| Дата підписання договору. Якщо було декілька підписань, то" " береться дата останнього підписання." -#: ../../source/standard/contract.rst:90 msgid "The date when the contract was changed or activated." msgstr "Дата, коли договір був змінений або активований." -#: ../../source/standard/contract.rst:93 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/contract.rst:95 msgid "" "|ocdsDescription| All documents and attachments related to the contract, " "including any notices." @@ -148,11 +121,9 @@ msgstr "" "|ocdsDescription| Усі документи та додатки пов’язані з договором, включно з " "будь-якими повідомленнями." -#: ../../source/standard/contract.rst:14 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/contract.rst:52 msgid "" "|ocdsDescription| The goods, services, and any intangible outcomes in this " "contract. Note: If the items are the same as the award, do not repeat." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/document.po b/docs/source/locale/uk/LC_MESSAGES/standard/document.po index 3bccc20..72a78f9 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/document.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/document.po @@ -2,7 +2,7 @@ # greg , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-12-05 10:50+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/index.po b/docs/source/locale/uk/LC_MESSAGES/standard/index.po index 851404b..c64a3f4 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/index.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/index.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 13:34+0200\n" @@ -15,11 +15,9 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/index.rst:5 msgid "Data Standard" msgstr "Стандарт даних" -#: ../../source/standard/index.rst:7 msgid "" "Data standard is modelled along the `Open Contracting Standard " "`_ with extensions in areas that were" diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/item.po b/docs/source/locale/uk/LC_MESSAGES/standard/item.po index 7abe7a3..abe8fd7 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/item.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/item.po @@ -1,7 +1,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-13 17:22+0200\n" @@ -14,40 +14,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/item.rst:9 msgid "Item" msgstr "Item" -#: ../../source/standard/item.rst:12 ../../source/standard/item.rst:91 -#: ../../source/standard/item.rst:128 msgid "Schema" msgstr "Схема" -#: ../../source/standard/item.rst:15 msgid "string, auto-generated" msgstr "рядок, генерується автоматично" -#: ../../source/standard/item.rst:18 msgid "string, multilingual, required" msgstr "рядок, багатомовний, обов’язковий" -#: ../../source/standard/item.rst:20 msgid "|ocdsDescription| A description of the goods, services to be provided." msgstr "|ocdsDescription| Опис товарів та послуг, які повинні бути надані." -#: ../../source/standard/item.rst:26 msgid ":ref:`Classification`" msgstr ":ref:`Classification`" -#: ../../source/standard/item.rst:37 msgid "List of :ref:`Classification` objects" msgstr "Список об’єктів :ref:`Classification`" -#: ../../source/standard/item.rst:48 msgid ":ref:`Unit`" msgstr ":ref:`Unit`" -#: ../../source/standard/item.rst:50 msgid "" "|ocdsDescription| Description of the unit which the good comes in e.g. " "hours, kilograms. Made up of a unit name, and the value of a single unit." @@ -55,41 +45,30 @@ msgstr "" "|ocdsDescription| Опис одиниці виміру товару, наприклад, години, кілограми. " "Складається з назви одиниці та значення однієї одиниці." -#: ../../source/standard/item.rst:55 msgid "integer" msgstr "ціле число" -#: ../../source/standard/item.rst:57 msgid "|ocdsDescription| The number of units required" msgstr "|ocdsDescription| Кількість необхідних одиниць." -#: ../../source/standard/item.rst:61 msgid ":ref:`Address`" msgstr ":ref:`Address`" -#: ../../source/standard/item.rst:66 msgid "dictionary" msgstr "словник" -#: ../../source/standard/item.rst:71 ../../source/standard/item.rst:73 -#: ../../source/standard/item.rst:131 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/item.rst:75 msgid "string, optional, usually not used" msgstr "рядок, не обов’язково, переважно не використовується" -#: ../../source/standard/item.rst:94 ../../source/standard/item.rst:103 -#: ../../source/standard/item.rst:109 ../../source/standard/item.rst:136 msgid "string" msgstr "рядок" -#: ../../source/standard/item.rst:88 msgid "Classification" msgstr "Classification" -#: ../../source/standard/item.rst:96 msgid "" "|ocdsDescription| A classification should be drawn from an existing scheme " "or list of codes. This field is used to indicate the scheme/codelist from " @@ -102,20 +81,16 @@ msgstr "" "значення повинно представляти відому Схему Класифікації Елементів, де це " "можливо." -#: ../../source/standard/item.rst:105 msgid "" "|ocdsDescription| The classification code drawn from the selected scheme." msgstr "|ocdsDescription| Код класифікації взятий з вибраної схеми." -#: ../../source/standard/item.rst:111 msgid "|ocdsDescription| A textual description or title for the code." msgstr "|ocdsDescription| Текстовий опис або назва коду." -#: ../../source/standard/item.rst:115 msgid "uri" msgstr "uri" -#: ../../source/standard/item.rst:117 msgid "" "|ocdsDescription| A URI to identify the code. In the event individual URIs " "are not available for items in the identifier scheme this value should be " @@ -125,19 +100,15 @@ msgstr "" "доступні для елементів у схемі ідентифікації, це значення треба залишити " "пустим." -#: ../../source/standard/item.rst:125 msgid "Unit" msgstr "Unit" -#: ../../source/standard/item.rst:133 msgid "UN/CEFACT Recommendation 20 unit code." msgstr "Код одиниці виміру в UN/CEFACT Recommendation 20." -#: ../../source/standard/item.rst:138 msgid "|ocdsDescription| Name of the unit" msgstr "|ocdsDescription| Назва одиниці виміру" -#: ../../source/standard/item.rst:63 msgid "" "Address, where the item is located. " "Classification codes (CAV-PS) for which `item.address` object is optional are given below:" @@ -145,21 +116,18 @@ msgstr "" "Адреса, де розташований елемент. " "Класифікатори (CAV-PS) для яких заповнення полів `item.address` є необов'язковим, знаходяться за посиланням нижче:" -#: ../../source/standard/item.rst:68 msgid "" "Geographical coordinates of the location. Element consists of the following " "items:" msgstr "" "Географічні координати місця розташування. Складається з таких компонентів:" -#: ../../source/standard/item.rst:77 msgid "" "`location` usually takes precedence over `address` if both are present." msgstr "" "Параметр `location` зазвичай має вищий пріоритет ніж `address`, якщо вони " "обидва вказані." -#: ../../source/standard/item.rst:28 msgid "" "|ocdsDescription| The primary classification for the item. See " "the `itemClassificationScheme` to identify preferred classification lists." @@ -167,7 +135,6 @@ msgstr "" "|ocdsDescription| Початкова класифікація елемента. Дивіться " "у `itemClassificationScheme`, щоб визначити бажані списки класифікації." -#: ../../source/standard/item.rst:32 msgid "" "Possible variants of available primary classifiers are CPV and CAV-PS. " "Additionally, there is a validation for the input of these classifiers due to which " @@ -176,7 +143,6 @@ msgstr "" "Класифікатори, що можуть використовуватись при заведенні закупівлі як основні, - CPV та CAV-PS. " "Додатково здійснюється валідація введення CAV-PS та CPV з точністю не менше класу." -#: ../../source/standard/item.rst:39 msgid "" "|ocdsDescription| An array of additional classifications for the item. See " "the `itemClassificationScheme` codelist for common options to use in OCDS." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/organization.po b/docs/source/locale/uk/LC_MESSAGES/standard/organization.po index 81f1e8d..2ac8763 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/organization.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/organization.po @@ -2,7 +2,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-13 17:23+0200\n" @@ -16,53 +16,33 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/organization.rst:9 msgid "Organization" msgstr "Organization" -#: ../../source/standard/organization.rst:12 -#: ../../source/standard/organization.rst:40 -#: ../../source/standard/organization.rst:89 -#: ../../source/standard/organization.rst:130 msgid "Schema" msgstr "Схема" -#: ../../source/standard/organization.rst:15 -#: ../../source/standard/organization.rst:64 msgid "string, multilingual" msgstr "рядок, багатомовний" -#: ../../source/standard/organization.rst:20 msgid ":ref:`Identifier`" msgstr ":ref:`Identifier`" -#: ../../source/standard/organization.rst:25 msgid "List of :ref:`identifier` objects" msgstr "Список об’єктів :ref:`identifier`" -#: ../../source/standard/organization.rst:27 msgid ":ref:`Address`, required" msgstr ":ref:`Address`, обов’язково" -#: ../../source/standard/organization.rst:29 msgid ":ref:`ContactPoint`, required" msgstr ":ref:`ContactPoint`, обов’язково" -#: ../../source/standard/organization.rst:37 msgid "Identifier" msgstr "Identifier" -#: ../../source/standard/organization.rst:43 -#: ../../source/standard/organization.rst:92 -#: ../../source/standard/organization.rst:98 -#: ../../source/standard/organization.rst:104 -#: ../../source/standard/organization.rst:110 -#: ../../source/standard/organization.rst:145 -#: ../../source/standard/organization.rst:151 msgid "string" msgstr "рядок" -#: ../../source/standard/organization.rst:45 msgid "" "|ocdsDescription| Organization identifiers be drawn from an existing " "identification scheme. This field is used to indicate the scheme or codelist" @@ -74,16 +54,13 @@ msgstr "" "ідентифікатор організації. Це значення повинно братись зі Схеми " "Ідентифікації Організацій." -#: ../../source/standard/organization.rst:52 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/organization.rst:54 msgid "" "|ocdsDescription| The identifier of the organization in the selected scheme." msgstr "|ocdsDescription| Ідентифікатор організації у вибраній схемі." -#: ../../source/standard/organization.rst:57 msgid "" "The allowed codes are the ones found in `\"Organisation Registration " "Agency\" codelist of IATI Standard " @@ -97,15 +74,12 @@ msgstr "" "додаванням коду `UA-EDR` для організацій, зареєстрованих в Україні (ЄДРПОУ " "та ІПН)." -#: ../../source/standard/organization.rst:66 msgid "|ocdsDescription| The legally registered name of the organization." msgstr "|ocdsDescription| Легально зареєстрована назва організації." -#: ../../source/standard/organization.rst:72 msgid "uri" msgstr "uri" -#: ../../source/standard/organization.rst:74 msgid "" "|ocdsDescription| A URI to identify the organization, such as those provided" " by Open Corporates or some other relevant URI provider. This is not for " @@ -116,41 +90,31 @@ msgstr "" "надають Open Corporates або інші постачальники URI. Це не для вебсайту " "організації, його можна надати в полі url в ContactPoint організації." -#: ../../source/standard/organization.rst:86 msgid "Address" msgstr "Address" -#: ../../source/standard/organization.rst:94 msgid "" "|ocdsDescription| The street address. For example, 1600 Amphitheatre Pkwy." msgstr "|ocdsDescription| Вулиця. Наприклад, вул.Хрещатик, 22." -#: ../../source/standard/organization.rst:100 msgid "|ocdsDescription| The locality. For example, Mountain View." msgstr "|ocdsDescription| Населений пункт. Наприклад, Київ." -#: ../../source/standard/organization.rst:106 msgid "|ocdsDescription| The region. For example, CA." msgstr "|ocdsDescription| Область. Наприклад, Київська." -#: ../../source/standard/organization.rst:112 msgid "|ocdsDescription| The postal code. For example, 94043." msgstr "|ocdsDescription| Поштовий індекс, Наприклад, 78043." -#: ../../source/standard/organization.rst:116 -#: ../../source/standard/organization.rst:133 msgid "string, multilingual, required" msgstr "рядок, багатомовний, обов’язковий" -#: ../../source/standard/organization.rst:118 msgid "|ocdsDescription| The country name. For example, United States." msgstr "|ocdsDescription| Назва країни. Наприклад, Україна." -#: ../../source/standard/organization.rst:127 msgid "ContactPoint" msgstr "ContactPoint" -#: ../../source/standard/organization.rst:135 msgid "" "|ocdsDescription| The name of the contact person, department, or contact " "point, for correspondence relating to this contracting process." @@ -158,15 +122,12 @@ msgstr "" "|ocdsDescription| Ім’я контактної особи, назва відділу чи контактного пункту" " для листування, що стосується цього процесу укладання договору." -#: ../../source/standard/organization.rst:139 msgid "email" msgstr "email" -#: ../../source/standard/organization.rst:141 msgid "|ocdsDescription| The e-mail address of the contact point/person." msgstr "|ocdsDescription| Адреса електронної пошти контактної особи/пункту." -#: ../../source/standard/organization.rst:147 msgid "" "|ocdsDescription| The telephone number of the contact point/person. This " "should include the international dialling code." @@ -174,7 +135,6 @@ msgstr "" "|ocdsDescription| Номер телефону контактної особи/пункту. Повинен включати " "міжнародний телефонний код." -#: ../../source/standard/organization.rst:153 msgid "" "|ocdsDescription| The fax number of the contact point/person. This should " "include the international dialling code." @@ -182,28 +142,22 @@ msgstr "" "|ocdsDescription| Номер факсу контактної особи/пункту. Повинен включати " "міжнародний телефонний код." -#: ../../source/standard/organization.rst:159 msgid "|ocdsDescription| A web address for the contact point/person." msgstr "|ocdsDescription| Веб адреса контактної особи/пункту." -#: ../../source/standard/organization.rst:163 msgid "Either `email` or `telephone` field has to be provided." msgstr "" "Повинне бути заповнене хоча б одне з полів: або `email`, або `telephone`." -#: ../../source/standard/organization.rst:17 msgid "Name of the organization." msgstr "Назва організації." -#: ../../source/standard/organization.rst:22 msgid "The primary identifier for this organization." msgstr "Ідентифікатор цієї організації." -#: ../../source/standard/organization.rst:157 msgid "URL" msgstr "URL-адреса" -#: ../../source/standard/organization.rst:69 msgid "Full legal name (e.g. Nadra Bank)." msgstr "Повна юридична назва (наприклад - “Надра Банк”)." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/procuringentity.po b/docs/source/locale/uk/LC_MESSAGES/standard/procuringentity.po index 44ff3c3..16e5d34 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/procuringentity.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/procuringentity.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 14:36+0200\n" @@ -15,59 +15,45 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/procuringentity.rst:12 msgid "Schema" msgstr "Схема" -#: ../../source/standard/procuringentity.rst:15 msgid "string, multilingual" msgstr "рядок, багатомовний" -#: ../../source/standard/procuringentity.rst:17 msgid "|ocdsDescription| The common name of the organization." msgstr "|ocdsDescription| Назва організації." -#: ../../source/standard/procuringentity.rst:21 msgid ":ref:`Identifier`" msgstr ":ref:`Identifier`" -#: ../../source/standard/procuringentity.rst:23 msgid "|ocdsDescription| The primary identifier for this organization." msgstr "|ocdsDescription| Ідентифікатор цієї організації." -#: ../../source/standard/procuringentity.rst:27 msgid "List of :ref:`identifier` objects" msgstr "Список об’єктів :ref:`identifier`" -#: ../../source/standard/procuringentity.rst:30 msgid ":ref:`Address`, required" msgstr ":ref:`Address`, обов’язково" -#: ../../source/standard/procuringentity.rst:33 msgid ":ref:`ContactPoint`, required" msgstr ":ref:`ContactPoint`, обов’язково" -#: ../../source/standard/procuringentity.rst:36 msgid "string" msgstr "рядок" -#: ../../source/standard/procuringentity.rst:43 msgid "Possible values:" msgstr "Можливі значення:" -#: ../../source/standard/procuringentity.rst:9 msgid "ProcuringEntity (Organizer)" msgstr "ProcuringEntity (Організатор)" -#: ../../source/standard/procuringentity.rst:38 msgid "Type of organizer" msgstr "Тип організатора" -#: ../../source/standard/procuringentity.rst:41 msgid "``general`` - Organizer (general)" msgstr "``general`` - Організатор (загальний)" -#: ../../source/standard/procuringentity.rst:42 msgid "" "``special`` - Organizer that operates in certain spheres of economic " "activity" @@ -75,7 +61,6 @@ msgstr "" "``special`` - Організатор, що здійснює діяльність в окремих сферах " "господарювання" -#: ../../source/standard/procuringentity.rst:43 msgid "" "``other`` - Legal persons that are not organizers in the sense of the Law, " "but are state, utility, public enterprises, economic partnerships or " diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/question.po b/docs/source/locale/uk/LC_MESSAGES/standard/question.po index 6fb64d8..72588b3 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/question.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/question.po @@ -2,7 +2,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-13 18:08+0200\n" @@ -16,19 +16,15 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/question.rst:7 msgid "Question" msgstr "Question" -#: ../../source/standard/question.rst:10 msgid "Schema" msgstr "Схема" -#: ../../source/standard/question.rst:16 msgid ":ref:`Organization`, required" msgstr ":ref:`Organization`, обов’язково" -#: ../../source/standard/question.rst:18 msgid "" "Who is asking a question (contactPoint - person, identification - " "organization that person represents)." @@ -36,52 +32,39 @@ msgstr "" "Хто задає питання (contactPoint - людина, identification - організація, яку " "ця людина представляє)." -#: ../../source/standard/question.rst:21 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/question.rst:23 msgid "Title of the question." msgstr "Назва запитання." -#: ../../source/standard/question.rst:26 ../../source/standard/question.rst:36 -#: ../../source/standard/question.rst:41 ../../source/standard/question.rst:50 msgid "string" msgstr "рядок" -#: ../../source/standard/question.rst:28 msgid "Description of the question." msgstr "Опис запитання." -#: ../../source/standard/question.rst:31 msgid "string, :ref:`date`, auto-generated" msgstr "рядок, :ref:`date`, генерується автоматично" -#: ../../source/standard/question.rst:33 msgid "Date of posting." msgstr "Дата публікації." -#: ../../source/standard/question.rst:43 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/question.rst:45 msgid "`auction`" msgstr "`auction`" -#: ../../source/standard/question.rst:46 msgid "`item`" msgstr "`item`" -#: ../../source/standard/question.rst:13 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/question.rst:38 msgid "Answer for the question." msgstr "Відповідь на задане питання." -#: ../../source/standard/question.rst:52 msgid "ID of related :ref:`item`." msgstr "Ідентифікатор пов'язаних об'єктів :ref:`item`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/util.po b/docs/source/locale/uk/LC_MESSAGES/standard/util.po index 64f0b1c..f43ac61 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/util.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/util.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 14:35+0200\n" @@ -15,85 +15,63 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/util.rst:8 msgid "Period" msgstr "Period" -#: ../../source/standard/util.rst:11 ../../source/standard/util.rst:41 -#: ../../source/standard/util.rst:67 ../../source/standard/util.rst:84 msgid "Schema" msgstr "Схема" -#: ../../source/standard/util.rst:14 ../../source/standard/util.rst:20 -#: ../../source/standard/util.rst:70 msgid "string, :ref:`date`" msgstr "рядок, :ref:`date`" -#: ../../source/standard/util.rst:16 msgid "|ocdsDescription| The start date for the period." msgstr "|ocdsDescription| Початкова дата періоду." -#: ../../source/standard/util.rst:22 msgid "|ocdsDescription| The end date for the period." msgstr "|ocdsDescription| Кінцева дата періоду." -#: ../../source/standard/util.rst:25 msgid "`startDate` should always precede `endDate`." msgstr "Значення `startDate` завжди повинно йти перед `endDate`." -#: ../../source/standard/util.rst:30 msgid "Date" msgstr "Date" -#: ../../source/standard/util.rst:32 msgid "Date/time in :ref:`date-format`." msgstr "Дата/час у :ref:`date-format`." -#: ../../source/standard/util.rst:38 msgid "Value" msgstr "Value" -#: ../../source/standard/util.rst:44 ../../source/standard/util.rst:87 msgid "float, required" msgstr "float, обов’язково" -#: ../../source/standard/util.rst:46 ../../source/standard/util.rst:89 msgid "|ocdsDescription| Amount as a number." msgstr "|ocdsDescription| Кількість як число." -#: ../../source/standard/util.rst:49 ../../source/standard/util.rst:92 msgid "Should be positive." msgstr "Повинно бути додатнім." -#: ../../source/standard/util.rst:52 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/util.rst:54 ../../source/standard/util.rst:97 msgid "|ocdsDescription| The currency in 3-letter ISO 4217 format." msgstr "|ocdsDescription| Валюта у трибуквенному форматі ISO 4217." -#: ../../source/standard/util.rst:58 msgid "bool, required" msgstr "булеве значення, обов’язково" -#: ../../source/standard/util.rst:64 msgid "Revision" msgstr "Revision" -#: ../../source/standard/util.rst:72 msgid "Date when changes were recorded." msgstr "Дата, коли зміни були записані." -#: ../../source/standard/util.rst:75 msgid "List of `Change` objects" msgstr "Список об’єктів `Change`" -#: ../../source/standard/util.rst:81 msgid "Guarantee" msgstr "Guarantee" -#: ../../source/standard/util.rst:95 msgid "string, required, default = `UAH`" msgstr "рядок, обов’язковий, за замовчуванням = `UAH`" diff --git a/docs/source/locale/uk/LC_MESSAGES/tutorial.po b/docs/source/locale/uk/LC_MESSAGES/tutorial.po index 05ee640..6a9d7ea 100644 --- a/docs/source/locale/uk/LC_MESSAGES/tutorial.po +++ b/docs/source/locale/uk/LC_MESSAGES/tutorial.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-26 11:24+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/upload.po b/docs/source/locale/uk/LC_MESSAGES/upload.po index f658201..3868a11 100644 --- a/docs/source/locale/uk/LC_MESSAGES/upload.po +++ b/docs/source/locale/uk/LC_MESSAGES/upload.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 13:24+0200\n" From 31426b6218c93369b9569408d241c4102be14e42 Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Fri, 25 May 2018 17:18:46 +0300 Subject: [PATCH 04/14] Remove fintutorial related files --- docs/source/fintutorial.rst | 146 -------------- docs/source/index.rst | 1 - .../locale/uk/LC_MESSAGES/fintutorial.po | 188 ------------------ docs/source/standard/document.rst | 5 +- .../tutorial/finauction-adding-vdr.http | 31 --- .../tutorial/finauction-documents-2.http | 35 ---- .../tutorial/finauction-documents-3.http | 35 ---- .../source/tutorial/finauction-documents.http | 24 --- .../finauction-post-attempt-json-data.http | 162 --------------- .../finauction-update-award-criteria.http | 32 --- .../finauction-upload-award-criteria.http | 33 --- 11 files changed, 3 insertions(+), 689 deletions(-) delete mode 100644 docs/source/fintutorial.rst delete mode 100644 docs/source/locale/uk/LC_MESSAGES/fintutorial.po delete mode 100644 docs/source/tutorial/finauction-adding-vdr.http delete mode 100644 docs/source/tutorial/finauction-documents-2.http delete mode 100644 docs/source/tutorial/finauction-documents-3.http delete mode 100644 docs/source/tutorial/finauction-documents.http delete mode 100644 docs/source/tutorial/finauction-post-attempt-json-data.http delete mode 100644 docs/source/tutorial/finauction-update-award-criteria.http delete mode 100644 docs/source/tutorial/finauction-upload-award-criteria.http diff --git a/docs/source/fintutorial.rst b/docs/source/fintutorial.rst deleted file mode 100644 index e655323..0000000 --- a/docs/source/fintutorial.rst +++ /dev/null @@ -1,146 +0,0 @@ -.. _fintutorial: - -Fin. Tutorial -============= - -Tutorial for the `dgfFinancialAssets` procedure. - -Creating auction ----------------- - -Let's create auction with the minimal data set (only required properties): - -.. include:: tutorial/finauction-post-attempt-json-data.http - :code: - -Success! Now we can see that new object has been created. Response code is `201` -and `Location` response header reports the location of the created object. The -body of response reveals the information about the created auction: its internal -`id` (that matches the `Location` segment), its official `auctionID` and -`dateModified` datestamp stating the moment in time when auction has been last -modified. Pay attention to the `procurementMethodType`. Note that auction is -created with `active.tendering` status. - -Let's access the URL of the created object (the `Location` header of the response): - -.. include:: tutorial/blank-finauction-view.http - :code: - -We can see the same response we got after creating auction. - -Let's see what listing of auctions reveals us: - -.. include:: tutorial/initial-finauction-listing.http - :code: - -We do see the auction's internal `id` (that can be used to construct full URL by prepending `https://api-sandbox.ea.openprocurement.org/api/0/auctions/`) and its `dateModified` datestamp. - -.. index:: Document, VDR - -Uploading documentation ------------------------ - -Organizer can upload PDF files into the created auction. Uploading should -follow the :ref:`upload` rules. - -.. include:: tutorial/upload-finauction-notice.http - :code: - -`201 Created` response code and `Location` header confirm document creation. -We can additionally query the `documents` collection API endpoint to confirm the -action: - -.. include:: tutorial/finauction-documents.http - :code: - -The single array element describes the uploaded document. We can upload more documents: - -.. include:: tutorial/finauction-upload-award-criteria.http - :code: - -And again we can confirm that there are two documents uploaded. - -.. include:: tutorial/finauction-documents-2.http - :code: - -In case we made an error, we can reupload the document over the older version: - -.. include:: tutorial/finauction-update-award-criteria.http - :code: - -And we can see that it is overriding the original version: - -.. include:: tutorial/finauction-documents-3.http - :code: - -Uploading illustration ------------------------ - -Organizer can upload illustration files into the created auction. Uploading should -follow the :ref:`upload` rules. - -In order to specify illustration display order, ``index`` field can be used (for details see :ref:`document`). Since this illustration should be displayed first, it has ``"index": 1``. - -.. include:: tutorial/upload-first-auction-illustration.http - :code: - -We can check whether illustration is uploaded. - -.. include:: tutorial/auction-documents-4.http - :code: - -Organizer can upload second illustration. This illustration should be displayed second, so it has ``"index": 2``. - -.. include:: tutorial/upload-second-auction-illustration.http - :code: - -Add third illustration: - -.. include:: tutorial/upload-third-auction-illustration.http - :code: - -Note that `index` of the third illustration is the same as for the second illustration: ``"index": 2``. In such cases firstly will be displayed illustration that was uploaded earlier. - -We can check that there are three uploaded illustrations. - -.. include:: tutorial/auction-documents-5.http - :code: - -Adding virtual data room ------------------------- - -Organizer can add URL for virtual data room: - -.. include:: tutorial/finauction-adding-vdr.http - :code: - - -.. index:: Bidding - -Registering bid ---------------- - -Bidder can register a bid in `draft` status. Bidder must specify ``UA-FIN`` value for the `additionalIdentifiers` parameter. - -.. include:: tutorial/register-finbidder.http - :code: - -And activate a bid: - -.. include:: tutorial/activate-finbidder.http - :code: - -And upload license (with ``documentType: financialLicense``): - -.. include:: tutorial/upload-finbid-financial-license.http - :code: - -It is possible to check the uploaded documents: - -.. include:: tutorial/finbidder-documents.http - :code: - -For the best effect (biggest economy) auction should have multiple bidders registered: - -.. include:: tutorial/register-2nd-finbidder.http - :code: diff --git a/docs/source/index.rst b/docs/source/index.rst index 68775e4..c197314 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -26,7 +26,6 @@ Contents: upload award_workflow tutorial - fintutorial 2pc acceleration diff --git a/docs/source/locale/uk/LC_MESSAGES/fintutorial.po b/docs/source/locale/uk/LC_MESSAGES/fintutorial.po deleted file mode 100644 index 4fa20be..0000000 --- a/docs/source/locale/uk/LC_MESSAGES/fintutorial.po +++ /dev/null @@ -1,188 +0,0 @@ -# -msgid "" -msgstr "" -"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-16 16:42+0300\n" -"PO-Revision-Date: 2016-09-20 17:47+0200\n" -"Last-Translator: Zoriana Zaiats \n" -"Language-Team: Ukrainian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: uk\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 2.0\n" - -msgid "Fin. Tutorial" -msgstr "Фін. туторіал" - -msgid "Creating auction" -msgstr "Створення аукціону" - -msgid "" -"Let's create auction with the minimal data set (only required properties):" -msgstr "" -"Створимо аукціон з мінімально допустимим (обовязковим для заповнення) " -"набором даних:" - -msgid "" -"Success! Now we can see that new object has been created. Response code is " -"`201` and `Location` response header reports the location of the created " -"object. The body of response reveals the information about the created " -"auction: its internal `id` (that matches the `Location` segment), its " -"official `auctionID` and `dateModified` datestamp stating the moment in time" -" when auction has been last modified. Pay attention to the " -"`procurementMethodType`. Note that auction is created with " -"`active.tendering` status." -msgstr "" -"Успіх! Тепер ми бачимо, що новий об’єкт було створено. Код відповіді `201` " -"та заголовок відповіді `Location` вказує місцерозташування створеного " -"об’єкта. Тіло відповіді показує інформацію про створений аукціон, його " -"внутрішнє `id` (яке співпадає з сегментом `Location`), його офіційне " -"`auctionID` та `dateModified` дату, що показує час, коли аукціон востаннє " -"модифікувався. Зверніть увагу на `procurementMethodType`, а також на те, що " -"аукціон створюється зі статусом `active.tendering`." - -msgid "" -"Let's access the URL of the created object (the `Location` header of the " -"response):" -msgstr "Використаємо URL створеного об’єкта (заголовок відповіді `Location`):" - -msgid "We can see the same response we got after creating auction." -msgstr "Ми бачимо ту ж відповідь, що і після створення аукціону." - -msgid "Let's see what listing of auctions reveals us:" -msgstr "Подивимось, що показує список аукціонів:" - -msgid "" -"We do see the auction's internal `id` (that can be used to construct full " -"URL by prepending `https://api-" -"sandbox.ea.openprocurement.org/api/0/auctions/`) and its `dateModified` " -"datestamp." -msgstr "" -"Ми бачимо внутрішнє `id` аукціону (що може бути використано для побудови " -"повної URL-адреси, якщо додати `http://api-" -"sandbox.openprocurement.org/api/0/auctions/`) та його `dateModified` дату." - -msgid "Uploading documentation" -msgstr "Завантаження документації" - -msgid "" -"Organizer can upload PDF files into the created auction. Uploading should " -"follow the :ref:`upload` rules." -msgstr "" -"Замовник може завантажити PDF файл у створений аукціон. Завантаження повинно" -" відбуватись згідно правил :ref:`upload`." - -msgid "" -"`201 Created` response code and `Location` header confirm document creation." -" We can additionally query the `documents` collection API endpoint to " -"confirm the action:" -msgstr "" -"Код відповіді `201 Created` та заголовок `Location` підтверджують, що " -"документ було створено. Додатково можна зробити запит точки входу API " -"колекції `документів`, щоб підтвердити дію:" - -msgid "" -"The single array element describes the uploaded document. We can upload more" -" documents:" -msgstr "" -"Один елемент масиву описує завантажений документ. Ми можемо завантажити " -"більше документів:" - -msgid "And again we can confirm that there are two documents uploaded." -msgstr "І знову можна перевірити, що є два завантажених документа." - -msgid "" -"In case we made an error, we can reupload the document over the older " -"version:" -msgstr "" -"Якщо сталась помилка, ми можемо ще раз завантажити документ поверх старої " -"версії:" - -msgid "And we can see that it is overriding the original version:" -msgstr "І ми бачимо, що вона перекриває оригінальну версію:" - -msgid "Adding virtual data room" -msgstr "Додавання віртуальної кімнати для роботи з конфіденційними даними" - -msgid "Registering bid" -msgstr "Реєстрація пропозиції" - -msgid "And activate a bid:" -msgstr "І активувати пропозицію:" - -msgid "It is possible to check the uploaded documents:" -msgstr "Можна перевірити завантажені документи:" - -msgid "" -"For the best effect (biggest economy) auction should have multiple bidders " -"registered:" -msgstr "" -"Для найкращого результату (найбільшої економії) аукціон повинен мати багато " -"зареєстрованих учасників." - -msgid "Organizer can add URL for virtual data room:" -msgstr "" -"Організатор може додати URL-адресу віртуальної кімнати для роботи з " -"конфіденційними даними:" - -msgid "And upload license (with ``documentType: financialLicense``):" -msgstr "І завантажити ліцензію (вказавши ``documentType: financialLicense``):" - -msgid "Uploading illustration" -msgstr "Завантаження ілюстрації" - -msgid "" -"Organizer can upload illustration files into the created auction. Uploading " -"should follow the :ref:`upload` rules." -msgstr "" -"Організатор може завантажити файли з ілюстраціями у створений аукціон. " -"Завантаження повинно відповідати правилам :ref:`upload`." - -msgid "We can check whether illustration is uploaded." -msgstr "Ми можемо перевірити, чи завантажилась ілюстрація." - -msgid "Tutorial for the `dgfFinancialAssets` procedure." -msgstr "" -"Туторіал для процедури `dgfFinancialAssets` - продаж права вимоги за " -"кредитними договорами." - -msgid "" -"In order to specify illustration display order, ``index`` field can be used " -"(for details see :ref:`document`). Since this illustration should be " -"displayed first, it has ``\"index\": 1``." -msgstr "" -"Для того, щоб вказати порядок відображення ілюстрацій, використовується поле" -" `index` (див. :ref:`document`). Оскільки ця ілюстрація повинна бути " -"відображена першою, то вказується ``\"index\": 1``" - -msgid "" -"Organizer can upload second illustration. This illustration should be " -"displayed second, so it has ``\"index\": 2``." -msgstr "" -"Організатор може завантажити ще одну ілюстрацію. Ця ілюстрація повинна бути " -"відображена другою, тому має параметр ``\"index\": 2``." - -msgid "Add third illustration:" -msgstr "Додаємо третю ілюстрацію:" - -msgid "" -"Note that `index` of the third illustration is the same as for the second " -"illustration: ``\"index\": 2``. In such cases firstly will be displayed " -"illustration that was uploaded earlier." -msgstr "" -"Зверніть увагу, що параметр `index` третьої ілюстрації такий же як і у " -"другої: ``\"index\": 2``. У таких випадках спочатку відображатиметься " -"ілюстрація з ранішою датою публікації." - -msgid "We can check that there are three uploaded illustrations." -msgstr "Можемо перевірити, що є три завантажені ілюстрації." - -msgid "" -"Bidder can register a bid in `draft` status. Bidder must specify ``UA-FIN`` " -"value for the `additionalIdentifiers` parameter." -msgstr "" -"Учасник може зареєструвати пропозицію у статусі `draft` (чернетка). Учасник " -"повинен вказати значення ``UA-FIN`` для параметра `additionalIdentifiers`." diff --git a/docs/source/standard/document.rst b/docs/source/standard/document.rst index 1d1ac2e..4d2c2d2 100644 --- a/docs/source/standard/document.rst +++ b/docs/source/standard/document.rst @@ -40,7 +40,7 @@ Schema Information on bidders or participants, their validation documents and any procedural exemptions for which they qualify. - * `virtualDataRoom` - **Virtual Data Room** (available only for the `dgfFinancialAssets` procedure, see :ref:`fintutorial`) + * `virtualDataRoom` - **Virtual Data Room** * `illustration` - **Illustrations** @@ -82,7 +82,7 @@ Schema * `eligibilityDocuments` - **Eligibility documents** - * `financialLicense` - **License** (available only for the `dgfFinancialAssets` procedure, see :ref:`fintutorial`) + * `financialLicense` - **License** * `auctionProtocol` - **Auction protocol** @@ -143,6 +143,7 @@ Schema * `auction` * `item` + .. * `lot` :relatedItem: diff --git a/docs/source/tutorial/finauction-adding-vdr.http b/docs/source/tutorial/finauction-adding-vdr.http deleted file mode 100644 index d38f424..0000000 --- a/docs/source/tutorial/finauction-adding-vdr.http +++ /dev/null @@ -1,31 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents?acc_token=6c03609dd6844e42bc1318fddf20c937 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 127 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "url": "http://virtial-data-room.com/id_of_room", - "title": "VDR for auction lot", - "documentType": "virtualDataRoom" - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/4e24994ddc1c4c72b24b992f8826acf4 - -{ - "data": { - "title": "VDR for auction lot", - "url": "http://virtial-data-room.com/id_of_room", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.313920+02:00", - "documentType": "virtualDataRoom", - "dateModified": "2017-11-30T16:56:24.313948+02:00", - "id": "4e24994ddc1c4c72b24b992f8826acf4" - } -} - diff --git a/docs/source/tutorial/finauction-documents-2.http b/docs/source/tutorial/finauction-documents-2.http deleted file mode 100644 index 71351d3..0000000 --- a/docs/source/tutorial/finauction-documents-2.http +++ /dev/null @@ -1,35 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": [ - { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=Cqo%2Fl%2FHX9fy29aZ4TPnu9LB6ZtHdt6tquLKAJIGPLchoAf4OTMDnRAqLTeQK8rW9jgzFQ6I9HGfJtUP8i3gKDA%253D%253D", - "title": "Notice.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.108881+02:00", - "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:24.108911+02:00", - "id": "74e4e4b7624d420b8448a6220e0a86cf" - }, - { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0a0c1a4b083475caaa4c8fb08d18781?KeyID=c822be4a&Signature=xnYvodjAvZu8pjdlyQ4kdlC62x%252BEi2JnnuWKvRdNbne9KWdXVWSlqM%252BeGrGuJ4%252BS2e9qmZRCg9vHJvc1iz%252BMAA%253D%253D", - "title": "AwardCriteria.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.174808+02:00", - "dateModified": "2017-11-30T16:56:24.174838+02:00", - "id": "55dc8e33c47948eab4e7b327bede3959" - } - ] -} - diff --git a/docs/source/tutorial/finauction-documents-3.http b/docs/source/tutorial/finauction-documents-3.http deleted file mode 100644 index 10cb314..0000000 --- a/docs/source/tutorial/finauction-documents-3.http +++ /dev/null @@ -1,35 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": [ - { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=Cqo%2Fl%2FHX9fy29aZ4TPnu9LB6ZtHdt6tquLKAJIGPLchoAf4OTMDnRAqLTeQK8rW9jgzFQ6I9HGfJtUP8i3gKDA%253D%253D", - "title": "Notice.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.108881+02:00", - "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:24.108911+02:00", - "id": "74e4e4b7624d420b8448a6220e0a86cf" - }, - { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/3efb323d6d6a42c9817ec011d6c8898f?KeyID=c822be4a&Signature=oMIup%252BjcxK%2FooCGXGpptyKCu1slmnk3T1I8XhOKPQXsKAD3R3zPyoDvYbF%252B47ZdbzNJ8m9v3TNQdsbseMlv7CA%253D%253D", - "title": "AwardCriteria-2.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.174808+02:00", - "dateModified": "2017-11-30T16:56:24.243244+02:00", - "id": "55dc8e33c47948eab4e7b327bede3959" - } - ] -} - diff --git a/docs/source/tutorial/finauction-documents.http b/docs/source/tutorial/finauction-documents.http deleted file mode 100644 index 9113873..0000000 --- a/docs/source/tutorial/finauction-documents.http +++ /dev/null @@ -1,24 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/74e4e4b7624d420b8448a6220e0a86cf HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=Cqo%2Fl%2FHX9fy29aZ4TPnu9LB6ZtHdt6tquLKAJIGPLchoAf4OTMDnRAqLTeQK8rW9jgzFQ6I9HGfJtUP8i3gKDA%253D%253D", - "title": "Notice.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.108881+02:00", - "previousVersions": [], - "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:24.108911+02:00", - "id": "74e4e4b7624d420b8448a6220e0a86cf" - } -} - diff --git a/docs/source/tutorial/finauction-post-attempt-json-data.http b/docs/source/tutorial/finauction-post-attempt-json-data.http deleted file mode 100644 index 8df0cfa..0000000 --- a/docs/source/tutorial/finauction-post-attempt-json-data.http +++ /dev/null @@ -1,162 +0,0 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1972 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "title": "футляри до державних нагород", - "minimalStep": { - "currency": "UAH", - "amount": 35 - }, - "procurementMethodDetails": "quick, accelerator=1440", - "tenderAttempts": 1, - "procurementMethodType": "dgfFinancialAssets", - "value": { - "currency": "UAH", - "amount": 100 - }, - "dgfID": "219560", - "auctionPeriod": { - "startDate": "2017-12-14" - }, - "items": [ - { - "classification": { - "scheme": "CPV", - "id": "66113000-5", - "description": "Земельні ділянки" - }, - "quantity": 5, - "description": "Земля для військовослужбовців", - "unit": { - "code": "44617100-9", - "name": "item" - }, - "address": { - "countryName": "Україна", - "postalCode": "79000", - "region": "м. Київ", - "streetAddress": "вул. Банкова 1", - "locality": "м. Київ" - } - } - ], - "procuringEntity": { - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "countryName": "Україна", - "postalCode": "01220", - "region": "м. Київ", - "streetAddress": "вул. Банкова, 11, корпус 1", - "locality": "м. Київ" - } - } - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28 - -{ - "access": { - "token": "6c03609dd6844e42bc1318fddf20c937" - }, - "data": { - "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", - "enquiryPeriod": { - "startDate": "2017-11-30T16:56:23.942831+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", - "procuringEntity": { - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - }, - "owner": "broker", - "id": "73e1598288054eb98e8153ee9e69bb28", - "eligibilityCriteria_ru": "К участию допускаются только лицензированные финансовые учреждения.", - "title": "футляри до державних нагород", - "tenderAttempts": 1, - "eligibilityCriteria_en": "Only licensed financial institutions are eligible to participate.", - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:23.946137+02:00", - "status": "active.tendering", - "eligibilityCriteria": "До участі допускаються лише ліцензовані фінансові установи.", - "tenderPeriod": { - "startDate": "2017-11-30T16:56:23.942831+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" - }, - "procurementMethodType": "dgfFinancialAssets", - "dgfID": "219560", - "date": "2017-11-30T16:56:23.942831+02:00", - "minimalStep": { - "currency": "UAH", - "amount": 35.0, - "valueAddedTaxIncluded": true - }, - "items": [ - { - "description": "Земля для військовослужбовців", - "classification": { - "scheme": "CPV", - "description": "Земельні ділянки", - "id": "66113000-5" - }, - "address": { - "postalCode": "79000", - "countryName": "Україна", - "streetAddress": "вул. Банкова 1", - "region": "м. Київ", - "locality": "м. Київ" - }, - "id": "e16351a78632484e8756b1dea38e6201", - "unit": { - "code": "44617100-9", - "name": "item" - }, - "quantity": 5 - } - ], - "value": { - "currency": "UAH", - "amount": 100.0, - "valueAddedTaxIncluded": true - }, - "awardCriteria": "highestCost" - } -} - diff --git a/docs/source/tutorial/finauction-update-award-criteria.http b/docs/source/tutorial/finauction-update-award-criteria.http deleted file mode 100644 index 8f1f3ec..0000000 --- a/docs/source/tutorial/finauction-update-award-criteria.http +++ /dev/null @@ -1,32 +0,0 @@ -PUT /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/55dc8e33c47948eab4e7b327bede3959?acc_token=6c03609dd6844e42bc1318fddf20c937 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 340 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/3efb323d6d6a42c9817ec011d6c8898f?KeyID=c822be4a&Signature=ihcWFQ7J6n6ycnrnh0RJKYBGr3PXLL4%2Fu39OMCUhkdXcrv9CY%2FXcFty3b%2BqTiMV6ODEMR7zAyub4CwZXgyoYBA%3D%3D", - "title": "AwardCriteria-2.pdf", - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf" - } -} - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/3efb323d6d6a42c9817ec011d6c8898f?KeyID=c822be4a&Signature=oMIup%252BjcxK%2FooCGXGpptyKCu1slmnk3T1I8XhOKPQXsKAD3R3zPyoDvYbF%252B47ZdbzNJ8m9v3TNQdsbseMlv7CA%253D%253D", - "title": "AwardCriteria-2.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.174808+02:00", - "dateModified": "2017-11-30T16:56:24.243244+02:00", - "id": "55dc8e33c47948eab4e7b327bede3959" - } -} - diff --git a/docs/source/tutorial/finauction-upload-award-criteria.http b/docs/source/tutorial/finauction-upload-award-criteria.http deleted file mode 100644 index f417008..0000000 --- a/docs/source/tutorial/finauction-upload-award-criteria.http +++ /dev/null @@ -1,33 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents?acc_token=6c03609dd6844e42bc1318fddf20c937 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 338 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0a0c1a4b083475caaa4c8fb08d18781?KeyID=c822be4a&Signature=eUjEvPipgCDUg2CRW0uqyy%2Br5C7MNpbTp26C83J4cy7H84gzepDYr%2BfNWkPzjpTqZfg%2BIfTNVj86hY07Z9mcBA%3D%3D", - "title": "AwardCriteria.pdf", - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf" - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/55dc8e33c47948eab4e7b327bede3959 - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0a0c1a4b083475caaa4c8fb08d18781?KeyID=c822be4a&Signature=xnYvodjAvZu8pjdlyQ4kdlC62x%252BEi2JnnuWKvRdNbne9KWdXVWSlqM%252BeGrGuJ4%252BS2e9qmZRCg9vHJvc1iz%252BMAA%253D%253D", - "title": "AwardCriteria.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.174808+02:00", - "dateModified": "2017-11-30T16:56:24.174838+02:00", - "id": "55dc8e33c47948eab4e7b327bede3959" - } -} - From 42e69c9196a49f240c2ed331da884f1c4517d712 Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Fri, 25 May 2018 17:43:35 +0300 Subject: [PATCH 05/14] Make object references consistent --- docs/source/award_workflow.rst | 2 +- .../locale/uk/LC_MESSAGES/award_workflow.po | 4 +- .../locale/uk/LC_MESSAGES/standard/auction.po | 40 +++++++++---------- .../locale/uk/LC_MESSAGES/standard/award.po | 8 ++-- .../locale/uk/LC_MESSAGES/standard/bid.po | 8 ++-- .../uk/LC_MESSAGES/standard/cancellation.po | 8 ++-- .../uk/LC_MESSAGES/standard/complaint.po | 8 ++-- .../uk/LC_MESSAGES/standard/contract.po | 4 +- .../uk/LC_MESSAGES/standard/document.po | 24 +++++------ .../locale/uk/LC_MESSAGES/standard/item.po | 4 +- .../uk/LC_MESSAGES/standard/question.po | 12 +++--- .../locale/uk/LC_MESSAGES/standard/util.po | 4 +- docs/source/locale/uk/LC_MESSAGES/tutorial.po | 4 +- docs/source/standard/auction.rst | 28 ++++++------- docs/source/standard/award.rst | 8 ++-- docs/source/standard/bid.rst | 8 ++-- docs/source/standard/cancellation.rst | 7 ++-- docs/source/standard/complaint.rst | 18 ++++----- docs/source/standard/contract.rst | 6 +-- docs/source/standard/document.rst | 14 +++---- docs/source/standard/item.rst | 2 +- docs/source/standard/question.rst | 9 +++-- docs/source/standard/util.rst | 12 +++--- docs/source/tutorial.rst | 4 +- 24 files changed, 124 insertions(+), 122 deletions(-) diff --git a/docs/source/award_workflow.rst b/docs/source/award_workflow.rst index 9bfaf1d..012dbb4 100644 --- a/docs/source/award_workflow.rst +++ b/docs/source/award_workflow.rst @@ -3,7 +3,7 @@ Award Workflow ============== -For a more detailed information see :ref:`award` +For a more detailed information see :ref:`Award` * :ref:`Qualification` * :ref:`Confirming_qualification` diff --git a/docs/source/locale/uk/LC_MESSAGES/award_workflow.po b/docs/source/locale/uk/LC_MESSAGES/award_workflow.po index e909188..8559b84 100644 --- a/docs/source/locale/uk/LC_MESSAGES/award_workflow.po +++ b/docs/source/locale/uk/LC_MESSAGES/award_workflow.po @@ -17,8 +17,8 @@ msgstr "" msgid "Award Workflow" msgstr "Схема роботи кваліфікації" -msgid "For a more detailed information see :ref:`award`" -msgstr "Для більш детальної інформації зверніться до секції :ref:`award`" +msgid "For a more detailed information see :ref:`Award`" +msgstr "Для більш детальної інформації зверніться до секції :ref:`Award`" msgid ":ref:`Qualification`" msgstr "" diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/auction.po b/docs/source/locale/uk/LC_MESSAGES/standard/auction.po index da1a7ca..5dc4050 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/auction.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/auction.po @@ -43,8 +43,8 @@ msgstr ":ref:`ProcuringEntity`, обов'язково" msgid "Organization conducting the auction." msgstr "Організатор (організація, що проводить аукціон)." -msgid ":ref:`value`, required, editable during enquiryPeriod" -msgstr ":ref:`value`, обов'язково, доступне для редагування впродовж enquiryPeriod" +msgid ":ref:`Value`, required, editable during enquiryPeriod" +msgstr ":ref:`Value`, обов'язково, доступне для редагування впродовж enquiryPeriod" msgid ":ref:`Guarantee`, editable during enquiryPeriod" msgstr ":ref:`Guarantee`, доступне для редагування впродовж enquiryPeriod" @@ -78,8 +78,8 @@ msgstr "" msgid "Bid guarantee" msgstr "Гарантійний внесок" -msgid "list of :ref:`item` objects, required, editable during enquiryPeriod" -msgstr "список об’єктів :ref:`item`, обов’язково, доступне для редагування впродовж enquiryPeriod" +msgid "list of :ref:`Item` objects, required, editable during enquiryPeriod" +msgstr "список об’єктів :ref:`Item`, обов’язково, доступне для редагування впродовж enquiryPeriod" msgid "" "|ocdsDescription| The goods and services to be purchased, broken into line " @@ -96,26 +96,26 @@ msgstr "список об’єктів :ref:`Feature`" msgid "Features of auction." msgstr "Властивості аукціону." -msgid "List of :ref:`document` objects" -msgstr "Список об’єктів :ref:`document`" +msgid "List of :ref:`Document` objects" +msgstr "Список об’єктів :ref:`Document`" msgid "|ocdsDescription| All documents and attachments related to the auction." msgstr "|ocdsDescription| Всі документи та додатки пов’язані із аукціоном." -msgid "List of :ref:`question` objects" -msgstr "Список об’єктів :ref:`question`" +msgid "List of :ref:`Question` objects" +msgstr "Список об’єктів :ref:`Question`" msgid "Questions to ``procuringEntity`` and answers to them." msgstr "Питання до організатора ``procuringEntity`` і відповіді на них." -msgid "List of :ref:`complaint` objects" -msgstr "Список об’єктів :ref:`complaint`" +msgid "List of :ref:`Complaint` objects" +msgstr "Список об’єктів :ref:`Complaint`" msgid "Complaints to auction conditions and their resolutions." msgstr "Скарги на умови аукціону та їх вирішення." -msgid "List of :ref:`bid` objects" -msgstr "Список об’єктів :ref:`bid`" +msgid "List of :ref:`Bid` objects" +msgstr "Список об’єктів :ref:`Bid`" msgid "" "|ocdsDescription| A list of all the companies who entered submissions for " @@ -136,8 +136,8 @@ msgstr "" "Значення `valueAddedTaxIncluded` повинно бути або відсутнім, або співпадати " "з `Auction.value.valueAddedTaxIncluded`" -msgid "List of :ref:`award` objects" -msgstr "Список об’єктів :ref:`award`" +msgid "List of :ref:`Award` objects" +msgstr "Список об’єктів :ref:`Award`" msgid "All qualifications (disqualifications and awards)." msgstr "Всі кваліфікації (дискваліфікації та визначення переможця)." @@ -145,8 +145,8 @@ msgstr "Всі кваліфікації (дискваліфікації та в msgid "List of :ref:`Contract` objects" msgstr "Список об’єктів :ref:`Contract`" -msgid ":ref:`period`, required" -msgstr ":ref:`period`, обов'язково" +msgid ":ref:`Period`, required" +msgstr ":ref:`Period`, обов'язково" msgid "" "|ocdsDescription| The period during which enquiries may be made and will be " @@ -162,8 +162,8 @@ msgstr "" "|ocdsDescription| Період, коли аукціон відкритий для подачі пропозицій. " "Кінцева дата - це дата, коли перестають прийматись пропозиції." -msgid ":ref:`period`, read-only" -msgstr ":ref:`period`, лише для читання" +msgid ":ref:`Period`, read-only" +msgstr ":ref:`Period`, лише для читання" msgid "url" msgstr "URL-адреса" @@ -272,8 +272,8 @@ msgstr "" msgid "|ocdsDescription| The total estimated value of the procurement." msgstr "|ocdsDescription| Загальна кошторисна вартість закупівлі." -msgid ":ref:`period`" -msgstr ":ref:`period`" +msgid ":ref:`Period`" +msgstr ":ref:`Period`" msgid "Period when questions are allowed." msgstr "Період, коли дозволено задавати питання." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/award.po b/docs/source/locale/uk/LC_MESSAGES/standard/award.po index b377821..8c969d4 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/award.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/award.po @@ -98,8 +98,8 @@ msgstr "" msgid "List of :ref:`Complaint` objects" msgstr "Список об’єктів :ref:`Complaint`" -msgid ":ref:`period`" -msgstr ":ref:`period`" +msgid ":ref:`Period`" +msgstr ":ref:`Period`" msgid "|ocdsDescription| Identifier for this award." msgstr "|ocdsDescription| Ідентифікатор цього рішення." @@ -119,5 +119,5 @@ msgstr "" msgid "The time frame when complaints can be submitted." msgstr "Період часу, під час якого можна подавати скарги." -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/bid.po b/docs/source/locale/uk/LC_MESSAGES/standard/bid.po index ffa3bec..7781531 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/bid.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/bid.po @@ -23,8 +23,8 @@ msgstr "Схема" msgid "List of :ref:`Organization` objects" msgstr "Список об’єктів :ref:`Organization` " -msgid "string, :ref:`date`, auto-generated" -msgstr "рядок, :ref:`date`, генерується автоматично" +msgid "string, :ref:`Date`, auto-generated" +msgstr "рядок, :ref:`Date`, генерується автоматично" msgid "string" msgstr "рядок" @@ -129,5 +129,5 @@ msgstr "" #~ "`valueAddedTaxIncluded` повинно або бути відсутнім, або відповідати " #~ "`Lot.value.valueAddedTaxIncluded`" -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po b/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po index 222ca85..270f942 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po @@ -45,8 +45,8 @@ msgstr "" "Супровідна документація скасування: Протокол рішення Аукціонного комітету " "організатора про скасування аукціону." -msgid "string, :ref:`date`" -msgstr "рядок, :ref:`date`" +msgid "string, :ref:`Date`" +msgstr "рядок, :ref:`Date`" msgid "Cancellation date." msgstr "Дата скасування" @@ -63,5 +63,5 @@ msgstr "Причина, з якої скасовується аукціон." #~ msgid "`lot`" #~ msgstr "`lot`" -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po b/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po index 5e211a1..00f8b9b 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po @@ -39,8 +39,8 @@ msgstr "Заголовок скарги." msgid "Description of the issue." msgstr "Опис запитання." -msgid "string, :ref:`date`, auto-generated" -msgstr "рядок, :ref:`date`, генерується автоматично" +msgid "string, :ref:`Date`, auto-generated" +msgstr "рядок, :ref:`Date`, генерується автоматично" msgid "Date of posting." msgstr "Дата подання." @@ -126,5 +126,5 @@ msgstr "UID, генерується автоматично" msgid "Reviewer's decision." msgstr "Рішення органу оскарження." -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/contract.po b/docs/source/locale/uk/LC_MESSAGES/standard/contract.po index 0a4742c..3c01e32 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/contract.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/contract.po @@ -98,8 +98,8 @@ msgstr ":ref:`Period`" msgid "|ocdsDescription| The start and end date for the contract." msgstr "|ocdsDescription| Дата початку та завершення договору." -msgid "string, :ref:`date`" -msgstr "рядок, :ref:`date`" +msgid "string, :ref:`Date`" +msgstr "рядок, :ref:`Date`" msgid "" "|ocdsDescription| The date the contract was signed. In the case of multiple " diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/document.po b/docs/source/locale/uk/LC_MESSAGES/standard/document.po index 72a78f9..14d5013 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/document.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/document.po @@ -28,8 +28,8 @@ msgstr "рядок, генерується автоматично" msgid "string" msgstr "рядок" -msgid "Possible values for :ref:`auction`" -msgstr "Можливі значення для :ref:`auction`" +msgid "Possible values for :ref:`Auction`" +msgstr "Можливі значення для :ref:`Auction`" msgid "`notice` - **Auction notice**" msgstr "`notice` - **Повідомлення про аукціон**" @@ -63,8 +63,8 @@ msgstr "" "Інформація про учасників, їхні документи для перевірки та будь-які " "процесуальні пільги, на які вони можуть претендувати." -msgid "Possible values for :ref:`award`" -msgstr "Можливі значення для :ref:`award`" +msgid "Possible values for :ref:`Award`" +msgstr "Можливі значення для :ref:`Award`" msgid "`winningBid` - **Winning Bid**" msgstr "`winningBid` - **Пропозиція, що перемогла**" @@ -90,8 +90,8 @@ msgstr "`contractSigned` - **Підписаний договір**" msgid "`contractAnnexe` - **Annexes to the Contract**" msgstr "`contractAnnexe` - **Додатки до договору**" -msgid "Possible values for :ref:`bid`" -msgstr "Можливі значення для :ref:`bid`" +msgid "Possible values for :ref:`Bid`" +msgstr "Можливі значення для :ref:`Bid`" msgid "`commercialProposal` - **Сommercial proposal**" msgstr "`commercialProposal` - **Цінова пропозиція**" @@ -134,8 +134,8 @@ msgstr "" msgid "|ocdsDescription| Direct link to the document or attachment." msgstr "|ocdsDescription| Пряме посилання на документ чи додаток." -msgid "string, :ref:`date`" -msgstr "рядок, :ref:`date`" +msgid "string, :ref:`Date`" +msgstr "рядок, :ref:`Date`" msgid "|ocdsDescription| The date on which the document was first published." msgstr "|ocdsDescription| Дата, коли документ був опублікований вперше." @@ -218,8 +218,8 @@ msgstr "" "що під час аукціону подав найбільшу цінову пропозицію, а при однакових " "цінових пропозиціях, того, що подав пропозицію раніше." -msgid "ID of related :ref:`item`." -msgstr "Ідентифікатор пов'язаних об'єктів :ref:`item`." +msgid "ID of related :ref:`Item`." +msgstr "Ідентифікатор пов'язаних об'єктів :ref:`Item`." msgid "`x_dgfAssetFamiliarization` - **Asset Familiarization**" msgstr "" @@ -337,5 +337,5 @@ msgstr "" #~ msgid "`lot`" #~ msgstr "`lot`" -#~ msgid "ID of related :ref:`lot` or :ref:`item`." -#~ msgstr "Ідентифікатор пов'язаних об'єктів :ref:`lot` або :ref:`item`." +#~ msgid "ID of related :ref:`Lot` or :ref:`Item`." +#~ msgstr "Ідентифікатор пов'язаних об'єктів :ref:`Lot` або :ref:`Item`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/item.po b/docs/source/locale/uk/LC_MESSAGES/standard/item.po index abe8fd7..39a58c9 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/item.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/item.po @@ -170,8 +170,8 @@ msgid "Additional classifier is CPVS. The property can be leased, when entering msgstr "Додатковим класифікатором є CPVS. Майно може бути здане в оренду, при передачі " "значення PA01-7 в полі класифікатора CPVS." -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." #~ msgid "" #~ "|ocdsDescription| The primary classification for the item. See the " diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/question.po b/docs/source/locale/uk/LC_MESSAGES/standard/question.po index 72588b3..cd539b5 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/question.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/question.po @@ -44,8 +44,8 @@ msgstr "рядок" msgid "Description of the question." msgstr "Опис запитання." -msgid "string, :ref:`date`, auto-generated" -msgstr "рядок, :ref:`date`, генерується автоматично" +msgid "string, :ref:`Date`, auto-generated" +msgstr "рядок, :ref:`Date`, генерується автоматично" msgid "Date of posting." msgstr "Дата публікації." @@ -65,11 +65,11 @@ msgstr "UID, генерується автоматично" msgid "Answer for the question." msgstr "Відповідь на задане питання." -msgid "ID of related :ref:`item`." -msgstr "Ідентифікатор пов'язаних об'єктів :ref:`item`." +msgid "ID of related :ref:`Item`." +msgstr "Ідентифікатор пов'язаних об'єктів :ref:`Item`." #~ msgid "`lot`" #~ msgstr "`lot`" -#~ msgid "ID of related :ref:`lot` or :ref:`item`." -#~ msgstr "Ідентифікатор пов'язаних об'єктів :ref:`lot` або :ref:`item`." +#~ msgid "ID of related :ref:`Lot` or :ref:`Item`." +#~ msgstr "Ідентифікатор пов'язаних об'єктів :ref:`Lot` або :ref:`Item`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/util.po b/docs/source/locale/uk/LC_MESSAGES/standard/util.po index f43ac61..2fa47db 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/util.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/util.po @@ -21,8 +21,8 @@ msgstr "Period" msgid "Schema" msgstr "Схема" -msgid "string, :ref:`date`" -msgstr "рядок, :ref:`date`" +msgid "string, :ref:`Date`" +msgstr "рядок, :ref:`Date`" msgid "|ocdsDescription| The start date for the period." msgstr "|ocdsDescription| Початкова дата періоду." diff --git a/docs/source/locale/uk/LC_MESSAGES/tutorial.po b/docs/source/locale/uk/LC_MESSAGES/tutorial.po index 6a9d7ea..958065a 100644 --- a/docs/source/locale/uk/LC_MESSAGES/tutorial.po +++ b/docs/source/locale/uk/LC_MESSAGES/tutorial.po @@ -395,11 +395,11 @@ msgstr "Та дискваліфікувати кандидата:" msgid "" "In order to specify illustration display order, `index` field can be used " -"(for details see :ref:`document`). Since this illustration should be " +"(for details see :ref:`Document`). Since this illustration should be " "displayed first, it has ``\"index\": 1``." msgstr "" "Для того, щоб вказати порядок відображення ілюстрацій, використовується поле" -" `index` (див. :ref:`document`). Оскільки ця ілюстрація повинна бути " +" `index` (див. :ref:`Document`). Оскільки ця ілюстрація повинна бути " "відображена першою, то вказується ``\"index\": 1``." msgid "" diff --git a/docs/source/standard/auction.rst b/docs/source/standard/auction.rst index ece47dc..1c7f7b6 100644 --- a/docs/source/standard/auction.rst +++ b/docs/source/standard/auction.rst @@ -2,7 +2,7 @@ .. include:: defs.hrst .. index:: Auction, Auction -.. _auction: +.. _Auction: Auction ======= @@ -45,7 +45,7 @@ Schema :value: - :ref:`value`, required, editable during enquiryPeriod + :ref:`Value`, required, editable during enquiryPeriod Total available auction budget. Bids lower than ``value`` will be rejected. @@ -58,7 +58,7 @@ Schema Bid guarantee :items: - list of :ref:`item` objects, required, editable during enquiryPeriod + list of :ref:`Item` objects, required, editable during enquiryPeriod List that contains single item being sold. @@ -71,23 +71,23 @@ Schema Features of auction. :documents: - List of :ref:`document` objects + List of :ref:`Document` objects |ocdsDescription| All documents and attachments related to the auction. :questions: - List of :ref:`question` objects + List of :ref:`Question` objects Questions to ``procuringEntity`` and answers to them. :complaints: - List of :ref:`complaint` objects + List of :ref:`Complaint` objects Complaints to auction conditions and their resolutions. :bids: - List of :ref:`bid` objects + List of :ref:`Bid` objects A list of all bids placed in the auction with information about participants, their proposals and other qualification documentation. @@ -105,7 +105,7 @@ Schema for the procedure to be successful. Therewith the auction is omitted and that bid turns to a qualified award. :minimalStep: - :ref:`value`, required, editable during enquiryPeriod + :ref:`Value`, required, editable during enquiryPeriod The minimal step of auction. Validation rules: @@ -114,7 +114,7 @@ Schema * `valueAddedTaxIncluded` should either be absent or match `Auction.value.valueAddedTaxIncluded` :awards: - List of :ref:`award` objects + List of :ref:`Award` objects All qualifications (disqualifications and awards). @@ -122,7 +122,7 @@ Schema List of :ref:`Contract` objects :enquiryPeriod: - :ref:`period` + :ref:`Period` Period when questions are allowed. @@ -130,7 +130,7 @@ Schema The period during which enquiries may be made and will be answered. :tenderPeriod: - :ref:`period` + :ref:`Period` Period when bids can be submitted. @@ -138,7 +138,7 @@ Schema The period when the auction is open for submissions. The end date is the closing date for auction submissions. :auctionPeriod: - :ref:`period`, required + :ref:`Period`, required Period when Auction is conducted. `startDate` should be provided. @@ -148,7 +148,7 @@ Schema A web address where auction is accessible for view. :awardPeriod: - :ref:`period`, read-only + :ref:`Period`, read-only Awarding process period. @@ -189,7 +189,7 @@ Schema * ``eligibilityCriteria_en`` (English) - Only licensed financial institutions are eligible to participate. .. :lots: - List of :ref:`lot` objects. + List of :ref:`Lot` objects. Contains all auction lots. diff --git a/docs/source/standard/award.rst b/docs/source/standard/award.rst index b4d7cc7..2a93781 100644 --- a/docs/source/standard/award.rst +++ b/docs/source/standard/award.rst @@ -2,7 +2,7 @@ .. include:: defs.hrst .. index:: Award -.. _award: +.. _Award: Award ===== @@ -53,7 +53,7 @@ Schema The date of the contract award. :value: - `Value` object, auto-generated, read-only + :ref:`Value` object, auto-generated, read-only |ocdsDescription| The total value of this award. @@ -80,11 +80,11 @@ Schema List of :ref:`Complaint` objects :complaintPeriod: - :ref:`period` + :ref:`Period` The time frame when complaints can be submitted. .. :lotID: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. diff --git a/docs/source/standard/bid.rst b/docs/source/standard/bid.rst index a4a655d..5884d93 100644 --- a/docs/source/standard/bid.rst +++ b/docs/source/standard/bid.rst @@ -2,7 +2,7 @@ .. index:: Bid, Parameter, LotValue, bidder, participant, pretendent -.. _bid: +.. _Bid: Bid === @@ -14,7 +14,7 @@ Schema List of :ref:`Organization` objects :date: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date when bid has been submitted. @@ -98,10 +98,10 @@ Schema :relatedLot: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. :date: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated :participationUrl: URL diff --git a/docs/source/standard/cancellation.rst b/docs/source/standard/cancellation.rst index bc12005..09e1bac 100644 --- a/docs/source/standard/cancellation.rst +++ b/docs/source/standard/cancellation.rst @@ -2,7 +2,7 @@ .. include:: defs.hrst .. index:: Cancellation -.. _cancellation: +.. _Cancellation: Cancellation ============ @@ -34,7 +34,7 @@ Schema with decision to cancel the Auction. :date: - string, :ref:`date` + string, :ref:`Date` Cancellation date. @@ -44,9 +44,10 @@ Schema Possible values are: * `auction` + .. * `lot` .. :relatedLot: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. diff --git a/docs/source/standard/complaint.rst b/docs/source/standard/complaint.rst index d751ee9..9a2f843 100644 --- a/docs/source/standard/complaint.rst +++ b/docs/source/standard/complaint.rst @@ -3,7 +3,7 @@ .. index:: Complaint, dispute -.. _complaint: +.. _Complaint: Complaint ========= @@ -28,32 +28,32 @@ Schema Description of the issue. :date: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of posting. :dateSubmitted: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date when claim was submitted. :dateAnswered: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date when Organizer answered the claim. :dateEscalated: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of claim to complaint escalation. :dateDecision: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of complaint decision. :dateCanceled: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of cancelling. @@ -114,7 +114,7 @@ Schema .. :relatedLot: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. :auctionerAction: string @@ -122,6 +122,6 @@ Schema Participants's action. :auctionerActionDate: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of participant's action. diff --git a/docs/source/standard/contract.rst b/docs/source/standard/contract.rst index f20aadf..180484b 100644 --- a/docs/source/standard/contract.rst +++ b/docs/source/standard/contract.rst @@ -41,7 +41,7 @@ Schema Contract description :value: - `Value` object, auto-generated, read-only + :ref:`Value` object, auto-generated, read-only |ocdsDescription| The total value of this contract. @@ -79,13 +79,13 @@ Schema The start and end date for the contract. :dateSigned: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| The date the contract was signed. In the case of multiple signatures, the date of the last signature. :date: - string, :ref:`date` + string, :ref:`Date` The date when the contract was changed or activated. diff --git a/docs/source/standard/document.rst b/docs/source/standard/document.rst index 4d2c2d2..575823b 100644 --- a/docs/source/standard/document.rst +++ b/docs/source/standard/document.rst @@ -17,7 +17,7 @@ Schema :documentType: string - Possible values for :ref:`auction` + Possible values for :ref:`Auction` * `notice` - **Auction notice** @@ -56,7 +56,7 @@ Schema A non-disclosure agreement between a participant and a bank/Deposit Guarantee Fund. - Possible values for :ref:`award` + Possible values for :ref:`Award` * `winningBid` - **Winning Bid** @@ -73,7 +73,7 @@ Schema * `contractAnnexe` - **Annexes to the Contract** - Possible values for :ref:`bid` + Possible values for :ref:`Bid` * `commercialProposal` - **Сommercial proposal** @@ -119,13 +119,13 @@ Schema Direct link to the document or attachment. :datePublished: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| The date on which the document was first published. :dateModified: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| Date that the document was last modified @@ -149,9 +149,9 @@ Schema :relatedItem: string - ID of related :ref:`item`. + ID of related :ref:`Item`. -.. ID of related :ref:`lot` or :ref:`item`. +.. ID of related :ref:`Lot` or :ref:`Item`. * `biddingDocuments` - **Bidding Documents** diff --git a/docs/source/standard/item.rst b/docs/source/standard/item.rst index 2ac96c7..6095084 100644 --- a/docs/source/standard/item.rst +++ b/docs/source/standard/item.rst @@ -91,7 +91,7 @@ Schema .. :relatedLot: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. .. _Classification: diff --git a/docs/source/standard/question.rst b/docs/source/standard/question.rst index 0c2a539..5575ac7 100644 --- a/docs/source/standard/question.rst +++ b/docs/source/standard/question.rst @@ -1,7 +1,7 @@ .. . Kicking page rebuild 2014-10-30 17:00:08 .. index:: Question, Answer, Author -.. _question: +.. _Question: Question ======== @@ -28,7 +28,7 @@ Schema Description of the question. :date: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of posting. @@ -44,12 +44,13 @@ Schema * `auction` * `item` + .. * `lot` :relatedItem: string - ID of related :ref:`item`. + ID of related :ref:`Item`. -.. ID of related :ref:`lot` or :ref:`item`. +.. ID of related :ref:`Lot` or :ref:`Item`. diff --git a/docs/source/standard/util.rst b/docs/source/standard/util.rst index 39d3e17..575e340 100644 --- a/docs/source/standard/util.rst +++ b/docs/source/standard/util.rst @@ -2,7 +2,7 @@ .. include:: defs.hrst .. index:: Period, startDate, endDate -.. _period: +.. _Period: Period ====== @@ -11,13 +11,13 @@ Schema ------ :startDate: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| The start date for the period. :endDate: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| The end date for the period. @@ -32,7 +32,7 @@ Date Date/time in :ref:`date-format`. .. index:: Value, Currency, VAT -.. _value: +.. _Value: Value ===== @@ -67,7 +67,7 @@ Schema ------ :date: - string, :ref:`date` + string, :ref:`Date` Date when changes were recorded. @@ -75,7 +75,7 @@ Schema List of `Change` objects -.. _guarantee: +.. _Guarantee: Guarantee ========= diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst index cb2546d..dee54d6 100644 --- a/docs/source/tutorial.rst +++ b/docs/source/tutorial.rst @@ -170,7 +170,7 @@ Uploading illustration Organizer can upload illustration files into the created auction. Uploading should follow the :ref:`upload` rules. -In order to specify illustration display order, `index` field can be used (for details see :ref:`document`). Since this illustration should be displayed first, it has ``"index": 1``. +In order to specify illustration display order, `index` field can be used (for details see :ref:`Document`). Since this illustration should be displayed first, it has ``"index": 1``. .. include:: tutorial/upload-first-auction-illustration.http :code: @@ -416,7 +416,7 @@ Only the request that has been activated (3rd step above) has power to cancel auction. I.e. you have to not only prepare cancellation request but to activate it as well. -See :ref:`cancellation` data structure for details. +See :ref:`Cancellation` data structure for details. Preparing the cancellation request ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From bc3d06fc586c559aa2b3d1ab853293f03e86db04 Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Tue, 29 May 2018 11:25:54 +0300 Subject: [PATCH 06/14] Update docs config: remove fin parts --- docs.py | 158 ++++++-------------------------------------------------- 1 file changed, 15 insertions(+), 143 deletions(-) mode change 100755 => 100644 docs.py diff --git a/docs.py b/docs.py old mode 100755 new mode 100644 index fb84f27..d5df081 --- a/docs.py +++ b/docs.py @@ -2,22 +2,25 @@ # -*- coding: utf-8 -*- import json import os -from datetime import timedelta, datetime +from datetime import timedelta -from openprocurement.auctions.core.utils import get_now from openprocurement.auctions.core.tests.base import PrefixedRequestClass import openprocurement.auctions.lease.tests.base as base_test -from openprocurement.auctions.lease.constants import DEFAULT_PROCUREMENT_METHOD_TYPE_FINANCIAL -from openprocurement.auctions.lease.tests.base import test_auction_data as base_test_auction_data, test_bids, test_financial_bids +from openprocurement.auctions.lease.constants import DEFAULT_PROCUREMENT_METHOD_TYPE_LEASE +from openprocurement.auctions.lease.tests.base import ( + test_auction_data as base_test_auction_data, test_bids +) from openprocurement.auctions.lease.tests.base import test_auction_maximum_data from openprocurement.auctions.lease.tests.tender import BaseAuctionWebTest from webtest import TestApp +from openprocurement.auctions.core.utils import ( + apply_data_patch, get_now, SANDBOX_MODE +) -now = datetime.now() +now = get_now() test_auction_data = base_test_auction_data.copy() -test_financial_auction_data = test_auction_data.copy() -test_financial_auction_data["procurementMethodType"] = DEFAULT_PROCUREMENT_METHOD_TYPE_FINANCIAL +test_auction_data["procurementMethodType"] = DEFAULT_PROCUREMENT_METHOD_TYPE_LEASE bid = { "data": { @@ -187,8 +190,9 @@ def generate_docservice_url(self): def test_docs_acceleration(self): # SANDBOX_MODE=TRUE data = test_auction_data.copy() - data['procurementMethodDetails'] = 'quick, accelerator=1440' - data['submissionMethodDetails'] = 'quick' + if SANDBOX_MODE: + data['procurementMethodDetails'] = 'quick, accelerator=1440' + data['submissionMethodDetails'] = 'quick' data['mode'] = 'test' data["auctionPeriod"] = { "startDate": (now + timedelta(days=12)).isoformat() @@ -320,6 +324,8 @@ def test_docs_tutorial(self): # Uploading documentation # + self.set_status("active.tendering") + with open('docs/source/tutorial/upload-auction-notice.http', 'w') as self.app.file_obj: response = self.app.post_json('/auctions/{}/documents?acc_token={}'.format(self.auction_id, owner_token), {'data': { @@ -1236,137 +1242,3 @@ def _test_docs_complaints(self): response = self.app.get('/auctions/{}/awards'.format( self.auction_id, award_id)) self.assertEqual(response.status, '200 OK') - - def test_docs_fintutorial(self): - request_path = '/auctions?opt_pretty=1' - - # Creating auction - # - - with open('docs/source/tutorial/finauction-post-attempt-json-data.http', 'w') as self.app.file_obj: - response = self.app.post_json( - '/auctions?opt_pretty=1', {"data": test_financial_auction_data}) - self.assertEqual(response.status, '201 Created') - - auction = response.json['data'] - owner_token = response.json['access']['token'] - - with open('docs/source/tutorial/blank-finauction-view.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}'.format(auction['id'])) - self.assertEqual(response.status, '200 OK') - - self.app.get('/auctions') - with open('docs/source/tutorial/initial-finauction-listing.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions') - self.assertEqual(response.status, '200 OK') - - self.app.authorization = ('Basic', ('broker', '')) - self.auction_id = auction['id'] - - # Uploading documentation - # - - with open('docs/source/tutorial/upload-finauction-notice.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/documents?acc_token={}'.format(self.auction_id, owner_token), - {'data': { - 'title': u'Notice.pdf', - 'url': self.generate_docservice_url(), - 'hash': 'md5:' + '0' * 32, - 'format': 'application/pdf', - "documentType": "technicalSpecifications", - "description": "technical specification" - }}) - self.assertEqual(response.status, '201 Created') - - doc_id = response.json["data"]["id"] - with open('docs/source/tutorial/finauction-documents.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}/documents/{}'.format( - self.auction_id, doc_id)) - self.assertEqual(response.status, '200 OK') - - with open('docs/source/tutorial/finauction-upload-award-criteria.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/documents?acc_token={}'.format(self.auction_id, owner_token), - {'data': { - 'title': u'AwardCriteria.pdf', - 'url': self.generate_docservice_url(), - 'hash': 'md5:' + '0' * 32, - 'format': 'application/pdf', - }}) - self.assertEqual(response.status, '201 Created') - - doc_id = response.json["data"]["id"] - - with open('docs/source/tutorial/finauction-documents-2.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}/documents'.format( - self.auction_id)) - self.assertEqual(response.status, '200 OK') - - with open('docs/source/tutorial/finauction-update-award-criteria.http', 'w') as self.app.file_obj: - response = self.app.put_json('/auctions/{}/documents/{}?acc_token={}'.format(self.auction_id, doc_id, owner_token), - {'data': { - 'title': u'AwardCriteria-2.pdf', - 'url': self.generate_docservice_url(), - 'hash': 'md5:' + '0' * 32, - 'format': 'application/pdf', - }}) - self.assertEqual(response.status, '200 OK') - - with open('docs/source/tutorial/finauction-documents-3.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}/documents'.format( - self.auction_id)) - self.assertEqual(response.status, '200 OK') - - with open('docs/source/tutorial/finauction-adding-vdr.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/documents?acc_token={}'.format(self.auction_id, owner_token), - {'data': { - 'title': u'VDR for auction lot', - 'url': 'http://virtial-data-room.com/id_of_room', - 'documentType': 'virtualDataRoom', - }}) - self.assertEqual(response.status, '201 Created') - - # Registering bid - # - - self.app.authorization = ('Basic', ('broker', '')) - bids_access = {} - with open('docs/source/tutorial/register-finbidder.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/bids'.format( - self.auction_id), {'data': test_financial_bids[0]}) - bid1_id = response.json['data']['id'] - bids_access[bid1_id] = response.json['access']['token'] - self.assertEqual(response.status, '201 Created') - - with open('docs/source/tutorial/activate-finbidder.http', 'w') as self.app.file_obj: - response = self.app.patch_json('/auctions/{}/bids/{}?acc_token={}'.format( - self.auction_id, bid1_id, bids_access[bid1_id]), {"data": {"status": "active"}}) - self.assertEqual(response.status, '200 OK') - - # Proposal Uploading - # - - with open('docs/source/tutorial/upload-finbid-financial-license.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/bids/{}/documents?acc_token={}'.format(self.auction_id, bid1_id, bids_access[bid1_id]), - {'data': { - 'title': u'FinancialLicense.pdf', - 'url': self.generate_docservice_url(), - 'hash': 'md5:' + '0' * 32, - 'format': 'application/pdf', - "documentType": "financialLicense", - }}) - self.assertEqual(response.status, '201 Created') - - with open('docs/source/tutorial/finbidder-documents.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}/bids/{}/documents?acc_token={}'.format( - self.auction_id, bid1_id, bids_access[bid1_id])) - self.assertEqual(response.status, '200 OK') - - # Second bidder registration - # - - with open('docs/source/tutorial/register-2nd-finbidder.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/bids'.format( - self.auction_id), {'data': test_financial_bids[1]}) - bid2_id = response.json['data']['id'] - bids_access[bid2_id] = response.json['access']['token'] - self.assertEqual(response.status, '201 Created') From e067aea88dbd9e5e66b91a199f449532401fd264 Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Tue, 29 May 2018 11:27:47 +0300 Subject: [PATCH 07/14] Remove finaction requests --- docs/source/tutorial/activate-finbidder.http | 18 ---- .../tutorial/blank-finauction-view.http | 94 ------------------ docs/source/tutorial/finbidder-documents.http | 24 ----- .../tutorial/initial-finauction-listing.http | 22 ----- .../tutorial/register-2nd-finbidder.http | 96 ------------------- docs/source/tutorial/register-finbidder.http | 96 ------------------- .../tutorial/upload-finauction-notice.http | 37 ------- .../upload-finbid-financial-license.http | 35 ------- 8 files changed, 422 deletions(-) delete mode 100644 docs/source/tutorial/activate-finbidder.http delete mode 100644 docs/source/tutorial/blank-finauction-view.http delete mode 100644 docs/source/tutorial/finbidder-documents.http delete mode 100644 docs/source/tutorial/initial-finauction-listing.http delete mode 100644 docs/source/tutorial/register-2nd-finbidder.http delete mode 100644 docs/source/tutorial/register-finbidder.http delete mode 100644 docs/source/tutorial/upload-finauction-notice.http delete mode 100644 docs/source/tutorial/upload-finbid-financial-license.http diff --git a/docs/source/tutorial/activate-finbidder.http b/docs/source/tutorial/activate-finbidder.http deleted file mode 100644 index 6718ac9..0000000 --- a/docs/source/tutorial/activate-finbidder.http +++ /dev/null @@ -1,18 +0,0 @@ -PATCH /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca?acc_token=b6c5e3c4087848a08703ae24889033a7 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 30 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "status": "active" - } -} - - -200 OK -Content-Type: application/json; charset=UTF-8 - -null - diff --git a/docs/source/tutorial/blank-finauction-view.http b/docs/source/tutorial/blank-finauction-view.http deleted file mode 100644 index 6166dde..0000000 --- a/docs/source/tutorial/blank-finauction-view.http +++ /dev/null @@ -1,94 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": { - "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", - "enquiryPeriod": { - "startDate": "2017-11-30T16:56:23.942831+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", - "procuringEntity": { - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - }, - "owner": "broker", - "id": "73e1598288054eb98e8153ee9e69bb28", - "eligibilityCriteria_ru": "К участию допускаются только лицензированные финансовые учреждения.", - "title": "футляри до державних нагород", - "tenderAttempts": 1, - "eligibilityCriteria_en": "Only licensed financial institutions are eligible to participate.", - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:23.946137+02:00", - "status": "active.tendering", - "eligibilityCriteria": "До участі допускаються лише ліцензовані фінансові установи.", - "tenderPeriod": { - "startDate": "2017-11-30T16:56:23.942831+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" - }, - "procurementMethodType": "dgfFinancialAssets", - "dgfID": "219560", - "date": "2017-11-30T16:56:23.942831+02:00", - "minimalStep": { - "currency": "UAH", - "amount": 35.0, - "valueAddedTaxIncluded": true - }, - "items": [ - { - "description": "Земля для військовослужбовців", - "classification": { - "scheme": "CPV", - "description": "Земельні ділянки", - "id": "66113000-5" - }, - "address": { - "postalCode": "79000", - "countryName": "Україна", - "streetAddress": "вул. Банкова 1", - "region": "м. Київ", - "locality": "м. Київ" - }, - "id": "e16351a78632484e8756b1dea38e6201", - "unit": { - "code": "44617100-9", - "name": "item" - }, - "quantity": 5 - } - ], - "value": { - "currency": "UAH", - "amount": 100.0, - "valueAddedTaxIncluded": true - }, - "awardCriteria": "highestCost" - } -} - diff --git a/docs/source/tutorial/finbidder-documents.http b/docs/source/tutorial/finbidder-documents.http deleted file mode 100644 index b073d4e..0000000 --- a/docs/source/tutorial/finbidder-documents.http +++ /dev/null @@ -1,24 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents?acc_token=b6c5e3c4087848a08703ae24889033a7 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": [ - { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents/523bf2858a644c37bb188b696ae1ee65?download=9d26f2842ae149228d379eb98961e054", - "title": "FinancialLicense.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.486255+02:00", - "documentType": "financialLicense", - "dateModified": "2017-11-30T16:56:24.486283+02:00", - "id": "523bf2858a644c37bb188b696ae1ee65" - } - ] -} - diff --git a/docs/source/tutorial/initial-finauction-listing.http b/docs/source/tutorial/initial-finauction-listing.http deleted file mode 100644 index d703548..0000000 --- a/docs/source/tutorial/initial-finauction-listing.http +++ /dev/null @@ -1,22 +0,0 @@ -GET /api/2.3/auctions HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "next_page": { - "path": "/api/2.3/auctions?offset=2017-11-30T16%3A56%3A23.946137%2B02%3A00", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=2017-11-30T16%3A56%3A23.946137%2B02%3A00", - "offset": "2017-11-30T16:56:23.946137+02:00" - }, - "data": [ - { - "id": "73e1598288054eb98e8153ee9e69bb28", - "dateModified": "2017-11-30T16:56:23.946137+02:00" - } - ] -} - diff --git a/docs/source/tutorial/register-2nd-finbidder.http b/docs/source/tutorial/register-2nd-finbidder.http deleted file mode 100644 index e1f70dd..0000000 --- a/docs/source/tutorial/register-2nd-finbidder.http +++ /dev/null @@ -1,96 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1004 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "qualified": true, - "tenderers": [ - { - "additionalIdentifiers": [ - { - "scheme": "UA-FIN", - "id": "А01 457213" - } - ], - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "countryName": "Україна", - "postalCode": "01220", - "region": "м. Київ", - "streetAddress": "вул. Банкова, 11, корпус 1", - "locality": "м. Київ" - } - } - ], - "value": { - "currency": "UAH", - "amount": 479, - "valueAddedTaxIncluded": true - }, - "eligible": true - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/afc000ac87e642d8b70141957772cdb8 - -{ - "access": { - "token": "47bbd4a1e6f9460b94cea52301caca48" - }, - "data": { - "status": "active", - "eligible": true, - "value": { - "currency": "UAH", - "amount": 479.0, - "valueAddedTaxIncluded": true - }, - "date": "2017-11-30T16:56:24.588843+02:00", - "qualified": true, - "tenderers": [ - { - "additionalIdentifiers": [ - { - "scheme": "UA-FIN", - "id": "А01 457213" - } - ], - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - } - ], - "owner": "broker", - "id": "afc000ac87e642d8b70141957772cdb8" - } -} - diff --git a/docs/source/tutorial/register-finbidder.http b/docs/source/tutorial/register-finbidder.http deleted file mode 100644 index d5a2999..0000000 --- a/docs/source/tutorial/register-finbidder.http +++ /dev/null @@ -1,96 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1004 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "qualified": true, - "tenderers": [ - { - "additionalIdentifiers": [ - { - "scheme": "UA-FIN", - "id": "А01 457213" - } - ], - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "countryName": "Україна", - "postalCode": "01220", - "region": "м. Київ", - "streetAddress": "вул. Банкова, 11, корпус 1", - "locality": "м. Київ" - } - } - ], - "value": { - "currency": "UAH", - "amount": 469, - "valueAddedTaxIncluded": true - }, - "eligible": true - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca - -{ - "access": { - "token": "b6c5e3c4087848a08703ae24889033a7" - }, - "data": { - "status": "active", - "eligible": true, - "value": { - "currency": "UAH", - "amount": 469.0, - "valueAddedTaxIncluded": true - }, - "date": "2017-11-30T16:56:24.381299+02:00", - "qualified": true, - "tenderers": [ - { - "additionalIdentifiers": [ - { - "scheme": "UA-FIN", - "id": "А01 457213" - } - ], - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - } - ], - "owner": "broker", - "id": "c7a52fb296b143cc87728f74b2585fca" - } -} - diff --git a/docs/source/tutorial/upload-finauction-notice.http b/docs/source/tutorial/upload-finauction-notice.http deleted file mode 100644 index 0d78aba..0000000 --- a/docs/source/tutorial/upload-finauction-notice.http +++ /dev/null @@ -1,37 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents?acc_token=6c03609dd6844e42bc1318fddf20c937 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 412 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "title": "Notice.pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=QCihV3O02wIHwqfKrwHkYdZ4jtSlChjb8EKFrnRDwr6fv1qdAOmQ7Id6vM0vCWQaWvv4%2FPpEwTE4DYGWUECgAQ%3D%3D", - "format": "application/pdf", - "documentType": "technicalSpecifications" - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/74e4e4b7624d420b8448a6220e0a86cf - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=Cqo%2Fl%2FHX9fy29aZ4TPnu9LB6ZtHdt6tquLKAJIGPLchoAf4OTMDnRAqLTeQK8rW9jgzFQ6I9HGfJtUP8i3gKDA%253D%253D", - "title": "Notice.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.108881+02:00", - "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:24.108911+02:00", - "id": "74e4e4b7624d420b8448a6220e0a86cf" - } -} - diff --git a/docs/source/tutorial/upload-finbid-financial-license.http b/docs/source/tutorial/upload-finbid-financial-license.http deleted file mode 100644 index c432e51..0000000 --- a/docs/source/tutorial/upload-finbid-financial-license.http +++ /dev/null @@ -1,35 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents?acc_token=b6c5e3c4087848a08703ae24889033a7 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 381 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9d26f2842ae149228d379eb98961e054?KeyID=c822be4a&Signature=GihlzLpKCv%2Fv86BLw%2Fn8wAMDJhbuncQkvQpe68VIyD15Z0MfPipOfda9ENxJNDZ3ygf%2B%2F8%2Fv6AypQlORVmLoDw%3D%3D", - "title": "FinancialLicense.pdf", - "format": "application/pdf", - "hash": "md5:00000000000000000000000000000000", - "documentType": "financialLicense" - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents/523bf2858a644c37bb188b696ae1ee65 - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents/523bf2858a644c37bb188b696ae1ee65?download=9d26f2842ae149228d379eb98961e054", - "title": "FinancialLicense.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.486255+02:00", - "documentType": "financialLicense", - "dateModified": "2017-11-30T16:56:24.486283+02:00", - "id": "523bf2858a644c37bb188b696ae1ee65" - } -} - From 9604e433909f07be131ca1fb0df8bb4087f2ce60 Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Tue, 29 May 2018 11:28:48 +0300 Subject: [PATCH 08/14] Regenerate tutorial requests --- docs/source/tutorial/activate-bidder.http | 15 +- docs/source/tutorial/active-cancellation.http | 31 +-- .../add-asset-familiarization-document.http | 19 +- docs/source/tutorial/answer-question.http | 15 +- docs/source/tutorial/ask-question.http | 17 +- .../auction-contract-get-documents-again.http | 23 +- .../auction-contract-get-documents.http | 15 +- .../tutorial/auction-contract-period.http | 46 ++-- .../tutorial/auction-contract-sign.http | 62 +++-- .../auction-contract-upload-document.http | 23 +- ...ction-contract-upload-second-document.http | 23 +- docs/source/tutorial/auction-documents-2.http | 23 +- docs/source/tutorial/auction-documents-3.http | 23 +- docs/source/tutorial/auction-documents-4.http | 31 +-- docs/source/tutorial/auction-documents-5.http | 47 ++-- docs/source/tutorial/auction-documents-6.http | 53 +++-- docs/source/tutorial/auction-documents.http | 15 +- .../tutorial/auction-listing-after-patch.http | 23 +- ...auction-listing-after-procuringEntity.http | 17 +- docs/source/tutorial/auction-listing.http | 11 +- docs/source/tutorial/auction-patch-2pc.http | 64 +++-- docs/source/tutorial/auction-post-2pc.http | 113 ++++++--- .../tutorial/auction-post-acceleration.http | 123 ++++++---- .../auction-post-attempt-json-data.http | 111 ++++++--- .../tutorial/auction-post-attempt-json.http | 13 +- .../source/tutorial/auction-post-attempt.http | 11 +- docs/source/tutorial/auction-url.http | 122 ++++++---- .../tutorial/bidder-auction-protocol.http | 27 ++- docs/source/tutorial/bidder-documents.http | 15 +- .../tutorial/bidder-participation-url.http | 21 +- .../tutorial/bidder2-participation-url.http | 13 +- docs/source/tutorial/blank-auction-view.http | 59 +++-- .../tutorial/confirm-qualification.http | 57 ++--- .../create-auction-procuringEntity.http | 222 +++++++++++------- docs/source/tutorial/get-answer.http | 11 +- docs/source/tutorial/get-awards.http | 35 +-- .../tutorial/initial-auction-listing.http | 20 +- docs/source/tutorial/list-question.http | 11 +- ...f-rectification-period-editing-denied.http | 43 ++-- .../tutorial/owner-auction-protocol.http | 27 ++- docs/source/tutorial/patch-cancellation.http | 19 +- .../tutorial/patch-items-value-periods.http | 66 ++++-- .../source/tutorial/prepare-cancellation.http | 17 +- docs/source/tutorial/register-2nd-bidder.http | 19 +- docs/source/tutorial/register-bidder.http | 19 +- .../tenderperiod-validation-error.http | 36 ++- .../tutorial/update-award-criteria.http | 21 +- .../tutorial/update-cancellation-doc.http | 21 +- .../tutorial/upload-auction-notice.http | 23 +- .../tutorial/upload-award-criteria.http | 23 +- docs/source/tutorial/upload-bid-proposal.http | 23 +- .../tutorial/upload-cancellation-doc.http | 23 +- .../upload-first-auction-illustration.http | 23 +- .../upload-second-auction-illustration.http | 23 +- .../upload-third-auction-illustration.http | 23 +- docs/source/tutorial/verify-protocol.http | 55 ++--- 56 files changed, 1215 insertions(+), 869 deletions(-) diff --git a/docs/source/tutorial/activate-bidder.http b/docs/source/tutorial/activate-bidder.http index f5d8b82..ab6ed3d 100644 --- a/docs/source/tutorial/activate-bidder.http +++ b/docs/source/tutorial/activate-bidder.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4?acc_token=a94a2b6627aa46f3bbb83ff885e3beae HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 30 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4?acc_token=650aaa4270024deaac41cb856120c3c5 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 30 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,7 +12,8 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -22,7 +23,7 @@ Content-Type: application/json; charset=UTF-8 "amount": 500.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:26.821209+02:00", + "date": "2018-05-28T19:03:05.400869+03:00", "qualified": true, "tenderers": [ { @@ -47,7 +48,7 @@ Content-Type: application/json; charset=UTF-8 } ], "owner": "broker", - "id": "afaa508128da4829b9202fe300965bf4" + "id": "4ed57eda57b941399523f19f03b9ada4" } } diff --git a/docs/source/tutorial/active-cancellation.http b/docs/source/tutorial/active-cancellation.http index 0c30cd7..79b278c 100644 --- a/docs/source/tutorial/active-cancellation.http +++ b/docs/source/tutorial/active-cancellation.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 30 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 30 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,7 +12,8 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -22,29 +23,29 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "Changed description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/02dd9977d20e4b409d307bc67ee6ca36?KeyID=8473a74a&Signature=5WtHn%252BXf4U2eKnBY5mwdZNifHaf%2FMoApsRroJSOzQBI%252BdJ5ZwCkP%252BTZmjkZ%2FDOh1M4U5JY7u1MJE8%252Bp7YQOSBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/7fad0841b4c04a34a0781b5d9df39299?KeyID=7149c8cc&Signature=eUJfguREMN77TKqJoyrlz%2FApEeUDvgZU9XhPBnaBegBMH8jSxwBRpzwr87dhEd3bK16kfFwoUn3JVSWqae6OAA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:29.945720+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.723479+03:00", + "id": "45baf4951469459394de757f4c50b394" }, { "hash": "md5:00000000000000000000000000000000", "description": "Changed description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1981cae19a6d4577bf343cf0b7d813f5?KeyID=8473a74a&Signature=6PDYxf6GgOgkJuoH%2FR4qtBFHx%2FEcXKpV9NJ0lWVPu7IBKLdQ8%252ByiK5kIQk5YZ9aebaDik0e4JNDdJihcZVA%252BBg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f3b6995285c4491db7d8df528e48aeb4?KeyID=7149c8cc&Signature=V21tF8lhwqSmzPprBLYz8aNyWVvyDYsRc5wzBCakSQ8y6l3iCExbaMwc954xcldHZjLdRT54YkBNR1obYBMtCw%253D%253D", "title": "Notice-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:30.284752+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.960503+03:00", + "id": "45baf4951469459394de757f4c50b394" } ], "reason": "cancellation reason", - "date": "2017-11-30T16:56:30.483484+02:00", + "date": "2018-05-28T19:03:08.092234+03:00", "cancellationOf": "tender", - "id": "3fd26d96a4454abf9a875bef110dba4e" + "id": "5b7b7e9fbe0340f5ad88eccc7ced1c51" } } diff --git a/docs/source/tutorial/add-asset-familiarization-document.http b/docs/source/tutorial/add-asset-familiarization-document.http index d23f4b7..845d056 100644 --- a/docs/source/tutorial/add-asset-familiarization-document.http +++ b/docs/source/tutorial/add-asset-familiarization-document.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 160 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 160 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -14,8 +14,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/b31139eea309435592a725e115dc90ed +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/f08b3a9250ab4539b492080a538da808 +X-Content-Type-Options: nosniff { "data": { @@ -23,10 +24,10 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "format": "offline/on-site-examination", "accessDetails": "Familiar with asset: days, time, address", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.520040+02:00", + "datePublished": "2018-05-28T19:03:05.169280+03:00", "documentType": "x_dgfAssetFamiliarization", - "dateModified": "2017-11-30T16:56:26.520067+02:00", - "id": "b31139eea309435592a725e115dc90ed" + "dateModified": "2018-05-28T19:03:05.169300+03:00", + "id": "f08b3a9250ab4539b492080a538da808" } } diff --git a/docs/source/tutorial/answer-question.http b/docs/source/tutorial/answer-question.http index ab98065..e193b8a 100644 --- a/docs/source/tutorial/answer-question.http +++ b/docs/source/tutorial/answer-question.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions/e966c8cdacc14655907b34713b141d18?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 162 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions/22c3e98b31fd4c50bab5639de0668f1c?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 162 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,15 +12,16 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "description": "Просимо додати таблицю потрібної калорійності харчування", "title": "Калорійність", - "date": "2017-11-30T16:56:26.610507+02:00", + "date": "2018-05-28T19:03:05.241690+03:00", "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", - "id": "e966c8cdacc14655907b34713b141d18", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } } diff --git a/docs/source/tutorial/ask-question.http b/docs/source/tutorial/ask-question.http index 0ff5ede..ad261ac 100644 --- a/docs/source/tutorial/ask-question.http +++ b/docs/source/tutorial/ask-question.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1506 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 1506 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -34,8 +34,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions/e966c8cdacc14655907b34713b141d18 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions/22c3e98b31fd4c50bab5639de0668f1c +X-Content-Type-Options: nosniff { "data": { @@ -62,8 +63,8 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "locality": "м. Вінниця" } }, - "date": "2017-11-30T16:56:26.610507+02:00", - "id": "e966c8cdacc14655907b34713b141d18", + "date": "2018-05-28T19:03:05.241690+03:00", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } } diff --git a/docs/source/tutorial/auction-contract-get-documents-again.http b/docs/source/tutorial/auction-contract-get-documents-again.http index 9b908eb..123af14 100644 --- a/docs/source/tutorial/auction-contract-get-documents-again.http +++ b/docs/source/tutorial/auction-contract-get-documents-again.http @@ -1,32 +1,33 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=JQHt0PL4w47AD3VLzHc10HkPeKF1%252BHLSabNSU66N7xOOgzeZ5ABgvszpMW%252Bf1dAvGCTqIVBaD2EYUV1iUuYZAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=%2FPNXKssC1k3uSmpkRC5HNRsKm%2FqqhKJCfz7iGpg4NvXw5zpliC1cbosi9mcf5XA%252BAYoV7%2FVHlpyb1tY7n%2FS0Dw%253D%253D", "title": "contract_first_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.913379+02:00", - "dateModified": "2017-11-30T16:56:28.913410+02:00", - "id": "1702fe06543e4c10b6f0bcb0aa694e8c" + "datePublished": "2018-05-28T19:03:06.977922+03:00", + "dateModified": "2018-05-28T19:03:06.977944+03:00", + "id": "8f222525b9e14ddcbc45f735d686ec53" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4d1df678191e499cbb764244f4469b22?KeyID=8473a74a&Signature=jAmAX7MaWviKJdsUEYM2RR8oXbt8vNobcDP6zqadHWj%252BoQKkUnjVwDry6HmSExDU7DJCqVN9ReLo4mMzNmibBQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/56888ce263254954812bd739c579b282?KeyID=7149c8cc&Signature=KpqYmCHeGiflvKB6J6m36no4so%2FXztSIKeEsGa2e1QwOZZVYoxXKwVuL0oIqLDmJDY1eCeM2NJ2fd5qOvgHnCw%253D%253D", "title": "contract_second_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.118456+02:00", - "dateModified": "2017-11-30T16:56:29.118484+02:00", - "id": "5c42650d4e074aae85732d8655eec1b7" + "datePublished": "2018-05-28T19:03:07.239455+03:00", + "dateModified": "2018-05-28T19:03:07.239484+03:00", + "id": "8b9fef12b1bf4667aea993380a35f276" } ] } diff --git a/docs/source/tutorial/auction-contract-get-documents.http b/docs/source/tutorial/auction-contract-get-documents.http index 74fa6c8..5196782 100644 --- a/docs/source/tutorial/auction-contract-get-documents.http +++ b/docs/source/tutorial/auction-contract-get-documents.http @@ -1,22 +1,23 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=JQHt0PL4w47AD3VLzHc10HkPeKF1%252BHLSabNSU66N7xOOgzeZ5ABgvszpMW%252Bf1dAvGCTqIVBaD2EYUV1iUuYZAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=%2FPNXKssC1k3uSmpkRC5HNRsKm%2FqqhKJCfz7iGpg4NvXw5zpliC1cbosi9mcf5XA%252BAYoV7%2FVHlpyb1tY7n%2FS0Dw%253D%253D", "title": "contract_first_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.913379+02:00", - "dateModified": "2017-11-30T16:56:28.913410+02:00", - "id": "1702fe06543e4c10b6f0bcb0aa694e8c" + "datePublished": "2018-05-28T19:03:06.977922+03:00", + "dateModified": "2018-05-28T19:03:06.977944+03:00", + "id": "8f222525b9e14ddcbc45f735d686ec53" } ] } diff --git a/docs/source/tutorial/auction-contract-period.http b/docs/source/tutorial/auction-contract-period.http index 114401d..3386fda 100644 --- a/docs/source/tutorial/auction-contract-period.http +++ b/docs/source/tutorial/auction-contract-period.http @@ -1,21 +1,22 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 106 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 106 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { "period": { - "startDate": "2017-11-30T16:56:17.205813", - "endDate": "2018-11-30T16:56:17.205813" + "startDate": "2018-05-28T19:02:59.179463", + "endDate": "2019-05-28T19:02:59.179463" } } } 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -24,10 +25,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -35,12 +43,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "suppliers": [ @@ -66,18 +78,18 @@ Content-Type: application/json; charset=UTF-8 } ], "period": { - "startDate": "2017-11-30T16:56:17.205813+02:00", - "endDate": "2018-11-30T16:56:17.205813+02:00" + "startDate": "2018-05-28T19:02:59.179463+03:00", + "endDate": "2019-05-28T19:02:59.179463+03:00" }, "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:28.528529+02:00", - "awardID": "add0cbb7aa114e7cb6f5e127071f8b53", - "id": "ada81c2080f143a387863faae3db1f81", - "contractID": "UA-PS-2017-11-30-000001-1" + "date": "2018-05-28T19:03:06.703749+03:00", + "awardID": "708d3fdf13ac4868b0df09cf479ceb06", + "id": "1bb4e628954a47f3a89125866c880f00", + "contractID": "UA-EA-2018-05-28-000001-1" } } diff --git a/docs/source/tutorial/auction-contract-sign.http b/docs/source/tutorial/auction-contract-sign.http index 5deddf5..2e3cbba 100644 --- a/docs/source/tutorial/auction-contract-sign.http +++ b/docs/source/tutorial/auction-contract-sign.http @@ -1,19 +1,20 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 80 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 80 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { "status": "active", - "dateSigned": "2017-11-30T16:56:29.280738+02:00" + "dateSigned": "2018-05-28T19:03:07.364097+03:00" } } 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -22,32 +23,39 @@ Content-Type: application/json; charset=UTF-8 { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=JQHt0PL4w47AD3VLzHc10HkPeKF1%252BHLSabNSU66N7xOOgzeZ5ABgvszpMW%252Bf1dAvGCTqIVBaD2EYUV1iUuYZAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=%2FPNXKssC1k3uSmpkRC5HNRsKm%2FqqhKJCfz7iGpg4NvXw5zpliC1cbosi9mcf5XA%252BAYoV7%2FVHlpyb1tY7n%2FS0Dw%253D%253D", "title": "contract_first_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.913379+02:00", - "dateModified": "2017-11-30T16:56:28.913410+02:00", - "id": "1702fe06543e4c10b6f0bcb0aa694e8c" + "datePublished": "2018-05-28T19:03:06.977922+03:00", + "dateModified": "2018-05-28T19:03:06.977944+03:00", + "id": "8f222525b9e14ddcbc45f735d686ec53" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4d1df678191e499cbb764244f4469b22?KeyID=8473a74a&Signature=jAmAX7MaWviKJdsUEYM2RR8oXbt8vNobcDP6zqadHWj%252BoQKkUnjVwDry6HmSExDU7DJCqVN9ReLo4mMzNmibBQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/56888ce263254954812bd739c579b282?KeyID=7149c8cc&Signature=KpqYmCHeGiflvKB6J6m36no4so%2FXztSIKeEsGa2e1QwOZZVYoxXKwVuL0oIqLDmJDY1eCeM2NJ2fd5qOvgHnCw%253D%253D", "title": "contract_second_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.118456+02:00", - "dateModified": "2017-11-30T16:56:29.118484+02:00", - "id": "5c42650d4e074aae85732d8655eec1b7" + "datePublished": "2018-05-28T19:03:07.239455+03:00", + "dateModified": "2018-05-28T19:03:07.239484+03:00", + "id": "8b9fef12b1bf4667aea993380a35f276" } ], "items": [ { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -55,12 +63,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "suppliers": [ @@ -86,19 +98,19 @@ Content-Type: application/json; charset=UTF-8 } ], "period": { - "startDate": "2017-11-30T16:56:17.205813+02:00", - "endDate": "2018-11-30T16:56:17.205813+02:00" + "startDate": "2018-05-28T19:02:59.179463+03:00", + "endDate": "2019-05-28T19:02:59.179463+03:00" }, + "dateSigned": "2018-05-28T19:03:07.364097+03:00", "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "dateSigned": "2017-11-30T16:56:29.280738+02:00", - "date": "2017-11-30T16:56:29.382454+02:00", - "awardID": "add0cbb7aa114e7cb6f5e127071f8b53", - "id": "ada81c2080f143a387863faae3db1f81", - "contractID": "UA-PS-2017-11-30-000001-1" + "date": "2018-05-28T19:03:07.435336+03:00", + "awardID": "708d3fdf13ac4868b0df09cf479ceb06", + "id": "1bb4e628954a47f3a89125866c880f00", + "contractID": "UA-EA-2018-05-28-000001-1" } } diff --git a/docs/source/tutorial/auction-contract-upload-document.http b/docs/source/tutorial/auction-contract-upload-document.http index 2d57e46..d096751 100644 --- a/docs/source/tutorial/auction-contract-upload-document.http +++ b/docs/source/tutorial/auction-contract-upload-document.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 357 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 355 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=Ndscn5Uq%2Bs%2BeHLny6kCKT3nDq1M6MVzfBivwV%2FXJduW%2B5%2FpdvbQHPew9U9II8HSPns9p2S7vEM3CtUBL91%2B2Dg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=U6HrR84xXcKt0c2g4n9Pwdx%2FW9dJ5oqi%2F%2B9VxKgBbAJepX%2FtILhYTbvr9%2FvoPGv0pg6z83Pr2g6SYSLeU7kmCg%3D%3D", "title": "contract_first_document.doc", "hash": "md5:00000000000000000000000000000000", "format": "application/msword" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents/1702fe06543e4c10b6f0bcb0aa694e8c +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents/8f222525b9e14ddcbc45f735d686ec53 +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=JQHt0PL4w47AD3VLzHc10HkPeKF1%252BHLSabNSU66N7xOOgzeZ5ABgvszpMW%252Bf1dAvGCTqIVBaD2EYUV1iUuYZAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=%2FPNXKssC1k3uSmpkRC5HNRsKm%2FqqhKJCfz7iGpg4NvXw5zpliC1cbosi9mcf5XA%252BAYoV7%2FVHlpyb1tY7n%2FS0Dw%253D%253D", "title": "contract_first_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.913379+02:00", - "dateModified": "2017-11-30T16:56:28.913410+02:00", - "id": "1702fe06543e4c10b6f0bcb0aa694e8c" + "datePublished": "2018-05-28T19:03:06.977922+03:00", + "dateModified": "2018-05-28T19:03:06.977944+03:00", + "id": "8f222525b9e14ddcbc45f735d686ec53" } } diff --git a/docs/source/tutorial/auction-contract-upload-second-document.http b/docs/source/tutorial/auction-contract-upload-second-document.http index 3e6ecc1..6ef17ee 100644 --- a/docs/source/tutorial/auction-contract-upload-second-document.http +++ b/docs/source/tutorial/auction-contract-upload-second-document.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 350 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 356 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4d1df678191e499cbb764244f4469b22?KeyID=8473a74a&Signature=PIMLosfRw8Ru4sWIwgpHMjPorBzBQnIcamxeDNhK7vK%2F9dLDNtYYRfBrrEqaWzmb%2Bq5jApq1Pn2mUSQcS6pgAg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/56888ce263254954812bd739c579b282?KeyID=7149c8cc&Signature=S%2FVHOWx0lc1%2BJlUgmMZkAYjacJEABqxnKKhAbUiO7Or%2BtQ7AZk7EDGW%2F8I%2FfKw869qA5Wq3ogtEQC7ZEtACFAg%3D%3D", "title": "contract_second_document.doc", "hash": "md5:00000000000000000000000000000000", "format": "application/msword" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents/5c42650d4e074aae85732d8655eec1b7 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents/8b9fef12b1bf4667aea993380a35f276 +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4d1df678191e499cbb764244f4469b22?KeyID=8473a74a&Signature=jAmAX7MaWviKJdsUEYM2RR8oXbt8vNobcDP6zqadHWj%252BoQKkUnjVwDry6HmSExDU7DJCqVN9ReLo4mMzNmibBQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/56888ce263254954812bd739c579b282?KeyID=7149c8cc&Signature=KpqYmCHeGiflvKB6J6m36no4so%2FXztSIKeEsGa2e1QwOZZVYoxXKwVuL0oIqLDmJDY1eCeM2NJ2fd5qOvgHnCw%253D%253D", "title": "contract_second_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.118456+02:00", - "dateModified": "2017-11-30T16:56:29.118484+02:00", - "id": "5c42650d4e074aae85732d8655eec1b7" + "datePublished": "2018-05-28T19:03:07.239455+03:00", + "dateModified": "2018-05-28T19:03:07.239484+03:00", + "id": "8b9fef12b1bf4667aea993380a35f276" } } diff --git a/docs/source/tutorial/auction-documents-2.http b/docs/source/tutorial/auction-documents-2.http index 5073593..a47ce18 100644 --- a/docs/source/tutorial/auction-documents-2.http +++ b/docs/source/tutorial/auction-documents-2.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,23 +13,23 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/68fe48f4593a4de9844e6548344b2696?KeyID=8473a74a&Signature=QZwWxRCYJDGM8BwdJ%252Bh%2FZ7EfjK1tSuHstIWY7Phw8MUeywT2GsNNucpnf2UGZGud5EPLKF1xOz9hX%252BWHtaSeBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/42f468f963964ac0883313db87abc294?KeyID=7149c8cc&Signature=XRuGZP2eAk2I7vRsPppBUKCGQWoWEcTdD7Cn%2FQJFqHsAzhj5y9yj75Af3iKYenLWwy01%2Fj7A4jHQR%252BZkIbI4CA%253D%253D", "title": "AwardCriteria.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.157192+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.874644+03:00", + "id": "882f19abea9041a2adc123890e947ebb" } ] } diff --git a/docs/source/tutorial/auction-documents-3.http b/docs/source/tutorial/auction-documents-3.http index d9eae88..52563c0 100644 --- a/docs/source/tutorial/auction-documents-3.http +++ b/docs/source/tutorial/auction-documents-3.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,23 +13,23 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" } ] } diff --git a/docs/source/tutorial/auction-documents-4.http b/docs/source/tutorial/auction-documents-4.http index 3db20c7..dfc1bcd 100644 --- a/docs/source/tutorial/auction-documents-4.http +++ b/docs/source/tutorial/auction-documents-4.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,36 +13,36 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "index": 1, "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" } ] } diff --git a/docs/source/tutorial/auction-documents-5.http b/docs/source/tutorial/auction-documents-5.http index c779295..4326d55 100644 --- a/docs/source/tutorial/auction-documents-5.http +++ b/docs/source/tutorial/auction-documents-5.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,62 +13,62 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "index": 1, "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=nXLYMy2OkK2aIJDwV6kn7z3BkQD4wMe1ccc9%252BSvKDcUemJGUcmxtcGPn57JUQ6AJznS4IfCvaHVyDo5Aez7pDA%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=VxN7Lt4LBsnxm4RQWy146688XcEKpVkJ1ofItTIRC55pCuA2oh%2FVxBZRVv%2F0lTC3LXKNmwF%2F78mt68XuuQl4AA%253D%253D", "title": "second_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.376954+02:00", + "datePublished": "2018-05-28T19:03:05.055484+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.376981+02:00", - "id": "eb64e2d0457e42c89aed5861301d3d06" + "dateModified": "2018-05-28T19:03:05.055508+03:00", + "id": "db649c26ced64a8292a91f14c2bd4b59" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=AGnUbHWEz4OOa7kxT1%2Fj4Ml7cNOw%252BcsUiDVX9HQhwqAdi4UGtaxWqeAZ2YhsI20lzMp67Fq%252BUo6jPmWdLdWuAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=08nEK8j1PputzfNx7Db6qC%252BheWVbyrDCG8bFpl25q0ad%252BJD7Woa48SmacTzEhvPel5L3t5%2FCHEgq7jy82bRKCQ%253D%253D", "title": "third_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.434267+02:00", + "datePublished": "2018-05-28T19:03:05.101025+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.434293+02:00", - "id": "fdafece528e54fe5a7b38f025be993c3" + "dateModified": "2018-05-28T19:03:05.101047+03:00", + "id": "2c5c4017cc7d4001864e173fc897ffd1" } ] } diff --git a/docs/source/tutorial/auction-documents-6.http b/docs/source/tutorial/auction-documents-6.http index 68ba735..61d16a6 100644 --- a/docs/source/tutorial/auction-documents-6.http +++ b/docs/source/tutorial/auction-documents-6.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,72 +13,72 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "index": 1, "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=nXLYMy2OkK2aIJDwV6kn7z3BkQD4wMe1ccc9%252BSvKDcUemJGUcmxtcGPn57JUQ6AJznS4IfCvaHVyDo5Aez7pDA%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=VxN7Lt4LBsnxm4RQWy146688XcEKpVkJ1ofItTIRC55pCuA2oh%2FVxBZRVv%2F0lTC3LXKNmwF%2F78mt68XuuQl4AA%253D%253D", "title": "second_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.376954+02:00", + "datePublished": "2018-05-28T19:03:05.055484+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.376981+02:00", - "id": "eb64e2d0457e42c89aed5861301d3d06" + "dateModified": "2018-05-28T19:03:05.055508+03:00", + "id": "db649c26ced64a8292a91f14c2bd4b59" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=AGnUbHWEz4OOa7kxT1%2Fj4Ml7cNOw%252BcsUiDVX9HQhwqAdi4UGtaxWqeAZ2YhsI20lzMp67Fq%252BUo6jPmWdLdWuAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=08nEK8j1PputzfNx7Db6qC%252BheWVbyrDCG8bFpl25q0ad%252BJD7Woa48SmacTzEhvPel5L3t5%2FCHEgq7jy82bRKCQ%253D%253D", "title": "third_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.434267+02:00", + "datePublished": "2018-05-28T19:03:05.101025+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.434293+02:00", - "id": "fdafece528e54fe5a7b38f025be993c3" + "dateModified": "2018-05-28T19:03:05.101047+03:00", + "id": "2c5c4017cc7d4001864e173fc897ffd1" }, { "title": "Familiarization with bank asset", "format": "offline/on-site-examination", "accessDetails": "Familiar with asset: days, time, address", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.520040+02:00", + "datePublished": "2018-05-28T19:03:05.169280+03:00", "documentType": "x_dgfAssetFamiliarization", - "dateModified": "2017-11-30T16:56:26.520067+02:00", - "id": "b31139eea309435592a725e115dc90ed" + "dateModified": "2018-05-28T19:03:05.169300+03:00", + "id": "f08b3a9250ab4539b492080a538da808" } ] } diff --git a/docs/source/tutorial/auction-documents.http b/docs/source/tutorial/auction-documents.http index bfda73c..6460e21 100644 --- a/docs/source/tutorial/auction-documents.http +++ b/docs/source/tutorial/auction-documents.http @@ -1,24 +1,25 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/418d8f99150a4b92a57b81cc18cd968a HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/2bb61a55cf5b4a8386260ac1a4cad34c HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "previousVersions": [], "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" } } diff --git a/docs/source/tutorial/auction-listing-after-patch.http b/docs/source/tutorial/auction-listing-after-patch.http index 6d6b2ae..c68d758 100644 --- a/docs/source/tutorial/auction-listing-after-patch.http +++ b/docs/source/tutorial/auction-listing-after-patch.http @@ -1,24 +1,29 @@ -GET /api/2.3/auctions?opt_pretty=1 HTTP/1.0 +GET /api/2.4/auctions?opt_pretty=1 HTTP/1.0 Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "next_page": { - "path": "/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.873102%2B02%3A00", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.873102%2B02%3A00", - "offset": "2017-11-30T16:56:25.873102+02:00" + "path": "/api/2.4/auctions?offset=2018-05-28T19%3A03%3A04.639566%2B03%3A00", + "uri": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions?offset=2018-05-28T19%3A03%3A04.639566%2B03%3A00", + "offset": "2018-05-28T19:03:04.639566+03:00" }, "data": [ { - "id": "301d66e275cb4861ba502c1eaafa88ae", - "dateModified": "2017-11-30T16:56:25.621767+02:00" + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", + "dateModified": "2018-05-28T19:03:04.492942+03:00" }, { - "id": "dbcc98fdc3f64c6aaabe25f09a2c64d1", - "dateModified": "2017-11-30T16:56:25.873102+02:00" + "id": "e589f73396de4c75bbba0ef0a3a1d971", + "dateModified": "2018-05-28T19:03:04.598947+03:00" + }, + { + "id": "d831b4e9ad7c490f8fb18ebb19a41670", + "dateModified": "2018-05-28T19:03:04.639566+03:00" } ] } diff --git a/docs/source/tutorial/auction-listing-after-procuringEntity.http b/docs/source/tutorial/auction-listing-after-procuringEntity.http index 65b7ba5..454575a 100644 --- a/docs/source/tutorial/auction-listing-after-procuringEntity.http +++ b/docs/source/tutorial/auction-listing-after-procuringEntity.http @@ -1,21 +1,22 @@ -GET /api/2.3/auctions HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "next_page": { - "path": "/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.621767%2B02%3A00", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.621767%2B02%3A00", - "offset": "2017-11-30T16:56:25.621767+02:00" + "path": "/api/2.4/auctions?offset=2018-05-28T19%3A03%3A04.492942%2B03%3A00", + "uri": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions?offset=2018-05-28T19%3A03%3A04.492942%2B03%3A00", + "offset": "2018-05-28T19:03:04.492942+03:00" }, "data": [ { - "id": "301d66e275cb4861ba502c1eaafa88ae", - "dateModified": "2017-11-30T16:56:25.621767+02:00" + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", + "dateModified": "2018-05-28T19:03:04.492942+03:00" } ] } diff --git a/docs/source/tutorial/auction-listing.http b/docs/source/tutorial/auction-listing.http index 68c2d83..744a372 100644 --- a/docs/source/tutorial/auction-listing.http +++ b/docs/source/tutorial/auction-listing.http @@ -1,15 +1,16 @@ -GET /api/2.3/auctions HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "next_page": { - "path": "/api/2.3/auctions?offset=", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=", + "path": "/api/2.4/auctions?offset=", + "uri": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions?offset=", "offset": "" }, "data": [] diff --git a/docs/source/tutorial/auction-patch-2pc.http b/docs/source/tutorial/auction-patch-2pc.http index 4e28b42..0a839fa 100644 --- a/docs/source/tutorial/auction-patch-2pc.http +++ b/docs/source/tutorial/auction-patch-2pc.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/58ad76271332425694531cbfe1aa6723?acc_token=a3781f686544479b9060df012b8db196 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 40 -Content-Type: application/json +PATCH /api/2.4/auctions/3f49ee8f07da45a2a915dbd75ad1f475?acc_token=7b62c6525ece4347bb49f69cc79a4352 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 40 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,18 +12,19 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:19.163266+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", + "next_check": "2018-06-10T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -44,22 +45,32 @@ Content-Type: application/json; charset=UTF-8 } }, "owner": "broker", - "id": "58ad76271332425694531cbfe1aa6723", + "id": "3f49ee8f07da45a2a915dbd75ad1f475", "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:19.212525+02:00", + "dateModified": "2018-05-28T19:03:01.152650+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:19.163266+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" + "shouldStartAfter": "2018-06-11T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:19.212525+02:00", + "date": "2018-05-28T19:03:01.152650+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-05T20:00:00+03:00", + "invalidationDate": "2018-05-28T19:03:01.151212+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -69,10 +80,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -80,12 +98,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "c2fb6cf42caf4621b4bcac1deff95286", + "quantity": 5.001, + "id": "5a3153ba0e4f494497dc66ba58adb135", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/auction-post-2pc.http b/docs/source/tutorial/auction-post-2pc.http index c1fe905..18acbba 100644 --- a/docs/source/tutorial/auction-post-2pc.http +++ b/docs/source/tutorial/auction-post-2pc.http @@ -1,48 +1,64 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1987 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2249 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { "status": "draft", + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-11" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 }, "dgfID": "219560", - "auctionPeriod": { - "startDate": "2017-12-14" - }, "items": [ { + "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, - "quantity": 5, - "description": "Земля для військовослужбовців", - "unit": { - "code": "44617100-9", - "name": "item" - }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", "region": "м. Київ", "streetAddress": "вул. Банкова 1", "locality": "м. Київ" - } + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" + }, + "unit": { + "code": "44617100-9", + "name": "item" + }, + "quantity": 5.001 } ], "procuringEntity": { @@ -69,19 +85,30 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/58ad76271332425694531cbfe1aa6723 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/3f49ee8f07da45a2a915dbd75ad1f475 +X-Content-Type-Options: nosniff { "access": { - "token": "a3781f686544479b9060df012b8db196" + "token": "7b62c6525ece4347bb49f69cc79a4352" }, "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-05T20:00:00+03:00" + }, "tenderPeriod": { - "startDate": "2017-11-30T16:56:19.163266+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-10T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } }, "title": "футляри до державних нагород", "minimalStep": { @@ -89,16 +116,19 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/58ad7627133 "amount": 35.0, "valueAddedTaxIncluded": true }, - "procurementMethodDetails": "quick, accelerator=1440", + "enquiryPeriod": { + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-10T20:00:00+03:00" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100.0, "valueAddedTaxIncluded": true }, "submissionMethod": "electronicAuction", - "date": "2017-11-30T16:56:19.163266+02:00", + "date": "2018-05-28T19:03:01.104878+03:00", "status": "draft", "procuringEntity": { "contactPoint": { @@ -120,20 +150,21 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/58ad7627133 } }, "dgfID": "219560", - "enquiryPeriod": { - "startDate": "2017-11-30T16:56:19.163266+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "owner": "broker", - "dateModified": "2017-11-30T16:56:19.166771+02:00", "items": [ { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -141,15 +172,21 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/58ad7627133 "region": "м. Київ", "locality": "м. Київ" }, - "id": "c2fb6cf42caf4621b4bcac1deff95286", + "quantity": 5.001, + "id": "5a3153ba0e4f494497dc66ba58adb135", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], - "id": "58ad76271332425694531cbfe1aa6723", + "owner": "broker", + "dateModified": "2018-05-28T19:03:01.113778+03:00", + "id": "3f49ee8f07da45a2a915dbd75ad1f475", "awardCriteria": "highestCost" } } diff --git a/docs/source/tutorial/auction-post-acceleration.http b/docs/source/tutorial/auction-post-acceleration.http index ff6b02c..6f6f595 100644 --- a/docs/source/tutorial/auction-post-acceleration.http +++ b/docs/source/tutorial/auction-post-acceleration.http @@ -1,19 +1,27 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 2036 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2262 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-09T19:02:59.179463" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 @@ -37,31 +45,38 @@ Host: api-sandbox.ea.openprocurement.org "locality": "м. Київ" } }, - "submissionMethodDetails": "quick", "mode": "test", - "auctionPeriod": { - "startDate": "2017-11-30T17:01:17.205813" - }, "items": [ { + "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, - "quantity": 5, - "description": "Земля для військовослужбовців", - "unit": { - "code": "44617100-9", - "name": "item" - }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", "region": "м. Київ", "streetAddress": "вул. Банкова 1", "locality": "м. Київ" - } + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" + }, + "unit": { + "code": "44617100-9", + "name": "item" + }, + "quantity": 5.001 } ], "dgfID": "219560" @@ -70,22 +85,23 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/731dc3a4c39a4e0fa97816efac9797d4 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/bacab87b56264568b59082d8ff724cce +X-Content-Type-Options: nosniff { "access": { - "token": "0a74311e81c84f619214161e9a0dd1ef" + "token": "8164da3243104386b02a54665528347a" }, "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:20.188830+02:00", - "endDate": "2017-11-30T17:00:24.652197+02:00" + "startDate": "2018-05-28T19:03:01.837027+03:00", + "endDate": "2018-06-08T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-11-30T17:00:24.652197+02:00", + "next_check": "2018-06-08T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -107,31 +123,51 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/731dc3a4c39 }, "owner": "broker", "title_en": "[TESTING] ", - "id": "731dc3a4c39a4e0fa97816efac9797d4", + "id": "bacab87b56264568b59082d8ff724cce", "title": "[ТЕСТУВАННЯ] футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:20.192610+02:00", + "dateModified": "2018-05-28T19:03:01.845486+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:20.188830+02:00", - "endDate": "2017-11-30T17:00:24.652197+02:00" + "startDate": "2018-05-28T19:03:01.837027+03:00", + "endDate": "2018-06-08T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-11-30T17:00:24.652197+02:00" + "shouldStartAfter": "2018-06-09T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:20.188830+02:00", - "submissionMethodDetails": "quick", + "date": "2018-05-28T19:03:01.837027+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:01.837027+03:00", + "endDate": "2018-06-03T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, + "minimalStep": { + "currency": "UAH", + "amount": 35.0, + "valueAddedTaxIncluded": true + }, "items": [ { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -139,12 +175,16 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/731dc3a4c39 "region": "м. Київ", "locality": "м. Київ" }, - "id": "27e42212d979407a84f6ff1a6ed55e4e", + "quantity": 5.001, + "id": "4b1b5fe3c5b34c589d56658bfef148a9", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { @@ -152,11 +192,6 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/731dc3a4c39 "amount": 100.0, "valueAddedTaxIncluded": true }, - "minimalStep": { - "currency": "UAH", - "amount": 35.0, - "valueAddedTaxIncluded": true - }, "mode": "test", "title_ru": "[ТЕСТИРОВАНИЕ] ", "awardCriteria": "highestCost" diff --git a/docs/source/tutorial/auction-post-attempt-json-data.http b/docs/source/tutorial/auction-post-attempt-json-data.http index 46201e7..2ed8030 100644 --- a/docs/source/tutorial/auction-post-attempt-json-data.http +++ b/docs/source/tutorial/auction-post-attempt-json-data.http @@ -1,47 +1,63 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1968 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2230 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-11" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 }, "dgfID": "219560", - "auctionPeriod": { - "startDate": "2017-12-14" - }, "items": [ { + "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, - "quantity": 5, - "description": "Земля для військовослужбовців", - "unit": { - "code": "44617100-9", - "name": "item" - }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", "region": "м. Київ", "streetAddress": "вул. Банкова 1", "locality": "м. Київ" - } + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" + }, + "unit": { + "code": "44617100-9", + "name": "item" + }, + "quantity": 5.001 } ], "procuringEntity": { @@ -68,22 +84,23 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9 +X-Content-Type-Options: nosniff { "access": { - "token": "ccf4d45ff9524ec9ae87f38c43d7b0a3" + "token": "06bf67377235444180324a6ec7a7b41d" }, "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", + "next_check": "2018-06-10T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -104,22 +121,31 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c } }, "owner": "broker", - "id": "301d66e275cb4861ba502c1eaafa88ae", + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:25.621767+02:00", + "dateModified": "2018-05-28T19:03:04.492942+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" + "shouldStartAfter": "2018-06-11T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:25.617199+02:00", + "date": "2018-05-28T19:03:04.480367+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-05T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -129,10 +155,17 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -140,12 +173,16 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/auction-post-attempt-json.http b/docs/source/tutorial/auction-post-attempt-json.http index 492d538..081b426 100644 --- a/docs/source/tutorial/auction-post-attempt-json.http +++ b/docs/source/tutorial/auction-post-attempt-json.http @@ -1,18 +1,19 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 4 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 4 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org 422 Unprocessable Entity -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "status": "error", "errors": [ { - "description": "Expecting value: line 1 column 1 (char 0)", + "description": "Expecting value: line 1 column 1 (char 0)", "location": "body", "name": "data" } diff --git a/docs/source/tutorial/auction-post-attempt.http b/docs/source/tutorial/auction-post-attempt.http index 8ff9d41..cf078b4 100644 --- a/docs/source/tutorial/auction-post-attempt.http +++ b/docs/source/tutorial/auction-post-attempt.http @@ -1,12 +1,13 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 4 -Content-Type: application/x-www-form-urlencoded +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 4 +Content-Type: application/x-www-form-urlencoded Host: api-sandbox.ea.openprocurement.org 415 Unsupported Media Type -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "status": "error", diff --git a/docs/source/tutorial/auction-url.http b/docs/source/tutorial/auction-url.http index 9c5fb7b..d7a61df 100644 --- a/docs/source/tutorial/auction-url.http +++ b/docs/source/tutorial/auction-url.http @@ -1,22 +1,23 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9 HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", - "auctionUrl": "http://auction-sandbox.openprocurement.org/auctions/301d66e275cb4861ba502c1eaafa88ae", + "auctionID": "UA-EA-2018-05-28-000001", + "auctionUrl": "http://auction-sandbox.openprocurement.org/auctions/246d20f56b0a4601bd4b5ddd3ac636e9", "enquiryPeriod": { - "startDate": "2017-11-23T16:56:17.202736+02:00", - "endDate": "2017-11-30T16:56:17.202736+02:00" + "startDate": "2018-05-21T19:02:58.713827+03:00", + "endDate": "2018-05-28T19:02:58.713827+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-11-30T17:40:17.202736+02:00", + "next_check": "2018-05-28T19:46:58.713827+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -40,113 +41,123 @@ Content-Type: application/json; charset=UTF-8 { "description": "Просимо додати таблицю потрібної калорійності харчування", "title": "Калорійність", - "date": "2017-11-30T16:56:26.610507+02:00", + "date": "2018-05-28T19:03:05.241690+03:00", "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", - "id": "e966c8cdacc14655907b34713b141d18", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } ], "owner": "broker", - "id": "301d66e275cb4861ba502c1eaafa88ae", + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", "documents": [ { "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/68fe48f4593a4de9844e6548344b2696?KeyID=8473a74a&Signature=QZwWxRCYJDGM8BwdJ%252Bh%2FZ7EfjK1tSuHstIWY7Phw8MUeywT2GsNNucpnf2UGZGud5EPLKF1xOz9hX%252BWHtaSeBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/42f468f963964ac0883313db87abc294?KeyID=7149c8cc&Signature=XRuGZP2eAk2I7vRsPppBUKCGQWoWEcTdD7Cn%2FQJFqHsAzhj5y9yj75Af3iKYenLWwy01%2Fj7A4jHQR%252BZkIbI4CA%253D%253D", "title": "AwardCriteria.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.157192+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.874644+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "index": 1, "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=nXLYMy2OkK2aIJDwV6kn7z3BkQD4wMe1ccc9%252BSvKDcUemJGUcmxtcGPn57JUQ6AJznS4IfCvaHVyDo5Aez7pDA%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=VxN7Lt4LBsnxm4RQWy146688XcEKpVkJ1ofItTIRC55pCuA2oh%2FVxBZRVv%2F0lTC3LXKNmwF%2F78mt68XuuQl4AA%253D%253D", "title": "second_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.376954+02:00", + "datePublished": "2018-05-28T19:03:05.055484+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.376981+02:00", - "id": "eb64e2d0457e42c89aed5861301d3d06" + "dateModified": "2018-05-28T19:03:05.055508+03:00", + "id": "db649c26ced64a8292a91f14c2bd4b59" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=AGnUbHWEz4OOa7kxT1%2Fj4Ml7cNOw%252BcsUiDVX9HQhwqAdi4UGtaxWqeAZ2YhsI20lzMp67Fq%252BUo6jPmWdLdWuAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=08nEK8j1PputzfNx7Db6qC%252BheWVbyrDCG8bFpl25q0ad%252BJD7Woa48SmacTzEhvPel5L3t5%2FCHEgq7jy82bRKCQ%253D%253D", "title": "third_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.434267+02:00", + "datePublished": "2018-05-28T19:03:05.101025+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.434293+02:00", - "id": "fdafece528e54fe5a7b38f025be993c3" + "dateModified": "2018-05-28T19:03:05.101047+03:00", + "id": "2c5c4017cc7d4001864e173fc897ffd1" }, { "title": "Familiarization with bank asset", "format": "offline/on-site-examination", "accessDetails": "Familiar with asset: days, time, address", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.520040+02:00", + "datePublished": "2018-05-28T19:03:05.169280+03:00", "documentType": "x_dgfAssetFamiliarization", - "dateModified": "2017-11-30T16:56:26.520067+02:00", - "id": "b31139eea309435592a725e115dc90ed" + "dateModified": "2018-05-28T19:03:05.169300+03:00", + "id": "f08b3a9250ab4539b492080a538da808" } ], "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:27.371645+02:00", + "dateModified": "2018-05-28T19:03:05.823039+03:00", "status": "active.auction", "tenderPeriod": { - "startDate": "2017-11-23T16:56:17.202736+02:00", - "endDate": "2017-11-30T16:56:17.202736+02:00" + "startDate": "2018-05-21T19:02:58.713827+03:00", + "endDate": "2018-05-28T19:02:58.713827+03:00" }, "auctionPeriod": { - "startDate": "2017-11-30T16:56:17.202736+02:00", - "shouldStartAfter": "2017-12-01T00:00:00+02:00" + "startDate": "2018-05-28T19:02:58.713827+03:00", + "shouldStartAfter": "2018-05-29T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:25.617199+02:00", + "date": "2018-05-28T19:03:04.480367+03:00", + "rectificationPeriod": { + "startDate": "2018-05-21T19:02:58.713827+03:00", + "endDate": "2018-05-22T19:02:58.713827+03:00", + "invalidationDate": "2018-05-28T19:03:05.169439+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -156,10 +167,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -167,12 +185,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/bidder-auction-protocol.http b/docs/source/tutorial/bidder-auction-protocol.http index cf6b551..5fa6d4c 100644 --- a/docs/source/tutorial/bidder-auction-protocol.http +++ b/docs/source/tutorial/bidder-auction-protocol.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53/documents?acc_token=73842c515600468a8829fea44817fce1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 385 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06/documents?acc_token=ad29e002be7540eba7ee46592248215f HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 381 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/326d29c8df4744149f6082d061e6492e?KeyID=8473a74a&Signature=4cNJZ9v3X0JCIiaW9cFX2nbH10INN6%2B%2FLVLrM4p%2FwQQo%2FBU2JD1ryXuz6r6SxP7hcfQpgAtoL%2F2WB5QRENZvCA%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f4402467721a4eee9ef72e70a4ff04f1?KeyID=7149c8cc&Signature=ktH7wX%2BrsWWNqI7oijR9YIgHAM7Lw%2FCjN%2FHF5muEKERp53oy9RuOaTWLxVshntmKtvp3yA81ihypWST0wdI7DA%3D%3D", "title": "SignedAuctionProtocol.pdf", "format": "application/pdf", "hash": "md5:00000000000000000000000000000000", @@ -16,21 +16,22 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53/documents/de5b4f4f5aa04ef6a16606d1152b061a +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06/documents/627c441c40dd4635ac691c549cacba8c +X-Content-Type-Options: nosniff { "data": { - "dateModified": "2017-11-30T16:56:28.083997+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/326d29c8df4744149f6082d061e6492e?KeyID=8473a74a&Signature=W07o9qqLEOV3dvjZZVzBFeolqx4QEUoFCZPnHeu4xyBsP7NJma%252BZINjCbfVSmXeRHYiAnDikplownjV%2FJE%252B6BQ%253D%253D", "author": "bid_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f4402467721a4eee9ef72e70a4ff04f1?KeyID=7149c8cc&Signature=FWQKkrdr%2Fo95YrYaNn881fhFABAvU2yXd77Dz0R8h01tiB4%2FFX4efEmV4eK9jcB2Kmps5x0jStFNTA7Kxl4YBA%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.083969+02:00", + "datePublished": "2018-05-28T19:03:06.372223+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "de5b4f4f5aa04ef6a16606d1152b061a" + "dateModified": "2018-05-28T19:03:06.372249+03:00", + "id": "627c441c40dd4635ac691c549cacba8c" } } diff --git a/docs/source/tutorial/bidder-documents.http b/docs/source/tutorial/bidder-documents.http index e6b1c52..9ed597e 100644 --- a/docs/source/tutorial/bidder-documents.http +++ b/docs/source/tutorial/bidder-documents.http @@ -1,22 +1,23 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents?acc_token=a94a2b6627aa46f3bbb83ff885e3beae HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents?acc_token=650aaa4270024deaac41cb856120c3c5 HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents/3bd15f6db7764b7e9651fdf15dde6316?download=4accad3bd17a4f0baa9f6a8ea96397f7", + "url": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents/75135cb499834e5ca718f462e5d3c1e7?download=52acfea5369d48cb85f0bad1a27eaf23", "title": "Proposal.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.994147+02:00", - "dateModified": "2017-11-30T16:56:26.994175+02:00", - "id": "3bd15f6db7764b7e9651fdf15dde6316" + "datePublished": "2018-05-28T19:03:05.533715+03:00", + "dateModified": "2018-05-28T19:03:05.533744+03:00", + "id": "75135cb499834e5ca718f462e5d3c1e7" } ] } diff --git a/docs/source/tutorial/bidder-participation-url.http b/docs/source/tutorial/bidder-participation-url.http index 72e9ba4..938b6c8 100644 --- a/docs/source/tutorial/bidder-participation-url.http +++ b/docs/source/tutorial/bidder-participation-url.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4?acc_token=a94a2b6627aa46f3bbb83ff885e3beae HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4?acc_token=650aaa4270024deaac41cb856120c3c5 HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -13,12 +14,12 @@ Content-Type: application/json; charset=UTF-8 { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents/3bd15f6db7764b7e9651fdf15dde6316?download=4accad3bd17a4f0baa9f6a8ea96397f7", + "url": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents/75135cb499834e5ca718f462e5d3c1e7?download=52acfea5369d48cb85f0bad1a27eaf23", "title": "Proposal.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.994147+02:00", - "dateModified": "2017-11-30T16:56:26.994175+02:00", - "id": "3bd15f6db7764b7e9651fdf15dde6316" + "datePublished": "2018-05-28T19:03:05.533715+03:00", + "dateModified": "2018-05-28T19:03:05.533744+03:00", + "id": "75135cb499834e5ca718f462e5d3c1e7" } ], "value": { @@ -26,7 +27,7 @@ Content-Type: application/json; charset=UTF-8 "amount": 500.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:26.821209+02:00", + "date": "2018-05-28T19:03:05.400869+03:00", "qualified": true, "tenderers": [ { @@ -51,8 +52,8 @@ Content-Type: application/json; charset=UTF-8 } ], "owner": "broker", - "id": "afaa508128da4829b9202fe300965bf4", - "participationUrl": "http://auction-sandbox.openprocurement.org/auctions/301d66e275cb4861ba502c1eaafa88ae?key_for_bid=afaa508128da4829b9202fe300965bf4" + "id": "4ed57eda57b941399523f19f03b9ada4", + "participationUrl": "http://auction-sandbox.openprocurement.org/auctions/246d20f56b0a4601bd4b5ddd3ac636e9?key_for_bid=4ed57eda57b941399523f19f03b9ada4" } } diff --git a/docs/source/tutorial/bidder2-participation-url.http b/docs/source/tutorial/bidder2-participation-url.http index 72473e7..f08b1aa 100644 --- a/docs/source/tutorial/bidder2-participation-url.http +++ b/docs/source/tutorial/bidder2-participation-url.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/0d76a3f619044106b9bcdc0e57e93dad?acc_token=73842c515600468a8829fea44817fce1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/3ce3413a56584eb1a7a870e01121effb?acc_token=ad29e002be7540eba7ee46592248215f HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -14,7 +15,7 @@ Content-Type: application/json; charset=UTF-8 "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:27.113380+02:00", + "date": "2018-05-28T19:03:05.626934+03:00", "qualified": true, "tenderers": [ { @@ -39,8 +40,8 @@ Content-Type: application/json; charset=UTF-8 } ], "owner": "broker", - "id": "0d76a3f619044106b9bcdc0e57e93dad", - "participationUrl": "http://auction-sandbox.openprocurement.org/auctions/301d66e275cb4861ba502c1eaafa88ae?key_for_bid=0d76a3f619044106b9bcdc0e57e93dad" + "id": "3ce3413a56584eb1a7a870e01121effb", + "participationUrl": "http://auction-sandbox.openprocurement.org/auctions/246d20f56b0a4601bd4b5ddd3ac636e9?key_for_bid=3ce3413a56584eb1a7a870e01121effb" } } diff --git a/docs/source/tutorial/blank-auction-view.http b/docs/source/tutorial/blank-auction-view.http index 7c16573..a8fee41 100644 --- a/docs/source/tutorial/blank-auction-view.http +++ b/docs/source/tutorial/blank-auction-view.http @@ -1,21 +1,22 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9 HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", + "next_check": "2018-06-10T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -36,22 +37,31 @@ Content-Type: application/json; charset=UTF-8 } }, "owner": "broker", - "id": "301d66e275cb4861ba502c1eaafa88ae", + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:25.621767+02:00", + "dateModified": "2018-05-28T19:03:04.492942+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" + "shouldStartAfter": "2018-06-11T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:25.617199+02:00", + "date": "2018-05-28T19:03:04.480367+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-05T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -61,10 +71,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -72,12 +89,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/confirm-qualification.http b/docs/source/tutorial/confirm-qualification.http index 01d7eb8..b7dee74 100644 --- a/docs/source/tutorial/confirm-qualification.http +++ b/docs/source/tutorial/confirm-qualification.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 30 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 30 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,48 +12,49 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "status": "active", "paymentPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:56:28.528529+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-05-28T19:03:06.703749+03:00" }, "documents": [ { - "dateModified": "2017-11-30T16:56:28.083997+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/326d29c8df4744149f6082d061e6492e?KeyID=8473a74a&Signature=W07o9qqLEOV3dvjZZVzBFeolqx4QEUoFCZPnHeu4xyBsP7NJma%252BZINjCbfVSmXeRHYiAnDikplownjV%2FJE%252B6BQ%253D%253D", "author": "bid_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f4402467721a4eee9ef72e70a4ff04f1?KeyID=7149c8cc&Signature=FWQKkrdr%2Fo95YrYaNn881fhFABAvU2yXd77Dz0R8h01tiB4%2FFX4efEmV4eK9jcB2Kmps5x0jStFNTA7Kxl4YBA%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.083969+02:00", + "datePublished": "2018-05-28T19:03:06.372223+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "de5b4f4f5aa04ef6a16606d1152b061a" + "dateModified": "2018-05-28T19:03:06.372249+03:00", + "id": "627c441c40dd4635ac691c549cacba8c" }, { - "dateModified": "2017-11-30T16:56:28.217417+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/79f7d75e9ff34c1d94289241ebd04a46?KeyID=8473a74a&Signature=ZZf5dIDTAFetGGoNyGHK0TaTX%2FMo%2FTcKq%2FTatSSpuIZleTjJFvbciSiMq9MNq3mZGWRdK%2FYKfT0lkoOKYooXDA%253D%253D", "author": "auction_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1ba9a8b51cd14c05aa42fef2bb3965db?KeyID=7149c8cc&Signature=z%2Ftx0X6an%252B1mIrbwMmuknuPp%252BFVzm3Ps4I%2FXguLCJe5mLZLoqJHlVkZq%252B93cTVvvsRiGx2ASxd%2FtV762p80VBw%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.217384+02:00", + "datePublished": "2018-05-28T19:03:06.459190+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "edc7c486de494ac3bdcc0b456d006e4a" + "dateModified": "2018-05-28T19:03:06.459214+03:00", + "id": "77e9d9a7876740f1a64931dd4f96989c" } ], "verificationPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:56:28.375177+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-05-28T19:03:06.589568+03:00" }, "complaintPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:56:28.528529+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-05-28T19:03:06.703749+03:00" }, "suppliers": [ { @@ -78,17 +79,17 @@ Content-Type: application/json; charset=UTF-8 } ], "signingPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, - "bid_id": "0d76a3f619044106b9bcdc0e57e93dad", + "bid_id": "3ce3413a56584eb1a7a870e01121effb", "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:28.536946+02:00", - "id": "add0cbb7aa114e7cb6f5e127071f8b53" + "date": "2018-05-28T19:03:06.709267+03:00", + "id": "708d3fdf13ac4868b0df09cf479ceb06" } } diff --git a/docs/source/tutorial/create-auction-procuringEntity.http b/docs/source/tutorial/create-auction-procuringEntity.http index ea13c65..a851355 100644 --- a/docs/source/tutorial/create-auction-procuringEntity.http +++ b/docs/source/tutorial/create-auction-procuringEntity.http @@ -1,23 +1,72 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 2029 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 3158 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "description_en": "Cases with state awards", + "description": "футляри до державних нагород", + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-11" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", - "amount": 500 + "amount": 100 }, + "description_ru": "футляры к государственным наградам", + "dgfID": "219560", + "title_ru": "футляры к государственным наградам", + "items": [ + { + "description": "Земля для військовослужбовців", + "classification": { + "scheme": "CAV-PS", + "id": "04121000-2", + "description": "Земельні ділянки" + }, + "description_en": "Cases with state awards", + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], + "address": { + "countryName": "Україна", + "postalCode": "79000", + "region": "м. Київ", + "streetAddress": "вул. Банкова 1", + "locality": "м. Київ" + }, + "quantity": 5.001, + "description_ru": "футляры к государственным наградам", + "unit": { + "code": "44617100-9", + "name": "item" + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" + } + } + ], + "title_en": "Cases with state awards", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -29,7 +78,6 @@ Host: api-sandbox.ea.openprocurement.org "uri": "http://www.dus.gov.ua/" }, "name": "Державне управління справами", - "kind": "general", "address": { "countryName": "Україна", "postalCode": "01220", @@ -37,89 +85,60 @@ Host: api-sandbox.ea.openprocurement.org "streetAddress": "вул. Банкова, 11, корпус 1", "locality": "м. Київ" } - }, - "mode": "test", - "title_ru": "футляры к государственным наградам", - "auctionPeriod": { - "startDate": "2017-12-14T16:56:17.205813" - }, - "items": [ - { - "classification": { - "scheme": "CPV", - "id": "66113000-5", - "description": "Земельні ділянки" - }, - "description": "Земля для військовослужбовців", - "id": "aff7d0febd8847b78f31662488efd20b", - "unit": { - "code": "44617100-9", - "name": "item" - }, - "quantity": 5 - } - ], - "title_en": "Cases with state awards", - "dgfID": "219560" + } } } 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/057ecdd1ad8f45ea8151e731ac2b30f3 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/e589f73396de4c75bbba0ef0a3a1d971 +X-Content-Type-Options: nosniff { "access": { - "token": "52d7fbc91420401d908289b3cbfe71e9" + "token": "f047d95916a74118bb883896564b9a3f" }, "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000002", + "auctionID": "UA-EA-2018-05-28-000003", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:25.801167+02:00", - "endDate": "2017-12-14T16:55:24.860531+02:00" + "startDate": "2018-05-28T19:03:04.589432+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-14T16:55:24.860531+02:00", - "procuringEntity": { - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "kind": "general", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - }, + "next_check": "2018-06-10T20:00:00+03:00", + "awardCriteria": "highestCost", "owner": "broker", - "title_en": "[TESTING] Cases with state awards", - "id": "057ecdd1ad8f45ea8151e731ac2b30f3", - "title": "[ТЕСТУВАННЯ] футляри до державних нагород", + "id": "e589f73396de4c75bbba0ef0a3a1d971", + "description": "футляри до державних нагород", + "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:25.805777+02:00", + "auctionPeriod": { + "shouldStartAfter": "2018-06-11T00:00:00+03:00" + }, + "description_ru": "футляры к государственным наградам", + "dateModified": "2018-05-28T19:03:04.598947+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:25.801167+02:00", - "endDate": "2017-12-14T16:55:24.860531+02:00" - }, - "auctionPeriod": { - "shouldStartAfter": "2017-12-15T00:00:00+02:00" + "startDate": "2018-05-28T19:03:04.589432+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "title_en": "Cases with state awards", + "procurementMethodType": "propertyLease", + "description_en": "Cases with state awards", "dgfID": "219560", - "date": "2017-11-30T16:56:25.801167+02:00", + "date": "2018-05-28T19:03:04.589432+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:04.589432+03:00", + "endDate": "2018-06-05T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -127,28 +146,65 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/057ecdd1ad8 }, "items": [ { - "unit": { - "code": "44617100-9", - "name": "item" - }, "description": "Земля для військовослужбовців", - "id": "aff7d0febd8847b78f31662488efd20b", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" + }, + "description_en": "Cases with state awards", + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], + "address": { + "postalCode": "79000", + "countryName": "Україна", + "streetAddress": "вул. Банкова 1", + "region": "м. Київ", + "locality": "м. Київ" }, - "quantity": 5 + "quantity": 5.001, + "description_ru": "футляры к государственным наградам", + "id": "e9e1755a5a9245b0af8fc25870a07245", + "unit": { + "code": "44617100-9", + "name": "item" + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { "currency": "UAH", - "amount": 500.0, + "amount": 100.0, "valueAddedTaxIncluded": true }, - "mode": "test", - "title_ru": "[ТЕСТИРОВАНИЕ] футляры к государственным наградам", - "awardCriteria": "highestCost" + "title_ru": "футляры к государственным наградам", + "procuringEntity": { + "contactPoint": { + "name": "Державне управління справами", + "telephone": "0440000000" + }, + "identifier": { + "scheme": "UA-EDR", + "id": "00037256", + "uri": "http://www.dus.gov.ua/" + }, + "name": "Державне управління справами", + "address": { + "postalCode": "01220", + "countryName": "Україна", + "streetAddress": "вул. Банкова, 11, корпус 1", + "region": "м. Київ", + "locality": "м. Київ" + } + } } } diff --git a/docs/source/tutorial/get-answer.http b/docs/source/tutorial/get-answer.http index c43eae0..05054b5 100644 --- a/docs/source/tutorial/get-answer.http +++ b/docs/source/tutorial/get-answer.http @@ -1,18 +1,19 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions/e966c8cdacc14655907b34713b141d18 HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions/22c3e98b31fd4c50bab5639de0668f1c HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "description": "Просимо додати таблицю потрібної калорійності харчування", "title": "Калорійність", - "date": "2017-11-30T16:56:26.610507+02:00", + "date": "2018-05-28T19:03:05.241690+03:00", "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", - "id": "e966c8cdacc14655907b34713b141d18", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } } diff --git a/docs/source/tutorial/get-awards.http b/docs/source/tutorial/get-awards.http index fc4c2a5..87f19ea 100644 --- a/docs/source/tutorial/get-awards.http +++ b/docs/source/tutorial/get-awards.http @@ -1,26 +1,27 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "status": "pending.verification", "paymentPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, "verificationPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:59:30.218082+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-06T18:00:00+03:00" }, "signingPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, "suppliers": [ { @@ -45,21 +46,21 @@ Content-Type: application/json; charset=UTF-8 } ], "complaintPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00" }, - "bid_id": "0d76a3f619044106b9bcdc0e57e93dad", + "bid_id": "3ce3413a56584eb1a7a870e01121effb", "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:27.695166+02:00", - "id": "add0cbb7aa114e7cb6f5e127071f8b53" + "date": "2018-05-28T19:03:06.074292+03:00", + "id": "708d3fdf13ac4868b0df09cf479ceb06" }, { "status": "pending.waiting", "complaintPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00" }, "suppliers": [ { @@ -83,14 +84,14 @@ Content-Type: application/json; charset=UTF-8 } } ], - "bid_id": "afaa508128da4829b9202fe300965bf4", + "bid_id": "4ed57eda57b941399523f19f03b9ada4", "value": { "currency": "UAH", "amount": 500.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:27.695166+02:00", - "id": "14f4c1774be847098f247565c4871574" + "date": "2018-05-28T19:03:06.074292+03:00", + "id": "623e2ec3b03a4cbf82485097b8c3cc91" } ] } diff --git a/docs/source/tutorial/initial-auction-listing.http b/docs/source/tutorial/initial-auction-listing.http index 65b7ba5..9e701e3 100644 --- a/docs/source/tutorial/initial-auction-listing.http +++ b/docs/source/tutorial/initial-auction-listing.http @@ -1,22 +1,18 @@ -GET /api/2.3/auctions HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "next_page": { - "path": "/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.621767%2B02%3A00", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.621767%2B02%3A00", - "offset": "2017-11-30T16:56:25.621767+02:00" + "path": "/api/2.4/auctions?offset=", + "uri": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions?offset=", + "offset": "" }, - "data": [ - { - "id": "301d66e275cb4861ba502c1eaafa88ae", - "dateModified": "2017-11-30T16:56:25.621767+02:00" - } - ] + "data": [] } diff --git a/docs/source/tutorial/list-question.http b/docs/source/tutorial/list-question.http index a43ac52..cfc2d00 100644 --- a/docs/source/tutorial/list-question.http +++ b/docs/source/tutorial/list-question.http @@ -1,19 +1,20 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "description": "Просимо додати таблицю потрібної калорійності харчування", "title": "Калорійність", - "date": "2017-11-30T16:56:26.610507+02:00", + "date": "2018-05-28T19:03:05.241690+03:00", "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", - "id": "e966c8cdacc14655907b34713b141d18", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } ] diff --git a/docs/source/tutorial/out-of-rectification-period-editing-denied.http b/docs/source/tutorial/out-of-rectification-period-editing-denied.http index c836775..24136f8 100644 --- a/docs/source/tutorial/out-of-rectification-period-editing-denied.http +++ b/docs/source/tutorial/out-of-rectification-period-editing-denied.http @@ -1,35 +1,47 @@ -PATCH /api/2.3/auctions/aad622eb435a443e8a7afd5432c5d4e6?acc_token=8f2c28a574a647ab8f3dfaeadbbbadb2 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 2076 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2230 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-11" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 }, "dgfID": "219560", - "auctionPeriod": { - "startDate": "2017-12-04" - }, "items": [ { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", @@ -38,8 +50,8 @@ Host: api-sandbox.ea.openprocurement.org "locality": "м. Київ" }, "contractPeriod": { - "startDate": "2017-11-22T15:29:31.486546", - "endDate": "2017-11-25T15:29:31.486546" + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" }, "unit": { "code": "44617100-9", @@ -72,13 +84,14 @@ Host: api-sandbox.ea.openprocurement.org 403 Forbidden -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "status": "error", "errors": [ { - "description": "Auction can be edited only during the rectification period: from (2017-11-06T15:29:31.491067+02:00) to (2017-11-20T15:28:31.491067+02:00).", + "description": "Auction can be edited only during the rectification period: from (2018-05-14T19:03:04.732774+03:00) to (2018-05-22T19:03:04.732774+03:00).", "location": "body", "name": "data" } diff --git a/docs/source/tutorial/owner-auction-protocol.http b/docs/source/tutorial/owner-auction-protocol.http index 4c32f80..7a7713e 100644 --- a/docs/source/tutorial/owner-auction-protocol.http +++ b/docs/source/tutorial/owner-auction-protocol.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 383 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 385 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/79f7d75e9ff34c1d94289241ebd04a46?KeyID=8473a74a&Signature=Dw9ofeROBRO2k0vLPta83X2j28ym58QAiJ%2BKEtgsCkgGnY7vD6%2BBo%2Bdk29rxKjuVbQ%2FCyfdPWZKW8wFk8qCfAg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1ba9a8b51cd14c05aa42fef2bb3965db?KeyID=7149c8cc&Signature=muBdxzty2PgmXY%2BAnFhgHRne8Dy7aN%2FbrbgUblS74CnzEJxu%2FKCtb1zLcQ7nh3%2Bbb4qQAaJnMxWdDwdc%2FaQKCg%3D%3D", "title": "SignedAuctionProtocol.pdf", "format": "application/pdf", "hash": "md5:00000000000000000000000000000000", @@ -16,21 +16,22 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53/documents/edc7c486de494ac3bdcc0b456d006e4a +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06/documents/77e9d9a7876740f1a64931dd4f96989c +X-Content-Type-Options: nosniff { "data": { - "dateModified": "2017-11-30T16:56:28.217417+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/79f7d75e9ff34c1d94289241ebd04a46?KeyID=8473a74a&Signature=ZZf5dIDTAFetGGoNyGHK0TaTX%2FMo%2FTcKq%2FTatSSpuIZleTjJFvbciSiMq9MNq3mZGWRdK%2FYKfT0lkoOKYooXDA%253D%253D", "author": "auction_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1ba9a8b51cd14c05aa42fef2bb3965db?KeyID=7149c8cc&Signature=z%2Ftx0X6an%252B1mIrbwMmuknuPp%252BFVzm3Ps4I%2FXguLCJe5mLZLoqJHlVkZq%252B93cTVvvsRiGx2ASxd%2FtV762p80VBw%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.217384+02:00", + "datePublished": "2018-05-28T19:03:06.459190+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "edc7c486de494ac3bdcc0b456d006e4a" + "dateModified": "2018-05-28T19:03:06.459214+03:00", + "id": "77e9d9a7876740f1a64931dd4f96989c" } } diff --git a/docs/source/tutorial/patch-cancellation.http b/docs/source/tutorial/patch-cancellation.http index fe3d8be..97c2a70 100644 --- a/docs/source/tutorial/patch-cancellation.http +++ b/docs/source/tutorial/patch-cancellation.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e/documents/6aebbc98305a4847830bdc40863a4d6b?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 48 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51/documents/45baf4951469459394de757f4c50b394?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 48 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,19 +12,20 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "description": "Changed description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/02dd9977d20e4b409d307bc67ee6ca36?KeyID=8473a74a&Signature=5WtHn%252BXf4U2eKnBY5mwdZNifHaf%2FMoApsRroJSOzQBI%252BdJ5ZwCkP%252BTZmjkZ%2FDOh1M4U5JY7u1MJE8%252Bp7YQOSBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/7fad0841b4c04a34a0781b5d9df39299?KeyID=7149c8cc&Signature=eUJfguREMN77TKqJoyrlz%2FApEeUDvgZU9XhPBnaBegBMH8jSxwBRpzwr87dhEd3bK16kfFwoUn3JVSWqae6OAA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:29.945720+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.723479+03:00", + "id": "45baf4951469459394de757f4c50b394" } } diff --git a/docs/source/tutorial/patch-items-value-periods.http b/docs/source/tutorial/patch-items-value-periods.http index 05a1093..bda254f 100644 --- a/docs/source/tutorial/patch-items-value-periods.http +++ b/docs/source/tutorial/patch-items-value-periods.http @@ -1,31 +1,32 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 75 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 75 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { "tenderPeriod": { - "endDate": "2017-12-15T16:56:35.944933+02:00" + "endDate": "2018-06-12T19:03:14.663047+03:00" } } } 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", + "next_check": "2018-06-10T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -46,22 +47,32 @@ Content-Type: application/json; charset=UTF-8 } }, "owner": "broker", - "id": "301d66e275cb4861ba502c1eaafa88ae", + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:25.621767+02:00", + "dateModified": "2018-05-28T19:03:04.702467+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" + "shouldStartAfter": "2018-06-11T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:25.617199+02:00", + "date": "2018-05-28T19:03:04.480367+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-05T20:00:00+03:00", + "invalidationDate": "2018-05-28T19:03:04.701084+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -71,10 +82,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -82,12 +100,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/prepare-cancellation.http b/docs/source/tutorial/prepare-cancellation.http index c961846..066b98f 100644 --- a/docs/source/tutorial/prepare-cancellation.http +++ b/docs/source/tutorial/prepare-cancellation.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 43 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 43 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,16 +12,17 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51 +X-Content-Type-Options: nosniff { "data": { - "date": "2017-11-30T16:56:29.616244+02:00", + "date": "2018-05-28T19:03:07.609340+03:00", "status": "pending", "reason": "cancellation reason", "cancellationOf": "tender", - "id": "3fd26d96a4454abf9a875bef110dba4e" + "id": "5b7b7e9fbe0340f5ad88eccc7ced1c51" } } diff --git a/docs/source/tutorial/register-2nd-bidder.http b/docs/source/tutorial/register-2nd-bidder.http index f55b9c2..e1fe957 100644 --- a/docs/source/tutorial/register-2nd-bidder.http +++ b/docs/source/tutorial/register-2nd-bidder.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 723 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 723 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -37,12 +37,13 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/0d76a3f619044106b9bcdc0e57e93dad +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/3ce3413a56584eb1a7a870e01121effb +X-Content-Type-Options: nosniff { "access": { - "token": "73842c515600468a8829fea44817fce1" + "token": "ad29e002be7540eba7ee46592248215f" }, "data": { "status": "active", @@ -51,7 +52,7 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:27.113380+02:00", + "date": "2018-05-28T19:03:05.626934+03:00", "qualified": true, "tenderers": [ { @@ -76,7 +77,7 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c } ], "owner": "broker", - "id": "0d76a3f619044106b9bcdc0e57e93dad" + "id": "3ce3413a56584eb1a7a870e01121effb" } } diff --git a/docs/source/tutorial/register-bidder.http b/docs/source/tutorial/register-bidder.http index b3bd8dc..da98f60 100644 --- a/docs/source/tutorial/register-bidder.http +++ b/docs/source/tutorial/register-bidder.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 776 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 776 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -38,12 +38,13 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4 +X-Content-Type-Options: nosniff { "access": { - "token": "a94a2b6627aa46f3bbb83ff885e3beae" + "token": "650aaa4270024deaac41cb856120c3c5" }, "data": { "status": "draft", @@ -52,7 +53,7 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "amount": 500.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:26.821209+02:00", + "date": "2018-05-28T19:03:05.400869+03:00", "qualified": true, "tenderers": [ { @@ -77,7 +78,7 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c } ], "owner": "broker", - "id": "afaa508128da4829b9202fe300965bf4" + "id": "4ed57eda57b941399523f19f03b9ada4" } } diff --git a/docs/source/tutorial/tenderperiod-validation-error.http b/docs/source/tutorial/tenderperiod-validation-error.http index 9595c71..f2fecfb 100644 --- a/docs/source/tutorial/tenderperiod-validation-error.http +++ b/docs/source/tutorial/tenderperiod-validation-error.http @@ -1,21 +1,27 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 2037 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2246 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, "auctionPeriod": { - "startDate": "2017-09-02T15:56:30.045984" + "startDate": "2018-06-03T19:02:59.179463" }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 @@ -25,10 +31,17 @@ Host: api-sandbox.ea.openprocurement.org { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", @@ -37,8 +50,8 @@ Host: api-sandbox.ea.openprocurement.org "locality": "м. Київ" }, "contractPeriod": { - "startDate": "2017-08-30T15:56:30.043635", - "endDate": "2017-09-02T15:56:30.043635" + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" }, "unit": { "code": "44617100-9", @@ -71,7 +84,8 @@ Host: api-sandbox.ea.openprocurement.org 422 Unprocessable Entity -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "status": "error", diff --git a/docs/source/tutorial/update-award-criteria.http b/docs/source/tutorial/update-award-criteria.http index f95268b..a9d5013 100644 --- a/docs/source/tutorial/update-award-criteria.http +++ b/docs/source/tutorial/update-award-criteria.http @@ -1,12 +1,12 @@ -PUT /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/3385ba24fb704db79cb8a70561e023c7?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 336 -Content-Type: application/json +PUT /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/882f19abea9041a2adc123890e947ebb?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 334 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=zV0b0U6S2LivauIlHbmy3NjVsbCTyEtgWFhrVYM3rEVniUg%2FJnfwZc3BruHog0KupIa2qItySihDKH2sVU1UAQ%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=uVKfsWM4KrB3drjyiQK6BqYk1l0PQH2KyPEmHERFtDC5PSJoVEmCzBtX6LKxIyRcibxBlDhHDWPc7KadrtVpCQ%3D%3D", "title": "AwardCriteria-2.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,18 +15,19 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" } } diff --git a/docs/source/tutorial/update-cancellation-doc.http b/docs/source/tutorial/update-cancellation-doc.http index d16730c..d903a22 100644 --- a/docs/source/tutorial/update-cancellation-doc.http +++ b/docs/source/tutorial/update-cancellation-doc.http @@ -1,12 +1,12 @@ -PUT /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e/documents/6aebbc98305a4847830bdc40863a4d6b?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 331 -Content-Type: application/json +PUT /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51/documents/45baf4951469459394de757f4c50b394?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 335 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1981cae19a6d4577bf343cf0b7d813f5?KeyID=8473a74a&Signature=8gW%2BOhgmZJCtbnvWqrJA%2Bigktxl1Ze93F9aM6jRFkTFNYgGjSTv7UcmiLAzKivOQlJDM0rAk5VD9ORurYDjDCw%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f3b6995285c4491db7d8df528e48aeb4?KeyID=7149c8cc&Signature=DcaUzE4kidbxF2hRrGxcVQFrH5V3WC5RtICwvXfmrgNS9L%2FUVmr8Qb%2BY4%2B%2FDReKJDQlkqTFDmvLy2BCm4w1LAA%3D%3D", "title": "Notice-2.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "description": "Changed description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1981cae19a6d4577bf343cf0b7d813f5?KeyID=8473a74a&Signature=6PDYxf6GgOgkJuoH%2FR4qtBFHx%2FEcXKpV9NJ0lWVPu7IBKLdQ8%252ByiK5kIQk5YZ9aebaDik0e4JNDdJihcZVA%252BBg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f3b6995285c4491db7d8df528e48aeb4?KeyID=7149c8cc&Signature=V21tF8lhwqSmzPprBLYz8aNyWVvyDYsRc5wzBCakSQ8y6l3iCExbaMwc954xcldHZjLdRT54YkBNR1obYBMtCw%253D%253D", "title": "Notice-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:30.284752+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.960503+03:00", + "id": "45baf4951469459394de757f4c50b394" } } diff --git a/docs/source/tutorial/upload-auction-notice.http b/docs/source/tutorial/upload-auction-notice.http index 494dc4d..54cace8 100644 --- a/docs/source/tutorial/upload-auction-notice.http +++ b/docs/source/tutorial/upload-auction-notice.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 415 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 417 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -9,7 +9,7 @@ Host: api-sandbox.ea.openprocurement.org "hash": "md5:00000000000000000000000000000000", "description": "document description", "title": "Notice.pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=P1G3pRNxZchhK%2FgkOzQoI4eQtwB%2BhjrtHZpWFS4DHIsNZke%2BhlU%2Fckb5vkmRwzqcg96vsSluTsCXIfg4TWd6Bg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=zF%2FDQ%2BwGfUxGhzdH0WUV5CQv4Gw%2BVqcLMGRtZWHXO2eL2RL%2FhsL79opqAMj6z3%2B5FzxGycrLGf79AwYPvydkCA%3D%3D", "format": "application/pdf", "documentType": "technicalSpecifications" } @@ -17,21 +17,22 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/418d8f99150a4b92a57b81cc18cd968a +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/2bb61a55cf5b4a8386260ac1a4cad34c +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" } } diff --git a/docs/source/tutorial/upload-award-criteria.http b/docs/source/tutorial/upload-award-criteria.http index a1bcc63..4e679fa 100644 --- a/docs/source/tutorial/upload-award-criteria.http +++ b/docs/source/tutorial/upload-award-criteria.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 340 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 342 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/68fe48f4593a4de9844e6548344b2696?KeyID=8473a74a&Signature=20qbIlw9A9vFgmcjaagAfrYpHKp5oWHqcqZEBDuJIq%2FwysuHo4C%2BREnHEOneynezrY%2FoIQoJ8379xY%2BDJId4BQ%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/42f468f963964ac0883313db87abc294?KeyID=7149c8cc&Signature=wGBY5DfS1F7IuNqMNoDQTALBL%2Bv8FFM3Cn1vaK3o%2BT3juGBtq%2F7kErnuTwjX20%2Bj72Pk%2F8eAY5jixa45U4dXAA%3D%3D", "title": "AwardCriteria.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/3385ba24fb704db79cb8a70561e023c7 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/882f19abea9041a2adc123890e947ebb +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/68fe48f4593a4de9844e6548344b2696?KeyID=8473a74a&Signature=QZwWxRCYJDGM8BwdJ%252Bh%2FZ7EfjK1tSuHstIWY7Phw8MUeywT2GsNNucpnf2UGZGud5EPLKF1xOz9hX%252BWHtaSeBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/42f468f963964ac0883313db87abc294?KeyID=7149c8cc&Signature=XRuGZP2eAk2I7vRsPppBUKCGQWoWEcTdD7Cn%2FQJFqHsAzhj5y9yj75Af3iKYenLWwy01%2Fj7A4jHQR%252BZkIbI4CA%253D%253D", "title": "AwardCriteria.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.157192+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.874644+03:00", + "id": "882f19abea9041a2adc123890e947ebb" } } diff --git a/docs/source/tutorial/upload-bid-proposal.http b/docs/source/tutorial/upload-bid-proposal.http index bae5573..817193c 100644 --- a/docs/source/tutorial/upload-bid-proposal.http +++ b/docs/source/tutorial/upload-bid-proposal.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents?acc_token=a94a2b6627aa46f3bbb83ff885e3beae HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 329 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents?acc_token=650aaa4270024deaac41cb856120c3c5 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 337 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4accad3bd17a4f0baa9f6a8ea96397f7?KeyID=8473a74a&Signature=F1ZZ8oz1qK%2B51JWibcyBu4pKvQcdApeIzqnBqPAbC9cdvKzLWXgVTNPak47HJv4BsbUhFSa9j9qb7pQ6mMOsBg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/52acfea5369d48cb85f0bad1a27eaf23?KeyID=7149c8cc&Signature=4q1KoUcei%2F0mVUpDP%2Fp7lbItVK5MCwKtEOT3%2FOECC6UaJkfxl5Pg1xHJblSlgkIkFC%2BeSIcB9ym4bSsZhV%2FkBg%3D%3D", "title": "Proposal.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents/3bd15f6db7764b7e9651fdf15dde6316 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents/75135cb499834e5ca718f462e5d3c1e7 +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents/3bd15f6db7764b7e9651fdf15dde6316?download=4accad3bd17a4f0baa9f6a8ea96397f7", + "url": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents/75135cb499834e5ca718f462e5d3c1e7?download=52acfea5369d48cb85f0bad1a27eaf23", "title": "Proposal.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.994147+02:00", - "dateModified": "2017-11-30T16:56:26.994175+02:00", - "id": "3bd15f6db7764b7e9651fdf15dde6316" + "datePublished": "2018-05-28T19:03:05.533715+03:00", + "dateModified": "2018-05-28T19:03:05.533744+03:00", + "id": "75135cb499834e5ca718f462e5d3c1e7" } } diff --git a/docs/source/tutorial/upload-cancellation-doc.http b/docs/source/tutorial/upload-cancellation-doc.http index 79eef40..8084ca2 100644 --- a/docs/source/tutorial/upload-cancellation-doc.http +++ b/docs/source/tutorial/upload-cancellation-doc.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 333 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 329 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/02dd9977d20e4b409d307bc67ee6ca36?KeyID=8473a74a&Signature=WhL6NTgs5mjvzOHNCCeQke4w1%2F7zXZ7lFpc59uvGIzXOAJPb8fwjWqupDk86%2Frroe1%2B77jX624%2Bo6ZLSkbCADw%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/7fad0841b4c04a34a0781b5d9df39299?KeyID=7149c8cc&Signature=1eWteIfdxnq871lPftqepjZhSKyA890EovtDNGeh2ZMPBEIYlnITLqBLkH7oggV6etsYU%2F8JMVr9IYsyQ%2FbDAg%3D%3D", "title": "Notice.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e/documents/6aebbc98305a4847830bdc40863a4d6b +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51/documents/45baf4951469459394de757f4c50b394 +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/02dd9977d20e4b409d307bc67ee6ca36?KeyID=8473a74a&Signature=5WtHn%252BXf4U2eKnBY5mwdZNifHaf%2FMoApsRroJSOzQBI%252BdJ5ZwCkP%252BTZmjkZ%2FDOh1M4U5JY7u1MJE8%252Bp7YQOSBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/7fad0841b4c04a34a0781b5d9df39299?KeyID=7149c8cc&Signature=eUJfguREMN77TKqJoyrlz%2FApEeUDvgZU9XhPBnaBegBMH8jSxwBRpzwr87dhEd3bK16kfFwoUn3JVSWqae6OAA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:29.945720+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.723479+03:00", + "id": "45baf4951469459394de757f4c50b394" } } diff --git a/docs/source/tutorial/upload-first-auction-illustration.http b/docs/source/tutorial/upload-first-auction-illustration.http index 8fe6cb5..a1814ff 100644 --- a/docs/source/tutorial/upload-first-auction-illustration.http +++ b/docs/source/tutorial/upload-first-auction-illustration.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 436 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 430 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -10,7 +10,7 @@ Host: api-sandbox.ea.openprocurement.org "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "title": "first_illustration.jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=A72CeRi4%2B8fC9UG9C%2FuvfJdkbzFP52dV0xg%2B7gXZoHp3EF4HjQAR1xdz0W%2F%2BcV902JTBXbJG9ebWHwZiyU2HCg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=9ipzic9%2BgVU8FnYxrVTTaTcdzScMCkZEMWbj99tIU5oLySOsESzLg6YmlvnAr4hCGL1eFoZpK9Ln%2B0hGhMIEBQ%3D%3D", "format": "image/jpeg", "documentType": "illustration" } @@ -18,8 +18,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/f143cdc5fef246f59d11cd3bc7c72d46 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/c6bd2aaef7cf42c5ba4f0dfad08285e2 +X-Content-Type-Options: nosniff { "data": { @@ -27,13 +28,13 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" } } diff --git a/docs/source/tutorial/upload-second-auction-illustration.http b/docs/source/tutorial/upload-second-auction-illustration.http index 7e3ea11..412648e 100644 --- a/docs/source/tutorial/upload-second-auction-illustration.http +++ b/docs/source/tutorial/upload-second-auction-illustration.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 430 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 434 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -10,7 +10,7 @@ Host: api-sandbox.ea.openprocurement.org "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "title": "second_illustration.jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=vmvWJOCo0jvQ1wr8Czb2%2BrC8ntp51VS0BYxtlXrCiPyKuKv7d7XJoVeAMmw8bH9RE28w1cW8BECbEgScz5ISBQ%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=JhDc6%2BOC2Tbf15iDLCR7WV4VP6lxh1qswnBMqDtoBUom1ycV2R9ZjLtqXh3hiZ%2BByfhOmd%2FMM9cNv3k9fLdKAg%3D%3D", "format": "image/jpeg", "documentType": "illustration" } @@ -18,8 +18,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/eb64e2d0457e42c89aed5861301d3d06 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/db649c26ced64a8292a91f14c2bd4b59 +X-Content-Type-Options: nosniff { "data": { @@ -27,13 +28,13 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=nXLYMy2OkK2aIJDwV6kn7z3BkQD4wMe1ccc9%252BSvKDcUemJGUcmxtcGPn57JUQ6AJznS4IfCvaHVyDo5Aez7pDA%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=VxN7Lt4LBsnxm4RQWy146688XcEKpVkJ1ofItTIRC55pCuA2oh%2FVxBZRVv%2F0lTC3LXKNmwF%2F78mt68XuuQl4AA%253D%253D", "title": "second_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.376954+02:00", + "datePublished": "2018-05-28T19:03:05.055484+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.376981+02:00", - "id": "eb64e2d0457e42c89aed5861301d3d06" + "dateModified": "2018-05-28T19:03:05.055508+03:00", + "id": "db649c26ced64a8292a91f14c2bd4b59" } } diff --git a/docs/source/tutorial/upload-third-auction-illustration.http b/docs/source/tutorial/upload-third-auction-illustration.http index 91b0304..b4d0914 100644 --- a/docs/source/tutorial/upload-third-auction-illustration.http +++ b/docs/source/tutorial/upload-third-auction-illustration.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 432 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 432 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -10,7 +10,7 @@ Host: api-sandbox.ea.openprocurement.org "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "title": "third_illustration.jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=BgTF%2BhgcDdTXB%2BMmv4Xfyl0PHorwUgDAKN7GVtlMm%2FoufbQVpM3pO11DN98KuWxwva2DIy73KKNE1hiIa53WBw%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=%2FjDRSZj2J2t%2FvYi7QAi4iJceqEGLXhciu%2FoxMvqzWkSmalU0nYctOeBPRZ9vmADuj2fmC7Pq3S7y7DwE7s0nDg%3D%3D", "format": "image/jpeg", "documentType": "illustration" } @@ -18,8 +18,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/fdafece528e54fe5a7b38f025be993c3 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/2c5c4017cc7d4001864e173fc897ffd1 +X-Content-Type-Options: nosniff { "data": { @@ -27,13 +28,13 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=AGnUbHWEz4OOa7kxT1%2Fj4Ml7cNOw%252BcsUiDVX9HQhwqAdi4UGtaxWqeAZ2YhsI20lzMp67Fq%252BUo6jPmWdLdWuAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=08nEK8j1PputzfNx7Db6qC%252BheWVbyrDCG8bFpl25q0ad%252BJD7Woa48SmacTzEhvPel5L3t5%2FCHEgq7jy82bRKCQ%253D%253D", "title": "third_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.434267+02:00", + "datePublished": "2018-05-28T19:03:05.101025+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.434293+02:00", - "id": "fdafece528e54fe5a7b38f025be993c3" + "dateModified": "2018-05-28T19:03:05.101047+03:00", + "id": "2c5c4017cc7d4001864e173fc897ffd1" } } diff --git a/docs/source/tutorial/verify-protocol.http b/docs/source/tutorial/verify-protocol.http index 6eaf33e..56209c2 100644 --- a/docs/source/tutorial/verify-protocol.http +++ b/docs/source/tutorial/verify-protocol.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 39 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 39 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,47 +12,48 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "status": "pending.payment", "paymentPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, "documents": [ { - "dateModified": "2017-11-30T16:56:28.083997+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/326d29c8df4744149f6082d061e6492e?KeyID=8473a74a&Signature=W07o9qqLEOV3dvjZZVzBFeolqx4QEUoFCZPnHeu4xyBsP7NJma%252BZINjCbfVSmXeRHYiAnDikplownjV%2FJE%252B6BQ%253D%253D", "author": "bid_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f4402467721a4eee9ef72e70a4ff04f1?KeyID=7149c8cc&Signature=FWQKkrdr%2Fo95YrYaNn881fhFABAvU2yXd77Dz0R8h01tiB4%2FFX4efEmV4eK9jcB2Kmps5x0jStFNTA7Kxl4YBA%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.083969+02:00", + "datePublished": "2018-05-28T19:03:06.372223+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "de5b4f4f5aa04ef6a16606d1152b061a" + "dateModified": "2018-05-28T19:03:06.372249+03:00", + "id": "627c441c40dd4635ac691c549cacba8c" }, { - "dateModified": "2017-11-30T16:56:28.217417+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/79f7d75e9ff34c1d94289241ebd04a46?KeyID=8473a74a&Signature=ZZf5dIDTAFetGGoNyGHK0TaTX%2FMo%2FTcKq%2FTatSSpuIZleTjJFvbciSiMq9MNq3mZGWRdK%2FYKfT0lkoOKYooXDA%253D%253D", "author": "auction_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1ba9a8b51cd14c05aa42fef2bb3965db?KeyID=7149c8cc&Signature=z%2Ftx0X6an%252B1mIrbwMmuknuPp%252BFVzm3Ps4I%2FXguLCJe5mLZLoqJHlVkZq%252B93cTVvvsRiGx2ASxd%2FtV762p80VBw%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.217384+02:00", + "datePublished": "2018-05-28T19:03:06.459190+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "edc7c486de494ac3bdcc0b456d006e4a" + "dateModified": "2018-05-28T19:03:06.459214+03:00", + "id": "77e9d9a7876740f1a64931dd4f96989c" } ], "verificationPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:56:28.375177+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-05-28T19:03:06.589568+03:00" }, "complaintPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00" }, "suppliers": [ { @@ -77,17 +78,17 @@ Content-Type: application/json; charset=UTF-8 } ], "signingPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, - "bid_id": "0d76a3f619044106b9bcdc0e57e93dad", + "bid_id": "3ce3413a56584eb1a7a870e01121effb", "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:28.382166+02:00", - "id": "add0cbb7aa114e7cb6f5e127071f8b53" + "date": "2018-05-28T19:03:06.594311+03:00", + "id": "708d3fdf13ac4868b0df09cf479ceb06" } } From 196d7a5eb35cbd874bda0b611b8318a890c45b4b Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Tue, 29 May 2018 15:03:44 +0300 Subject: [PATCH 09/14] Add `Glossary` page --- docs/source/glossary.rst | 61 +++++++++++++++++++++++ docs/source/images/auction_lifecycle.png | Bin 0 -> 86294 bytes docs/source/index.rst | 1 + 3 files changed, 62 insertions(+) create mode 100644 docs/source/glossary.rst create mode 100644 docs/source/images/auction_lifecycle.png diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst new file mode 100644 index 0000000..e958dec --- /dev/null +++ b/docs/source/glossary.rst @@ -0,0 +1,61 @@ +Glossary +======== + +Tender Procedure + a process which includes: + + * lease tender procedure initialization by an Organizer; + + * initial bids proposals by Participants (Bidders); + + * auction (3 rounds); + + * qualification (awarding) - identifying of the winner; + + * payment; + + * contract signing; + +Organizer + lease procedure initiator + +Minimum number of qualified bids [``minNumberOfQualifiedBids``] + minimum desired participants' count to consider procedure successful + + +Invalidation date [``invalidationDate``] + date when the last editing was made by an Organizer (initial bids invalidation occurs) + +Valid bid + a bid which value is equal or greater then a value of ``value.amount + minimalStep`` + +CAV-PS + the main classifier + +CPVS (Common Procurement Vocabulary) + additional (secondary) classifier + +Tender Procedure life cycle + consists of the following periods: + + * ``tenderPeriod`` - the time period during which tender ``bids`` are accepting; + + * ``enquiryPeriod`` - the time period during which participants can ask ``questions`` to clarify tender's terms; + + * ``rectificationPeriod`` - the time period during which an Organizer can perform changes to tender terms; + + * ``auctionPeriod`` - the time period of ``auction`` itself; + + * ``verificationPeriod`` - the time period during which an Organizer identifies a winner; + + * ``paymentPeriod`` - the time period during which Participant (Winner) performs payment; + + * ``signingPeriod`` - the time period of downloading and activating of Contract by an Organizer; + +.. image:: images/auction_lifecycle.png + +.. note:: + + * ``tenderPeriod`` has to be at least 5 days longer than ``rectificationPeriod``; + * as a result of verification process is auction ``Protocol`` (confirmed and downloaded by an Organizer); + * every period has its ``startDate`` and ``endDate``. diff --git a/docs/source/images/auction_lifecycle.png b/docs/source/images/auction_lifecycle.png new file mode 100644 index 0000000000000000000000000000000000000000..48ae3e5cb887c3333d283875f14ebe8d1abd9c9f GIT binary patch literal 86294 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 literal 0 HcmV?d00001 diff --git a/docs/source/index.rst b/docs/source/index.rst index c197314..15281a0 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -22,6 +22,7 @@ Contents: :maxdepth: 2 overview + glossary standard/index upload award_workflow From 14de390b39874dcc1bf03561bfa54d35c34bb0cc Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Tue, 29 May 2018 15:08:26 +0300 Subject: [PATCH 10/14] Update index file: dgf => lease --- docs/source/index.rst | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 15281a0..20ece16 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -1,20 +1,17 @@ -.. openprocurement.auctions.dgf documentation master file, created by - sphinx-quickstart on Wed Oct 1 02:29:13 2014. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. +.. openprocurement.auctions.lease documentation master file, created by + sphinx-quickstart on Wed Oct 1 02:29:13 2014; + (forked from `dgf` package and manually updated) -.. title:: OpenProcurement API + +.. title:: OpenProcurement SALE:LEASE API .. meta:: :google-site-verification: kmqHGqhpzgef4t5OVKoQCPa5v-CK14HOLmVrZV2QgmQ -Welcome to openprocurement.auctions.dgf's documentation! -======================================================== +Welcome to `openprocurement.auctions.lease's` documentation! +============================================================ -Please report any problems or suggestions for improvement either via the -`mailing list `_ or -the `issue tracker -`_. +Please report any problems or suggestions for improvement either via the `Issue tracker `_. Contents: From 6ce8dd2ff1809ad9dbcb550eb50d2dd40c6d13ef Mon Sep 17 00:00:00 2001 From: wowkalucky Date: Tue, 29 May 2018 15:10:15 +0300 Subject: [PATCH 11/14] Update `Overview` page: adapt for LEASE package v1.1.1-sale --- docs/HISTORY.txt | 4 ++ docs/source/overview.rst | 112 ++++++++++++++++++++++++--------------- 2 files changed, 72 insertions(+), 44 deletions(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index fb38ee9..54bb123 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,10 @@ Changelog ========= +1.1.1-sale +---------- + + 0.1dev (unreleased) ------------------- diff --git a/docs/source/overview.rst b/docs/source/overview.rst index 7c8cf6f..b251c56 100644 --- a/docs/source/overview.rst +++ b/docs/source/overview.rst @@ -1,95 +1,119 @@ Overview ======== -openprocurement.auctions.dgf contains documentaion for Deposit Guarantee Fund auctions. +This ``openprocurement.auctions.lease`` package documentation contains information for Participants +of the PROZORRO.SALE system and intended to discover all aspects of ``lease procedure``. -There are two procedures: - - * dgfOtherAssets - sale of the insolvent bank property. - - * dgfFinancialAssets - sale of the creditor claim right. +The following subjects can act as an Organizer: + +* `State Property Fund of Ukraine`_; + +* state enterprises; + +* authorities, which are authorized by the Verkhovna Rada of the Autonomous Republic of Crimea; + +* enterprises, institutions and organizations. + + +In order to perform state property lease specialized procedure is available: + + * ``propertyLease`` - lease of the state property. Features -------- -* The only date Organizer has to provide is *Tender.auctionPeriod.startDate*, the rest will be calculated automatically. -* Optionally Organizer can set *enquiryPeriod.endDate*. -* If *enquiryPeriod.endDate* is not provided it will be calculated automatically. -* Organizer can both increase and decrease `value.amount`, `guarantee.amount`, `minimalStep.amount`. -* `tenderPeriod` must be at least 7 calendar days. -* Organizer can edit procedure only during *rectificationPeriod*. -* Organizer can add and edit documents only during *rectificationPeriod*. -* As soon as the action is edited, the status of all of the submitted bids will be switched to `invalid`. -* Procedure can be switched from *draft* status to *active.tendering*. -* During *active.tendering* period participants can ask questions, submit proposals, and upload documents. -* There is obligatory participant qualification (*Bid.selfQualified*) via guarantee payment. -* The only currency (*Value.currency*) for this procedure is hryvnia (UAH). +* The only currency (``value.currency``) for this procedure is hryvnia (UAH). + +* The only date Organizer has to provide is ``Auction.auctionPeriod.startDate`` - approximate Auction start date - actual value of Auction start will be calculated based on current system load. The rest will be calculated automatically. + +* ``tenderPeriod`` duration must be at least 7 calendar days. + +* Procedure can be switched from ``draft`` status to ``active.tendering``. + +* During ``active.tendering`` period participants can ask questions, submit proposals, and upload documents. + * The items within an auction are allowed to be from different CAV groups. +.. note:: There is predefined list of possible items to lease. + +* Additional classification (CPVS) is constant for ``propertyLease`` procedure - ``PA01-7``. + +* The minimum desired participants' count by default is 2, but there is option to decrease it explicitly to 1 participant; + +* Optionally an Organizer can set ``tenderPeriod.endDate`` - if so, auction can't start earlier 3 days after. + +* Optionally an Organizer can set ``enquiryPeriod.endDate``, if not provided - it will be calculated automatically. + +* An Organizer can edit procedure only during ``rectificationPeriod`` (increase and decrease ``value.amount``, ``guarantee.amount``, ``minimalStep.amount``). + +* Organizer can add and edit documents only during ``rectificationPeriod``. + +* As soon as the action is edited, the status of all of the submitted bids will be switched to ``invalid``. + +* There is obligatory participant qualification via guarantee payment. + +* The only criterion for choosing a winner is the price, provided the tenderer complies with the qualifying criteria determined by the Organizer. + Conventions ----------- -API accepts `JSON `_ or form-encoded content in +API accepts `JSON`_ or form-encoded content in requests. It returns JSON content in all of its responses, including errors. Only the UTF-8 character encoding is supported for both requests and responses. All API POST and PUT requests expect a top-level object with a single -element in it named `data`. Successful responses will mirror this format. +element in it named ``data``. Successful responses will mirror this format. The data element should itself be an object, containing the parameters for the request. In the case of creating a new auction, these are the fields we want to set on the auction itself. -If the request was successful, we will get a response code of `201` +If the request was successful, we will get a response code of ``201`` indicating the object was created. That response will have a data field at its top level, which will contain complete information on the new auction, including its ID. If something went wrong during the request, we'll get a different status -code and the JSON returned will have an `errors` field at the top level +code and the JSON returned will have an ``errors`` field at the top level containing a list of problems. We look at the first one and print out its message. -Main responsibilities ---------------------- - -Business logic --------------- - Project status -------------- -The project has pre alpha status. +The project currently is in `beta` status. -The source repository for this project is on GitHub: https://github.com/openprocurement/openprocurement.auctions.dgf +The source repository for this project is on GitHub: +https://github.com/openprocurement/openprocurement.auctions.lease -You can leave feedback by raising a new issue on the `issue tracker -`_ (GitHub -registration necessary). +You can leave feedback by raising a new issue on the `Issue tracker +`_ (GitHub +registration necessary). Documentation of related packages --------------------------------- * `OpenProcurement API `_ -API stability -------------- - -API is highly unstable, and while API endpoints are expected to remain -relatively stable the data exchange formats are expected to be changed a -lot. The changes in the API are communicated via `Open Procurement API -`_ maillist. - Change log ---------- +1.1.1-sale -0.1 -~~~ -Released: not released +0.1.0 +Released: not released Next steps ---------- You might find it helpful to look at the :ref:`tutorial`. + +********** +References +********** + +.. target-notes:: + +.. _`State Property Fund of Ukraine`: http://www.spfu.gov.ua +.. _`JSON`: http://json.org/ From 48aea58105ab1890cbc346d7927c7945a8c98634 Mon Sep 17 00:00:00 2001 From: Anton Korobko Date: Thu, 31 May 2018 18:34:47 +0300 Subject: [PATCH 12/14] review fixes --- docs/source/overview.rst | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/docs/source/overview.rst b/docs/source/overview.rst index b251c56..5799716 100644 --- a/docs/source/overview.rst +++ b/docs/source/overview.rst @@ -1,22 +1,22 @@ Overview ======== -This ``openprocurement.auctions.lease`` package documentation contains information for Participants -of the PROZORRO.SALE system and intended to discover all aspects of ``lease procedure``. +This ``openprocurement.auctions.lease`` package documentation contains information for Users +of the PROZORRO.SALE system and intends to discover all aspects of ``lease procedure``. The following subjects can act as an Organizer: * `State Property Fund of Ukraine`_; -* state enterprises; +* state-owned enterprises; -* authorities, which are authorized by the Verkhovna Rada of the Autonomous Republic of Crimea; +* the authorities, that are authorized by the Supreme Council of the Autonomous Republic of Crimea; * enterprises, institutions and organizations. -In order to perform state property lease specialized procedure is available: +To perform state property lease specialized procedure is available: * ``propertyLease`` - lease of the state property. @@ -25,7 +25,9 @@ Features * The only currency (``value.currency``) for this procedure is hryvnia (UAH). -* The only date Organizer has to provide is ``Auction.auctionPeriod.startDate`` - approximate Auction start date - actual value of Auction start will be calculated based on current system load. The rest will be calculated automatically. +* The only date Organizer has to provide is ``Auction.auctionPeriod.startDate`` - approximate date when the auction starts - the actual value will be calculated automatically considering the existing capacity. + +* The rest dates and periods will be calculated automatically based on ``Auction.auctionPeriod.startDate``. * ``tenderPeriod`` duration must be at least 7 calendar days. @@ -37,23 +39,23 @@ Features .. note:: There is predefined list of possible items to lease. -* Additional classification (CPVS) is constant for ``propertyLease`` procedure - ``PA01-7``. +* All of the identifiers within the scheme ``CPVS`` can be chosen. ``PA01-7`` is the one to be added automatically. * The minimum desired participants' count by default is 2, but there is option to decrease it explicitly to 1 participant; * Optionally an Organizer can set ``tenderPeriod.endDate`` - if so, auction can't start earlier 3 days after. -* Optionally an Organizer can set ``enquiryPeriod.endDate``, if not provided - it will be calculated automatically. +* Optionally an Organizer can set ``rectificationPeriod.endDate``, if not provided - it will be calculated automatically. -* An Organizer can edit procedure only during ``rectificationPeriod`` (increase and decrease ``value.amount``, ``guarantee.amount``, ``minimalStep.amount``). +* An Organizer can edit the procedure only during ``rectificationPeriod`` (e.g. increase and decrease ``value.amount``, ``guarantee.amount``, ``minimalStep.amount``). * Organizer can add and edit documents only during ``rectificationPeriod``. -* As soon as the action is edited, the status of all of the submitted bids will be switched to ``invalid``. +* As soon as the procedure is edited, the status of all of the submitted bids will be switched to ``invalid``. * There is obligatory participant qualification via guarantee payment. -* The only criterion for choosing a winner is the price, provided the tenderer complies with the qualifying criteria determined by the Organizer. +* The only criterion for choosing a winner is the price, provided the bidder complies with the qualifying criteria determined by the Organizer. Conventions ----------- From 65b7adba1a8c2fc8797989f54bfced796b47aea5 Mon Sep 17 00:00:00 2001 From: Anton Korobko Date: Fri, 1 Jun 2018 12:03:51 +0300 Subject: [PATCH 13/14] cleanup and fetures reorder --- docs/source/overview.rst | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/docs/source/overview.rst b/docs/source/overview.rst index 5799716..3d8e8a8 100644 --- a/docs/source/overview.rst +++ b/docs/source/overview.rst @@ -23,35 +23,35 @@ To perform state property lease specialized procedure is available: Features -------- -* The only currency (``value.currency``) for this procedure is hryvnia (UAH). - * The only date Organizer has to provide is ``Auction.auctionPeriod.startDate`` - approximate date when the auction starts - the actual value will be calculated automatically considering the existing capacity. * The rest dates and periods will be calculated automatically based on ``Auction.auctionPeriod.startDate``. +* Optionally an Organizer can set ``rectificationPeriod.endDate``, if not provided - it will be calculated automatically. + * ``tenderPeriod`` duration must be at least 7 calendar days. -* Procedure can be switched from ``draft`` status to ``active.tendering``. +* Optionally an Organizer can set ``tenderPeriod.endDate`` - if so, auction can't start earlier 3 days after. -* During ``active.tendering`` period participants can ask questions, submit proposals, and upload documents. +* An Organizer can edit the procedure only during ``rectificationPeriod`` (e.g. increase and decrease ``value.amount``, ``guarantee.amount``, ``minimalStep.amount``). -* The items within an auction are allowed to be from different CAV groups. +* Organizer can add and edit documents only during ``rectificationPeriod``. -.. note:: There is predefined list of possible items to lease. +* As soon as the procedure is edited, the status of all of the submitted bids will be switched to ``invalid``. -* All of the identifiers within the scheme ``CPVS`` can be chosen. ``PA01-7`` is the one to be added automatically. +* Procedure can be switched from ``draft`` status to ``active.tendering``. -* The minimum desired participants' count by default is 2, but there is option to decrease it explicitly to 1 participant; +* During ``tenderPeriod`` participants can ask questions, submit proposals, and upload documents. -* Optionally an Organizer can set ``tenderPeriod.endDate`` - if so, auction can't start earlier 3 days after. +* All of the identifiers within the scheme ``CPVS`` can be chosen. ``PA01-7`` is the one to be added automatically. -* Optionally an Organizer can set ``rectificationPeriod.endDate``, if not provided - it will be calculated automatically. +* The minimum desired participants' count by default is 2, but there is option to decrease it explicitly to 1 participant; -* An Organizer can edit the procedure only during ``rectificationPeriod`` (e.g. increase and decrease ``value.amount``, ``guarantee.amount``, ``minimalStep.amount``). +* The only currency (``value.currency``) for this procedure is hryvnia (UAH). -* Organizer can add and edit documents only during ``rectificationPeriod``. +* The items within an auction are allowed to be from different CAV groups. -* As soon as the procedure is edited, the status of all of the submitted bids will be switched to ``invalid``. +.. note:: There is predefined list of possible items to lease. * There is obligatory participant qualification via guarantee payment. @@ -98,6 +98,12 @@ Documentation of related packages * `OpenProcurement API `_ +API stability +------------- + +API is relatively stable. + + Change log ---------- 1.1.1-sale From d400f46baa5b3994b8b62463be8364956a1e7d41 Mon Sep 17 00:00:00 2001 From: Anton Korobko Date: Fri, 1 Jun 2018 17:05:32 +0300 Subject: [PATCH 14/14] few corrections (en) --- docs/source/overview.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/overview.rst b/docs/source/overview.rst index 3d8e8a8..8702a93 100644 --- a/docs/source/overview.rst +++ b/docs/source/overview.rst @@ -41,15 +41,15 @@ Features * Procedure can be switched from ``draft`` status to ``active.tendering``. -* During ``tenderPeriod`` participants can ask questions, submit proposals, and upload documents. +* During ``enquiryPeripod`` participants can ask questions, submit proposals, and upload documents. * All of the identifiers within the scheme ``CPVS`` can be chosen. ``PA01-7`` is the one to be added automatically. -* The minimum desired participants' count by default is 2, but there is option to decrease it explicitly to 1 participant; +* The minimum desired participants' number by default is 2, but there is option to decrease it explicitly to 1 participant; * The only currency (``value.currency``) for this procedure is hryvnia (UAH). -* The items within an auction are allowed to be from different CAV groups. +* The items within an procedure are allowed to be from different CAV-PS groups. .. note:: There is predefined list of possible items to lease.