diff --git a/rowers/views.py b/rowers/views.py index 113c8a1b..5295bb83 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13382,9 +13382,16 @@ def virtualevents_view(request): is_ajax = True # default races - races = VirtualRace.objects.filter( - startdate__gte=datetime.date.today() - ).order_by("startdate","start_time") + races1 = VirtualRace.objects.filter( + startdate__gte=datetime.date.today(), + ) + races2 = VirtualRace.objects.filter( + startdate__lte=datetime.date.today(), + evaluation_closure__gte=timezone.now(), + ) + + + races = (races1 | races2).order_by("startdate","start_time") if not request.user.is_anonymous(): r = getrower(request.user)