From 7eed5aa34135a75f82987a11d61b0eb95fddd4de Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 4 Jul 2020 06:55:58 +0200 Subject: [PATCH 1/2] whatisnear --- rowers/views/racesviews.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index 451d7184..b74651be 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -16,6 +16,8 @@ def howfaris(lat_lon,course): return distance +whatisnear = 150 + # get nearest races def getnearestraces(lat_lon,races): newlist = [] @@ -27,7 +29,7 @@ def getnearestraces(lat_lon,races): c = race.course coords = c.coord distance = howfaris(lat_lon,c) - if distance < 100: + if distance < whatisnear: newlist.append(race) counter += 1 @@ -39,7 +41,7 @@ def getnearestraces(lat_lon,races): orders = sorted(orders,key = lambda tup:tup[1]) ids = [id for id,distance in orders[0:4]] for id, distance in orders[5:]: - if distance<100: + if distance Date: Sat, 4 Jul 2020 17:24:39 +0200 Subject: [PATCH 2/2] bug fix --- rowers/views/racesviews.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index b74651be..a68ef3ba 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -380,7 +380,7 @@ def standard_view(request,id=0): r = getrower(request.user) - allower = ["-referencespeed","agemax","agemin","sex","name", + allowed = ["-referencespeed","agemax","agemin","sex","name", "referencespeed","-agemax","-agemin","-sex","-name"] orderby = request.GET.get('order_by')