improved race uploading

rowers/views.py

@@ -10023,7 +10023,10 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 
     row = get_workout(id)
 
-    indoorraces = get_indoorraces(row)
+    if row.workouttype in mytypes.otetypes:
+        indoorraces = get_indoorraces(row)
+    else:
+        indoorraces = []
 
     if (checkworkoutuser(request.user,row)==False):
         raise PermissionDenied("Access denied")
@@ -17403,7 +17406,7 @@ def indoorvirtualevent_edit_view(request,id=0):
 
 
 @login_required()
-def virtualevent_submit_result_view(request,id=0):
+def virtualevent_submit_result_view(request,id=0,workoutid=0):
 
     r = getrower(request.user)
 
@@ -17456,6 +17459,7 @@ def virtualevent_submit_result_view(request,id=0):
     
     ws = Workout.objects.filter(
         user=r,
+        workouttype__in=mytypes.rowtypes,
         startdatetime__gte=startdatetime,
         startdatetime__lte=enddatetime,
         ).order_by("date","startdatetime","id")
@@ -17531,6 +17535,8 @@ def virtualevent_submit_result_view(request,id=0):
             if result:
                 otherrecords = resultobj.objects.filter(
         race = race).exclude(userid = r.id)
+                if not jobid:
+                    messages.info(request,"Result submitted successfully.")
 
                 for otherrecord in otherrecords:
                     otheruser = Rower.objects.get(id=otherrecord.userid)
@@ -17556,8 +17562,12 @@ def virtualevent_submit_result_view(request,id=0):
             return HttpResponseRedirect(url)
 
     else:
+        if workoutid:
+            workoutdata['initial'] = workoutid
         w_form = WorkoutRaceSelectForm(workoutdata,entries)
 
+
+
     breadcrumbs = [
         {
             'url':reverse(virtualevents_view),