diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 318a12b2..728f8219 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -373,23 +373,10 @@ def interactive_workouttype_piechart(workouts): } - div, script = get_chart("/workouttypepie", chart_data, debug=True) + script, div = get_chart("/workouttypepie", chart_data, debug=True) + return script, div - p = figure(height=350, title="Types", toolbar_location=None, - tools="hover,save", tooltips="@type: @totaltime", x_range=(-0.5, 1.0)) - - p.wedge(x=0, y=1, radius=0.4, - start_angle=cumsum('angle', include_zero=True), end_angle=cumsum('angle'), - line_color="white", fill_color='color', source=data, legend_group='type', ) - - p.axis.axis_label = None - p.axis.visible = False - p.grid.grid_line_color = None - p.outline_line_color = None - p.toolbar_location = 'right' - - return components(p) def interactive_boxchart(datadf, fieldname, extratitle='', diff --git a/rowers/templates/history.html b/rowers/templates/history.html index 52aaa542..55ddbb5b 100644 --- a/rowers/templates/history.html +++ b/rowers/templates/history.html @@ -22,9 +22,6 @@
-
- {{ tscript|safe}} -
@@ -91,6 +88,10 @@
  • {{ tdiv|safe }} +
    + {{ tscript|safe}} +
    +