From dee2ec8859b9b7e82637ead00a37e7b5c7b5a9d5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 7 Mar 2019 12:36:45 +0100 Subject: [PATCH] encoding`:wq --- rowers/dataprep.py | 10 +++++++--- rowers/templates/otwrankings.html | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 501154be..6ecbb890 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -736,7 +736,11 @@ def fetchcp(rower,theworkouts,table='cpdata'): avgpower2[id] = 0 return pd.Series([]),pd.Series([]),avgpower2 - dfgrouped = df.groupby(['workoutid']) + try: + dfgrouped = df.groupby(['workoutid']) + except KeyError: + avgpower2 = {} + return pd.Series([]),pd.Series([]),avgpower2 try: avgpower2 = dict(dfgrouped.mean()['power'].astype(int)) except KeyError: @@ -756,10 +760,10 @@ def fetchcp(rower,theworkouts,table='cpdata'): theids, table=table) - return [],[],avgpower2 + return pd.Series([]),pd.Series([]),avgpower2 - return [],[],avgpower2 + return pd.Series([]),pd.Series([]),avgpower2 # create a new workout from manually entered data diff --git a/rowers/templates/otwrankings.html b/rowers/templates/otwrankings.html index 7a9443db..a4b2cdd6 100644 --- a/rowers/templates/otwrankings.html +++ b/rowers/templates/otwrankings.html @@ -91,7 +91,7 @@ {{ workout.distance }} m {{ workout.duration |durationprint:"%H:%M:%S.%f" }} - {{ avgpower|lookup:workout.id|encode }} W + {{ avgpower|lookup:workout.id }} W {{ workout.date }} {{ workout.averagehr }} {{ workout.maxhr }}