From da9a226cc60de3d6ececd301d668e63c1eda3585 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sat, 20 Jun 2020 12:22:38 +0200
Subject: [PATCH 1/2] allowing race edit during race window

---
 rowers/plannedsessions.py  |  8 +++++++-
 rowers/views/racesviews.py | 23 ++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index d8936ca3..a9be6a3e 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -1026,7 +1026,13 @@ def race_can_edit(r,race):
         startdatetime = pytz.timezone(race.timezone).localize(
             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
         else:
             return False
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index 81d1ab5e..c0369e00 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -1223,7 +1223,6 @@ def virtualevent_view(request,id=0):
 
     comments = PlannedSessionComment.objects.filter(plannedsession=race).order_by("created")
 
-
     return render(request,'virtualevent.html',
                   {
                       'coursescript':script,
@@ -2565,8 +2564,15 @@ def virtualevent_edit_view(request,id=0):
         startdatetime
         )
 
-    if timezone.now() > startdatetime:
-        messages.error(request,"You cannot edit a race after the start of the race window")
+    end_time = race.end_time
+    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',
                       kwargs={
                           'id':race.id,
@@ -2658,8 +2664,15 @@ def indoorvirtualevent_edit_view(request,id=0):
         startdatetime
         )
 
-    if timezone.now() > startdatetime:
-        messages.error(request,"You cannot edit a race after the start of the race window")
+    end_time = race.end_time
+    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',
                       kwargs={
                           'id':race.id,

From 1914b855deee1a9c7c4ccdfaa74f0593e4af7111 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sat, 20 Jun 2020 12:23:52 +0200
Subject: [PATCH 2/2] c

---
 rowers/emails.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rowers/emails.py b/rowers/emails.py
index d3d76ff6..59f3e0ec 100644
--- a/rowers/emails.py
+++ b/rowers/emails.py
@@ -80,7 +80,6 @@ def send_template_email(from_email,to_email,subject,
     text_content = textify(html_content)
     #    html_content = newlinetobr(html_content)
 
-    print(kwargs['bcc'])
 
     if 'bcc' in kwargs and 'cc' in kwargs:
         msg = EmailMultiAlternatives(subject, text_content, from_email, to_email,cc=kwargs['cc'],