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

Merge branch 'release/v16.1.1'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-05-03 12:31:42 +02:00
parent 254d02e973 f7a585adb9
commit 45cad6f99a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/views/planviews.py
View File

@@ -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.)