diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index 90685498..cd3ffd22 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -267,7 +267,7 @@
| + | {{ result.username }} | +{{ result.teamname }} | +{{ result.age }} | +{{ result.sex }} | +{{ result.weightcategory }} | ++ {% if result.adaptiveclass == 'None' %} + + {% else %} + {{ result.adaptiveclass }} + {% endif %} + | +{{ result.boatclass }} | + {% if race.sessiontype == 'race' %} +{{ result.boattype }} | + {% endif %} +DNF | ++ + Details + | +||
| diff --git a/rowers/templates/virtualeventranking.html b/rowers/templates/virtualeventranking.html index 42bb6299..9053c269 100644 --- a/rowers/templates/virtualeventranking.html +++ b/rowers/templates/virtualeventranking.html @@ -48,7 +48,7 @@ |
| + | {{ result.username }} | +{{ result.teamname }} | +{{ result.age }} | +{{ result.sex }} | +{{ result.weightcategory }} | ++ {% if result.adaptiveclass == 'None' %} + + {% else %} + {{ result.adaptiveclass }} + {% endif %} + | +{{ result.boatclass }} | + {% if race.sessiontype == 'race' %} +{{ result.boattype }} | + {% endif %} ++ + Details + | +DNF | +
| diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index 1f6f4a33..9f918437 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -1072,6 +1072,12 @@ def virtualevent_view(request,id=0): workoutid__isnull=True, ) + dnf = resultobj.objects.filter( + race=race, + workoutid__isnull=False, + coursecompleted=False, + ) + if not request.user.is_anonymous: if race_can_register(r,race): @@ -1143,6 +1149,7 @@ def virtualevent_view(request,id=0): adaptiveclass__in=adaptiveclass, age__gte=age_min, age__lte=age_max, + coursecompleted=True, ).order_by("duration") else: results = resultobj.objects.filter( @@ -1154,6 +1161,7 @@ def virtualevent_view(request,id=0): adaptiveclass__in=adaptiveclass, age__gte=age_min, age__lte=age_max, + coursecompleted=True, ).order_by("duration","-distance") if entrycategory is not None: @@ -1179,6 +1187,8 @@ def virtualevent_view(request,id=0): coursecompleted=True, ).order_by("duration","-distance") + + if results: form = RaceResultFilterForm(records=records) else: @@ -1221,6 +1231,7 @@ def virtualevent_view(request,id=0): 'results':results, 'buttons':buttons, 'dns':dns, + 'dnf':dnf, 'records':records, 'racelogo':racelogo, 'form':form, |