Merge branch 'release/v18.9.9'
This commit is contained in:
@@ -1257,6 +1257,13 @@ def performancemanager_view(request, userid=0, mode='rower',
|
||||
doform = therower.showfresh
|
||||
dofatigue = therower.showfit
|
||||
|
||||
script = ''
|
||||
thediv = 'Submit form to create chart'
|
||||
endfitness = 0
|
||||
endfatigue = 0
|
||||
endform = 0
|
||||
ids = []
|
||||
|
||||
if request.method == 'POST':
|
||||
form = PerformanceManagerForm(request.POST)
|
||||
if form.is_valid():
|
||||
@@ -1268,21 +1275,22 @@ def performancemanager_view(request, userid=0, mode='rower',
|
||||
therower.showfresh = doform
|
||||
therower.showfatigue = dofatigue
|
||||
therower.save()
|
||||
script, thediv, endfitness, endfatigue, endform, ids = performance_chart(
|
||||
theuser, startdate=startdate, enddate=enddate,
|
||||
kfitness=kfitness,
|
||||
kfatigue=kfatigue,
|
||||
metricchoice=metricchoice,
|
||||
doform=doform,
|
||||
dofatigue=dofatigue,
|
||||
showtests=True,
|
||||
)
|
||||
else:
|
||||
form = PerformanceManagerForm(initial={
|
||||
'doform': doform,
|
||||
'dofatigue': dofatigue,
|
||||
})
|
||||
|
||||
script, thediv, endfitness, endfatigue, endform, ids = performance_chart(
|
||||
theuser, startdate=startdate, enddate=enddate,
|
||||
kfitness=kfitness,
|
||||
kfatigue=kfatigue,
|
||||
metricchoice=metricchoice,
|
||||
doform=doform,
|
||||
dofatigue=dofatigue,
|
||||
showtests=True,
|
||||
)
|
||||
|
||||
|
||||
ids = pd.Series(ids, dtype='int').dropna().values
|
||||
|
||||
|
||||
Reference in New Issue
Block a user