fixes for coach trial

rowers/rower_rules.py

@@ -138,6 +138,12 @@ def is_staff(user):  # pragma: no cover
 
 @rules.predicate
 def is_coach(user):
+    if user is None:
+        return False
+    if user.is_anonymous:
+        return False
+    if user.rower.coachtrialexpires >= timezone.now().date():
+        return True
     return user.rower.rowerplan in ['coach', 'freecoach']
 
 
@@ -157,6 +163,9 @@ def is_planmember(user):
     except AttributeError:  # pragma: no cover
         return False
 
+    if user.rower.coachtrialexpires >= timezone.now().date():
+        return True
+
     return r.rowerplan in ['coach', 'plan']  # freecoach?
 
 
@@ -198,7 +207,7 @@ def is_coachtrial(user):
     return False  # pragma: no cover
 
 
-ispromember = is_promember | is_protrial
+ispromember = is_promember | is_protrial | is_coach | is_coachtrial
 
 
 can_have_teams = ispromember | is_coach | is_coachtrial
@@ -251,7 +260,7 @@ def is_plantrial(user):
 
 isplanmember = is_planmember | is_plantrial
 
-iscoachmember = is_coach | is_coachtrial
+iscoachmember = is_coachtrial | is_coach
 
 
 @rules.predicate