Private
Public Access
1
0

v0.1 of testcourse working (plannedsession)

This commit is contained in:
Sander Roosendaal
2018-02-22 21:39:15 +01:00
parent 083f91914c
commit 581250a7b0
5 changed files with 57 additions and 17 deletions

View File

@@ -12657,15 +12657,24 @@ def plannedsession_view(request,id=0,rowerid=0,
rankws = Workout.objects.filter(
plannedsession=ps).order_by("-distance")
for w in rankws:
dd = w.duration
dddelta = datetime.timedelta(hours=dd.hour,
minutes=dd.minute,
seconds=dd.second,
microseconds=dd.microsecond)
wdict = {
'name': w.user.user.first_name+' '+w.user.user.last_name,
'date': w.date,
'distance': w.distance,
'time': w.duration,
'time': dddelta,
'type': w.workouttype,
}
if ps.sessiontype == 'coursetest':
coursetimeseconds,coursecompleted = courses.get_time_course(ws,ps.course)
(
coursetimeseconds,
coursemeters,
coursecompleted
) = courses.get_time_course(ws,ps.course)
intsecs = int(coursetimeseconds)
microsecs = int(1.e6*(coursetimeseconds-intsecs))
@@ -12673,9 +12682,12 @@ def plannedsession_view(request,id=0,rowerid=0,
seconds=intsecs,
microseconds=microsecs
)
wdict['distance'] = int(round(coursemeters))
ranking.append(wdict)
if ps.sessiontype == 'coursetest':
ranking = sorted(ranking, key=lambda k: k['time'])
# if coursetest, need to reorder the ranking