plan chart
This commit is contained in:
@@ -25,6 +25,7 @@ from rowingdata import rower as rrower
|
||||
from rowingdata import rowingdata as rrdata
|
||||
import arrow
|
||||
import pandas as pd
|
||||
import polars as pl
|
||||
import json
|
||||
|
||||
# Python
|
||||
@@ -203,16 +204,8 @@ def get_execution_report(rower, startdate, enddate, plan=None):
|
||||
startdate__gte=enddate)
|
||||
else: # pragma: no cover
|
||||
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")
|
||||
|
||||
if not plans:
|
||||
# make week cycles here
|
||||
# get monday before startdate
|
||||
|
||||
micros = []
|
||||
else:
|
||||
sorted_plans = sorted(plans, key= lambda t: t.overlap(startdate,enddate))
|
||||
@@ -313,7 +306,7 @@ def get_execution_report(rower, startdate, enddate, plan=None):
|
||||
planned += [plannedscore]
|
||||
executed += [actualscore]
|
||||
|
||||
data = pd.DataFrame({
|
||||
data = pl.DataFrame({
|
||||
'startdate': startdates,
|
||||
'planned': planned,
|
||||
'executed': executed,
|
||||
|
||||
Reference in New Issue
Block a user