From 4d968743b48b176a95c9c43c26caecbedb620a9a Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Wed, 6 Jul 2022 20:53:51 +0200
Subject: [PATCH 1/2] handy links
---
boatmovers/templates/athlete.html | 16 +++++++++++++++-
boatmovers/templates/crew.html | 4 ++--
boatmovers/views.py | 2 +-
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/boatmovers/templates/athlete.html b/boatmovers/templates/athlete.html
index a03f9767..b6dc06d8 100644
--- a/boatmovers/templates/athlete.html
+++ b/boatmovers/templates/athlete.html
@@ -4,13 +4,27 @@
{{ athlete.first_name }} {{ athlete.last_name }}
+
+ {{ athlete.trueskill_exposed }}
+
+
+
+ | Datum |
+ Plaats |
+ Race |
+
+
+
{% for result in results %}
- | {{ result.order }} | {{ result.race.name }} |
+ {{ result.race.date }} |
+ {{ result.order }} |
+ {{ result.race.name }} |
{% endfor %}
+
{% endblock %}
diff --git a/boatmovers/templates/crew.html b/boatmovers/templates/crew.html
index 59d963ea..555e012f 100644
--- a/boatmovers/templates/crew.html
+++ b/boatmovers/templates/crew.html
@@ -12,8 +12,8 @@
{% for athlete in athletes %}
- | {{ athlete.first_name }} |
- {{ athlete.last_name }} |
+ {{ athlete.first_name }} |
+ {{ athlete.last_name }} |
{{ athlete.trueskill_exposed|floatformat:2 }} |
{% endfor %}
diff --git a/boatmovers/views.py b/boatmovers/views.py
index 4235c6d8..95873b46 100644
--- a/boatmovers/views.py
+++ b/boatmovers/views.py
@@ -88,7 +88,7 @@ def boatmovers_view(request):
elif filter == 'f':
athletes = athletes.exclude(gender='m')
- races = Race.objects.filter(verified=True,processed=True).order_by('-date')
+ races = Race.objects.filter(verified=True,processed=True).order_by('-date','-id')
new_races = Race.objects.filter(processed=False).order_by('date')
return render(request,
From 52634aff739e87fe6df02eab8104ad413d3e5c45 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Wed, 6 Jul 2022 20:59:58 +0200
Subject: [PATCH 2/2] added names
---
boatmovers/templates/race.html | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/boatmovers/templates/race.html b/boatmovers/templates/race.html
index ab59510d..2f47ebc6 100644
--- a/boatmovers/templates/race.html
+++ b/boatmovers/templates/race.html
@@ -11,7 +11,7 @@
Results
-
+
| Order |
Crew | |
@@ -20,6 +20,11 @@
| {{ result.order }} |
{{ result.crew.name }} |
+ {% for athlete in result.crew.athletes.all %}
+
+ {{ athlete.first_name }} {{ athlete.last_name }}
+ |
+ {% endfor %}
{% if result.crew.id in duplicate_crews %}
! |
{% elif result.crew.id in duplicate_athletes_crews %}