Skip to content

Commit

Permalink
Merge pull request #7 from sofiiakopach/master
Browse files Browse the repository at this point in the history
Docs: Correct typos and add translation
  • Loading branch information
ivanka-jakimchuk committed Dec 13, 2018
2 parents 6e32837 + 0c454a9 commit 7bc6d29
Show file tree
Hide file tree
Showing 49 changed files with 2,798 additions and 1,584 deletions.
51 changes: 26 additions & 25 deletions docs/source/awardWorkflow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,21 @@ Award Section
Legend
""""""
\* admission protocol is downloaded and award is switched to `pending` by the organizer.
\* admission protocol is uploaded and award is switched to `pending` by the organizer.

\*\* protocol is downloaded and award is switched to `active` by the organizer.
\*\* protocol is uploaded and award is switched to `active` by the organizer.

\*\*\* organizer has decided to disqualify the bidder.

\~ admission protocol is not downloaded and award is not switched to `pending` by the organizer in time.
\~ admission protocol is not uploaded and award is not switched to `pending` by the organizer in time.

\~\~ organizer has decided to disqualify the bidder. The approptiate document is downloaded and award is manually switched to `unsuccessful`.
\~\~ organizer has decided to disqualify the bidder. The appropriate document is uploaded and award is manually switched to `unsuccessful`.

\~\~\~ organizer switched contract to `cancelled`.

Roles
"""""
"""""

:Chronograph: solid

Expand All @@ -76,7 +77,7 @@ Contract Section
Legend
""""""

\* document was downloaded to contract. The contract itself was successfully activated by the organizer.
\* document was uploaded to contract. The contract itself was successfully activated by the organizer.

\*\* there was no document uploaded. The organizer refused to activate the contract.

Expand All @@ -92,17 +93,17 @@ Procedure Description

1. The procedure receives `active.qualification` status.

2. The award initially receives `pending.admission` status. The process enters the `admissionPeriod` with the auto-generated duration of 0-5 business days. During this term the organizer uploads the protocol (`documentType: admissionProtocol`) first and manually switches award to `pending` status then. Simultaneously the awarding process enters the the `verificationPeriod` phase. If the actions needed are not completed, the award auctomatically receives `unsuccessful` status, so that the procedure will be switched to `unsuccessful` as well.
2. The award initially receives `pending.admission` status. The process enters the `admissionPeriod` with the auto-generated duration of 0-5 business days. During this term the organizer uploads the protocol (`documentType: admissionProtocol`) first and manually switches award to `pending` status then. Simultaneously the awarding process enters the the `verificationPeriod` phase. If needed actions are not completed, the award automatically receives `unsuccessful` status, so the procedure will be switched to `unsuccessful` as well.

2.1 If the organizer decides to disqualify the bidder, a document (`documentType: rejectionProtocol` or `act`) has to be downloaded first and the award has to be manually switched to `unsuccessful` then. The procedure will be given `unsuccessful` status this way.
2.1 If the organizer decides to disqualify the bidder, a document (`documentType: rejectionProtocol` or `act`) has to be uploaded first and the award has to be manually switched to `unsuccessful` then. The procedure will be given `unsuccessful` status this way.

3. When the conditions are met, the process enters the `verificationPeriod` with the auto-generated duration of 0-10 business days. During this term the organizer uploads the protocol (`documentType: auctionProtocol`) first and manually switches award to `active` status then. Simultaneously the awarding process enters the signingPeriod phase and the procedure receives `active.awarded` status.

3.1 If the organizer decides to disqualify the bidder, a document (`documentType: rejectionProtocol` or `act`) has to be downloaded first and the award has to be manually switched to `unsuccessful` then.
3.1 If the organizer decides to disqualify the bidder, a document (`documentType: rejectionProtocol` or `act`) has to be uploaded first and the award has to be manually switched to `unsuccessful` then.

4. It is then when the qualification procedure enters the `signingPeriod` stage, which lasts up to 40 days from the beginning of the bidder qualification process. The contract of the qualifying bid initially receives a `pending` status. Within this time, the organizer should upload the document (`documentType: contractSigned`) in the system and manually switch contract to `active` status in order to successfully finish the qualification procedure.
4. When the qualification procedure enters the `signingPeriod` stage, which lasts up to 20 days from the beginning of the bidder qualification process. The contract of the qualifying bid initially receives a `pending` status. Within this time, the organizer should upload the document (`documentType: contractSigned`) in the system and manually switch contract to `active` status in order to successfully finish the qualification procedure.

4.1 For the bidder to be disqualified a document (`documentType: rejectionProtocol` or `act`) has to be downloaded first and the contract has to be manually switched to `cancelled` by the organizer then. As long as such an action is done, award status will receive `unsuccessful`.
4.1 For the bidder to be disqualified a document (`documentType: rejectionProtocol` or `act`) has to be uploaded first and the contract has to be manually switched to `cancelled` by the organizer then. When all of the actions are done, award will receive `unsuccessful` status.

Procedure Workflow for 2 Submitted Bids or More
================================================
Expand Down Expand Up @@ -143,7 +144,7 @@ Legend

\* award for winner is always formed in `pending`.

\*\* protocol is downloaded and award is switched to `active` by the organizer.
\*\* protocol is uploaded and award is switched to `active` by the organizer.

\*\*\* organizer has decided to disqualify the bidder.

Expand All @@ -165,20 +166,20 @@ Contract Section

