Commit 6d35101f9842d74e0b03cd5fbeb2af0c57056c4e

Authored by ssk
Committed by GitHub
2 parents 7fb6c026 a195f6f4

Merge pull request #1 from ProzorroUKR/master

merge fork master with prozorro master
... ... @@ -14,6 +14,8 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
14 14 ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
15 15 ${ARTIFACT}= load_data_from ${file_path}
16 16 Log ${ARTIFACT.tender_uaid}
  17 + Log ${ARTIFACT.tender_id}
  18 + Log ${ARTIFACT.tender_owner_access_token}
17 19 ${NUMBER_OF_LOTS}= Convert To Integer ${NUMBER_OF_LOTS}
18 20 ${NUMBER_OF_ITEMS}= Convert To Integer ${NUMBER_OF_ITEMS}
19 21 ${NUMBER_OF_MILESTONES}= Convert To Integer ${NUMBER_OF_MILESTONES}
... ... @@ -42,7 +44,7 @@ ${ERROR_PLAN_MESSAGE}= Calling method 'get_plan' failed: ResourceGone: {"status
42 44 Log ${plan_data}
43 45 ${tender_data}= Підготувати дані для створення тендера ${tender_parameters} ${plan_data}
44 46 ${adapted_data}= Адаптувати дані для оголошення тендера ${tender_data}
45   - ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data}
  47 + ${TENDER_UAID}= Run As ${tender_owner} Створити тендер ${adapted_data} ${ARTIFACT.tender_id} ${ARTIFACT.tender_owner_access_token}
46 48 Set To Dictionary ${USERS.users['${tender_owner}']} initial_data=${adapted_data}
47 49 Set To Dictionary ${TENDER} TENDER_UAID=${TENDER_UAID}
48 50
... ...
... ... @@ -189,15 +189,15 @@ Library openprocurement_client.utils
189 189
190 190
191 191 Створити тендер
192   - [Arguments] ${username} ${tender_data}
193   - ${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
194   - ${ARTIFACT}= load_data_from ${file_path}
195   - Log ${ARTIFACT.tender_owner_access_token}
196   - Log ${ARTIFACT.tender_id}
  192 + [Arguments] ${username} ${tender_data} ${plan_id} ${plan_access_token}
  193 + #${file_path}= Get Variable Value ${ARTIFACT_FILE} artifact_plan.yaml
  194 + #${ARTIFACT}= load_data_from ${file_path}
  195 + #Log ${ARTIFACT.tender_owner_access_token}
  196 + #Log ${ARTIFACT.tender_id}
197 197 ${tender}= Call Method ${USERS.users['${username}'].tender_create_client} create_tender
198   - ... ${ARTIFACT.tender_id}
  198 + ... ${plan_id}
199 199 ... ${tender_data}
200   - ... access_token=${ARTIFACT.tender_owner_access_token}
  200 + ... access_token=${plan_access_token}
201 201 Log ${tender}
202 202 ${access_token}= Get Variable Value ${tender.access.token}
203 203 ${status}= Set Variable If 'open' in '${MODE}' active.tendering ${EMPTY}
... ...
... ... @@ -730,7 +730,8 @@ ${PLAN_TENDER} ${True}
730 730 ... tender_owner
731 731 ... ${USERS.users['${tender_owner}'].broker}
732 732 ... award_complaint
733   - :FOR ${username} IN ${viewer} ${tender_owner}
  733 + ${award_index}= Отримати останній індекс awards ${tender_owner} ${viewer}
  734 + :FOR ${username} IN ${viewer}
734 735 \ Отримати дані із тендера ${username} ${TENDER['TENDER_UAID']} awards[${award_index}].complaintPeriod.endDate
735 736
736 737
... ... @@ -739,10 +740,43 @@ ${PLAN_TENDER} ${True}
739 740 ... tender_owner
740 741 ... ${USERS.users['${tender_owner}'].broker}
741 742 ... award_complaint
742   - ${standstillEnd}= Get Variable Value ${USERS.users['${tender_owner}'].tender_data.data.awards[${award_index}].complaintPeriod.endDate}
  743 + ${award_index}= Отримати останній індекс awards ${tender_owner} ${viewer}
  744 + ${standstillEnd}= Get Variable Value ${USERS.users['${viewer}'].tender_data.data.awards[${award_index}].complaintPeriod.endDate}
743 745 Дочекатись дати ${standstillEnd}
744 746
745 747
  748 +Відображення вартості угоди без урахування ПДВ
  749 + [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
  750 + ... viewer
  751 + ... ${USERS.users['${viewer}'].broker}
  752 + ... contract_view
  753 + ... non-critical
  754 + [Setup] Дочекатись синхронізації з майданчиком ${viewer}
  755 + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer}
  756 + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer}
  757 + Log ${award}
  758 + ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer}
  759 + Log ${contract}
  760 + Log ${award.value.amount}
  761 + Звірити відображення поля contracts[${contract_index}].value.amountNet тендера із ${award.value.amount} для користувача ${viewer}
  762 +
  763 +
  764 +Відображення вартості угоди
  765 + [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
  766 + ... viewer
  767 + ... ${USERS.users['${viewer}'].broker}
  768 + ... contract_view
  769 + ... non-critical
  770 + [Setup] Дочекатись синхронізації з майданчиком ${viewer}
  771 + ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer}
  772 + ${award}= Отримати останній элемент awards ${tender_owner} ${viewer}
  773 + Log ${award}
  774 + ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer}
  775 + Log ${contract}
  776 + Log ${award.value.amount}
  777 + Звірити відображення поля contracts[${contract_index}].value.amount тендера із ${award.value.amount} для користувача ${viewer}
  778 +
  779 +
