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

improved session completion date

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-16 10:41:26 +01:00
parent af2ae853bd
commit 0c9bfcad8d
3 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/views.py
View File

@@ -11991,7 +11991,7 @@ def plannedsessions_coach_view(request,timeperiod='thisweek',
for ps in sps:
rowerstatus = {}
for r in rowers:
ratio, status = is_session_complete(r,ps)
ratio, status,completiondate = is_session_complete(r,ps)
rowerstatus[r.id] = status
sessiondict = {
'results':rowerstatus,
@@ -12046,15 +12046,11 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
completiondate = {}
for ps in sps:
ratio,status = is_session_complete(r,ps)
ratio,status,cdate = is_session_complete(r,ps)
actualvalue[ps.id] = int(ps.sessionvalue*ratio)
completeness[ps.id] = status
ws = Workout.objects.filter(user=r,plannedsession=ps)
if len(ws):
date = min([w.date for w in ws])
completiondate[ps.id] = date
else:
completiondate[ps.id] = ''
completiondate[ps.id] = cdate
unmatchedworkouts = Workout.objects.filter(
user=r,
@@ -12361,7 +12357,7 @@ def plannedsession_view(request,id=0,rowerid=0,
ws = get_workouts_session(r,ps)
ratio,status = is_session_complete(r,ps)
ratio,status,completiondate = is_session_complete(r,ps)
ratio = int(100.*ratio)
@@ -12391,7 +12387,7 @@ def plannedsession_view(request,id=0,rowerid=0,
'psdict': psdict,
'attrs':[
'name','startdate','enddate','sessiontype',
'sessionmode',
'sessionmode','criterium',
'sessionvalue','sessionunit'
],
'workouts': ws,