From 03edc5a57f597e931e8543a25f6827ab31902639 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 8 Oct 2021 17:11:23 +0200
Subject: [PATCH] some refinements

---
 rowers/courses.py            | 4 +++-
 rowers/models.py             | 2 +-
 rowers/tests/statements.py   | 1 +
 rowers/views/racesviews.py   | 2 --
 rowers/views/workoutviews.py | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rowers/courses.py b/rowers/courses.py
index abc44597..cb028272 100644
--- a/rowers/courses.py
+++ b/rowers/courses.py
@@ -22,6 +22,8 @@ import xml.etree.ElementTree as et
 from xml.etree.ElementTree import Element, SubElement, Comment, tostring
 from xml.dom import minidom
 
+from rowers.models import VirtualRace
+
 # distance of course from lat_lon in km
 def howfaris(lat_lon,course):
     coords = course.coord
@@ -64,7 +66,7 @@ def getnearestraces(lat_lon,races,whatisnear=150):
     return races
 
 def getnearestcourses(lat_lon,courses,whatisnear=150,strict=False):
-    print(lat_lon,whatisnear)
+
     newlist = []
     counter = 0
     for c in courses:
diff --git a/rowers/models.py b/rowers/models.py
index 369852df..cef1bece 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3453,7 +3453,7 @@ class VirtualRaceResult(models.Model):
             return False
         if self.race is None and other.race is not None:
             return False
-        if self.rae is not None and other.race is None:
+        if self.race is not None and other.race is None:
             return False
         if self.race != other.race:
             return False
diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py
index 54c2bbd9..8dd9f406 100644
--- a/rowers/tests/statements.py
+++ b/rowers/tests/statements.py
@@ -16,6 +16,7 @@ except NameError:
 import pytest
 
 from pandas.core.common import SettingWithCopyWarning
+from rowers.courses import howfaris
 
 import warnings
 warnings.filterwarnings("error",
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index 57e4ce83..c5222860 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -265,8 +265,6 @@ def course_view(request,id=0):
             except KeyError:
                 adaptiveclass = ['None','PR1','PR2','PR3','FES']
 
-            print(age_min,age_max)
-
             records = VirtualRaceResult.objects.filter(
                 course=course,
                 workoutid__isnull=False,
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index ddf7e988..0b1b862d 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2375,7 +2375,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0)
             latitudes = rowdata.df[' latitude']
             longitudes = rowdata.df[' longitude']
         mapscript,mapdiv = leaflet_chart(latitudes,longitudes,row.name,raceresult=raceresult)
-        records = VirtualRaceResult.objects.filter(workoutid=row.id,userid=row.user.user.id)
+        records = VirtualRaceResult.objects.filter(workoutid=row.id,userid=row.user.user.id,courseceompleted=True)
         if records.count()>0:
             courses = list(set([record.course for record in records]))
 
@@ -4480,7 +4480,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
         except KeyError:  # pragma: no cover
             pass
 
-        records = VirtualRaceResult.objects.filter(workoutid=row.id,userid=row.user.user.id)
+        records = VirtualRaceResult.objects.filter(workoutid=row.id,userid=row.user.user.id,coursecompleted=True)
         if records.count()>0:
             courses = list(set([record.course for record in records]))