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

making execution chart accessible

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-20 13:35:03 +02:00
parent 8f2e0356d1
commit ec75ba1c16
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/plannedsessions.py
View File

@@ -178,7 +178,11 @@ def get_execution_report(rower,startdate,enddate,plan=None):
macros = TrainingMacroCycle.objects.filter(plan=plan).order_by("startdate")
checkscores(rower,macros)
mesos = TrainingMesoCycle.objects.filter(plan__in=macros).order_by("startdate")
micros = TrainingMicroCycle.objects.filter(plan__in=mesos).order_by("startdate")
micros = TrainingMicroCycle.objects.filter(
plan__in=mesos,
enddate__gte=startdate,
startdate__lte=enddate,
).order_by("startdate")
# we've got micros, now get sessions
startdates = []
@@ -203,7 +207,7 @@ def get_execution_report(rower,startdate,enddate,plan=None):
actualscore += minutes
for ps in sps:
ratio, status, cdate = is_session_complete(rower,ps)
if ps.sessionmode == 'rscore':
if ps.sessionmode == 'rScore':
plannedscore += ps.sessionvalue
actualscore += ratio*ps.sessionvalue
else: