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

Merge branch 'develop' into feature/fastestchallenges

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-11 08:45:19 +01:00
parent 2589f4165d abefbbc799
commit 3c58145af4
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/plannedsessions.py
View File

@@ -403,7 +403,7 @@ def add_workouts_plannedsession(ws,ps,r):
record.delete()
df = dataprep.getsmallrowdata_db(['time','cumdist'],ids=[w.id])
fastest_milliseconds = datautils.getfastest(df,ps.sessionvalue,mode='distance')
fastest_milliseconds,starttime,endtime = datautils.getfastest(df,ps.sessionvalue,mode='distance')
if fastest_milliseconds > 0:
w.plannedsession = ps
@@ -418,6 +418,8 @@ def add_workouts_plannedsession(ws,ps,r):
coursecompleted = True,
workoutid=w.id,
distance = ps.sessionvalue,
startsecond=starttime,
endsecond=endtime,
)
record.save()
@@ -440,7 +442,7 @@ def add_workouts_plannedsession(ws,ps,r):
record.delete()
df = dataprep.getsmallrowdata_db(['time','cumdist'],ids=[w.id])
fastest_meters = datautils.getfastest(df,ps.sessionvalue,mode='time')
fastest_meters,starttime,endtime = datautils.getfastest(df,ps.sessionvalue,mode='time')
if fastest_meters > 0:
w.plannedsession = ps
@@ -454,6 +456,8 @@ def add_workouts_plannedsession(ws,ps,r):
duration = duration,
coursecompleted = True,
distance = fastest_meters,
startsecond=starttime,
endsecond=endtime,
)
record.save()
else: