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

small fix - bars didn't reload with the red in performance chart

Browse Source
This commit is contained in:
Sander Roosendaal
2021-01-06 18:10:38 +01:00
parent d850ec4305
commit b920cbd50e
1 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
rowers/interactiveplots.py
View File

@@ -182,20 +182,6 @@ def build_goldmedalstandards(workouts,kfitness):
df.sort_values(['workoutdt'],inplace=True) df.sort_values(['workoutdt'],inplace=True)
#for id, row in df.iterrows():
# d = row['workoutdt']
# dd = d-datetime.timedelta(days=90)
# mask = df['workoutdt']>dd
# mask2 = df['workoutdt']<=d
# df2 = df.where(mask & mask2)
# powertest = df2['goldmedalstandard'].max()
# idx = df2['goldmedalstandard'].argmax()
# durationtest = df2['goldmedalduration'].values[idx]
# dates.append(d)
# testpower.append(powertest)
# testduration.append(durationtest)
# fatigues.append(np.nan)
# fitnesses.append(np.nan)
for w in workouts: for w in workouts:
ids = [ww.id for ww in workouts.filter(date__gte=w.date-datetime.timedelta(days=42), ids = [ww.id for ww in workouts.filter(date__gte=w.date-datetime.timedelta(days=42),
@@ -1995,25 +1981,27 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
outids = [] outids = []
if showtests:
workouts = Workout.objects.filter(user=user.rower,date__gte=startdate, workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
date__lte=enddate, date__lte=enddate,
workouttype__in=mytypes.rowtypes, workouttype__in=mytypes.rowtypes,
duplicate=False) duplicate=False)
dates,testpower,testduration,fatigues,fitnesses,impulses, outids = build_goldmedalstandards( dates,testpower,testduration,fatigues,fitnesses,impulses, outids = build_goldmedalstandards(
workouts,kfitness workouts,kfitness
) )
df = pd.DataFrame({
'id': outids, df = pd.DataFrame({
'date':dates, 'id': outids,
'testpower':testpower, 'date':dates,
'testduration':testduration, 'testpower':testpower,
'fatigue':fatigues, 'testduration':testduration,
'fitness':fitnesses, 'fatigue':fatigues,
'impulse':impulses, 'fitness':fitnesses,
}) 'impulse':impulses,
df.sort_values(['date'],inplace=True) })
df.sort_values(['date'],inplace=True)
if showtests:
df['testdup'] = df['testpower'].shift(1) df['testdup'] = df['testpower'].shift(1)
df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1) df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1)
df['id'] = df.apply(lambda x: newtestpowerid(x),axis=1) df['id'] = df.apply(lambda x: newtestpowerid(x),axis=1)
@@ -2030,7 +2018,8 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
fitnesses = df['fitness'].values.tolist() fitnesses = df['fitness'].values.tolist()
testduration = df['testduration'].values.tolist() testduration = df['testduration'].values.tolist()
impulses = df['impulse'].tolist() impulses = df['impulse'].tolist()
outids = df['id'].unique()
outids = df['id'].unique()
fatigues,fitnesses,dates,testpower,testduration,impulses = getfatigues(fatigues, fatigues,fitnesses,dates,testpower,testduration,impulses = getfatigues(fatigues,
fitnesses, fitnesses,