Showing
1 changed file
with
16 additions
and
5 deletions
| @@ -104,7 +104,6 @@ Login | @@ -104,7 +104,6 @@ Login | ||
| 104 | ${playtender_proc_type}= Convert_to_Lowercase ${procurementMethodType} | 104 | ${playtender_proc_type}= Convert_to_Lowercase ${procurementMethodType} |
| 105 | ${playtender_proc_type}= Remove String ${playtender_proc_type} \. | 105 | ${playtender_proc_type}= Remove String ${playtender_proc_type} \. |
| 106 | 106 | ||
| 107 | - Select From List By Value id=tender${playtender_proc_type}form-main_procurement_category ${tender_data.data.mainProcurementCategory} | ||
| 108 | Input text id=tender${playtender_proc_type}form-title ${title} | 107 | Input text id=tender${playtender_proc_type}form-title ${title} |
| 109 | Run Keyword If 'cause' in ${tender_data_keys} Select From List By Value id=tender${playtender_proc_type}form-cause ${tender_data.data.cause} | 108 | Run Keyword If 'cause' in ${tender_data_keys} Select From List By Value id=tender${playtender_proc_type}form-cause ${tender_data.data.cause} |
| 110 | Run Keyword If 'causeDescription' in ${tender_data_keys} Input text id=tender${playtender_proc_type}form-cause_description ${tender_data.data.causeDescription} | 109 | Run Keyword If 'causeDescription' in ${tender_data_keys} Input text id=tender${playtender_proc_type}form-cause_description ${tender_data.data.causeDescription} |
| @@ -114,6 +113,7 @@ Login | @@ -114,6 +113,7 @@ Login | ||
| 114 | Run Keyword If 'fundingKind' in ${tender_data_keys} Select From List By Value id=tender${playtender_proc_type}form-funding_kind ${tender_data.data.fundingKind} | 113 | Run Keyword If 'fundingKind' in ${tender_data_keys} Select From List By Value id=tender${playtender_proc_type}form-funding_kind ${tender_data.data.fundingKind} |
| 115 | Run Keyword If 'NBUdiscountRate' in ${tender_data_keys} Input Float Multiply100 \#tender${playtender_proc_type}form-nbu_discount_rate ${tender_data.data.NBUdiscountRate} | 114 | Run Keyword If 'NBUdiscountRate' in ${tender_data_keys} Input Float Multiply100 \#tender${playtender_proc_type}form-nbu_discount_rate ${tender_data.data.NBUdiscountRate} |
| 116 | Click Element id=tender${playtender_proc_type}form-value_added_tax_included | 115 | Click Element id=tender${playtender_proc_type}form-value_added_tax_included |
| 116 | + Run Keyword If 'mainProcurementCategory' in ${tender_data_keys} Select From List By Value id=tender${pzo_proc_type}form-main_procurement_category ${tender_data.data.mainProcurementCategory} | ||
| 117 | Run Keyword If '${procurementMethodType}' == 'belowThreshold' Створити тендер enquiryPeriod.startDate ${playtender_proc_type} ${tender_data.data.enquiryPeriod.startDate} | 117 | Run Keyword If '${procurementMethodType}' == 'belowThreshold' Створити тендер enquiryPeriod.startDate ${playtender_proc_type} ${tender_data.data.enquiryPeriod.startDate} |
| 118 | Run Keyword If '${procurementMethodType}' == 'belowThreshold' Створити тендер enquiryPeriod.endDate ${playtender_proc_type} ${tender_data.data.enquiryPeriod.endDate} | 118 | Run Keyword If '${procurementMethodType}' == 'belowThreshold' Створити тендер enquiryPeriod.endDate ${playtender_proc_type} ${tender_data.data.enquiryPeriod.endDate} |
| 119 | Run Keyword If '${procurementMethodType}' == 'belowThreshold' Створити тендер tenderPeriod.startDate ${playtender_proc_type} ${tender_data.data.tenderPeriod.startDate} | 119 | Run Keyword If '${procurementMethodType}' == 'belowThreshold' Створити тендер tenderPeriod.startDate ${playtender_proc_type} ${tender_data.data.tenderPeriod.startDate} |
| @@ -1908,9 +1908,10 @@ Save Proposal | @@ -1908,9 +1908,10 @@ Save Proposal | ||
| 1908 | Run Keyword And Ignore Error Click Element xpath=//div[contains(@class, 'active')]//li[contains(@data-title, '${doc_id}')] | 1908 | Run Keyword And Ignore Error Click Element xpath=//div[contains(@class, 'active')]//li[contains(@data-title, '${doc_id}')] |
| 1909 | Run Keyword And Ignore Error Click Element xpath=//div[contains(@class, 'active')]//li[contains(@data-titles, '${doc_id}')] | 1909 | Run Keyword And Ignore Error Click Element xpath=//div[contains(@class, 'active')]//li[contains(@data-titles, '${doc_id}')] |
| 1910 | Sleep 1 | 1910 | Sleep 1 |
| 1911 | - Click Element xpath=//div[contains(@class, 'active')]//div[contains(@class, 'active')]//input[contains(@id, '-confidentiality')] | 1911 | + Run Keyword And Ignore Error Click Element xpath=//div[contains(@class, 'active')]//div[contains(@class, 'active')]//input[contains(@id, '-confidentiality')] |
| 1912 | + Run Keyword And Ignore Error Click Element xpath=//div[contains(@class, 'active')]//div[contains(@class, 'active')]//input[contains(@id, '-is_description_decision')] | ||
| 1912 | Sleep 1 | 1913 | Sleep 1 |
| 1913 | - Input text xpath=//div[contains(@class, 'active')]//div[contains(@class, 'active')]//textarea[contains(@id, '-confidentiality_rationale')] ${data.data.confidentialityRationale} | 1914 | + Run Keyword And Ignore Error Input text xpath=//div[contains(@class, 'active')]//div[contains(@class, 'active')]//textarea[contains(@id, '-confidentiality_rationale')] ${data.data.confidentialityRationale} |
| 1914 | Sleep 1 | 1915 | Sleep 1 |
| 1915 | 1916 | ||
| 1916 | Save Proposal | 1917 | Save Proposal |
| @@ -1919,8 +1920,8 @@ Save Proposal | @@ -1919,8 +1920,8 @@ Save Proposal | ||
| 1919 | [Arguments] ${username} ${tender_uaid} ${field} ${value} | 1920 | [Arguments] ${username} ${tender_uaid} ${field} ${value} |
| 1920 | Switch browser ${username} | 1921 | Switch browser ${username} |
| 1921 | Start Edit Proposal | 1922 | Start Edit Proposal |
| 1922 | - Run Keyword If '${field}' == 'lotValues[0].value.amount' Подати цінову пропозицію Amount ${value} | ||
| 1923 | -# Run Keyword If '${field}' == 'status' xxx | 1923 | + ${procurementMethodType}= Отримати інформацію із тендера procurementMethodType |
| 1924 | + Run Keyword If '${field}' == 'lotValues[0].value.amount' and '${procurementMethodType}' != 'esco' Подати цінову пропозицію Amount ${value} | ||
| 1924 | Sleep 1 | 1925 | Sleep 1 |
| 1925 | 1926 | ||
| 1926 | Save Proposal | 1927 | Save Proposal |
| @@ -2052,11 +2053,15 @@ Save Proposal | @@ -2052,11 +2053,15 @@ Save Proposal | ||
| 2052 | 2053 | ||
| 2053 | ${current_tender_uaid}= Отримати інформацію із тендера tenderID | 2054 | ${current_tender_uaid}= Отримати інформацію із тендера tenderID |
| 2054 | 2055 | ||
| 2056 | + Run Keyword And Return If 'NBUdiscountRate' == '${arguments[2]}' Get number from text by locator jquery=#tender-general-info .nbu-discount-rate .value | ||
| 2055 | Run Keyword And Return If 'auctionPeriod.startDate' == '${arguments[2]}' get_invisible_text jquery=.timeline-info-wrapper .auction-start-date | 2057 | Run Keyword And Return If 'auctionPeriod.startDate' == '${arguments[2]}' get_invisible_text jquery=.timeline-info-wrapper .auction-start-date |
| 2056 | Run Keyword And Return If 'lots[0].value.amount' == '${arguments[2]}' Get invisible text number by locator jquery=#accordionLots .lot-info-wrapper:first .budget-source.hidden | 2058 | Run Keyword And Return If 'lots[0].value.amount' == '${arguments[2]}' Get invisible text number by locator jquery=#accordionLots .lot-info-wrapper:first .budget-source.hidden |
| 2057 | Run Keyword And Return If 'lots[0].auctionPeriod.startDate' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .lot-info-wrapper:first .auction-period-start-date.hidden | 2059 | Run Keyword And Return If 'lots[0].auctionPeriod.startDate' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .lot-info-wrapper:first .auction-period-start-date.hidden |
| 2058 | Run Keyword And Return If 'lots[0].auctionPeriod.endDate' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .lot-info-wrapper:first .auction-period-end-date.hidden | 2060 | Run Keyword And Return If 'lots[0].auctionPeriod.endDate' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .lot-info-wrapper:first .auction-period-end-date.hidden |
| 2059 | Run Keyword And Return If 'auctionPeriod.endDate' == '${arguments[2]}' get_invisible_text jquery=.timeline-info-wrapper .auction-end-date | 2061 | Run Keyword And Return If 'auctionPeriod.endDate' == '${arguments[2]}' get_invisible_text jquery=.timeline-info-wrapper .auction-end-date |
| 2062 | + Run Keyword And Return If 'lots[0].minimalStepPercentage' == '${arguments[2]}' Get invisible text number by locator jquery=#accordionLots .lot-info-wrapper:first .minimal-step-percentage-source.hidden | ||
| 2063 | + Run Keyword And Return If 'lots[0].fundingKind' == '${arguments[2]}' get_invisible_text jquery=#accordionLots .lot-info-wrapper:first .funding-kind-source.hidden | ||
| 2064 | + Run Keyword And Return If 'lots[0].yearlyPaymentsPercentageRange' == '${arguments[2]}' Get invisible text number by locator jquery=#accordionLots .lot-info-wrapper:first .yearly-payments-percentage-range-source.hidden | ||
| 2060 | Run Keyword And Return If 'deliveryLocation.longitude' == '${arguments[2]}' Fail Не реалізований функціонал | 2065 | Run Keyword And Return If 'deliveryLocation.longitude' == '${arguments[2]}' Fail Не реалізований функціонал |
| 2061 | Run Keyword And Return If 'deliveryLocation.latitude' == '${arguments[2]}' Fail Не реалізований функціонал | 2066 | Run Keyword And Return If 'deliveryLocation.latitude' == '${arguments[2]}' Fail Не реалізований функціонал |
| 2062 | Run Keyword And Return If 'tenderPeriod.startDate' == '${arguments[2]}' Отримати інформацію із тендера tenderPeriod.startDate | 2067 | Run Keyword And Return If 'tenderPeriod.startDate' == '${arguments[2]}' Отримати інформацію із тендера tenderPeriod.startDate |
| @@ -2663,6 +2668,12 @@ Get invisible text number by locator | @@ -2663,6 +2668,12 @@ Get invisible text number by locator | ||
| 2663 | ${return_value}= Convert To Number ${return_value} | 2668 | ${return_value}= Convert To Number ${return_value} |
| 2664 | [return] ${return_value} | 2669 | [return] ${return_value} |
| 2665 | 2670 | ||
| 2671 | +Get number from text by locator | ||
| 2672 | + [Arguments] ${locator} | ||
| 2673 | + ${return_value}= get_text ${locator} | ||
| 2674 | + ${return_value}= Convert To Number ${return_value} | ||
| 2675 | + [return] ${return_value} | ||
| 2676 | + | ||
| 2666 | Get invisible text boolean by locator | 2677 | Get invisible text boolean by locator |
| 2667 | [Arguments] ${locator} | 2678 | [Arguments] ${locator} |
| 2668 | ${return_value}= get_invisible_text ${locator} | 2679 | ${return_value}= get_invisible_text ${locator} |
Please
register
or
login
to post a comment