From 453835b1ad0aee0515cf827ae5b93d547685deec Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 28 Nov 2018 17:50:18 +0100
Subject: [PATCH 1/2] bla

---
 rowers/management/commands/getexpired.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rowers/management/commands/getexpired.py b/rowers/management/commands/getexpired.py
index e6f68fc0..26ccd478 100644
--- a/rowers/management/commands/getexpired.py
+++ b/rowers/management/commands/getexpired.py
@@ -20,10 +20,10 @@ def getexpired():
     lijst = []
     for r in rs:
         if r.planexpires < datetime.datetime.now().date():
-            if r.rowerplan == 'pro' or r.rowerplan == 'coach':
+            if r.rowerplan == 'pro' or r.rowerplan == 'coach' or r.rowerplan == 'plan':
                 lijst.append(r)
         if r.teamplanexpires < datetime.datetime.now().date():
-            if r.rowerplan == 'pro' or r.rowerplan == 'coach':
+            if r.rowerplan == 'pro' or r.rowerplan == 'coach' or r.rowerplan == 'plan':
                 lijst.append(r)
     return lijst
 

From 41c0234b535b4527822712ed4e6aad9c61de162f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 28 Nov 2018 18:04:04 +0100
Subject: [PATCH 2/2] bug fix withdraw

---
 rowers/plannedsessions.py | 7 ++++++-
 rowers/views.py           | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index 04f6c194..1155cf53 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -798,7 +798,12 @@ def race_can_adddiscipline(r,race):
     
 
 def race_can_withdraw(r,race):
-    records = VirtualRaceResult.objects.filter(
+    if race.sessiontype == 'race':
+        recordobj = VirtualRaceResult
+    else:
+        recordobj = IndoorVirtualRaceResult
+        
+    records = recordobj.objects.filter(
         userid=r.id,
         race=race
         )
diff --git a/rowers/views.py b/rowers/views.py
index 307ba0de..96687396 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -16124,6 +16124,7 @@ def virtualevent_view(request,id=0):
 @login_required()
 def virtualevent_withdraw_view(request,id=0,recordid=None):
     r = getrower(request.user)
+
     try:
         race = VirtualRace.objects.get(id=id)
     except VirtualRace.DoesNotExist: