Showing
2 changed files
with
17 additions
and
17 deletions
... | ... | @@ -234,7 +234,7 @@ confirm award |
234 | 234 | |
235 | 235 | capture page screenshot |
236 | 236 | wait until page contains element with reloading ${qualification_form_0_open_btn_locator} |
237 | - click visible element ${qualification_form_0_open_btn_locator} | |
237 | + open popup by btn locator ${qualification_form_0_open_btn_locator} | |
238 | 238 | Wait Until Page Contains ${popup_opened_content_success_locator} 60 |
239 | 239 | run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 10 |
240 | 240 | wait until element is visible ${qualification_form_submit_btn_locator} 60 |
... | ... | @@ -261,11 +261,11 @@ confirm award |
261 | 261 | |
262 | 262 | run keyword and ignore error click visible element ${qualification_ecp_check_input_locator} |
263 | 263 | capture page screenshot |
264 | - run keyword and ignore error run keyword if '${mode}' in 'reporting' submit form and check result ${qualification_form_submit_btn_locator} ${qualification_form_submit_success_msg} | |
264 | + run keyword and ignore error run keyword if '${mode}' in 'reporting' submit form and check result ${qualification_form_submit_btn_locator} ${qualification_award_form_submit_success_msg} | |
265 | 265 | capture page screenshot |
266 | 266 | run keyword and ignore error run keyword if '${mode}' in 'reporting' wait until page contains element with reloading ${qualification_form_0_open_btn_locator} |
267 | 267 | capture page screenshot |
268 | - run keyword and ignore error run keyword if '${mode}' in 'reporting' click visible element ${qualification_form_0_open_btn_locator} | |
268 | + run keyword and ignore error run keyword if '${mode}' in 'reporting' open popup by btn locator ${qualification_form_0_open_btn_locator} | |
269 | 269 | capture page screenshot |
270 | 270 | run keyword and ignore error run keyword if '${mode}' in 'reporting' Execute Javascript $('#qualificationform-decision').val('accept').change() |
271 | 271 | capture page screenshot | ... | ... |
... | ... | @@ -152,17 +152,13 @@ fill tender form items |
152 | 152 | [Arguments] ${item_attributes_array} |
153 | 153 | [Documentation] заповнення номенклатури тендеру |
154 | 154 | |
155 | -# ${report} = set variable if "${mode}" in "reporting" 1 0 | |
156 | 155 | :FOR ${item_attributes} IN @{item_attributes_array} |
157 | - \ run keyword and ignore error click visible element ${tender_form_item_add_edit_btn_locator} | |
158 | -# \ run keyword and ignore error run keyword if "${mode}" not in "reporting" or ${report} == 2 click visible element ${tender_form_item_add_edit_btn_locator} | |
159 | -# \ run keyword and ignore error run keyword if "${mode}" in "reporting" and ${report} == 1 click visible element ${tender_form_lots_add_item_reporting_btn_locator} | |
160 | - \ wait until popup is visible | |
156 | + \ run keyword and ignore error open popup by btn locator ${tender_form_item_add_edit_btn_locator} | |
157 | +# \ wait until popup is visible | |
161 | 158 | \ fill tender item form in opened popup ${item_attributes} |
162 | 159 | \ submit current visible popup |
163 | 160 | \ ${features} = get from dictionary by keys ${item_attributes} features |
164 | 161 | \ run keyword if condition is not none ${features} fill tender form features ${features} ${tender_form_item_panel_add_feature_btn_locator} |
165 | -# \ ${report} = set variable if "${mode}" in "reporting" 2 | |
166 | 162 | |
167 | 163 | fill tender item form in opened popup |
168 | 164 | [Arguments] ${data} |
... | ... | @@ -187,8 +183,9 @@ fill tender form milestones |
187 | 183 | [Arguments] ${milestone_attributes_array} |
188 | 184 | [Documentation] заповнення умов оплати тендеру |
189 | 185 | |
190 | - click visible element ${tender_form_milestones_panel_edit_btn_locator} | |
191 | - wait until popup is visible | |
186 | + open popup by btn locator ${tender_form_milestones_panel_edit_btn_locator} | |
187 | +# click visible element ${tender_form_milestones_panel_edit_btn_locator} | |
188 | +# wait until popup is visible | |
192 | 189 | :FOR ${milestone_attributes} IN @{milestone_attributes_array} |
193 | 190 | \ click visible element ${milestone_form_popup_add_btn_locator} |
194 | 191 | \ wait until page does not contain element ${popup_dynamic_form_loading_element_locator} |
... | ... | @@ -216,8 +213,9 @@ fill tender form features |
216 | 213 | [Arguments] ${feature_attributes_array} ${add_btn_locator} |
217 | 214 | [Documentation] заповнення нецінові крітерії тендеру |
218 | 215 | |
219 | - click visible element ${add_btn_locator} | |
220 | - wait until popup is visible | |
216 | + open popup by btn locator ${add_btn_locator} | |
217 | +# click visible element ${add_btn_locator} | |
218 | +# wait until popup is visible | |
221 | 219 | :FOR ${feature_attributes} IN @{feature_attributes_array} |
222 | 220 | # \ click visible element ${tender_form_features_panel_edit_btn_locator} |
223 | 221 | \ execute javascript ${tender_form_features_panel_edit_btn_locator} |
... | ... | @@ -229,8 +227,9 @@ fill tender form features2 |
229 | 227 | [Arguments] ${feature_attributes_array} ${add_btn_locator} |
230 | 228 | [Documentation] заповнення нецінові крітерії тендеру |
231 | 229 | |
232 | - click visible element ${add_btn_locator} | |
233 | - wait until popup is visible | |
230 | + open popup by btn locator ${add_btn_locator} | |
231 | +# click visible element ${add_btn_locator} | |
232 | +# wait until popup is visible | |
234 | 233 | click visible element ${tender_form_features_panel_edit_btn_locator} |
235 | 234 | wait until page does not contain element ${popup_dynamic_form_loading_element_locator} |
236 | 235 | fill feature form in opened popup ${feature_attributes_array} |
... | ... | @@ -273,8 +272,9 @@ fill tender form lots |
273 | 272 | ${milestones1} = Run Keyword If "${mode}" in "negotiation" Get From Dictionary ${prepared_tender_data} milestones |
274 | 273 | ##### EOF - TMP ##### |
275 | 274 | :FOR ${lot_attributes} IN @{lot_attributes_array} |
276 | - \ click visible element ${tender_form_lots_panel_edit_btn_locator} | |
277 | - \ wait until popup is visible | |
275 | + \ open popup by btn locator ${tender_form_lots_panel_edit_btn_locator} | |
276 | +# \ click visible element ${tender_form_lots_panel_edit_btn_locator} | |
277 | +# \ wait until popup is visible | |
278 | 278 | \ fill lot form in opened popup ${lot_attributes} |
279 | 279 | \ submit current visible popup |
280 | 280 | \ ${features} = get from dictionary by keys ${lot_attributes} features | ... | ... |
Please
register
or
login
to post a comment