746 780 Можливість редагувати вартість угоди без урахування ПДВ
747 781 [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди
748 782 ... tender_owner
... ...
... ... @@ -301,20 +301,26 @@ SmartTender:
301 301 intervals:
302 302 default:
303 303 enquiry: [0, 10]
  304 + tender: [0, 30]
  305 + belowThreshold:
  306 + enquiry: [0, 25]
304 307 tender: [0, 20]
305 308 openua:
306 309 accelerator: 1440
307   - tender: [0, 15]
  310 + tender: [30, 70]
308 311 openeu:
309   - tender: [0, 30]
  312 + tender: [30, 70]
310 313 accelerator: 1440
  314 + framework_selection:
  315 + accelerator: 360
311 316 keywords_file: smarttender
312 317 roles:
313 318 provider: SmartTender_Provider1
314 319 provider1: SmartTender_Provider2
  320 + provider2: SmartTender_Provider3
315 321 tender_owner: SmartTender_Owner
316 322 viewer: SmartTender_Viewer
317   - timeout_on_wait: 300
  323 + timeout_on_wait: 0
318 324 uatenders:
319 325 intervals:
320 326 default:
... ...
... ... @@ -415,6 +415,14 @@ users:
415 415 browser: chrome
416 416 position: [0, 450]
417 417 size: [1280, 1024]
  418 + SmartTender_Provider3:
  419 + broker: SmartTender
  420 + homepage: "http://test.smarttender.biz"
  421 + login: monosmarttender@gmail.com
  422 + password: monosmart11
  423 + browser: chrome
  424 + position: [0, 450]
  425 + size: [1280, 1024]
418 426 SmartTender_Owner:
419 427 broker: SmartTender
420 428 homepage: "http://test.smarttender.biz"
... ...
... ... @@ -178,6 +178,7 @@ def test_tender_data(params,
178 178 "title_en": fake_en.catch_phrase(),
179 179 "title_ru": fake_ru.catch_phrase(),
180 180 "procuringEntity": fake.procuringEntity(),
  181 + "procurementMethodType": "belowThreshold",
181 182 "value": {
182 183 "amount": value_amount,
183 184 "currency": u"UAH",
... ... @@ -294,7 +295,11 @@ def test_tender_data_planning(params):
294 295 "currency": "UAH",
295 296 "amount": round(random.uniform(3000, 99999999999.99), 2),
296 297 "id": str(fake.random_int(min=1, max=99999999999)) + "-" + str(fake.random_int(min=1, max=9)),
297   - "breakdown": []
  298 + "breakdown": [],
  299 + "period": {
  300 + "startDate": get_now().replace(hour=0, minute=0, second=0, microsecond=0).isoformat(),
  301 + "endDate": get_now().replace(hour=0, minute=0, second=0, microsecond=0).isoformat()
  302 + }
298 303 },
299 304 "procuringEntity": {
300 305 "identifier": {
... ...
... ... @@ -326,6 +326,7 @@ Get Broker Property By Username
326 326 Підготувати дані для подання пропозиції для другого етапу
327 327 [Arguments] ${username}
328 328 ${value}= Evaluate ${USERS.users['${username}'].bidresponses.bid.data.lotValues[0].value.amount}*0.95
  329 + ${value}= Convert To Number ${value} 2
329 330 Set To Dictionary ${USERS.users['${username}'].bidresponses.bid.data.lotValues[0].value} amount=${value}
330 331 [Return] ${USERS.users['${username}'].bidresponses.bid}
331 332
... ... @@ -392,6 +393,7 @@ Get Broker Property By Username
392 393
393 394 Підготувати дані для оновлення властивості угоди
394 395 [Arguments] ${username} ${field_name} ${field_value}
  396 + ${username}= Отримати користувача з доступом до поля за пріорітетом items ${tender_owner} ${viewer}
395 397 ${modification_data}= test_modification_data
396 398 ... ${USERS.users['${username}'].agreement_data.data['items'][0]['id']}
397 399 ... ${field_name}
... ... @@ -986,13 +988,12 @@ Require Failure
986 988 [Arguments] ${username} ${tender_uaid} ${left}
987 989 ${right}= Run as ${username} Отримати інформацію із тендера ${tender_uaid} status
988 990 Порівняти об'єкти ${left} ${right}
989   - Порівняти об'єкти ${left} ${right}
990 991
991 992
992 993 Звірити статус плану
993 994 [Arguments] ${username} ${tender_uaid} ${left}
994 995 ${right}= Run as ${username} Отримати інформацію із плану ${tender_uaid} status
995   -
  996 + Порівняти об'єкти ${left} ${right}
996 997
997 998 Звірити статус об'єкта моніторингу
998 999 [Arguments] ${username} ${monitoring_uaid} ${left}
... ... @@ -1194,7 +1195,8 @@ Require Failure
1194 1195
1195 1196 Дочекатись можливості зареєструвати угоди
1196 1197 [Arguments] ${username}
1197   - Дочекатись дати ${USERS.users['${tender_owner}'].tender_data.data.contractPeriod.clarificationsUntil}
  1198 + ${username}= Отримати користувача з доступом до поля за пріорітетом contractPeriod ${tender_owner} ${viewer}
  1199 + Дочекатись дати ${USERS.users['${username}'].tender_data.data.contractPeriod.clarificationsUntil}
1198 1200 Оновити LAST_MODIFICATION_DATE
1199 1201 Дочекатись синхронізації з майданчиком ${username}
1200 1202
... ... @@ -1265,6 +1267,7 @@ Require Failure
1265 1267
1266 1268
1267 1269 Розрахувати ціну для ${contract_number} контракту
  1270 + ${username}= Отримати користувача з доступом до поля за пріорітетом agreements ${tender_owner} ${viewer}
1268 1271 ${contract_data}= Create Dictionary data=${USERS.users['${tender_owner}'].tender_data.data.agreements[0].contracts[${contract_number}]}
1269 1272 ${quantity}= Set Variable ${0}
1270 1273 :FOR ${index} IN RANGE ${NUMBER_OF_ITEMS}
... ... @@ -1275,4 +1278,4 @@ Require Failure
1275 1278 \ Set To Dictionary ${contract_data.data.unitPrices[${index}].value} amount=${value}
1276 1279 ${contract_data}= munch_dict arg=${contract_data}
1277 1280 Log ${contract_data}
1278   - [Return] ${contract_data}
\ No newline at end of file
  1281 + [Return] ${contract_data}
... ...
... ... @@ -778,38 +778,6 @@ ${PLAN_TENDER} ${True}
778 778 Звірити відображення поля contracts[${contract_index}].value.amount тендера із ${award.value.amount} для користувача ${viewer}
779 779
780 780
781   -Відображення вартості угоди без урахування ПДВ
782   - [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
783   - ... viewer
784   - ... ${USERS.users['${viewer}'].broker}
785   - ... contract_view
786   - ... non-critical
787   - [Setup] Дочекатись синхронізації з майданчиком ${viewer}
788   - ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer}
789   - ${award}= Отримати останній элемент awards ${tender_owner} ${viewer}
790   - Log ${award}
791   - ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer}
792   - Log ${contract}
793   - Log ${award.value.amount}
794   - Звірити відображення поля contracts[${contract_index}].value.amountNet тендера із ${award.value.amount} для користувача ${viewer}
795   -
796   -
797   -Відображення вартості угоди
798   - [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних угоди
799   - ... viewer
800   - ... ${USERS.users['${viewer}'].broker}
801   - ... contract_view
802   - ... non-critical
803   - [Setup] Дочекатись синхронізації з майданчиком ${viewer}
804   - ${contract_index}= Отримати останній індекс contracts ${tender_owner} ${viewer}
805   - ${award}= Отримати останній элемент awards ${tender_owner} ${viewer}
806   - Log ${award}
807   - ${contract}= Отримати останній элемент contracts ${tender_owner} ${viewer}
808   - Log ${contract}
809   - Log ${award.value.amount}
810   - Звірити відображення поля contracts[${contract_index}].value.amount тендера із ${award.value.amount} для користувача ${viewer}
811   -
812   -
813 781 Можливість редагувати вартість угоди без урахування ПДВ
814 782 [Tags] ${USERS.users['${tender_owner}'].broker}: Редагування угоди
815 783 ... tender_owner
... ...
... ... @@ -8,7 +8,7 @@ ${RESOURCE} plans
8 8 ${MODE} belowThreshold
9 9 @{USED_ROLES} tender_owner viewer
10 10
11   -${NUMBER_OF_ITEMS} ${2}
  11 +${NUMBER_OF_ITEMS} ${1}
12 12 ${TENDER_MEAT} ${False}
13 13 ${ITEM_MEAT} ${False}
14 14 ${MOZ_INTEGRATION} ${False}
... ...
... ... @@ -11,6 +11,7 @@
11 11 -i qualification_approve_first_award
12 12
13 13 -i award_complaint
  14 +-i contract_view
14 15 -i modify_contract_amount_net
15 16 -i modify_contract_value
16 17 -i below_award_complaint
\ No newline at end of file
... ...
... ... @@ -8,7 +8,6 @@
8 8 -v ITEM_MEAT:False
9 9 -v LOT_MEAT:False
10 10
11   -
12 11 -i create_tender
13 12 -i find_tender
14 13 -i tender_view
... ... @@ -18,8 +17,6 @@
18 17 -i tender_view_deliveryDate
19 18 -i tender_view_quantity
20 19 -i tender_view_unit_name
21   --i tender_view_unit_code
22   --i tender_view_coordinates
23 20 -i lot_view
24 21 -i lot_view_value
25 22 -i lot_view_minimalStep
... ...
1 1 -v MODE:open_competitive_dialogue
2 2
3   -
4 3 -v NUMBER_OF_ITEMS:1
5 4 -v NUMBER_OF_LOTS:1
6 5
... ... @@ -8,7 +7,6 @@
8 7 -v ITEM_MEAT:False
9 8 -v LOT_MEAT:False
10 9
11   -
12 10 -i create_tender
13 11 -i find_tender
14 12 -i tender_view
... ... @@ -18,13 +16,10 @@
18 16 -i tender_view_deliveryDate
19 17 -i tender_view_quantity
20 18 -i tender_view_unit_name
21   --i tender_view_unit_code
22   --i tender_view_coordinates
23 19 -i lot_view
24 20 -i lot_view_value
25 21 -i lot_view_minimalStep
26 22
27   -
28 23 -i make_bid_by_provider
29 24 -i make_bid_by_provider1
30 25 -i make_bid_by_provider2
... ... @@ -63,8 +58,11 @@
63 58
64 59 -i auction
65 60
  61 +-i qualification_add_doc_to_first_award
66 62 -i qualification_approve_first_award
67   -
  63 +-i qualification_cancel_first_award_qualification
  64 +-i qualification_add_doc_to_second_award
  65 +-i qualification_approve_second_award
68 66
69 67 -i contract_stand_still
70 68 -i contract_view
... ...
... ... @@ -9,7 +9,6 @@
9 9 -v ITEM_MEAT:False
10 10 -v LOT_MEAT:False
11 11
12   -
13 12 -i create_tender
14 13 -i find_tender
15 14 -i tender_view
... ... @@ -18,8 +17,6 @@
18 17 -i tender_view_minimalStep
19 18 -i tender_view_deliveryDate
20 19 -i tender_view_quantity
21   --i tender_view_unit_name
22   --i tender_view_unit_code
23 20 -i tender_view_coordinates
24 21 -i lot_view
25 22 -i lot_view_value
... ... @@ -56,26 +53,17 @@
56 53
57 54 -i auction
58 55
  56 +-i qualification_add_doc_to_first_award
59 57 -i qualification_approve_first_award
  58 +-i qualification_cancel_first_award_qualification
  59 +-i qualification_add_doc_to_second_award
  60 +-i qualification_approve_second_award
60 61
61   --i contract_sign
62 62 -i contract_stand_still
63   -
  63 +-i contract_view
  64 +-i modify_contract_amount_net
  65 +-i modify_contract_value
64 66 -i modify_contract
65 67 -i add_doc_to_contract
66 68 -i contract_doc_documentOf
67   --i contract_sign
68   -
69   --i find_contract
70   --i access_contract
71   --i submit_change
72   --i view_change
73   --i upload_change_document
74   --i modify_change
75   -
76   --i apply_change
77   --i add_contract_doc
78   --i termination_reasons
79   --i amount_paid
80   -
81   --i contract_termination
\ No newline at end of file
  69 +-i contract_sign
\ No newline at end of file
... ...
... ... @@ -4,8 +4,8 @@
4 4 -v NUMBER_OF_LOTS:1
5 5
6 6 -v TENDER_MEAT:True
7   --v ITEM_MEAT:True
8   --v LOT_MEAT:True
  7 +-v ITEM_MEAT:False
  8 +-v LOT_MEAT:False
9 9
10 10 -v FUNDING_KIND:budget
11 11
... ... @@ -20,31 +20,14 @@
20 20
21 21 -i extend_tendering_period
22 22 -i add_tender_doc
23   --i add_lot_doc
24   --i add_lot_meat
25   - -i delete_lot_meat
26   -
27   --i ask_question_to_lot
28   - -i answer_question_to_lot
  23 +-i ask_question_to_tender
  24 +-i answer_question_to_tender
29 25 -i modify_tender_after_questions
30 26
31   --i make_bid_without_related_lot
32   --i make_bid_without_parameters
33 27 -i make_bid_by_provider
34 28 -i add_doc_to_bid_by_provider
35 29 -i make_bid_by_provider1
36 30
37   --i bid_view_in_tendering_period
38   -
39   --i add_bid_doc_after_tendering_period_by_provider
40   --i modify_bid_doc_after_tendering_period_by_provider
41   --i modify_bid_after_tendering_period_by_provider1
42   --i cancel_bid_after_tendering_period_by_provider1
43   -
44   --i ask_question_to_tender_after_tendering_period
45   --i ask_question_to_item_after_tendering_period
46   --i ask_question_to_lot_after_tendering_period
47   -
48 31 -i open_modify_tender_in_tendering_period
49 32 -i open_confirm_first_bid
50 33 -i open_confirm_second_bid
... ... @@ -65,17 +48,15 @@
65 48 -i auction_url
66 49 -i auction
67 50
68   --i qualification_add_doc_to_first_award
69   -
70 51 #-i qualifications_check_by_edrpou
71 52
  53 +-i qualification_add_doc_to_first_award
72 54 -i qualification_approve_first_award
73 55 -i qualification_cancel_first_award_qualification
74 56 -i qualification_reject_second_award
75 57 -i qualification_add_doc_to_third_award
76 58 -i qualification_approve_third_award
77 59
78   -
79 60 -i contract_stand_still
80 61 -i contract_view
81 62 #-i modify_contract_invalid_amount
... ...
... ... @@ -4,55 +4,42 @@
4 4 -v NUMBER_OF_LOTS:1
5 5
6 6 -v TENDER_MEAT:True
7   --v ITEM_MEAT:True
  7 +-v ITEM_MEAT:False
8 8 -v LOT_MEAT:False
9 9
10   -
11 10 -i create_tender
12 11 -i find_tender
13   -
14 12 -i tender_view
15 13 -i tender_view_milestone
16 14 -i tender_view_value
17 15 -i tender_view_unit_name
18   --i tender_view_unit_code
19   --i tender_view_coordinates
20 16 -i tender_view_framework
21 17 -i lot_view
22 18 -i lot_view_value
23 19 -i lot_view_minimalStep
24 20 -i meat_view
25 21
26   -#-i add_item
27   - #-i delete_item
28 22 -i add_tender_meat
29 23 -i delete_tender_meat
30 24
31 25 -i extend_tendering_period
32 26 -i add_tender_doc
33   --i add_lot_doc
  27 +
34 28 -i modify_lot_value_amount
35 29 -i modify_maxAwardsCount
36 30
37 31 -i ask_question_to_tender
38 32 -i answer_question_to_tender
39   --i ask_question_to_item
40   - -i answer_question_to_item
41   --i ask_question_to_lot
42   - -i answer_question_to_lot
  33 +
43 34 -i modify_tender_after_questions
44 35 -i modify_lot_after_questions
45 36
46   --i make_bid_without_related_lot
47 37 -i make_bid_by_provider
48 38 -i modify_bid_by_provider
49 39 -i add_doc_to_bid_by_provider
50 40 -i make_bid_by_provider1
51   --i bid_view_in_tendering_period
52 41 -i make_bid_by_provider2
53 42
54   --i ask_question_to_tender_after_tendering_period
55   -
56 43 -i open_tender_view
57 44 -i open_modify_tender_in_tendering_period
58 45 -i open_confirm_first_bid
... ... @@ -65,16 +52,11 @@
65 52 -i openeu_add_eligibility_bid_doc_by_provider
66 53 -i add_winningBid_doc_by_provider
67 54
68   --i pre-qualification_add_doc_to_tender
69   --i pre-qualification_add_doc_to_lot
70   -
71 55 -i pre-qualification_view
72 56
73 57 #-i pre-qualifications_check_by_edrpou
74 58
75   -#-i pre-qualification_add_doc_to_first_bid
76 59 -i pre-qualification_approve_first_bid
77   -#-i pre-qualification_add_doc_to_second_bid
78 60 -i pre-qualification_reject_second_bid
79 61 -i pre-qualification_cancel_second_bid_qualification
80 62 -i pre-qualification_approve_second_bid
... ... @@ -95,13 +77,11 @@
95 77 -i qualification_approve_fourth_award
96 78 -i qualification_approve_qualifications
97 79
98   -
99 80 -i contract_stand_still
100 81 -i awarding_approve_first_award
101 82 -i modify_agreement
102 83 -i agreement_registration
103 84
104   -
105 85 -i find_agreement
106 86 -i add_agreement_doc
107 87 -i submit_change
... ...
... ... @@ -15,9 +15,6 @@
15 15 -i tender_view_deliveryDate
16 16 -i tender_view_quantity
17 17 -i tender_view_unit_name
18   --i tender_view_unit_code
19   --i tender_view_coordinates
20   --i meat_view
21 18 -i lot_view
22 19 -i lot_view_value
23 20 -i lot_view_minimalStep
... ... @@ -32,9 +29,6 @@
32 29 -i modify_bid_by_provider
33 30 -i make_bid_by_provider1
34 31 -i modify_bid_by_provider1
35   --i bid_view_in_tendering_period
36   --i add_bid_doc_after_tendering_period_by_provider
37   -
38 32
39 33 -i auction_url
40 34 -i auction
... ... @@ -45,26 +39,9 @@
45 39 -i qualification_add_doc_to_second_award
46 40 -i qualification_approve_second_award
47 41
48   -
49 42 -i contract_view
50   --i modify_contract_invalid_amount
51   --i modify_contract_invalid_amountNet_tender_vat_true
52 43 -i modify_contract_amount_net
53 44 -i modify_contract_value
54 45 -i modify_contract
55 46 -i add_doc_to_contract
56   --i contract_sign
57   -
58   --i find_contract
59   --i access_contract
60   --i submit_change
61   --i view_change
62   --i upload_change_document
63   --i modify_change
64   --i change_contract_amountNet
65   --i change_contract_amount
66   --i apply_change
67   --i termination_reasons
68   --i amount_paid
69   --i change_amount_paid
70   --i contract_termination
\ No newline at end of file
  47 +-i contract_sign
\ No newline at end of file
... ...
... ... @@ -14,11 +14,11 @@
14 14 -i tender_view_cause
15 15 -i tender_view_milestone
16 16 -i tender_view_contactPoint_url
17   --i tender_view_unit_code
18 17 -i tender_view_delivery_address
19 18 -i add_tender_doc
20 19 -i award_view
21 20 -i add_contract
  21 +-i contract_stand_still
22 22 -i contract_view
23 23 -i modify_contract_amount_net
24 24 -i modify_contract_value
... ...
... ... @@ -4,8 +4,8 @@
4 4 -v NUMBER_OF_LOTS:1
5 5
6 6 -v TENDER_MEAT:True
7   --v ITEM_MEAT:True
8   --v LOT_MEAT:True
  7 +-v ITEM_MEAT:False
  8 +-v LOT_MEAT:False
9 9
10 10
11 11 -i create_tender
... ... @@ -17,8 +17,6 @@
17 17 -i tender_view_deliveryDate
18 18 -i tender_view_quantity
19 19 -i tender_view_unit_name
20   --i tender_view_unit_code
21   --i tender_view_coordinates
22 20 -i meat_view
23 21 -i lot_view
24 22 -i lot_view_value
... ... @@ -27,37 +25,21 @@
27 25
28 26 -i extend_tendering_period
29 27 -i add_tender_doc
30   --i add_lot_doc
31 28 -i modify_lot_value_amount
32   -#-i add_lot
33   - #-i delete_lot
34   -#-i add_item
35   - #-i delete_item
  29 +
36 30 -i add_tender_meat
37 31 -i delete_tender_meat
38   --i add_lot_meat
39   - -i delete_lot_meat
40   --i add_item_meat
41   - -i delete_item_meat
42 32
43 33 -i ask_question_to_tender
44   --i ask_question_to_item
45   - -i answer_question_to_item
46   --i ask_question_to_lot
47   - -i answer_question_to_lot
  34 +-i answer_question_after_clarifications_period
  35 +
48 36 -i modify_tender_after_questions
49   --i modify_lot_after_questions
50 37
51   --i make_bid_without_related_lot
52   --i make_bid_without_parameters
53 38 -i make_bid_by_provider
54 39 -i modify_bid_by_provider
55 40 -i add_doc_to_bid_by_provider
56   --i ask_question_after_enquiry_period
57   --i answer_question_after_clarifications_period
58   --i modify_tender_in_tendering_period
  41 +
59 42 -i open_confirm_first_bid
60   --i bid_view_in_tendering_period
61 43
62 44 -i ask_question_to_tender_after_tendering_period
63 45
... ... @@ -66,8 +48,6 @@
66 48
67 49 -i contract_stand_still
68 50 -i contract_view
69   -#-i modify_contract_invalid_amount
70   -#-i modify_contract_invalid_amountNet_tender_vat_true
71 51 -i modify_contract_amount_net
72 52 -i modify_contract_value
73 53 -i modify_contract
... ...
... ... @@ -4,9 +4,8 @@
4 4 -v NUMBER_OF_LOTS:1
5 5
6 6 -v TENDER_MEAT:True
7   --v ITEM_MEAT:True
8   --v LOT_MEAT:True
9   -
  7 +-v ITEM_MEAT:False
  8 +-v LOT_MEAT:False
10 9
11 10 -i create_tender
12 11 -i find_tender
... ... @@ -17,8 +16,6 @@
17 16 -i tender_view_deliveryDate
18 17 -i tender_view_quantity
19 18 -i tender_view_unit_name
20   --i tender_view_unit_code
21   --i tender_view_coordinates
22 19 -i meat_view
23 20 -i lot_view
24 21 -i lot_view_value
... ... @@ -26,43 +23,21 @@
26 23
27 24 -i extend_tendering_period
28 25 -i add_tender_doc
29   --i add_lot_doc
30 26 -i modify_lot_value_amount
31   -#-i add_lot
32   -#-i add_item
33   -#-i delete_item
34   -#-i delete_lot
  27 +
35 28 -i add_tender_meat
36 29 -i delete_tender_meat
37   --i add_lot_meat
38   --i delete_lot_meat
39   --i add_item_meat
40   - -i delete_item_meat
41 30
42 31 -i ask_question_to_tender
43 32 -i answer_question_to_tender
44 33
45   --i ask_question_to_lot
46   - -i answer_question_to_lot
47   -
48 34 -i modify_tender_after_questions
49 35 -i modify_lot_after_questions
50   --i make_bid_without_related_lot
51   --i make_bid_without_parameters
  36 +
52 37 -i make_bid_by_provider
53 38 -i modify_bid_by_provider
54 39 -i add_doc_to_bid_by_provider
55 40 -i make_bid_by_provider1
56   --i bid_view_in_tendering_period
57   -
58   --i add_bid_doc_after_tendering_period_by_provider
59   --i modify_bid_doc_after_tendering_period_by_provider
60   --i modify_bid_after_tendering_period_by_provider1
61   --i cancel_bid_after_tendering_period_by_provider1
62   -
63   --i ask_question_to_tender_after_tendering_period
64   --i ask_question_to_item_after_tendering_period
65   --i ask_question_to_lot_after_tendering_period
66 41
67 42 -i open_modify_tender_in_tendering_period
68 43 -i open_confirm_first_bid
... ... @@ -72,9 +47,6 @@
72 47 -i openeu_add_qualification_bid_doc_by_provider
73 48 -i openeu_add_eligibility_bid_doc_by_provider
74 49
75   --i pre-qualification_add_doc_to_tender
76   --i pre-qualification_add_doc_to_lot
77   -
78 50 -i pre-qualification_view
79 51
80 52 #-i pre-qualification_add_doc_to_first_bid
... ... @@ -86,8 +58,6 @@
86 58
87 59 -i pre-qualification_approve_qualifications
88 60
89   --i document_service
90   -
91 61 -i auction_url
92 62
93 63 -i auction
... ... @@ -98,11 +68,11 @@
98 68 -i qualification_add_doc_to_second_award
99 69 -i qualification_approve_second_award
100 70
101   --i contract_sign
102 71 -i contract_stand_still
103 72 -i modify_contract
104 73 -i modify_contract_amount_net
105 74 -i modify_contract_value
106 75 -i contract_view
107 76 -i add_doc_to_contract
108   - -i contract_doc_documentOf
\ No newline at end of file
  77 + -i contract_doc_documentOf
  78 +-i contract_sign
\ No newline at end of file
... ...
... ... @@ -4,9 +4,8 @@
4 4 -v NUMBER_OF_LOTS:1
5 5
6 6 -v TENDER_MEAT:True
7   --v ITEM_MEAT:True
8   --v LOT_MEAT:True
9   -
  7 +-v ITEM_MEAT:False
  8 +-v LOT_MEAT:False
10 9
11 10 -i create_tender
12 11 -i find_tender
... ... @@ -17,8 +16,6 @@
17 16 -i tender_view_deliveryDate
18 17 -i tender_view_quantity
19 18 -i tender_view_unit_name
20   --i tender_view_unit_code
21   --i tender_view_coordinates
22 19 -i meat_view
23 20 -i lot_view
24 21 -i lot_view_value
... ... @@ -26,50 +23,26 @@
26 23
27 24 -i extend_tendering_period
28 25 -i add_tender_doc
29   --i add_lot_doc
30 26 -i modify_lot_value_amount
31   -#-i add_lot
32   -#-i add_item
33   -#-i delete_item
34   -#-i delete_lot
  27 +
35 28 -i add_tender_meat
36 29 -i delete_tender_meat
37   --i add_lot_meat
38   --i delete_lot_meat
39   --i add_item_meat
40   - -i delete_item_meat
41 30
42 31 -i ask_question_to_tender
43 32 -i answer_question_to_tender
44 33
45   --i ask_question_to_lot
46   - -i answer_question_to_lot
47   -
48 34 -i modify_tender_after_questions
49 35 -i modify_lot_after_questions
50   --i make_bid_without_related_lot
51   --i make_bid_without_parameters
  36 +
52 37 -i make_bid_by_provider
53 38 -i modify_bid_by_provider
54 39 -i add_doc_to_bid_by_provider
55 40 -i make_bid_by_provider1
56   --i bid_view_in_tendering_period
57   -
58   --i add_bid_doc_after_tendering_period_by_provider
59   --i modify_bid_doc_after_tendering_period_by_provider
60   --i modify_bid_after_tendering_period_by_provider1
61   --i cancel_bid_after_tendering_period_by_provider1
62   -
63   --i ask_question_to_tender_after_tendering_period
64   --i ask_question_to_item_after_tendering_period
65   --i ask_question_to_lot_after_tendering_period
66 41
67 42 -i open_modify_tender_in_tendering_period
68 43 -i open_confirm_first_bid
69 44 -i open_confirm_second_bid
70 45
71   --i document_service
72   -
73 46 -i auction_url
74 47
75 48 -i auction
... ... @@ -80,11 +53,11 @@
80 53 -i qualification_add_doc_to_second_award
81 54 -i qualification_approve_second_award
82 55
83   --i contract_sign
84 56 -i contract_stand_still
85 57 -i modify_contract
86 58 -i modify_contract_amount_net
87 59 -i modify_contract_value
88 60 -i contract_view
89 61 -i add_doc_to_contract
90   - -i contract_doc_documentOf
\ No newline at end of file
  62 + -i contract_doc_documentOf
  63 +-i contract_sign
\ No newline at end of file
... ...
1 1 -v MODE:belowThreshold
2 2
3   --v NUMBER_OF_ITEMS:2
  3 +-v NUMBER_OF_ITEMS:1
4 4
5 5 -v TENDER_MEAT:False
6 6 -v ITEM_MEAT:False
... ...
... ... @@ -5,27 +5,16 @@
5 5
6 6
7 7 -i create_tender
8   -
9 8 -i add_tender_doc
10   -
11 9 -i add_award
12   -
  10 +-i find_tender
13 11 -i contract_view
14   -
15 12 -i modify_contract_amount_net
16   -
17 13 -i modify_contract_value
18   -
19 14 -i add_contract
20   -
21   --i find_tender
22   -
23 15 -i tender_view_milestone
24   -
25 16 -i tender_view
26   -
27 17 -i add_tender_doc
28   -
29 18 -i award_view
30 19
31 20
... ...
... ... @@ -8,8 +8,8 @@
8 8 -v LOT_MEAT:False
9 9
10 10 -i create_tender
11   --i add_tender_doc
12 11 -i find_tender
  12 +-i add_tender_doc
13 13 -i tender_view
14 14 -i tender_view_milestone
15 15 -i tender_view_value
... ... @@ -17,27 +17,16 @@
17 17 -i tender_view_deliveryDate
18 18 -i tender_view_quantity
19 19 -i tender_view_unit_name
20   --i tender_view_unit_code
21   --i tender_view_coordinates
22 20 -i extend_tendering_period
23 21 -i ask_question_to_tender
24 22 -i answer_question_to_tender
25 23 -i modify_tender_after_questions
26 24
27   --i ask_question_to_tender_after_tendering_period
28 25 -i make_bid_before_tendering_period
29 26 -i make_bid_by_provider
30 27 -i modify_bid_by_provider
31 28 -i add_doc_to_bid_by_provider
32 29 -i make_bid_by_provider1
33   --i bid_view_in_tendering_period
34   -
35   --i add_bid_doc_after_tendering_period_by_provider
36   --i modify_bid_doc_after_tendering_period_by_provider
37   --i modify_bid_after_tendering_period_by_provider1
38   --i cancel_bid_after_tendering_period_by_provider1
39   -
40   --i document_service
41 30
42 31 -i auction_url
43 32
... ... @@ -46,7 +35,7 @@
46 35 -i qualification_add_doc_to_first_award
47 36 -i qualification_approve_first_award
48 37
49   --i contract_sign
50 38 -i contract_stand_still
51 39 -i modify_contract_amount_net
52 40 -i modify_contract_value
  41 +-i contract_sign
... ...
Please register or login to post a comment