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-10 19:31:56 +01:00
parent 7b79600638 c230dd6e1b
commit 06bbce45b8
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/plannedsessions.py
View File

@@ -397,17 +397,22 @@ def add_workouts_plannedsession(ws,ps,r):
if ps.sessiontype == 'fastest_distance':
records = CourseTestResult.objects.filter(userid=w.user.id,plannedsession=ps)
for record in records:
w1 = Workout.objects.get(id=record.workoutid)
w1.plannedsession = None
w1.save()
record.delete()
df = dataprep.getsmallrowdata_db(['time','cumdist'],ids=[w.id])
fastest_milliseconds = datautils.getfastest(df,ps.sessionvalue,mode='distance')
if fastest_milliseconds > 0:
w.plannedsession = ps
w.save()
duration = to_time(1000.*fastest_milliseconds)
record = CourseTestResult(
userid=w.useruser..id,
userid=w.user.user.id,
plannedsession = ps,
duration = duration,
coursecompleted = True,
@@ -429,12 +434,17 @@ def add_workouts_plannedsession(ws,ps,r):
if ps.sessiontype == 'fastest_time':
records = CourseTestResult.objects.filter(userid=w.user.id,plannedsession=ps)
for record in records:
w1 = Workout.objects.get(id=record.workoutid)
w1.plannedsession = None
w1.save()
record.delete()
df = dataprep.getsmallrowdata_db(['time','cumdist'],ids=[w.id])
fastest_meters = datautils.getfastest(df,ps.sessionvalue,mode='time')
if fastest_meters > 0:
w.plannedsession = ps
w.save()
duration = dt.time(0,ps.sessionvalue)
record = CourseTestResult(
@@ -710,7 +720,7 @@ def is_session_complete_ws(ws,ps):
return ratio,'partial',completiondate
return (0,'partial',None)
elif ps.sessiontype in ['fastest_time','fastest_distance']:
vs = CourseTestResult.objects.filter(plannedsession=ps,userid=ws[0].user.id)
vs = CourseTestResult.objects.filter(plannedsession=ps,userid=ws[0].user.user.id)
completiondate = ws.reverse()[0].date
wids = [w.id for w in ws]
for record in vs: