bug fixes

rowers/views.py

@@ -5630,7 +5630,12 @@ def multi_compare_view(request,id=0,userid=0):
             teamid = chartform.cleaned_data['teamid']
             ids = request.session['ids']
             request.session['ids'] = ids
-            workouts = [Workout.objects.get(id=id) for id in ids]
+            workouts = []
+            for id in ids:
+                try:
+                    workouts.append(Workout.objects.get(id=id))
+                except Workout.DoesNotExist:
+                    pass
 
             labeldict = {
                 int(w.id): w.__unicode__() for w in workouts
@@ -5641,7 +5646,13 @@ def multi_compare_view(request,id=0,userid=0):
         plottype = request.session['plottype']
         teamid = 0
         ids = request.session['ids']
-        workouts = [Workout.objects.get(id=id) for id in ids]
+        workouts = []
+        for id in ids:
+            try:
+                workouts.append(Workout.objects.get(id=id))
+            except Workout.DoesNotExist:
+                pass
+
         labeldict = {
             int(w.id): w.__unicode__() for w in workouts
             }
@@ -5988,8 +5999,15 @@ def multiflex_data(request,userid=0,
     workmin = options['workmin']
     workmax = options['workmax']
     ids = options['ids']
-        
-    workouts = [Workout.objects.get(id=id) for id in ids]
+
+    workouts = []
+    
+    for id in ids:
+        try:
+            workouts.append(Workout.objects.get(id=id))
+        except Workout.DoesNotExist:
+            pass
+
     labeldict = {
         int(w.id): w.__unicode__() for w in workouts
     }
@@ -6581,7 +6599,15 @@ def boxplot_view_data(request,userid=0,
     if userid==0:
         userid = request.user.id
 
-    workouts = [Workout.objects.get(id=id) for id in ids]
+    workouts = []
+
+
+    for id in ids:
+        try:
+            workouts.append(Workout.objects.get(id=id))
+        except Workout.DoesNotExist:
+            pass
+            
     labeldict = {
         int(w.id): w.__unicode__() for w in workouts
     }
@@ -16879,6 +16905,9 @@ class MacroCycleDelete(DeleteView):
         return obj
 
 
+@user_passes_test(hasplannedsessions,login_url="/rowers/promembership",
+                  message="This functionality requires a Coach or Self-Coach plan",
+                  redirect_field_name=None)
 def rower_trainingplan_view(request,
                             id=0,
                             userid=0,