starting performance chart calculation 3 months before start of chart
This commit is contained in:
@@ -1850,7 +1850,7 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
|
||||
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,
|
||||
workouttype__in=mytypes.rowtypes,
|
||||
duplicate=False).order_by('date')
|
||||
@@ -1869,7 +1869,8 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
|
||||
dates,
|
||||
testpower,testduration,
|
||||
impulses,
|
||||
startdate,enddate,
|
||||
startdate-datetime.timedelta(days=90),
|
||||
enddate,
|
||||
user,metricchoice,
|
||||
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 = df.groupby(['date']).max()
|
||||
df['date'] = df.index.values
|
||||
mask = df['date'] > np.datetime64(startdate)
|
||||
df = df.loc[mask]
|
||||
|
||||
|
||||
|
||||
source = ColumnDataSource(
|
||||
|
||||
Reference in New Issue
Block a user