Commit f39d4fa253bb15ee1a0b34584f2a2c194090806d

Authored by Oleksandr Iskryzhytskyi
1 parent 76c78c4a

fixed: prepare_tender_data

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