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

Merge branch 'release/v10.35'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-05 21:16:55 +02:00
parent f583d4489c 48906faaff
commit 78863183c2
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rowers/plannedsessions.py
View File

@@ -189,14 +189,33 @@ def get_execution_report(rower,startdate,enddate,plan=None):
plannedscore = 0
actualscore = 0
sps = get_sessions(rower,startdate=mm.startdate,enddate=mm.enddate)
for ps in sps:
if ps.sessionmode == 'rscore':
plannedscore += ps.planrscore
actualscore += ps.actualrscore
unmatchedworkouts = Workout.objects.filter(
user=rower,
plannedsession=None,
date__gte=mm.startdate,date__lte=mm.enddate)
for w in unmatchedworkouts:
if w.rscore != 0:
actualscore += w.rscore
elif w.hrtss != 0:
actualscore += w.hrtss
else:
minutes = w.duration.hour*60+w.duration.minute
actualscore += minutes
for ps in sps:
ratio, status, cdate = is_session_complete(rower,ps)
if ps.sessionmode == 'rscore':
plannedscore += ps.sessionvalue
actualscore += ratio*ps.sessionvalue
else:
ratio, status, cdate = is_session_complete(rower,ps)
ws = Workout.objects.filter(user=rower,plannedsession=ps)
if not ws:
if ps.sessionmode == 'time':
plannedscore += ps.sessionvalue
elif ps.sessionmode == 'distance':
plannedscore += 60.
elif ps.sessionmode == 'TRIMP':
plannedscore += ps.sessionvalue/2.
for w in ws:
if w.rscore != 0:
if ratio > 0: