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

Merge branch 'release/v14.37'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-10 19:58:47 +01:00
parent cb45312c24 cd91a75fa0
commit c2ce17165c
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rowers/views/planviews.py
View File

@@ -1987,28 +1987,31 @@ def plannedsession_view(request,id=0,userid=0):
for record in vs: for record in vs:
userid = record.userid userid = record.userid
uu = User.objects.get(id=userid) uu = User.objects.get(id=userid)
w = Workout.objects.get(id=record.workoutid) try:
wdict = { w = Workout.objects.get(id=record.workoutid)
'name': uu.first_name+' '+uu.last_name, wdict = {
'date': w.date, 'name': uu.first_name+' '+uu.last_name,
'distance': record.distance, 'date': w.date,
'type': w.workouttype, 'distance': record.distance,
'coursecompleted':True, 'type': w.workouttype,
} 'coursecompleted':True,
}
coursecompleted = record.coursecompleted coursecompleted = record.coursecompleted
t = record.duration t = record.duration
wdict['time'] = datetime.timedelta( wdict['time'] = datetime.timedelta(
hours=t.hour, hours=t.hour,
seconds=t.second, seconds=t.second,
minutes=t.minute, minutes=t.minute,
microseconds=t.microsecond microseconds=t.microsecond
) )
wdict['coursecompleted'] = coursecompleted wdict['coursecompleted'] = coursecompleted
ranking.append(wdict) ranking.append(wdict)
except Workout.DoesNotExist:
pass
ranking = sorted(ranking, key=lambda k: k['time']) ranking = sorted(ranking, key=lambda k: k['time'])
if ps.sessiontype == 'fastest_time': if ps.sessiontype == 'fastest_time':