Merge branch 'release/v18.5.19'

boatmovers/templates/athlete.html

@@ -4,13 +4,27 @@
 <h1>
     {{ athlete.first_name }} {{ athlete.last_name }}
 </h1>
+<p>
+    {{ athlete.trueskill_exposed }}
+</p>
 <p>
     <table class="listtable shortpadded">
+        <thead>
+            <tr>
+                <th>Datum</th>
+                <th>Plaats</th>
+                <th>Race</th>
+            </tr>
+        </thead>
+        <tbody>
         {% for result in results %}
         <tr>
-            <td>{{ result.order }}</td><td>{{ result.race.name }}</td>
+            <td>{{ result.race.date }}</td>
+            <td>{{ result.order }}</td>
+            <td><a href="/boatmovers/race/{{ result.race.id }}">{{ result.race.name }}</a></td>
         </tr>
         {% endfor %}
+        </tbody>
     </table>
 </p>
 {% endblock %}

boatmovers/templates/crew.html

@@ -12,8 +12,8 @@
     </tr>
     {% for athlete in athletes %}
     <tr>
-        <td>{{ athlete.first_name }}</td>
-        <td>{{ athlete.last_name }}</td>
+        <td><a href="/boatmovers/athlete/{{ athlete.id }}/">{{ athlete.first_name }}</a></td>
+        <td><a href="/boatmovers/athlete/{{ athlete.id }}/">{{ athlete.last_name }}</a></td>
         <td>{{ athlete.trueskill_exposed|floatformat:2 }}</td>
     </tr>
     {% endfor %}

boatmovers/templates/race.html

@@ -11,7 +11,7 @@
     <a target="_" href="{{ race.resulturl }}">Results</a>
 </p>
 <p>
-<table>
+<table class="shortpadded">
     <tr>
         <th>Order</th>
         <th>Crew</th><td></td>
@@ -20,6 +20,11 @@
     <tr>
         <td>{{ result.order }}</td>
         <td><a href="/boatmovers/crew/{{ result.crew.id }}/">{{ result.crew.name }}</a></td>
+        {% for athlete in result.crew.athletes.all %}
+        <td>
+            {{ athlete.first_name }} {{ athlete.last_name }}&nbsp;
+        </td>
+        {% endfor %}
         {% if result.crew.id in duplicate_crews %}
         <td>!</td>
         {% elif result.crew.id in duplicate_athletes_crews %}

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,