From 5bb941ce88a9c4eb702e328cc275fd821beae122 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 12 Jun 2020 14:26:12 +0200
Subject: [PATCH] adding ranking

---
 rowers/templates/virtualevent.html        | 28 ++++++++++++++++++++++-
 rowers/templates/virtualeventranking.html | 28 ++++++++++++++++++++++-
 rowers/views/racesviews.py                | 11 +++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html
index 90685498..cd3ffd22 100644
--- a/rowers/templates/virtualevent.html
+++ b/rowers/templates/virtualevent.html
@@ -267,7 +267,7 @@
         <h2>Results</h2>
         {% endif %}
       </p>
-      {% if results or dns %}
+      {% if results or dns or dnf %}
       <p>
         <table class="listtable shortpadded" width="100%">
           <thead>
@@ -349,6 +349,32 @@
               </td>
             </tr>
             {% endfor %}
+            {% for result in dnf %}
+            <tr>
+              <td>&nbsp;</td>
+              <td>{{ result.username }}</td>
+              <td>{{ result.teamname }}</td>
+              <td>{{ result.age }}</td>
+              <td>{{ result.sex }}</td>
+              <td>{{ result.weightcategory }}</td>
+              <td>
+                {% if result.adaptiveclass == 'None' %}
+                &nbsp;
+                {% else %}
+                {{ result.adaptiveclass }}
+                {% endif %}
+              </td>
+              <td>{{ result.boatclass }}</td>
+              {% if race.sessiontype == 'race' %}
+              <td>{{ result.boattype }}</td>
+              {% endif %}
+              <td>DNF</td>
+              <td>
+                <a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/">
+                  Details</a>
+                </td>
+            </tr>
+            {% endfor %}
             {% for result in dns %}
             <tr>
               <td>&nbsp;</td>
diff --git a/rowers/templates/virtualeventranking.html b/rowers/templates/virtualeventranking.html
index 42bb6299..9053c269 100644
--- a/rowers/templates/virtualeventranking.html
+++ b/rowers/templates/virtualeventranking.html
@@ -48,7 +48,7 @@
         <h2>Results</h2>
         {% endif %}
       </p>
-      {% if results or dns %}
+      {% if results or dns or dnf %}
       <p>
         <table class="listtable shortpadded" width="100%">
           <thead>
@@ -108,6 +108,32 @@
               </td>
             </tr>
             {% endfor %}
+            {% for result in dnf %}
+            <tr>
+              <td>&nbsp;</td>
+              <td>{{ result.username }}</td>
+              <td>{{ result.teamname }}</td>
+              <td>{{ result.age }}</td>
+              <td>{{ result.sex }}</td>
+              <td>{{ result.weightcategory }}</td>
+              <td>
+                {% if result.adaptiveclass == 'None' %}
+                &nbsp;
+                {% else %}
+                {{ result.adaptiveclass }}
+                {% endif %}
+              </td>
+              <td>{{ result.boatclass }}</td>
+              {% if race.sessiontype == 'race' %}
+              <td>{{ result.boattype }}</td>
+              {% endif %}
+              <td>
+                <a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/">
+                  Details</a>
+                </td>
+              <td>DNF</td>
+            </tr>
+            {% endfor %}
             {% for result in dns %}
             <tr>
               <td>&nbsp;</td>
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index 1f6f4a33..9f918437 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -1072,6 +1072,12 @@ def virtualevent_view(request,id=0):
             workoutid__isnull=True,
         )
 
+    dnf = resultobj.objects.filter(
+        race=race,
+        workoutid__isnull=False,
+        coursecompleted=False,
+    )
+
 
     if not request.user.is_anonymous:
         if race_can_register(r,race):
@@ -1143,6 +1149,7 @@ def virtualevent_view(request,id=0):
                     adaptiveclass__in=adaptiveclass,
                     age__gte=age_min,
                     age__lte=age_max,
+                    coursecompleted=True,
                 ).order_by("duration")
             else:
                 results = resultobj.objects.filter(
@@ -1154,6 +1161,7 @@ def virtualevent_view(request,id=0):
                     adaptiveclass__in=adaptiveclass,
                     age__gte=age_min,
                     age__lte=age_max,
+                    coursecompleted=True,
                 ).order_by("duration","-distance")
 
             if entrycategory is not None:
@@ -1179,6 +1187,8 @@ def virtualevent_view(request,id=0):
             coursecompleted=True,
         ).order_by("duration","-distance")
 
+
+
         if results:
             form = RaceResultFilterForm(records=records)
         else:
@@ -1221,6 +1231,7 @@ def virtualevent_view(request,id=0):
                       'results':results,
                       'buttons':buttons,
                       'dns':dns,
+                      'dnf':dnf,
                       'records':records,
                       'racelogo':racelogo,
                       'form':form,