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

Merge branch 'develop' into feature/charts-microservice

Browse Source
This commit is contained in:
Sander Roosendaal
2024-04-05 15:28:38 +02:00
parent 9d2d5b30d0 ccb2b2a62f
commit fce523ef5d
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/courses_challenges.html
View File

@@ -47,6 +47,8 @@
<h1>Interesting Challenges</h1> <h1>Interesting Challenges</h1>
</li> </li>
<li> <li>
<p>
<a href="/rowers/virtualevents/?participate=true">Challenges I participate in</a>
<p> <p>
<a href="/rowers/virtualevents/">All Active Challenges</a> <a href="/rowers/virtualevents/">All Active Challenges</a>
</p> </p>

6
rowers/views/racesviews.py
View File

@@ -139,6 +139,7 @@ def courses_view(request):
courses = GeoCourse.objects.all().order_by("country", "name", "distance") courses = GeoCourse.objects.all().order_by("country", "name", "distance")
nearby = request.GET.get('nearby') nearby = request.GET.get('nearby')
liked = request.GET.get('liked') liked = request.GET.get('liked')
if nearby and lat_lon is not None: # pragma: no cover if nearby and lat_lon is not None: # pragma: no cover
courses = getnearestcourses(lat_lon, courses) courses = getnearestcourses(lat_lon, courses)
@@ -1055,10 +1056,15 @@ def virtualevents_view(request):
form = VirtualRaceSelectForm() form = VirtualRaceSelectForm()
nearby = request.GET.get('nearby') nearby = request.GET.get('nearby')
participate = request.GET.get('participate')
if nearby and lat_lon is not None: # pragma: no cover if nearby and lat_lon is not None: # pragma: no cover
races = getnearestraces(lat_lon, races) races = getnearestraces(lat_lon, races)
if participate:
ress = VirtualRaceResult.objects.filter(userid=r.id).order_by("-race__evaluation_closure")
races = [res.race for res in ress if res.race is not None]
if is_ajax: # pragma: no cover if is_ajax: # pragma: no cover
return render(request, 'racelist.html', return render(request, 'racelist.html',
{'races': races, {'races': races,