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

execution chart without plan

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-05 15:07:25 +02:00
parent c12a2c8fe3
commit db4465512c
3 changed files with 76 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/plannedsessions.py
View File

@@ -145,13 +145,13 @@ def checkscores(r,macrocycles):
m.save()
def get_execution_report(rower,startdate,enddate,plan=None):
if plan:
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 = micros.exclude(enddate__lte=startdate).exclude(startdate__gte=enddate)
else:
plans = TrainingPlan.objects.filter(startdate__lte=startdate,enddate__gte=startdate)
plans2 = TrainingPlan.objects.filter(enddate__lte=enddate,startdate__lte=enddate)
@@ -161,7 +161,18 @@ def get_execution_report(rower,startdate,enddate,plan=None):
if not plans:
# make week cycles here
return(0,'no plan found')
# get monday before startdate
startdate += timedelta(days=1-startdate.isoweekday())
startdate = startdate-timedelta(days=7)
micros = []
while startdate <= enddate:
micro = type('micros',(object,),
{
'startdate':startdate,
'enddate':startdate+timedelta(days=7)
})
micros.append(micro)
startdate += timedelta(days=7)
else:
plan = plans[0]
macros = TrainingMacroCycle.objects.filter(plan=plan).order_by("startdate")