From 6ff73c44c43a815d187f359a814b799004e615b2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 8 Feb 2018 23:11:26 +0100 Subject: [PATCH] improved date behavior for cloning --- rowers/dataprep.py | 6 +++--- rowers/views.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 9c891dd9..e738b735 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -2226,11 +2226,11 @@ def workout_trimp(workout): return trimp def workout_rscore(w): - r = workout.user - df,row = getrowdata_db(id=workout.id) + r = w.user + df,row = getrowdata_db(id=w.id) df = clean_df_stats(df) if df.empty: - df,row = getrowdata_db(id=workout.id) + df,row = getrowdata_db(id=w.id) df = clean_df_stats(df,workstrokesonly=False) duration = df['time'].max()-df['time'].min() diff --git a/rowers/views.py b/rowers/views.py index f16dcdae..f6943094 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -11969,8 +11969,10 @@ def plannedsession_clone_view(request,id=0,rowerid=0, ps.pk = None + deltadays = ps.enddate-ps.startdate + ps.startdate = timezone.now() - ps.enddate = timezone.now() + ps.enddate = timezone.now()+deltadays ps.name += ' (copy)' ps.save()