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

test type plannedsessions now have a ranking

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-15 16:32:33 +01:00
parent 706ffc90fd
commit 2221a633b1
10 changed files with 228 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rowers/views.py
View File

@@ -11959,7 +11959,6 @@ def plannedsession_teamedit_view(request,timeperiod='thisweek',
'rowersform':sessionrowerform,
'timeperiod':timeperiod,
'plannedsessions':sps,
'rower':r,
})
@user_passes_test(iscoachmember,login_url="/rowers/planmembership/",
@@ -12163,7 +12162,7 @@ def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,
if w.id not in selectedworkouts:
remove_workout_plannedsession(w,ps)
result,comments,errors = add_workouts_plannedsession(workouts,ps)
result,comments,errors = add_workouts_plannedsession(workouts,ps,r)
for c in comments:
messages.info(request,c)
for er in errors:
@@ -12289,7 +12288,6 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0):
kwargs={
'timeperiod':timeperiod,
'sessionid':id,
'rower':r,
})
return HttpResponseRedirect(url)
@@ -12336,7 +12334,8 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0):
@login_required()
def plannedsession_view(request,id=0,rowerid=0):
def plannedsession_view(request,id=0,rowerid=0,
timeperiod='thisweek'):
m = getrower(request.user)
@@ -12365,6 +12364,27 @@ def plannedsession_view(request,id=0,rowerid=0):
ratio,status = is_session_complete(r,ps)
ratio = int(100.*ratio)
# ranking for test
ranking = []
if ps.sessiontype == 'test':
if ps.sessionmode == 'distance':
rankws = Workout.objects.filter(
plannedsession=ps).order_by("duration")
else:
rankws = Workout.objects.filter(
plannedsession=ps).order_by("-distance")
for w in rankws:
wdict = {
'name': w.user.user.first_name+' '+w.user.user.last_name,
'date': w.date,
'distance': w.distance,
'time': w.duration,
'type': w.workouttype,
}
ranking.append(wdict)
return render(request,'plannedsessionview.html',
{
@@ -12380,6 +12400,9 @@ def plannedsession_view(request,id=0,rowerid=0):
'ratio':ratio,
'status':status,
'results':resultsdict,
'plannedsession':ps,
'timeperiod':timeperiod,
'ranking':ranking,
}
)