diff --git a/timers_module.py b/timers_module.py index 8b05674..f44fcff 100644 --- a/timers_module.py +++ b/timers_module.py @@ -123,7 +123,7 @@ class Timers_Module(): print(type(result)) self.TIMER_EXEC(name, datetime.datetime.strptime(startTime, '%Y-%m-%d %H:%M:%S.%f'), datetime.datetime.strptime(endTime, '%Y-%m-%d %H:%M:%S.%f'), trigger, trigger_exec, utility.strToBool(tempTimer)) - fixedEndTime = datetime.datetime.strftime(result, '%M:%S') + fixedEndTime = datetime.datetime.strftime(result, timerFormat) return str("Timer Done") else: endT = datetime.datetime.strptime(endTime, '%Y-%m-%d %H:%M:%S.%f') @@ -131,7 +131,7 @@ class Timers_Module(): curTime = datetime.datetime.strptime(curTime, '%Y-%m-%d %H:%M:%S.%f') result = endT - datetime.timedelta(days=curTime.day, hours=curTime.hour, minutes=curTime.minute, seconds=curTime.second, microseconds=curTime.microsecond) - fixedEndTime = datetime.datetime.strftime(result, '%M:%S') + fixedEndTime = datetime.datetime.strftime(result, timerFormat) #fixedTimeDelta = fixedEndTime - fixedCurTime #praxis_logger.log(str(timeDelta)) return str(fixedEndTime)