better OTW uploading and submitting

rowers/forms.py

@@ -389,18 +389,26 @@ class UploadOptionsForm(forms.Form):
         super(UploadOptionsForm, self).__init__(*args, **kwargs)
         r = Rower.objects.get(user=self.request.user)
         races = VirtualRace.objects.filter(
-            registration_closure__gt=timezone.now(),
+            registration_closure__gt=timezone.now())
-            sessiontype='indoorrace')
         registrations = IndoorVirtualRaceResult.objects.filter(
             race__in = races,
             userid = r.id)
 
+        registrations2 = VirtualRaceResult.objects.filter(
+            race__in = races,
+            userid = r.id,
+        )
+
         raceids = [r.race.id for r in registrations]
+        raceids2 = [r.race.id for r in registrations2]
+
+        raceids = raceids+raceids2
 
         races = VirtualRace.objects.filter(
             id__in=raceids
             )
 
+
         if races:
             self.fields['submitrace'].queryset = races
         else:
@@ -409,6 +417,8 @@ class UploadOptionsForm(forms.Form):
         if int(raceid) in raceids:
             self.fields['submitrace'].initial = VirtualRace.objects.get(id=raceid)
 
+
+
 # The form to indicate additional actions to be performed immediately
 # after a successful upload. This version allows the Team manager to select
 # a team member

rowers/plannedsessions.py

@@ -1472,7 +1472,7 @@ def add_workout_race(ws,race,r,splitsecond=0,recordid=0):
         errors.append('For tests and training sessions, selected workouts must all be done on the same date')
         return result,comments,errors,0
 
-    if ws.count()>1 and race.sessiontype == 'test':
+    if len(ws)>1 and race.sessiontype == 'test':
         errors.append('For tests, you can only attach one workout')
         return result,comments,errors,0
 
@@ -1553,6 +1553,8 @@ def add_workout_race(ws,race,r,splitsecond=0,recordid=0):
         job = myqueue(queue,handle_check_race_course,ws[0].csvfilename,
                       ws[0].id,race.course.id,record.id,splitsecond=splitsecond)
 
+
+
         add_workouts_plannedsession(ws,race,r)
 
 

rowers/templates/menu_racing.html

@@ -51,7 +51,7 @@
       <i class="fas fa-file-plus fa-fw"></i>&nbsp;Submit Workout</a>
   </li>
   <li>
-    <a href="/rowers/workout/upload/">
+    <a href="/rowers/workout/upload/{{ race.id }}/">
       <i class="fas fa-file-upload fa-fw"></i>&nbsp;Upload your Challenge result
     </a>
   </li>

rowers/views/workoutviews.py

@@ -4965,26 +4965,46 @@ def workout_upload_view(request,
                     messages.error(request,message)
 
             if race and race_can_submit(r,race):
-                records = IndoorVirtualRaceResult.objects.filter(
+                if race.sessiontype == 'indoorrace':
-                    race=race,
+                    records = IndoorVirtualRaceResult.objects.filter(
-                    userid=r.id
+                        race=race,
-                    )
+                        userid=r.id
-
-                if records:
-
-                    result,comments,errors,jobid = add_workout_indoorrace(
-                        [w],race,r,recordid=records[0].id
                         )
 
-                    if result:
+                    if records:
-                        messages.info(
-                            request,
-                            "We have submitted your workout to the race")
 
-                    for c in comments:
+                        result,comments,errors,jobid = add_workout_indoorrace(
-                        messages.info(request,c)
+                            [w],race,r,recordid=records[0].id
-                    for er in errors:
+                            )
-                        messages.error(request,er)
+
+                        if result:
+                            messages.info(
+                                request,
+                                "We have submitted your workout to the race")
+
+                        for c in comments:
+                            messages.info(request,c)
+                        for er in errors:
+                            messages.error(request,er)
+                if race.sessiontype == 'race':
+                    records = VirtualRaceResult.objects.filter(
+                        race=race,userid=r.id
+                    )
+
+
+                    if records:
+                        result,comments,errors,jobid = add_workout_race(
+                            [w], race,r,recordid=records[0].id
+                        )
+                        if result:
+                            messages.info(
+                                request,
+                                "We have submitted your workout to the race")
+
+                        for c in comments:
+                            messages.info(request,c)
+                        for er in errors:
+                            messages.error(request,er)
 
 
             if landingpage != 'workout_upload_view':