Commit 453e668d authored by panos's avatar panos

Bug fixed in the script

parent 8f8c3b40
...@@ -37,10 +37,14 @@ class DateTimeConvert(plugin.InputPreparationPlugin, TimeSupportMixin): ...@@ -37,10 +37,14 @@ class DateTimeConvert(plugin.InputPreparationPlugin, TimeSupportMixin):
proc_time = 0; proc_time = 0;
timeOut = entity.pop('timeOut', None) timeOut = entity.pop('timeOut', None)
timeIn = entity.pop('timeIn', 'NA') timeIn = entity.pop('timeIn', 'NA')
if not timeIn=='NA':
timeIn = strptime(timeIn, '%Y-%m-%d %H:%M:%S')
if timeOut: if timeOut:
entity['remainingProcessingTime'] = 0 entity['remainingProcessingTime'] = 0
else: else:
#calculate the time difference between the TIMEIN and the moment the user wants to run the simulation (e.g. datetime.now()) #calculate the time difference between the TIMEIN and the moment the user wants to run the simulation (e.g. datetime.now())
print type(now)
print type(timeIn)
timeDelta= now - timeIn timeDelta= now - timeIn
if self.timeUnit == 'second': if self.timeUnit == 'second':
timeDiff = timeDelta.total_seconds() #24 * 60 * 60 timeDiff = timeDelta.total_seconds() #24 * 60 * 60
...@@ -57,7 +61,7 @@ class DateTimeConvert(plugin.InputPreparationPlugin, TimeSupportMixin): ...@@ -57,7 +61,7 @@ class DateTimeConvert(plugin.InputPreparationPlugin, TimeSupportMixin):
elif self.timeUnit == 'year': elif self.timeUnit == 'year':
timeDiff = timeDelta.total_seconds()/(60*60*24*7*30*360) #1 / 360. timeDiff = timeDelta.total_seconds()/(60*60*24*7*30*360) #1 / 360.
else: else:
raise ValueError("Unsupported time unit %s" % timeUnit) raise ValueError("Unsupported time unit %s" % self.timeUnit)
for order in orders: for order in orders:
comps = order.get('componentsList', []) comps = order.get('componentsList', [])
...@@ -65,7 +69,8 @@ class DateTimeConvert(plugin.InputPreparationPlugin, TimeSupportMixin): ...@@ -65,7 +69,8 @@ class DateTimeConvert(plugin.InputPreparationPlugin, TimeSupportMixin):
if comp['id'] == ent_key: if comp['id'] == ent_key:
for step in comp.get('route', []): for step in comp.get('route', []):
if step.get('task_id', None) == task_id: if step.get('task_id', None) == task_id:
proc_time = step.get('processingTime', None) proc_time = step.get('processingTime', {}).get('Fixed',{}).get('mean', 0)
print proc_time
break break
if proc_time: if proc_time:
break break
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment