sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

some refinements

Browse Source
This commit is contained in:
Sander Roosendaal
2021-10-08 17:11:23 +02:00
parent d526646410
commit 03edc5a57f
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/courses.py
View File

@@ -22,6 +22,8 @@ import xml.etree.ElementTree as et
from xml.etree.ElementTree import Element, SubElement, Comment, tostring from xml.etree.ElementTree import Element, SubElement, Comment, tostring
from xml.dom import minidom from xml.dom import minidom
from rowers.models import VirtualRace
# distance of course from lat_lon in km # distance of course from lat_lon in km
def howfaris(lat_lon,course): def howfaris(lat_lon,course):
coords = course.coord coords = course.coord
@@ -64,7 +66,7 @@ def getnearestraces(lat_lon,races,whatisnear=150):
return races return races
def getnearestcourses(lat_lon,courses,whatisnear=150,strict=False): def getnearestcourses(lat_lon,courses,whatisnear=150,strict=False):
print(lat_lon,whatisnear)
newlist = [] newlist = []
counter = 0 counter = 0
for c in courses: for c in courses:

2
rowers/models.py
View File

@@ -3453,7 +3453,7 @@ class VirtualRaceResult(models.Model):
return False return False
if self.race is None and other.race is not None: if self.race is None and other.race is not None:
return False 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 return False
if self.race != other.race: if self.race != other.race:
return False return False

1
rowers/tests/statements.py
View File

@@ -16,6 +16,7 @@ except NameError:
import pytest import pytest
from pandas.core.common import SettingWithCopyWarning from pandas.core.common import SettingWithCopyWarning
from rowers.courses import howfaris
import warnings import warnings
warnings.filterwarnings("error", warnings.filterwarnings("error",

2
rowers/views/racesviews.py
View File

@@ -265,8 +265,6 @@ def course_view(request,id=0):
except KeyError: except KeyError:
adaptiveclass = ['None','PR1','PR2','PR3','FES'] adaptiveclass = ['None','PR1','PR2','PR3','FES']
print(age_min,age_max)
records = VirtualRaceResult.objects.filter( records = VirtualRaceResult.objects.filter(
course=course, course=course,
workoutid__isnull=False, workoutid__isnull=False,

4
rowers/views/workoutviews.py
View File

@@ -2375,7 +2375,7 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0,nocourseraceresult=0)
latitudes = rowdata.df[' latitude'] latitudes = rowdata.df[' latitude']
longitudes = rowdata.df[' longitude'] longitudes = rowdata.df[' longitude']
mapscript,mapdiv = leaflet_chart(latitudes,longitudes,row.name,raceresult=raceresult) 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: if records.count()>0:
courses = list(set([record.course for record in records])) 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 except KeyError: # pragma: no cover
pass 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: if records.count()>0:
courses = list(set([record.course for record in records])) courses = list(set([record.course for record in records]))