Merge branch 'release/v20.3.7'

rowers/interactiveplots.py

@@ -5786,7 +5786,7 @@ def interactive_flex_chart2(id, r, promember=0,
 
     try:
         _ = rowdata[yparam1]
-    except KeyError:  # pragma: no cover
+    except (TypeError, KeyError):  # pragma: no cover
         yparam1 = 'None'
 
     # test if we have drive energy

rowers/views/workoutviews.py

@@ -1656,9 +1656,12 @@ def course_compare_view(request, id=0):
                 except Workout.DoesNotExist:  # pragma: no cover
                     pass
 
-    labeldict = {
+    try:
-        int(w.id): w.__str__() for w in workouts
+        labeldict = {
-    }
+            int(w.id): w.__str__() for w in workouts
+        }
+    except:
+        labeldict = {}
 
     res = interactive_multiple_compare_chart(workoutids, xparam, yparam,
                                              promember=promember,
@@ -1758,8 +1761,10 @@ def virtualevent_compare_view(request, id=0):
 
         return HttpResponseRedirect(url)
 
+    xparam = 'time'
+    yparam = 'pace'
+
     if request.method == 'GET':
-        xparam = 'time'
         if race.sessionmode == 'distance':
             xparam = 'cumdist'