From 496c1efd5bbbcf029c2c46394792d5e38d2588ad Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 16 Apr 2018 07:45:24 +0200 Subject: [PATCH] hotfix OTW CP chart --- rowers/dataprep.py | 8 +++++++- rowers/forms.py | 2 +- rowers/templates/panel_staticchart.html | 2 +- rowers/templates/workout_form.html | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 7233b84e..d8591acc 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -719,7 +719,13 @@ def fetchcp(rower,theworkouts,table='cpdata'): return pd.Series([]),pd.Series([]),avgpower2 dfgrouped = df.groupby(['workoutid']) - avgpower2 = dict(dfgrouped.mean()['power'].astype(int)) + try: + avgpower2 = dict(dfgrouped.mean()['power'].astype(int)) + except KeyError: + avgpower2 = {} + for id in theids: + avgpower2[id] = 0 + return pd.Series([]),pd.Series([]),avgpower2 cpdf = getcpdata_sql(rower.id,table=table) diff --git a/rowers/forms.py b/rowers/forms.py index df48585f..2c74247a 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -198,7 +198,7 @@ class UploadOptionsForm(forms.Form): plotchoices = ( ('timeplot','Time Plot'), ('distanceplot','Distance Plot'), - ('pieplot','Pie Chart'), + ('pieplot','Heart Rate Pie Chart'), ) make_plot = forms.BooleanField(initial=False,required=False) plottype = forms.ChoiceField(required=False, diff --git a/rowers/templates/panel_staticchart.html b/rowers/templates/panel_staticchart.html index 60da93a4..02172c69 100644 --- a/rowers/templates/panel_staticchart.html +++ b/rowers/templates/panel_staticchart.html @@ -13,7 +13,7 @@

- Add Pie Chart + Add HR Pie Chart

diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html index 03a04eff..21161dec 100644 --- a/rowers/templates/workout_form.html +++ b/rowers/templates/workout_form.html @@ -137,7 +137,7 @@

- Add Pie Chart + Add HR Pie Chart