Merge tag 'v6.42' into develop

hotfix otw-bests
2018-04-16 07:58:55 +02:00
parent 51d788d2c9 fd42a5fe36
commit 2c1e39d02b
4 changed files with 10 additions and 4 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -721,7 +721,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)