some refinements

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:

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

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",

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,

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]))