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

allowing race edit during race window

Browse Source
This commit is contained in:
Sander Roosendaal
2020-06-20 12:22:38 +02:00
parent cbed58e0ca
commit da9a226cc6
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/plannedsessions.py
View File

@@ -1026,7 +1026,13 @@ def race_can_edit(r,race):
startdatetime = pytz.timezone(race.timezone).localize( startdatetime = pytz.timezone(race.timezone).localize(
startdatetime startdatetime
) )
if timezone.now()<startdatetime: end_time = race.end_time
end_date = race.enddate
enddatetime = datetime.combine(end_date,end_time)
enddatetime = pytz.timezone(race.timezone).localize(
enddatetime
)
if timezone.now()<enddatetime:
return True return True
else: else:
return False return False

23
rowers/views/racesviews.py
View File

@@ -1223,7 +1223,6 @@ def virtualevent_view(request,id=0):
comments = PlannedSessionComment.objects.filter(plannedsession=race).order_by("created") comments = PlannedSessionComment.objects.filter(plannedsession=race).order_by("created")
return render(request,'virtualevent.html', return render(request,'virtualevent.html',
{ {
'coursescript':script, 'coursescript':script,
@@ -2565,8 +2564,15 @@ def virtualevent_edit_view(request,id=0):
startdatetime startdatetime
) )
if timezone.now() > startdatetime: end_time = race.end_time
messages.error(request,"You cannot edit a race after the start of the race window") end_date = race.enddate
enddatetime = datetime.datetime.combine(end_date,end_time)
enddatetime = pytz.timezone(race.timezone).localize(
enddatetime
)
if timezone.now() > enddatetime:
messages.error(request,"You cannot edit a race after the end of the race window")
url = reverse('virtualevent_view', url = reverse('virtualevent_view',
kwargs={ kwargs={
'id':race.id, 'id':race.id,
@@ -2658,8 +2664,15 @@ def indoorvirtualevent_edit_view(request,id=0):
startdatetime startdatetime
) )
if timezone.now() > startdatetime: end_time = race.end_time
messages.error(request,"You cannot edit a race after the start of the race window") end_date = race.enddate
enddatetime = datetime.datetime.combine(end_date,end_time)
enddatetime = pytz.timezone(race.timezone).localize(
enddatetime
)
if timezone.now() > enddatetime:
messages.error(request,"You cannot edit a race after the end of the race window")
url = reverse('virtualevent_view', url = reverse('virtualevent_view',
kwargs={ kwargs={
'id':race.id, 'id':race.id,