Merge branch 'release/v14.54'

2020-11-24 18:02:21 +01:00
parent e246aab582 8f53fa7d26
commit ddc5b1d188
1 changed files with 9 additions and 2 deletions
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1555,7 +1555,7 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
        except:
            pass

-    
+
    if len(data)>1:
        df = pd.concat(data,axis=0)

@@ -1719,7 +1719,14 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
    try:
        script,div = components(plot)
    except:
-        return '','Something went wrong withthe chart'
+        df.dropna(inplace=True,axis=0,how='any')
+        return (
+            '',
+            'Something went wrong withthe chart ({nrworkouts} workouts, {nrdata} datapoints)'.format(
+                nrworkouts = workouts.count(),
+                nrdata = len(df),
+            )
+            )

    return [script,div]