From 82e3b83efdf32fecb29821972cb25e5d702101dd Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 9 Jan 2019 22:59:14 +0100 Subject: [PATCH] plannedsessions 1. races remain in ongoing until 3 days after end --- rowers/plannedsessions.py | 5 +++-- rowers/views.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 7b63360d..bd7f1958 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -568,14 +568,15 @@ def get_sessions_manager(m,teamid=0,startdate=date.today(), manager=m, startdate__lte=enddate, enddate__gte=startdate, - ).order_by("preferreddate","startdate","enddate") + ).order_by("preferreddate","startdate","enddate").exclude( + sessiontype='race').exclude(sessiontype='indoorrace') else: sps = PlannedSession.objects.filter( manager=m, startdate__lte=enddate, enddate__gte=startdate, ).order_by("preferreddate","startdate","enddate").exclude( - sessiontype='race') + sessiontype='race').exclude(sessiontype='indoorrace') return sps diff --git a/rowers/views.py b/rowers/views.py index ad59b882..e9b2dedd 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -16496,6 +16496,11 @@ def plannedsession_view(request,id=0,userid=0): except PlannedSession.DoesNotExist: raise Http404("Planned Session does not exist") + if ps.sessiontype in ['race','indoorrace']: + url = reverse(virtualevent_view, + kwargs={'id':ps.id} + ) + return HttpResponseRedirect(url) if ps.course: coursescript,coursediv = course_map(ps.course) @@ -16739,7 +16744,7 @@ def virtualevents_view(request): ) races2 = VirtualRace.objects.filter( startdate__lte=datetime.date.today(), - evaluation_closure__gte=timezone.now(), + evaluation_closure__gte=timezone.now()-datetime.timedelta(days=3), )