sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

improved date behavior for cloning

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-08 23:11:26 +01:00
parent 9df9969939
commit 6ff73c44c4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/dataprep.py
View File

@@ -2226,11 +2226,11 @@ def workout_trimp(workout):
return trimp return trimp
def workout_rscore(w): def workout_rscore(w):
r = workout.user r = w.user
df,row = getrowdata_db(id=workout.id) df,row = getrowdata_db(id=w.id)
df = clean_df_stats(df) df = clean_df_stats(df)
if df.empty: if df.empty:
df,row = getrowdata_db(id=workout.id) df,row = getrowdata_db(id=w.id)
df = clean_df_stats(df,workstrokesonly=False) df = clean_df_stats(df,workstrokesonly=False)
duration = df['time'].max()-df['time'].min() duration = df['time'].max()-df['time'].min()

4
rowers/views.py
View File

@@ -11969,8 +11969,10 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
ps.pk = None ps.pk = None
deltadays = ps.enddate-ps.startdate
ps.startdate = timezone.now() ps.startdate = timezone.now()
ps.enddate = timezone.now() ps.enddate = timezone.now()+deltadays
ps.name += ' (copy)' ps.name += ' (copy)'
ps.save() ps.save()