diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 1f9c708d..e1495525 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -70,7 +70,52 @@ def timefield_to_seconds_duration(t): duration += t.microsecond/1.e6 return duration - + +def get_session_metrics(ps): + rowers = ps.rower.all() + rscore = [] + trimp = [] + duration = [] + distance = [] + firstname = [] + lastname = [] + + for r in rowers: + rscorev = 0 + trimpv = 0 + durationv = 0 + distancev = 0 + + + ws = Workout.objects.filter(user=r,plannedsession=ps) + if len(ws) != 0: + for w in ws: + distancev += w.distance + durationv += timefield_to_seconds_duration(w.duration) + trimpv += dataprep.workout_trimp(w) + rscorev += dataprep.workout_rscore(w) + + + durationv /= 60. + + trimp.append(int(trimpv)) + duration.append(int(durationv)) + distance.append(int(distancev)) + rscore.append(int(rscorev)) + firstname.append(r.user.first_name) + lastname.append(r.user.last_name) + + thedict = { + 'first_name':firstname, + 'last_name':lastname, + 'duration':duration, + 'distance':distance, + 'rscore':rscore, + 'trimp':trimp + } + + return thedict + def is_session_complete(r,ps): status = 'not done' diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html index be61c544..c01326e3 100644 --- a/rowers/templates/plannedsessionview.html +++ b/rowers/templates/plannedsessionview.html @@ -9,6 +9,7 @@ {% include "planningbuttons.html" %} +
Status: {{ status }}
-Percentage complete: {{ ratio }}
Status: {{ status }}
+Percentage complete: {{ ratio }}
+| Name | +Minutes | +Meters | +rScore | +TRIMP | +
|---|---|---|---|---|
| {{ value|lookup:'first_name' }} {{ value|lookup:'last_name' }} | +{{ value|lookup:'duration' }} | +{{ value|lookup:'distance' }} | +{{ value|lookup:'rscore' }} | +{{ value|lookup:'trimp' }} | +