From 27bc739e340c04edbb0127cfe91414b17bd29cf2 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 27 Sep 2021 19:50:46 +0200
Subject: [PATCH] fix for disqualification with nonexisting workout

---
 rowers/templates/virtualevent.html |  1 +
 rowers/views/racesviews.py         | 63 +++++++++++++++++-------------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html
index 80dc9195..bcd6bbc7 100644
--- a/rowers/templates/virtualevent.html
+++ b/rowers/templates/virtualevent.html
@@ -426,6 +426,7 @@
               {% endif %}
               {% endif %}
               <td>DNF</td>
+              <td>DNF</td>
               <td>
                 <a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/">
                   <i class="fas fa-search-plus fa-fw"></i></a>
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index 7c9c24c3..66db3f8e 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -955,6 +955,7 @@ def virtualevent_disqualify_view(request,id=0,recordid=0):
 
     r = getrower(request.user)
     race = get_object_or_404(VirtualRace,pk=id)
+
     raceid = race.id
 
 
@@ -1007,40 +1008,46 @@ def virtualevent_disqualify_view(request,id=0,recordid=0):
     try:
         workout = Workout.objects.get(id=record.workoutid)
     except Workout.DoesNotExist: # pragma: no cover
-        raise Http404("Workout not found")
+        workout = None
 
-    g = GraphImage.objects.filter(workout=workout).order_by("-creationdatetime")
-    for i in g: # pragma: no cover
-        try:
-            width,height = Image.open(i.filename).size
-            i.width = width
-            i.height = height
-            i.save()
-        except:
-            pass
+    script = ''
+    div = ''
+    g = []
+    mapscript = ''
+    mapdiv = ''
+    if workout is not None:
+        g = GraphImage.objects.filter(workout=workout).order_by("-creationdatetime")
+        for i in g: # pragma: no cover
+            try:
+                width,height = Image.open(i.filename).size
+                i.width = width
+                i.height = height
+                i.save()
+            except:
+                pass
 
-    script, div = interactive_chart(record.workoutid)
+        script, div = interactive_chart(record.workoutid)
 
-    f1 = workout.csvfilename
-    rowdata = rdata(csvfile=f1)
-    hascoordinates = 1
-    if rowdata != 0:
-        try:
-            latitude = rowdata.df[' latitude']
-            if not latitude.std(): # pragma: no cover
+        f1 = workout.csvfilename
+        rowdata = rdata(csvfile=f1)
+        hascoordinates = 1
+        if rowdata != 0:
+            try:
+                latitude = rowdata.df[' latitude']
+                if not latitude.std(): # pragma: no cover
+                    hascoordinates = 0
+            except (KeyError, AttributeError): # pragma: no cover
                 hascoordinates = 0
-        except (KeyError, AttributeError): # pragma: no cover
+        else: # pragma: no cover
             hascoordinates = 0
-    else: # pragma: no cover
-        hascoordinates = 0
 
-    if hascoordinates:
-        mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'],
-                                          rowdata.df[' longitude'],
-                                          workout.name)
-    else: # pragma: no cover
-        mapscript = ""
-        mapdiv = ""
+        if hascoordinates:
+            mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'],
+                                            rowdata.df[' longitude'],
+                                            workout.name)
+        else: # pragma: no cover
+            mapscript = ""
+            mapdiv = ""
 
     breadcrumbs = [
         {