From 05cde74e3d747067b7a3af9ce6f3803f4e4674b9 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 23 Jan 2018 08:41:52 +0100 Subject: [PATCH] bug fix timezone c2 import --- rowers/interactiveplots.py | 8 ++++++-- rowers/views.py | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 9cde76f4..7f1b9af3 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1335,15 +1335,19 @@ def interactive_otwcpchart(powerdf,promember=0): def interactive_agegroup_plot(df,distance=2000,duration=None, sex='male',weightcategory='hwt'): + if df.empty: + return '','' + age = df['age'] power = df['power'] name = df['name'] season = df['season'] if duration: - plottitle = sex+' '+weightcategory+' '+duration+' min' + duration2 = int(duration/60.) + plottitle = sex+' '+weightcategory+' %s min' % duration2 else: - plottitle = sex+' '+weightcategory+' '+distance+'m' + plottitle = sex+' '+weightcategory+' %s m' % distance # poly_coefficients = np.polyfit(age,power,6) diff --git a/rowers/views.py b/rowers/views.py index 04b72774..ca4cc7db 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -9389,6 +9389,9 @@ def workout_getc2workout_view(request,c2id): except: timezone_str = 'UTC' + if timezone_str is None: + timezone_str = 'UTC' + workoutdate = startdatetime.astimezone( pytz.timezone(timezone_str) ).strftime('%Y-%m-%d')