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 15:56:39 +01:00
parent 8bc7f53b52 977da97b3c
commit cf16b2df0e
5 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/views/planviews.py
View File

@@ -1933,6 +1933,8 @@ def plannedsession_view(request,id=0,userid=0):
'time': dddelta,
'type': w.workouttype,
'coursecompleted':True,
'sessionresult':0,
'workoutid':w.id,
}
if ps.sessiontype == 'coursetest':
vs = CourseTestResult.objects.filter(plannedsession=ps,
@@ -1952,6 +1954,7 @@ def plannedsession_view(request,id=0,userid=0):
)
wdict['distance'] = int(round(coursemeters))
wdict['coursecompleted'] = coursecompleted
wdict['sessionresult'] = record.id
else:
record = CourseTestResult(
userid=w.user.id,
@@ -1996,7 +1999,9 @@ def plannedsession_view(request,id=0,userid=0):
'date': w.date,
'distance': record.distance,
'type': w.workouttype,
'workoutid':w.id,
'coursecompleted':True,
'sessionresult':record.id
}
coursecompleted = record.coursecompleted
@@ -2029,7 +2034,9 @@ def plannedsession_view(request,id=0,userid=0):
'date': w.date,
'distance': record.distance,
'type': w.workouttype,
'workoutid':w.id,
'coursecompleted':True,
'sessionresult':record.id,
}
coursecompleted = record.coursecompleted