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

activity chart without save

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-10 13:40:32 +02:00
parent 45ffeb76ee
commit 6d648c7c18
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/interactiveplots.py
View File

@@ -178,7 +178,7 @@ def interactive_hr_piechart(df,rower,title,totalseconds=0):
if df.empty: if df.empty:
return "","Not enough data to make a chart" return "","Not enough data to make a chart"
df.sort_values(by='hr',inplace=True) df.sort_values(by='hr',inplace=True)
df['timehr'] = df['deltat']*df['hr'] df['timehr'] = df['deltat']*df['hr']
@@ -401,7 +401,7 @@ def interactive_planchart(data,startdate,enddate):
return script,div return script,div
def interactive_activitychart(workouts,startdate,enddate,stack='type'): def interactive_activitychart(workouts,startdate,enddate,stack='type',toolbar_location=None):
dates = [] dates = []
dates_sorting = [] dates_sorting = []
@@ -521,7 +521,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
p.plot_width=550 p.plot_width=550
p.plot_height=350 p.plot_height=350
p.toolbar_location = 'above' p.toolbar_location = toolbar_location
p.sizing_mode = 'scale_width' p.sizing_mode = 'scale_width'
url = "http://rowsandall.com/rowers/workout/@duration/" url = "http://rowsandall.com/rowers/workout/@duration/"
taptool = p.select(type=TapTool) taptool = p.select(type=TapTool)

1
rowers/views/analysisviews.py
View File

@@ -4906,6 +4906,7 @@ def history_view_data(request,userid=0):
totalsdict['nrworkouts'] = g_workouts.count() totalsdict['nrworkouts'] = g_workouts.count()
# activity chart
# interactive hr pie chart # interactive hr pie chart
if typeselect == 'All': if typeselect == 'All':