totals now also take approximate
This commit is contained in:
@@ -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.)
|
||||
|
||||
Reference in New Issue
Block a user