improved race filtering

rowers/forms.py

@@ -880,8 +880,8 @@ class WorkoutSessionSelectForm(forms.Form):
 
         
 class RaceResultFilterForm(forms.Form):
-    boatclasses = (type for type in mytypes.workouttypes if type[0] in mytypes.otwtypes)
-    boatclassinitial = [t for t in mytypes.otwtypes]
+    boatclasses = (type for type in mytypes.workouttypes if type[0] in mytypes.rowtypes)
+    boatclassinitial = [t for t in mytypes.rowtypes]
     sexchoices = (
         ('female','Female'),
         ('male','Male'),
@@ -904,7 +904,7 @@ class RaceResultFilterForm(forms.Form):
     boatclass = forms.MultipleChoiceField(
         choices=boatclasses,
         initial=boatclassinitial,
-        label='Boat Class',
+        label='Boat/Erg Class',
         widget=forms.CheckboxSelectMultiple())
     
     boattype = forms.MultipleChoiceField(

rowers/templates/summary_edit.html

@@ -100,7 +100,7 @@
   </li>
   <li class="grid_2">
     <h1>Detailed Summary Edit</h1>
-    <p>This is still experimental and there are known bugs. Use at your own risk. Nothing is stored permanently until you hit Save on the summary above. You can use the restore original button to restore the original values.</p>
+    <p>This is still experimental and there are known bugs. Use at your own risk. Nothing is stored permanently until you hit Save in the Updated Summary section. You can use the restore original button to restore the original values.</p>
     <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals" method="post">
       <table width=100%> 
         <thead>

rowers/templates/virtualevent.html

@@ -245,8 +245,8 @@
               <th>&nbsp;</th>
               <th>&nbsp;</th>
               <th>&nbsp;</th>
-              {% if race.sessiontype == 'race' %}
               <th>Class</th>
+              {% if race.sessiontype == 'race' %}
               <th>Boat</th>
               {% endif %}
               <th>Time</th>
@@ -273,8 +273,8 @@
                 {{ result.adaptiveclass }}
                 {% endif %}
               </td>
-              {% if race.sessiontype == 'race' %}
               <td>{{ result.boatclass }}</td>
+              {% if race.sessiontype == 'race' %}
               <td>{{ result.boattype }}</td>
               {% endif %}
               <td>{{ result.duration |durationprint:"%H:%M:%S.%f" }}</td>
@@ -308,8 +308,8 @@
                 {{ result.adaptiveclass }}
                 {% endif %}
               </td>
-              {% if race.sessiontype == 'race' %}
               <td>{{ result.boatclass }}</td>
+              {% if race.sessiontype == 'race' %}
               <td>{{ result.boattype }}</td>
               {% endif %}
               <td>DNS</td>
@@ -366,11 +366,9 @@
           <tr>
             <td>{{ record.username }}
             <td>{{ record.teamname }}</td>
+            <td>{{ record.boatclass }}</td>
               {% if race.sessiontype == 'race' %}
-            <td>{{ record.boatclass }}</td>
             <td>{{ record.boattype }}</td>
-            {% else %}
-            <td>{{ record.boatclass }}</td>
             {% endif %}
             <td>{{ record.age }}</td>
             <td>{{ record.sex }}</td>

rowers/templates/workout_form.html

@@ -119,7 +119,7 @@ $('#id_workouttype').change();
     </p>
   </li>
   {% if indoorraces %}
-  <li>
+  <li class="grid_4">
     <h1>Racing</h1>
     {% for race in indoorraces %}
     <p>

rowers/views.py

@@ -17595,14 +17595,6 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0):
             selectedworkout = w_form.cleaned_data['workouts']
             splitsecond = 0
             recordid = w_form.cleaned_data['record']
-#            splittime = w_form.cleaned_data['evaluate_after']
-#            if splittime is not None:
-#                splitsecond = splittime.hour*3600
-#                splitsecond += splittime.minute*60
-#                splitsecond += splittime.second
-#                splitsecond += splittime.microsecond/1.e6
-#            else:
-#                splitsecond = 0
         else:
             selectedworkout = None
 
@@ -17621,11 +17613,6 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0):
                     workouts,race,r,recordid=recordid)
 
             
-                #            if result:
-#                for w in ws:
-#                    remove_workout_plannedsession(w,race)
-#                    delete_race_result(w,race)
-
             for c in comments:
                 messages.info(request,c)
             for er in errors: