Merge branch 'release/v10.48'

rowers/views/analysisviews.py

@@ -528,6 +528,7 @@ def statsdata(workouts, options):
 
 
     for field,verbosename in fielddict.items():
+        try:
             thedict = {
                 'mean':datadf[field].mean(),
                 'min': datadf[field].min(),
@@ -539,6 +540,8 @@ def statsdata(workouts, options):
                 'verbosename':verbosename,
                 }
             stats[field] = thedict
+        except KeyError:
+            pass
 
     # Create a dict with correlation values
     cor = datadf.corr(method='spearman')

rowers/views/workoutviews.py

@@ -2548,6 +2548,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
         pass
 
     for field,verbosename in fielddict.items():
+        try:
             thedict = {
                 'mean':datadf[field].mean(),
                 'wmean': wavg(datadf, field, 'deltat'),
@@ -2560,6 +2561,8 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
                 'verbosename':verbosename,
             }
             stats[field] = thedict
+        except KeyError:
+            pass
 
     # Create a dict with correlation values
     cor = datadf.corr(method='spearman')