From b8ea519589a0404fda620853217cc65082c423dc Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 23 Dec 2024 14:35:44 +0100 Subject: [PATCH 1/2] fixed plan creation form --- rowers/plannedsessions.py | 2 +- rowers/tasks.py | 1 + rowers/views/planviews.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 7cadd5d7..9e1a0ed9 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -1070,7 +1070,7 @@ def get_workouts_session(r, ps): def create_sessions_from_json(plansteps, rower, startdate, manager, planbyrscore=False, plan=None, plan_past_days=False, - asynchronous=False, queue=queue): + asynchronous=True, queue=queue): trainingdays = plansteps['trainingDays'] planstartdate = startdate if not asynchronous: diff --git a/rowers/tasks.py b/rowers/tasks.py index c26f02fb..8b4aca87 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -397,6 +397,7 @@ def create_sessions_from_json_async(plansteps, rower, startdate, manager, planby elif preferreddate >= timezone.now().date(): create_session = True + if create_session: ps = PlannedSession( startdate=preferreddate - diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index b88d29a5..06ba2bd1 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -2777,7 +2777,7 @@ def rower_view_instantplan(request, id='', userid=0): messages.info(request, 'Your Sessions have been added') url = reverse('plannedsessions_view') - timeperiod = startdate.strftime( + timeperiod = timezone.now().date().strftime( '%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d') url = url+'?when='+timeperiod From d31b552db68934d92c522d2ca7fce82f3d28bfaf Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 23 Dec 2024 14:55:24 +0100 Subject: [PATCH 2/2] fixing auto plan --- rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 83b86e0cfd41ac8288522b722849e19f933552fd..581276cd0480f19f5ff5d5ce409c9ef9c754c014 100644 GIT binary patch delta 37 vcmV+=0NVecAD|xxABzYG&u3||2dNGRMp)VxF3m@iw+`V5!^5iR#DD<+{r?Wc delta 37 vcmV+=0NVecAD|xxABzYG