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

adding dist

Browse Source
This commit is contained in:
Sander Roosendaal
2021-12-31 13:06:47 +01:00
parent 0fc1a7db28
commit 5dd00dcc39
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rowers/interactiveplots.py
View File

@@ -683,7 +683,7 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
rscores = []
trimps = []
links = []
distances = []
rowersinitials = {}
seen = ['seen']
@@ -719,6 +719,7 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
du = w.duration.hour*60+w.duration.minute
trimp = w.trimp
rscore = w.rscore
distance = w.distance
if rscore == 0: # pragma: no cover
rscore = w.hrtss
@@ -731,6 +732,7 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
durations.append(du)
trimps.append(trimp)
rscores.append(rscore)
distances.append(distance)
links.append(
"{siteurl}/rowers/workout/{code}/".format(
siteurl = settings.SITE_URL,
@@ -769,6 +771,7 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
durations.append(0)
trimps.append(0)
rscores.append(0)
distances.append(0)
links.append('')
types.append('rower')
@@ -791,6 +794,7 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
'rscore':rscores,
'type':types,
'rower':rowers,
'distance':distances,
'link':links,
}
@@ -805,9 +809,15 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
elif yaxis == 'TRIMP':
df.drop('duration',inplace=True,axis='columns')
df.drop('rscore',inplace=True,axis='columns')
df.drop('distance',inplace=True, axis='columns')
elif yaxis == 'rScore': # pragma: no cover
df.drop('duration',inplace=True,axis='columns')
df.drop('trimp',inplace=True,axis='columns' )
df.drop('distance',inplace=True, axis='columns')
elif yaxis == 'distance':
df.drop('duration',inplace=True,axis='columns')
df.drop('trimp', inplace=True,axis='columns')
df.drop('rscore',inplace=True,axis='columns')
df['color'] = df['type'].apply(lambda x:mapcolors(x))
@@ -848,9 +858,13 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
p.yaxis.axis_label = 'Duration (h)'
elif yaxis == 'TRIMP':
p.yaxis.axis_label = 'TRIMP'
elif yaxis == 'distance':
p.yaxis.axis_label = 'Distance (m)'
else: # pragma: no cover
p.yaxis.axis_label = 'rScore'
p.plot_width=550