Commit 5fa7eead0c61b5b627d396dc647dcd0f2e94ad7e

Authored by Playtenders
1 parent aba0d7de

agreementchangeform

@@ -242,7 +242,8 @@ Resource playtender_agree @@ -242,7 +242,8 @@ Resource playtender_agree
242 Run Keyword And Return If '${field_name}' == 'contracts[1].value.amount' Отримати інформацію із contracts[1].value.amount 242 Run Keyword And Return If '${field_name}' == 'contracts[1].value.amount' Отримати інформацію із contracts[1].value.amount
243 Run Keyword And Return If '${field_name}' == 'contracts[1].value.dateSigned' Отримати інформацію із contracts[1].dateSigned 243 Run Keyword And Return If '${field_name}' == 'contracts[1].value.dateSigned' Отримати інформацію із contracts[1].dateSigned
244 Run Keyword And Return If '${field_name}' == 'cancellations[0].status' Отримати інформацію із cancellations[0].status 244 Run Keyword And Return If '${field_name}' == 'cancellations[0].status' Отримати інформацію із cancellations[0].status
245 - Run Keyword And Return If '${field_name}' == 'agreements[0].agreementID' Execute Javascript return $('#aside-part-pjax .aside__inner input[name*="agreement_uaid"]').val() 245 + Run Keyword And Return If '${field_name}' == 'agreements[0].agreementID' Execute Javascript return $('#agreement-contracts-list .agreement-info-wrapper .info-row.agreement-id .value').text()
  246 +# Run Keyword And Return If '${field_name}' == 'agreements[0].agreementID' Execute Javascript return $('#aside-part-pjax .aside__inner input[name*="agreement_uaid"]').val()
246 # Run Keyword And Return If '${field_name}' == 'budget.amount' Отримати інформацію із плану ${username} ${tender_uaid} ${field_name} 247 # Run Keyword And Return If '${field_name}' == 'budget.amount' Отримати інформацію із плану ${username} ${tender_uaid} ${field_name}
247 ${field_name} = set variable tender.${field_name}.value 248 ${field_name} = set variable tender.${field_name}.value
248 ${value} = get field_value by field_name on opened page ${field_name} 249 ${value} = get field_value by field_name on opened page ${field_name}
@@ -1282,6 +1283,74 @@ Resource playtender_agree @@ -1282,6 +1283,74 @@ Resource playtender_agree
1282 add document in agreement ${filepath} 1283 add document in agreement ${filepath}
1283 save agreement form and wait synchronization 1284 save agreement form and wait synchronization
1284 1285
  1286 +Внести зміну в угоду
  1287 + [Arguments] ${username} ${agreement_uaid} ${change_data}
  1288 +
  1289 + log ${change_data}
  1290 + Execute Javascript $('#agreement-part-pjax #aside-part-pjax .aside__inner a[href*="/agreement/update"] span span').click()
  1291 + capture page screenshot
  1292 + wait until element is visible jquery=#agreementchangeform-rationale 60
  1293 + capture page screenshot
  1294 +
  1295 + Execute Javascript $('#agreementchangeform-rationale_type').val('${change_data.data.rationaleType}').change()
  1296 + capture page screenshot
  1297 + input text to exist visible input jquery=#agreementchangeform-rationale ${change_data.data.rationale}
  1298 + capture page screenshot
  1299 +
  1300 + ${date_signed} = Get Current Date
  1301 + input datetime to visible input jquery=#agreementchangeform-date_signed ${date_signed}
  1302 + capture page screenshot
  1303 +
  1304 + input text to exist visible input jquery=#agreementchangeform-agreement_number 1234567890
  1305 + ${rationaleType}= Set Variable ${change_data.data.rationaleType}
  1306 + capture page screenshot
  1307 +
  1308 +
  1309 +# Run Keyword If '${rationaleType}' == 'taxRate' Input Text xpath=//div[@data-block="agreement_change"][last()]//input[contains(@id, '_addend')] 1
  1310 + Run Keyword If '${rationaleType}' in ['thirdParty', 'itemPriceVariation', 'taxRate'] input text to exist visible input jquery=input[id*="agreementchangeform-factor"] 1
  1311 + capture page screenshot
  1312 +
  1313 + capture page screenshot
  1314 + submit form and check result jquery=#agreement-change-form .form-group.actions-wrapper button.btn.btn-success Зміни до угоди збережені ${tender_created_checker_element_locator} true
  1315 + capture page screenshot
  1316 +
  1317 +Застосувати зміну для угоди
  1318 + [Arguments] ${username} ${agreement_uaid} ${dateSigned} ${status}
  1319 +
  1320 +
  1321 +
  1322 +Оновити властивості угоди
  1323 + [Arguments] ${username} ${agreement_uaid} ${change_data}
  1324 + log ${change_data}
  1325 +
  1326 + Wait Until Element Is Visible xpath=//div[@data-block="agreement_change"][last()]//button[contains(@id, 'bt_agreement_change_pending_save_')]
  1327 +
  1328 + ${rationaleType}= Get text xpath=//div[@data-block="agreement_change"][last()]//span[@data-atid="rationaleType" and not(contains(@style,'display: none'))]
  1329 +
  1330 + ${modification}= Set variable ${change_data.data.modifications[0]}
  1331 +
  1332 + ${has_addend}= Run Keyword And Return Status Dictionary Should Contain Key ${modification} addend
  1333 + ${has_factor}= Run Keyword And Return Status Dictionary Should Contain Key ${modification} factor
  1334 + ${field_name}= Set Variable If ${has_addend} addend
  1335 + ... ${has_factor} factor
  1336 + ... contractId
  1337 +
  1338 + ${has_contractId}= Run Keyword And Return Status Dictionary Should Contain Key ${modification} contractId
  1339 + Run Keyword If ${has_contractId}
  1340 + ... Select From List By Value xpath=//div[contains(@id,'pn_agreement_changes_place')]//div[@data-block="agreement_change"][last()]//select[contains(@id, '_contractId')] ${modification.contractId}
  1341 + Select From List By Value xpath=//div[contains(@id,'pn_agreement_changes_place')]//div[@data-block="agreement_change"][last()]//select[contains(@id, '_itemId')] ${modification.itemId}
  1342 +
  1343 + ${addend}= Run Keyword If ${has_addend} Convert To String ${modification.addend}
  1344 + Run Keyword If ${has_addend} Run keywords
  1345 + ... Input Text xpath=//div[contains(@id,'pn_agreement_changes_place')]//div[@data-block="agreement_change"][last()]//input[contains(@id, '_addend')] ${addend}
  1346 + ... AND Run Keyword If '${rationaleType}' == 'taxRate' clear element text xpath=//div[contains(@id,'pn_agreement_changes_place')]//div[@data-block="agreement_change"][last()]//input[contains(@id, '_factor')]
  1347 +
  1348 + ${factor_percent}= Run Keyword If ${has_factor} Evaluate (${modification.factor}-1)*100
  1349 + ${factor_percent}= Convert To String ${factor_percent}
  1350 + Run Keyword If ${has_factor} Run keywords
  1351 + ... Input Text xpath=//div[contains(@id,'pn_agreement_changes_place')]//div[@data-block="agreement_change"][last()]//input[contains(@id, '_factor')] ${factor_percent}
  1352 + ... AND Run Keyword If '${rationaleType}' == 'taxRate' clear element text xpath=//div[contains(@id,'pn_agreement_changes_place')]//div[@data-block="agreement_change"][last()]//input[contains(@id, '_addend')]
  1353 +
