Merge branch 'develop' into feature/charts-microservice

rowers/views/analysisviews.py

@@ -410,12 +410,15 @@ def trendflexdata(workouts, options, userid=0):
         except (ValueError, AttributeError):  # pragma: no cover
             return ('', 'Error: not enough data')
     else:  # pragma: no cover
-        bins = np.arange(datadf['days ago'].min()-binsize,
-                         datadf['days ago'].max()+binsize,
-                         binsize,
-                         )
-        groups = datadf.groupby(pd.cut(datadf['days ago'], bins,
-                                       labels=False))
+        try:
+            bins = np.arange(datadf['days ago'].min()-binsize,
+                             datadf['days ago'].max()+binsize,
+                             binsize,
+                             )
+            groups = datadf.groupby(pd.cut(datadf['days ago'], bins,
+                                           labels=False))
+        except (ValueError, AttributeError):  # pragma: no cover
+            return ('', 'Error: not enough data')
 
     xvalues = []
     yvalues = []