sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

plannedsessions

Browse Source 
1. races remain in ongoing until 3 days after end
This commit is contained in:
Sander Roosendaal
2019-01-09 22:59:14 +01:00
parent 0ef7fc50bc
commit 82e3b83efd
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/plannedsessions.py
View File

@@ -568,14 +568,15 @@ def get_sessions_manager(m,teamid=0,startdate=date.today(),
manager=m, manager=m,
startdate__lte=enddate, startdate__lte=enddate,
enddate__gte=startdate, enddate__gte=startdate,
).order_by("preferreddate","startdate","enddate") ).order_by("preferreddate","startdate","enddate").exclude(
sessiontype='race').exclude(sessiontype='indoorrace')
else: else:
sps = PlannedSession.objects.filter( sps = PlannedSession.objects.filter(
manager=m, manager=m,
startdate__lte=enddate, startdate__lte=enddate,
enddate__gte=startdate, enddate__gte=startdate,
).order_by("preferreddate","startdate","enddate").exclude( ).order_by("preferreddate","startdate","enddate").exclude(
sessiontype='race') sessiontype='race').exclude(sessiontype='indoorrace')
return sps return sps

7
rowers/views.py
View File

@@ -16496,6 +16496,11 @@ def plannedsession_view(request,id=0,userid=0):
except PlannedSession.DoesNotExist: except PlannedSession.DoesNotExist:
raise Http404("Planned Session does not exist") 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: if ps.course:
coursescript,coursediv = course_map(ps.course) coursescript,coursediv = course_map(ps.course)
@@ -16739,7 +16744,7 @@ def virtualevents_view(request):
) )
races2 = VirtualRace.objects.filter( races2 = VirtualRace.objects.filter(
startdate__lte=datetime.date.today(), startdate__lte=datetime.date.today(),
evaluation_closure__gte=timezone.now(), evaluation_closure__gte=timezone.now()-datetime.timedelta(days=3),
) )