map compare

rowers/templates/virtualevent.html

@@ -354,6 +354,11 @@
               <td>&nbsp;</td>
               <td>{{ result.username }}</td>
               <td>{{ result.teamname }}</td>
+              {% if race.coursestandards %}
+              <td>{{ result.entrycategory }}</td>
+              <td>DNF</td>
+              <td>DNF</td>
+              {% else %}
               <td>{{ result.age }}</td>
               <td>{{ result.sex }}</td>
               <td>{{ result.weightcategory }}</td>
@@ -368,6 +373,7 @@
               {% if race.sessiontype == 'race' %}
               <td>{{ result.boattype }}</td>
               {% endif %}
+              {% endif %}
               <td>DNF</td>
               <td>
                 <a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/">
@@ -380,6 +386,11 @@
               <td>&nbsp;</td>
               <td>{{ result.username }}</td>
               <td>{{ result.teamname }}</td>
+              {% if race.coursestandards %}
+              <td>{{ result.entrycategory }}</td>
+              <td>DNS</td>
+              <td>DNS</td>
+              {% else %}
               <td>{{ result.age }}</td>
               <td>{{ result.sex }}</td>
               <td>{{ result.weightcategory }}</td>
@@ -394,6 +405,7 @@
               {% if race.sessiontype == 'race' %}
               <td>{{ result.boattype }}</td>
               {% endif %}
+              {% endif %}
               <td>DNS</td>
             </tr>
             {% endfor %}

rowers/views/workoutviews.py

@@ -1511,7 +1511,6 @@ def virtualevent_mapcompare_view(request,id=0):
     results = VirtualRaceResult.objects.filter(
         race=race,
         workoutid__isnull=False,
-        coursecompleted=True,
     ).order_by("distance","duration")
 
     workoutids = [result.workoutid for result in results]