digraph G {
subgraph cluster_1 {
node [style=filled, color=lightgrey];
edge[label="**" style=dashed];
"pending" -> "cancelled";
edge[label="*" style=dashed];
"pending" -> "active"
node [style=filled, fillcolor=seashell2];
edge[style=dashed, arrowhead="vee", label="*"];
"pending" -> "acive";
label = "Contract Workflow";
color=white
}
edge[style=dashed, arrowhead="vee", label="**"];
"pending" -> "cancelled";
}

Legend
""""""

\* document was downloaded to contract. The contract itself was successfully activated by the organizer.
\* document was uploaded to contract. The contract itself was successfully activated by the organizer.

\*\* there was no document uploaded. The organizer refused to activate the contract.

Expand All @@ -196,12 +197,12 @@ Procedure Description

2. The award with the highest qualifying bid initially receives `pending` status. The process enters the `verificationPeriod` with the auto-generated duration of 0-10 business days. During this term the organizer uploads the protocol (`documentType: auctionProtocol`) first and manually switches award to `active` status then. Simultaneously the procedure enters the signingPeriod phase and the procedure receives `active.awarded` status.

2.1 If the organizer decides to disqualify the bidder, a document (`documentType: rejectionProtocol` or `act`) has to be downloaded first and the award has to be manually switched to `unsuccessful` then.
2.1 If the organizer decides to disqualify the bidder, a document (`documentType: rejectionProtocol` or `act`) has to be uploaded first and the award has to be manually switched to `unsuccessful` then.

3. It is then when the qualification procedure enters the `signingPeriod` stage, which lasts up to 40 days from the beginning of the bidder qualification process. The contract of the qualifying bid initially receives a `pending` status. Within this time, the organizer should upload the document (`documentType: contractSigned`) in the system and manually switch contract to `active` status in
3. When the qualification procedure enters the `signingPeriod` stage, which lasts up to 20 days from the beginning of the bidder qualification process. The contract of the qualifying bid initially receives a `pending` status. Within this time, the organizer should upload the document (`documentType: contractSigned`) in the system and manually switch contract to `active` status in
order to successfully finish the qualification procedure.

3.1 For the bidder to be disqualified a document (`documentType: rejectionProtocol` or `act`) has to be downloaded first and the contract has to be manually switched to `cancelled` by the organizer then. As long as such an action is done, award status will receive `unsuccessful`.
3.1 For the bidder to be disqualified a document (`documentType: rejectionProtocol` or `act`) has to be uploaded first and the contract has to be manually switched to `cancelled` by the organizer then. As long as such an action is done, award status will receive `unsuccessful`.

4. The second highest qualifying bidder, immediately after the auction ending receives the `pending.waiting` status, in which by default they agree to wait for the end of the qualification of the highest qualifying bidder to be eligible to go through the qualification process if the highest bidder is disqualified. The only action that they can make is to manually cancel the award decision (switch award to `cancelled` status) - withdraw the security deposit and lose the chance to become a winner of the auction. If that is done and the first highest qualifying bidder becomes `unsuccessful`, the procedure receives the `unsuccessful` status. Provided that first award gets disqualified while the second has not disqualified themselves, the second award automatically changes its status from `pending.waiting` to `pending`, after which they undergo the same qualification procedure as outlined above for the first award.

Expand All @@ -216,7 +217,7 @@ Notes

2.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 unsuccessful immediately. The first highest bid (if larger than the value.amount + minimmalStep.amount) undergoes the awarding procedure and can win the auction.

3. The organizer can disqualify the award at any stage of the awarding process up to the moment, when a document with the `documentType: contractSigned` has been downloaded.
3. The organizer can disqualify the award at any stage of the awarding process up to the moment, when a document with the `documentType: contractSigned` has been uploaded.

4. The second highest qualifying bidder can disqualify themselves at any point in time BEFORE the start of their qualification process.

Expand All @@ -229,12 +230,12 @@ Statuses
:`Contract`: Awaiting for the contract to be signed (uploaded and activated in the system by the organizer).

:active:
:`Award`: Auction protocol (`documentType: auctionProtocol`) was downloaded so that the award could be switched to `active` by the organizer.
:`Award`: Auction protocol (`documentType: auctionProtocol`) was uploaded so that the award could be switched to `active` by the organizer.

:`Contract`: The document (`documentType: contractSigned`) was downloaded so that the status of the contract object could be switched to `active` by the organizer.
:`Contract`: The document (`documentType: contractSigned`) was uploaded so that the status of the contract object could be switched to `active` by the organizer.

:unsuccessful:
Terminal status of award. Rejection protocol or act (`documentType: rejectionProtocol/act`) was downloaded so that the award could be switched to `unsuccessful` by the organizer. Or when the contract becomes status `cancelled`, the status of the award will be `unsuccessful`.
Terminal status of award. Rejection protocol or act (`documentType: rejectionProtocol/act`) was uploaded so that the award could be switched to `unsuccessful` by the organizer. Or when the contract becomes status `cancelled`, the status of the award will be `unsuccessful`.

:cancelled:
Terminal status of contract. Rejection protocol or act (`documentType: rejectionProtocol/act`) was downloaded so that the contract could be switched to `cancelled` by the organizer.
Terminal status of contract. Rejection protocol or act (`documentType: rejectionProtocol/act`) was uploaded so that the contract could be switched to `cancelled` by the organizer.
Binary file added docs/source/locale/uk/LC_MESSAGES/2pc.mo
Binary file not shown.
Binary file added docs/source/locale/uk/LC_MESSAGES/acceleration.mo
Binary file not shown.

0 comments on commit 7bc6d29

Please sign in to comment.