Commit adb739550bf9a20ef5b933db151d76a2cf260569
Committed by
GitHub
Merge branch 'master' into global_fond_data
Showing
3 changed files
with
23 additions
and
10 deletions
@@ -211,7 +211,7 @@ Library openprocurement_client.utils | @@ -211,7 +211,7 @@ Library openprocurement_client.utils | ||
211 | 211 | ||
212 | Оприлюднити рішення про початок моніторингу | 212 | Оприлюднити рішення про початок моніторингу |
213 | [Arguments] ${username} ${monitoring_uaid} ${file_path} ${monitoring_data} | 213 | [Arguments] ${username} ${monitoring_uaid} ${file_path} ${monitoring_data} |
214 | - ${document}= Call Method ${USERS.users['${username}'].dasu_client} upload_obj_document ${file_path} ${USERS.users['${username}'].monitoring_data} | 214 | + ${document}= Call Method ${USERS.users['${username}'].dasu_client} upload_obj_document ${file_path} |
215 | ${documents}= Create List | 215 | ${documents}= Create List |
216 | Append To List ${documents} ${document.data} | 216 | Append To List ${documents} ${document.data} |
217 | Set To Dictionary ${monitoring_data.data.decision} documents=${documents} | 217 | Set To Dictionary ${monitoring_data.data.decision} documents=${documents} |
@@ -353,7 +353,7 @@ Library openprocurement_client.utils | @@ -353,7 +353,7 @@ Library openprocurement_client.utils | ||
353 | 353 | ||
354 | Надати звіт про усунення порушення замовником | 354 | Надати звіт про усунення порушення замовником |
355 | [Arguments] ${username} ${monitoring_uaid} ${resolution_data} ${file_path} | 355 | [Arguments] ${username} ${monitoring_uaid} ${resolution_data} ${file_path} |
356 | - ${reply}= Call Method ${USERS.users['${username}'].dasu_client} upload_obj_document ${file_path} ${USERS.users['${username}'].monitoring_data} | 356 | + ${reply}= Call Method ${USERS.users['${username}'].dasu_client} upload_obj_document ${file_path} |
357 | ${documents}= Create List | 357 | ${documents}= Create List |
358 | Append To List ${documents} ${reply.data} | 358 | Append To List ${documents} ${reply.data} |
359 | Set To Dictionary ${resolution_data.data} documents=${documents} | 359 | Set To Dictionary ${resolution_data.data} documents=${documents} |
@@ -365,7 +365,7 @@ Library openprocurement_client.utils | @@ -365,7 +365,7 @@ Library openprocurement_client.utils | ||
365 | 365 | ||
366 | Зазначити, що порушення було оскаржено в суді | 366 | Зазначити, що порушення було оскаржено в суді |
367 | [Arguments] ${username} ${monitoring_uaid} ${appeal_data} ${file_path} | 367 | [Arguments] ${username} ${monitoring_uaid} ${appeal_data} ${file_path} |
368 | - ${reply}= Call Method ${USERS.users['${username}'].dasu_client} upload_obj_document ${filepath} ${USERS.users['${username}'].monitoring} | 368 | + ${reply}= Call Method ${USERS.users['${username}'].dasu_client} upload_obj_document ${filepath} |
369 | ${documents}= Create List | 369 | ${documents}= Create List |
370 | Append To List ${documents} ${reply.data} | 370 | Append To List ${documents} ${reply.data} |
371 | Set To Dictionary ${appeal_data.data} documents=${documents} | 371 | Set To Dictionary ${appeal_data.data} documents=${documents} |
@@ -442,14 +442,19 @@ pzo: | @@ -442,14 +442,19 @@ pzo: | ||
442 | tender: [0, 25] | 442 | tender: [0, 25] |
443 | accelerator: 1440 | 443 | accelerator: 1440 |
444 | openua: | 444 | openua: |
445 | - tender: [0, 25] | 445 | + tender: [0, 35] |
446 | accelerator: 1440 | 446 | accelerator: 1440 |
447 | openeu: | 447 | openeu: |
448 | - tender: [0, 25] | 448 | + tender: [0, 35] |
449 | accelerator: 1440 | 449 | accelerator: 1440 |
450 | + openua_defense: | ||
451 | + accelerator: 720 | ||
452 | + tender: [0, 40] | ||
450 | open_competitive_dialogue: | 453 | open_competitive_dialogue: |
451 | accelerator: 1440 | 454 | accelerator: 1440 |
452 | - tender: [0, 35] | 455 | + tender: [0, 40] |
456 | + open_esco: | ||
457 | + tender: [0, 35] | ||
453 | keywords_file: pzo | 458 | keywords_file: pzo |
454 | basepage: 'http://dev.pzo.com.ua' | 459 | basepage: 'http://dev.pzo.com.ua' |
455 | homepage: 'http://dev.pzo.com.ua/tenders' | 460 | homepage: 'http://dev.pzo.com.ua/tenders' |
@@ -592,10 +597,10 @@ avi: | @@ -592,10 +597,10 @@ avi: | ||
592 | tender: [0, 20] | 597 | tender: [0, 20] |
593 | openeu: | 598 | openeu: |
594 | accelerator: 1440 | 599 | accelerator: 1440 |
595 | - tender: [0, 50] | 600 | + tender: [0, 65] |
596 | openua: | 601 | openua: |
597 | - accelerator: 2880 | ||
598 | - tender: [0, 45] | 602 | + accelerator: 1440 |
603 | + tender: [0, 60] | ||
599 | belowThreshold: | 604 | belowThreshold: |
600 | accelerator: 1440 | 605 | accelerator: 1440 |
601 | enquiry: [0, 20] | 606 | enquiry: [0, 20] |
@@ -620,4 +625,4 @@ avi: | @@ -620,4 +625,4 @@ avi: | ||
620 | provider1: avi_Provider2 | 625 | provider1: avi_Provider2 |
621 | tender_owner: avi_Owner | 626 | tender_owner: avi_Owner |
622 | viewer: avi_Viewer | 627 | viewer: avi_Viewer |
623 | - timeout_on_wait: 120 | ||
628 | + timeout_on_wait: 120 |
@@ -859,6 +859,14 @@ users: | @@ -859,6 +859,14 @@ users: | ||
859 | browser: chrome | 859 | browser: chrome |
860 | position: [800, 0] | 860 | position: [800, 0] |
861 | size: [1280, 1000] | 861 | size: [1280, 1000] |
862 | + avi_Provider3: | ||
863 | + broker: avi | ||
864 | + homepage: "https://test.avi.net.ua/prozorro/tender" | ||
865 | + login: tenderProvider3@yopmail.com | ||
866 | + password: tenderProvider3@yopmail.com | ||
867 | + browser: chrome | ||
868 | + position: [800, 0] | ||
869 | + size: [1280, 1000] | ||
862 | avi_Viewer: | 870 | avi_Viewer: |
863 | broker: avi | 871 | broker: avi |
864 | homepage: "https://test.avi.net.ua/prozorro/tender" | 872 | homepage: "https://test.avi.net.ua/prozorro/tender" |
Please
register
or
login
to post a comment