From f7a585adb98d6229473a137169e73ba8dd484757 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 3 May 2021 12:10:40 +0200 Subject: [PATCH] totals now also take approximate --- rowers/views/planviews.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index a35d05d5..a4a8ef63 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -1479,12 +1479,20 @@ def plannedsessions_view(request, completiondate[ps.id] = cdate if ps.sessionmode == 'distance': totals['planneddistance'] += ps.sessionvalue - elif ps.sessionmode == 'time': + else: + totals['planneddistance'] += ps.approximate_distance + if ps.sessionmode == 'time': totals['plannedtime'] += ps.sessionvalue - elif ps.sessionmode == 'rScore': # pragma: no cover + else: + totals['plannedtime'] += ps.approximate_duration + if ps.sessionmode == 'rScore': # pragma: no cover totals['plannedrscore'] += ps.sessionvalue - elif ps.sessionmode == 'TRIMP': # pragma: no cover + else: + totals['plannedrscore'] += ps.approximate_rscore + if ps.sessionmode == 'TRIMP': # pragma: no cover totals['plannedtrimp'] += ps.sessionvalue + else: + totals['plannedtrimp'] += ps.approximate_rscore*2 totals['time'] = int(totals['time']/60.) totals['actualtime'] = int(totals['actualtime']/60.)