Commit 0f58e98caed8efb6d975f490d2ac1ce994d5e0a7

Authored by Playtenders
1 parent 183062aa

complaint + bid value correct

@@ -587,6 +587,15 @@ Resource playtender_contr @@ -587,6 +587,15 @@ Resource playtender_contr
587 587
588 Відповісти на вимогу ${username} ${tender_uaid} ${complaintID} ${answer_data} ${award_index} 588 Відповісти на вимогу ${username} ${tender_uaid} ${complaintID} ${answer_data} ${award_index}
589 589
  590 +Створити чернетку скарги про виправлення умов закупівлі
  591 + [Arguments] ${username} ${tender_uaid} ${claim}
  592 + [Documentation] Створює скаргу claim про виправлення умов закупівлі
  593 + ... у статусі claim для тендера tender_uaid. Можна створити
  594 + ... вимогу як з документом, який знаходиться за шляхом document,
  595 + ... так і без нього.
  596 +
  597 + Run Keyword And Return Створити вимогу ${username} ${tender_uaid} tender null ${claim} null
  598 +
590 599
591 ######################################################################################################################## 600 ########################################################################################################################
592 ################################################### END CLAIM KEYWORDS ############################################# 601 ################################################### END CLAIM KEYWORDS #############################################
@@ -227,6 +227,7 @@ get bid information @@ -227,6 +227,7 @@ get bid information
227 ... ELSE Run Keyword If 'status' == '${field}' get_text ${question_answer_value_locator} 227 ... ELSE Run Keyword If 'status' == '${field}' get_text ${question_answer_value_locator}
228 ... ELSE Run Keyword If 'value.amount' == '${field}' get value by locator on opened page ${bid_form_value_amount_input_locator} 228 ... ELSE Run Keyword If 'value.amount' == '${field}' get value by locator on opened page ${bid_form_value_amount_input_locator}
229 # submit current visible popup 229 # submit current visible popup
  230 + ${return_value} = Run Keyword If 'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}' playtender_service.split_joinvalue ${return_value}
230 ${return_value} = Run Keyword If 'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}' Convert To Number ${return_value} 231 ${return_value} = Run Keyword If 'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}' Convert To Number ${return_value}
231 [Return] ${return_value} 232 [Return] ${return_value}
232 233
@@ -29,7 +29,7 @@ Resource playtender_claim @@ -29,7 +29,7 @@ Resource playtender_claim
29 Run Keyword And Ignore Error Run Keyword If '${type}' == 'lot' Click Element ${claim_form_complaintform_related_lot_select_locator} 29 Run Keyword And Ignore Error Run Keyword If '${type}' == 'lot' Click Element ${claim_form_complaintform_related_lot_select_locator}
30 capture page screenshot 30 capture page screenshot
31 Run Keyword And Ignore Error Select From List By Label ${claim_form_complaintform_complaintform_type_input_locator} Вимога 31 Run Keyword And Ignore Error Select From List By Label ${claim_form_complaintform_complaintform_type_input_locator} Вимога
32 - Run Keyword And Ignore Error Run Keyword If '${type}' == 'winner_complaint' Select From List By Label ${claim_form_complaintform_complaintform_type_input_locator} Скарга 32 + Run Keyword And Ignore Error Run Keyword If '${type}' == 'winner_complaint' or '${claim.data.type}' == 'complaint' Select From List By Label ${claim_form_complaintform_complaintform_type_input_locator} Скарга
33 33
34 capture page screenshot 34 capture page screenshot
35 ### Run Keyword If '${doc_name}' != 'null' click visible element ${claim_form_complaintform_document_btn_locator} 35 ### Run Keyword If '${doc_name}' != 'null' click visible element ${claim_form_complaintform_document_btn_locator}
@@ -3,6 +3,7 @@ import re @@ -3,6 +3,7 @@ import re
3 import copy 3 import copy
4 import urllib 4 import urllib
5 import urllib3 5 import urllib3
  6 +import string
6 7
7 import dateutil.parser 8 import dateutil.parser
8 from iso8601 import parse_date 9 from iso8601 import parse_date
@@ -158,8 +159,14 @@ def convert_float_to_string_3f(number): @@ -158,8 +159,14 @@ def convert_float_to_string_3f(number):
158 def convert_to_specified_type(value, type): 159 def convert_to_specified_type(value, type):
159 value = "%s" % (value) 160 value = "%s" % (value)
160 if type == 'integer': 161 if type == 'integer':
  162 + value = value.split()
  163 + value = ''.join(value)
  164 + print(value)
161 value = int(value) 165 value = int(value)
162 if type == 'float': 166 if type == 'float':
  167 + value = value.split()
  168 + value = ''.join(value)
  169 + print(value)
163 value = float(value) 170 value = float(value)
164 return value 171 return value
165 172
@@ -392,3 +399,9 @@ def parse_deliveryPeriod_date(date_string): @@ -392,3 +399,9 @@ def parse_deliveryPeriod_date(date_string):
392 date = date.strftime("%d.%m.%Y") 399 date = date.strftime("%d.%m.%Y")
393 return date 400 return date
394 401
  402 +def split_joinvalue(str_value):
  403 + str_value = str_value.split()
  404 + str_value = ''.join(str_value)
  405 + print(str_value)
  406 + str_value.replace(" ", "")
  407 + return str_value
Please register or login to post a comment