Private
Public Access
1
0

link to import and end fitness stat

This commit is contained in:
Sander Roosendaal
2020-12-03 08:33:50 +01:00
parent 6fc4e33e39
commit b11e75e456
4 changed files with 49 additions and 15 deletions

View File

@@ -1726,7 +1726,9 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
'impulse':impulses,
})
endfitness = fitnesses[-1]
endfatigue = fatigues[-1]
endform = endfitness-endfatigue
if modelchoice == 'banister':
df['fatigue'] = k2*df['fatigue']
@@ -1865,10 +1867,10 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
hover.tooltips = OrderedDict([
#(legend_label,'@testpower'),
('Date','@fdate'),
(fitlabel,'@fitness'),
(fatiguelabel,'@fatigue'),
(formlabel,'@form'),
('Impulse','@impulse')
(fitlabel,'@fitness{int}'),
(fatiguelabel,'@fatigue{int}'),
(formlabel,'@form{int}'),
('Impulse','@impulse{int}')
])
@@ -1908,7 +1910,7 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
)
)
return [script,div]
return [script,div,endfitness,endfatigue,endform]
def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,