Private
Public Access
1
0

finalizing mvp of goldmedalscores chart

This commit is contained in:
Sander Roosendaal
2021-01-04 17:20:16 +01:00
parent b84ba9d49a
commit 6e3d4a7051
3 changed files with 13 additions and 4 deletions

View File

@@ -1820,6 +1820,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
)
df = pd.DataFrame({
'id':outids,
'date':dates,
'testpower':testpower,
'testduration':testduration,
@@ -1830,10 +1831,15 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1)
#df['date'] = df.apply(lambda x: newtestpowerdate(x), axis=1)
mask = df['testpower'].isnull()
dates = df.mask(mask)['date'].dropna().values
testpower = df.mask(mask)['testpower'].dropna().values
outids = df.mask(mask)['id'].dropna().unique()
# all workouts
alldates,alltestpower,allduration = all_goldmedalstandards(workouts,startdate,enddate)
@@ -1937,7 +1943,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
size=10,
legend_label='Marker Workouts')
plot.legend.location = "top_left"
plot.legend.location = "bottom_left"
plot.x_range = Range1d(
startdate,enddate+datetime.timedelta(days=5),
@@ -1955,7 +1961,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
script, div = components(plot)
return script, div
return script, div,outids
def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
metricchoice='trimp',doform=False,dofatigue=False,