alex_orid/Praxis_Bot
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

master updates #41

Manually merged
alex_orid merged 177 commits from master into github-master 2021-05-13 21:11:10 +00:00
Conversation 0 Commits 177 Files Changed 103 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb4273416f - Show all commits

4
timers_module.py
View File

@ -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)