From 6d648c7c18988a765cae987676d5ec56387b5543 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 10 May 2020 13:40:32 +0200 Subject: [PATCH] activity chart without save --- rowers/interactiveplots.py | 6 +++--- rowers/views/analysisviews.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index bc2e0986..c657a2da 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -178,7 +178,7 @@ def interactive_hr_piechart(df,rower,title,totalseconds=0): if df.empty: return "","Not enough data to make a chart" - + df.sort_values(by='hr',inplace=True) df['timehr'] = df['deltat']*df['hr'] @@ -401,7 +401,7 @@ def interactive_planchart(data,startdate,enddate): return script,div -def interactive_activitychart(workouts,startdate,enddate,stack='type'): +def interactive_activitychart(workouts,startdate,enddate,stack='type',toolbar_location=None): dates = [] dates_sorting = [] @@ -521,7 +521,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'): p.plot_width=550 p.plot_height=350 - p.toolbar_location = 'above' + p.toolbar_location = toolbar_location p.sizing_mode = 'scale_width' url = "http://rowsandall.com/rowers/workout/@duration/" taptool = p.select(type=TapTool) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 04927008..902b8a29 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -4906,6 +4906,7 @@ def history_view_data(request,userid=0): totalsdict['nrworkouts'] = g_workouts.count() + # activity chart # interactive hr pie chart if typeselect == 'All':