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

starting performance chart calculation 3 months before start of chart

Browse Source
This commit is contained in:
Sander Roosendaal
2021-05-15 15:53:00 +02:00
parent 264706bdb3
commit 1c422a9931
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/interactiveplots.py
View File

@@ -1850,7 +1850,7 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
outids = [] outids = []
workouts = Workout.objects.filter(user=user.rower,date__gte=startdate, workouts = Workout.objects.filter(user=user.rower,date__gte=startdate-datetime.timedelta(days=90),
date__lte=enddate, date__lte=enddate,
workouttype__in=mytypes.rowtypes, workouttype__in=mytypes.rowtypes,
duplicate=False).order_by('date') duplicate=False).order_by('date')
@@ -1869,7 +1869,8 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
dates, dates,
testpower,testduration, testpower,testduration,
impulses, impulses,
startdate,enddate, startdate-datetime.timedelta(days=90),
enddate,
user,metricchoice, user,metricchoice,
kfatigue,kfitness) kfatigue,kfitness)
@@ -1900,6 +1901,9 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
df.sort_values(['date'],inplace=True) df.sort_values(['date'],inplace=True)
df = df.groupby(['date']).max() df = df.groupby(['date']).max()
df['date'] = df.index.values df['date'] = df.index.values
mask = df['date'] > np.datetime64(startdate)
df = df.loc[mask]
source = ColumnDataSource( source = ColumnDataSource(