From 29972188fd826557740b44a2efa7a194ed66fd52 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 21 Jun 2018 14:17:23 +0200 Subject: [PATCH] changed color to violet and fixed bug --- rowers/interactiveplots.py | 4 ++-- rowers/views.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 0f5e4594..f377fc84 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2222,7 +2222,7 @@ def interactive_chart(id=0,promember=0,intervaldata = {}): # add shaded bar chart areas - if intervaldata: + if intervaldata != {}: intervaldf = pd.DataFrame(intervaldata) intervaldf['itime'] = intervaldf['itime']*1.e3 intervaldf['time'] = intervaldf['itime'].cumsum() @@ -2237,7 +2237,7 @@ def interactive_chart(id=0,promember=0,intervaldata = {}): ) plot.quad(left='time',top='value',bottom='bottom', - right='time_r',source=intervalsource,color='pink', + right='time_r',source=intervalsource,color='mediumvioletred', y_range_name='spmax',fill_alpha=0.2,line_alpha=0.2) script, div = components(plot) diff --git a/rowers/views.py b/rowers/views.py index 7948a933..be6afc58 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -11342,7 +11342,10 @@ def workout_summary_edit_view(request,id,message="",successmessage="" pace_secs = 120.0 else: power = 0 - pace_secs = float(value_pace) + try: + pace_secs = float(value_pace) + except ValueError: + pace_secs = float(value_pace.replace(',','.')) if powerorpace == 'power' and power is not None: try: