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

added race action to race list

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-23 21:58:55 +02:00
parent 399d907066
commit e651198dba
4 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rowers/views.py
View File

@@ -13328,6 +13328,8 @@ def virtualevents_view(request):
if not request.user.is_anonymous():
r = getrower(request.user)
else:
r = None
if request.method == 'POST':
# process form
@@ -13342,19 +13344,29 @@ def virtualevents_view(request):
countries = [country]
if regattatype == 'upcoming':
races = VirtualRace.objects.filter(
races1 = VirtualRace.objects.filter(
startdate__gte=datetime.date.today(),
country__in=countries
).order_by("startdate","start_time")
)
races2 = VirtualRace.objects.filter(
startdate__lte=datetime.date.today(),
evaluation_closure__gte=timezone.now(),
country__in=countries
)
races = (races1 | races2).order_by("startdate","start_time")
elif regattatype == 'previous':
races = VirtualRace.objects.filter(
enddate__lt=datetime.date.today(),
evaluation_closure__lt=timezone.now(),
country__in=countries
).order_by("startdate","start_time")
elif regattatype == 'ongoing':
races = VirtualRace.objects.filter(
startdate__lte=datetime.date.today(),
evaluation_closure__gte=datetime.date.today(),
evaluation_closure__gte=timezone.now(),
country__in=countries
).order_by("startdate","start_time")
elif regattatype == 'my':
@@ -13374,11 +13386,13 @@ def virtualevents_view(request):
if is_ajax:
return render(request,'racelist.html',
{ 'races':races,
'rower':r,
})
return render(request,'virtualevents.html',
{ 'races':races,
'form':form,
'rower':r,
}
)