Commit f39d4fa253bb15ee1a0b34584f2a2c194090806d

Authored by Oleksandr Iskryzhytskyi
1 parent 76c78c4a

fixed: prepare_tender_data

Showing 1 changed file with 16 additions and 7 deletions
1 # -*- coding: utf-8 - 1 # -*- coding: utf-8 -
2 import re 2 import re
3 -import dateutil.parser  
4 3
  4 +import dateutil.parser
5 from iso8601 import parse_date 5 from iso8601 import parse_date
6 from robot.libraries.BuiltIn import BuiltIn 6 from robot.libraries.BuiltIn import BuiltIn
7 7
@@ -130,12 +130,15 @@ def trigger_input_change_event(locator): @@ -130,12 +130,15 @@ def trigger_input_change_event(locator):
130 def convert_float_to_string(number): 130 def convert_float_to_string(number):
131 return repr(float(number)) 131 return repr(float(number))
132 132
  133 +
133 def convert_esco__float_to_string(number): 134 def convert_esco__float_to_string(number):
134 return '{0:.5f}'.format(float(number)) 135 return '{0:.5f}'.format(float(number))
135 136
  137 +
136 def convert_float_to_string_3f(number): 138 def convert_float_to_string_3f(number):
137 return '{0:.3f}'.format(float(number)) 139 return '{0:.3f}'.format(float(number))
138 140
  141 +
139 # convert any variable to specified type 142 # convert any variable to specified type
140 def convert_to_specified_type(value, type): 143 def convert_to_specified_type(value, type):
141 value = "%s" % (value) 144 value = "%s" % (value)
@@ -242,6 +245,7 @@ def prepare_tender_data(data): @@ -242,6 +245,7 @@ def prepare_tender_data(data):
242 lot['features'].append(data['features'].pop(i)) 245 lot['features'].append(data['features'].pop(i))
243 l = l - 1 246 l = l - 1
244 i = i - 1 247 i = i - 1
  248 + break
245 if data['features'][i]['featureOf'] == 'item': 249 if data['features'][i]['featureOf'] == 'item':
246 for item in data['items']: 250 for item in data['items']:
247 if item['id'] == data['features'][i]['relatedItem']: 251 if item['id'] == data['features'][i]['relatedItem']:
@@ -250,6 +254,7 @@ def prepare_tender_data(data): @@ -250,6 +254,7 @@ def prepare_tender_data(data):
250 item['features'].append(data['features'].pop(i)) 254 item['features'].append(data['features'].pop(i))
251 l = l - 1 255 l = l - 1
252 i = i - 1 256 i = i - 1
  257 + break
253 i = i + 1 258 i = i + 1
254 259
255 if 'features' in data: 260 if 'features' in data:
@@ -267,6 +272,7 @@ def prepare_tender_data(data): @@ -267,6 +272,7 @@ def prepare_tender_data(data):
267 lot['items'].append(data['items'].pop(i)) 272 lot['items'].append(data['items'].pop(i))
268 l = l - 1 273 l = l - 1
269 i = i - 1 274 i = i - 1
  275 + break
270 i = i + 1 276 i = i + 1
271 277
272 del data['items'] 278 del data['items']
@@ -282,24 +288,27 @@ def prepare_tender_data(data): @@ -282,24 +288,27 @@ def prepare_tender_data(data):
282 lot['milestones'].append(data['milestones'].pop(i)) 288 lot['milestones'].append(data['milestones'].pop(i))
283 l = l - 1 289 l = l - 1
284 i = i - 1 290 i = i - 1
  291 + break
285 i = i + 1 292 i = i + 1
286 293
287 del data['milestones'] 294 del data['milestones']
288 295
289 return data 296 return data
290 297
  298 +
291 def split_agreementDuration(str, type): 299 def split_agreementDuration(str, type):
292 if type in 'year': 300 if type in 'year':
293 - year_temp = str.split('Y',1)  
294 - value = year_temp[0].split('P',1) 301 + year_temp = str.split('Y', 1)
  302 + value = year_temp[0].split('P', 1)
295 elif type in 'month': 303 elif type in 'month':
296 - month_temp = str.split('M',1)  
297 - value = month_temp[0].split('Y',1) 304 + month_temp = str.split('M', 1)
  305 + value = month_temp[0].split('Y', 1)
298 else: 306 else:
299 - day_temp = str.split('D',1)  
300 - value = day_temp[0].split('M',1) 307 + day_temp = str.split('D', 1)
  308 + value = day_temp[0].split('M', 1)
301 return value[1] 309 return value[1]
302 310
  311 +
303 def convert_date_to_string_contr(date): 312 def convert_date_to_string_contr(date):
304 date = dateutil.parser.parse(date) 313 date = dateutil.parser.parse(date)
305 date = date.strftime("%d.%m.%Y %H:%M:%S") 314 date = date.strftime("%d.%m.%Y %H:%M:%S")
Please register or login to post a comment