From 7bdcf1a0aec70f2313422cc7d585dc9c9446a4a1 Mon Sep 17 00:00:00 2001 From: altaf-creator Date: Tue, 2 Dec 2025 17:46:06 +0700 Subject: fixes to outdated code in restarting timers --- backend/main.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/main.py b/backend/main.py index d7cf060..57ae981 100644 --- a/backend/main.py +++ b/backend/main.py @@ -162,19 +162,19 @@ def restart_terminated_schedules(): for row in out: print(row) - end_date = datetime.datetime.fromisoformat(row[2]) + datetime.timedelta(minutes=row[3]) + end_date = datetime.datetime.fromisoformat(row[RowIndices.END_TIME]) now = datetime.datetime.now() + timer_id = row[RowIndices.TIMER_ID] if now > end_date: - print("unfinished timer was long gone") - scheduler.add_job(final_timer_finished, 'date', run_date=(now + datetime.timedelta(seconds=1)), id=str(row[0]), args=[row[0]]) + print("unfinished timer was long gone", timer_id) + scheduler.add_job(final_timer_finished, 'date', run_date=(now + datetime.timedelta(seconds=1)), id=str(timer_id), args=[timer_id]) elif now + datetime.timedelta(minutes=5) > end_date: - print("unfinished timer ends in less than five mins") - scheduler.add_job(final_timer_finished, 'date', run_date=end_date, id=str(row[0]), args=[row[0]]) + print("unfinished timer ends in less than five mins", timer_id) + scheduler.add_job(final_timer_finished, 'date', run_date=end_date, id=str(timer_id), args=[timer_id]) else: - print("unfinished timer scheduler started") - print(row[0]) - scheduler.add_job(reminder_timer_finished, 'date', run_date=end_date, id=str(row[0]), args=[row[0]]) + print("unfinished timer scheduler started", timer_id) + scheduler.add_job(reminder_timer_finished, 'date', run_date=end_date - datetime.timedelta(minutes=5), id=str(timer_id), args=[timer_id]) print("setting internal array information") machine_status[row[RowIndices.BLOCK] - 1][row[RowIndices.MACHINE] - 1] = Status.RUNNING.name -- cgit v1.2.3