1285 Отримати інформацію із угоди 1354 Отримати інформацію із угоди
1286 [Arguments] ${username} ${agreement_uaid} ${field_name} 1355 [Arguments] ${username} ${agreement_uaid} ${field_name}
1287 [Documentation] Отримати значення поля field_name для тендера tender_uaid. 1356 [Documentation] Отримати значення поля field_name для тендера tender_uaid.
@@ -135,7 +135,7 @@ active agreement contract @@ -135,7 +135,7 @@ active agreement contract
135 run keyword and ignore error Load Sign 135 run keyword and ignore error Load Sign
136 capture page screenshot 136 capture page screenshot
137 run keyword if '${mode}' == 'open_framework' close current visible alert 137 run keyword if '${mode}' == 'open_framework' close current visible alert
138 - capture pgage screenshot 138 + capture page screenshot
139 submit form and check result ${qualification_form_submit_btn_locator} ${contract_agreement_active_submit_success_msg} ${None} 139 submit form and check result ${qualification_form_submit_btn_locator} ${contract_agreement_active_submit_success_msg} ${None}
140 capture page screenshot 140 capture page screenshot
141 141
@@ -610,7 +610,7 @@ def getTenderDataByTenderAgreementContractUaId(apiBaseUrl, tenderUaId): @@ -610,7 +610,7 @@ def getTenderDataByTenderAgreementContractUaId(apiBaseUrl, tenderUaId):
610 return tenderDataJson 610 return tenderDataJson
611 611
612 def getAgreementDataByAgreementUaId(apiBaseUrl, tenderUaId): 612 def getAgreementDataByAgreementUaId(apiBaseUrl, tenderUaId):
613 - requestData = {"opt_fields": "tenderID", "descending": "1", "mode": "_all_"} 613 + requestData = {"opt_fields": "agreementID", "descending": "1", "mode": "_all_"}
614 updatesResponse = doGetRequest(apiBaseUrl.strip("/") + "/agreements", data=requestData) 614 updatesResponse = doGetRequest(apiBaseUrl.strip("/") + "/agreements", data=requestData)
615 if "json" not in updatesResponse: 615 if "json" not in updatesResponse:
616 print('json key not found') 616 print('json key not found')
@@ -619,12 +619,16 @@ def getAgreementDataByAgreementUaId(apiBaseUrl, tenderUaId): @@ -619,12 +619,16 @@ def getAgreementDataByAgreementUaId(apiBaseUrl, tenderUaId):
619 print("lastAgreement:") 619 print("lastAgreement:")
620 print(updatesResponse['json']['data']) 620 print(updatesResponse['json']['data'])
621 for item in updatesResponse['json']['data']: 621 for item in updatesResponse['json']['data']:
622 - if tenderUaId == item['tenderID']:  
623 - tenderId = item['id'] 622 + if tenderUaId == item['agreementID']:
  623 + agreementID = item['id']
624 break 624 break
625 - if tenderId is None: 625 + print("agreementID:")
  626 + print(agreementID)
  627 + if agreementID is None:
626 return {} 628 return {}
627 - tenderDataResponse = doGetRequest(apiBaseUrl.strip("/") + "/agreements/" + tenderId, data={}) 629 + tenderDataResponse = doGetRequest(apiBaseUrl.strip("/") + "/agreements/" + agreementID, data={})
  630 + print("tenderDataResponse:")
  631 + print(tenderDataResponse)
628 tenderDataJson = tenderDataResponse['json'] 632 tenderDataJson = tenderDataResponse['json']
629 return tenderDataJson 633 return tenderDataJson
630 634
Please register or login to post a comment