diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 4cbc5518..6f5a9d6d 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -6843,6 +6843,7 @@ def interactive_zoneschart(rower,data,startdate,enddate,trainingzones='hr',date_ df = pd.DataFrame(data) + df2 = pd.DataFrame(data) df.drop('minutes',inplace=True,axis='columns') @@ -6911,6 +6912,19 @@ def interactive_zoneschart(rower,data,startdate,enddate,trainingzones='hr',date_ p.y_range.start = 0 p.sizing_mode = 'stretch_both' + if yaxis == 'percentage': + tidy_df = df2.groupby(['date']).sum() + + source2 = ColumnDataSource(tidy_df) + y2rangemax = tidy_df.loc[:,'hours'].max()*1.1 + p.extra_y_ranges["yax2"] = Range1d(start=0,end=y2rangemax) + p.line('date','hours',source=source2,y_range_name="yax2",color="black",width=5) + p.circle('date','hours',source=source2,y_range_name="yax2",color="black",size=10, + legend_label='Hours') + p.add_layout(LinearAxis(y_range_name="yax2", + axis_label='Hours'),'right') + + script,div = components(p) return script,div