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

better plan actual comparison

Browse Source
This commit is contained in:
Sander Roosendaal
2022-04-12 09:51:12 +02:00
parent 1bdb867564
commit 24592f81ed
5 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rowers/plannedsessions.py
View File

@@ -202,30 +202,21 @@ def get_execution_report(rower, startdate, enddate, plan=None):
micros = micros.exclude(enddate__lte=startdate).exclude(
startdate__gte=enddate)
else: # pragma: no cover
plans = TrainingPlan.objects.filter(
startdate__lte=startdate, enddate__gte=startdate)
plans2 = TrainingPlan.objects.filter(
enddate__lte=enddate, startdate__lte=enddate)
plans = plans | plans2
plans = TrainingPlan.objects.filter(rowers__in=[rower])
#plans2 = TrainingPlan.objects.filter(
# enddate__lte=enddate, startdate__lte=enddate, rowers__in=[rower])
#plans = plans | plans2
plans = plans.exclude(status=False).order_by("-enddate")
#plans = plans.exclude(status=False).order_by("-enddate")
if not plans:
# make week cycles here
# 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]
sorted_plans = sorted(plans, key= lambda t: t.overlap(startdate,enddate))
plan = plans.reverse()[0]
macros = TrainingMacroCycle.objects.filter(
plan=plan).order_by("startdate")
checkscores(rower, macros)
@@ -237,12 +228,28 @@ def get_execution_report(rower, startdate, enddate, plan=None):
startdate__lte=enddate,
).order_by("startdate")
if len(micros)==0:
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)
# we've got micros, now get sessions
startdates = []
planned = []
executed = []
for mm in micros:
print(mm)
plannedscore = 0
actualscore = 0
sps = get_sessions(rower, startdate=mm.startdate, enddate=mm.enddate)