From a0bd17b593356286f0829825addc974c90559325 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 19 Feb 2019 18:06:18 +0100
Subject: [PATCH] fixed major issues

---
 rowers/braintreestuff.py            |  2 +-
 rowers/templatetags/rowerfilters.py |  4 ++--
 rowers/views/planviews.py           |  2 +-
 rowers/views/teamviews.py           | 21 ++++++++++++++-------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/rowers/braintreestuff.py b/rowers/braintreestuff.py
index 7d6a5fbd..ac46f4e2 100644
--- a/rowers/braintreestuff.py
+++ b/rowers/braintreestuff.py
@@ -172,7 +172,7 @@ def update_subscription(rower,data,method='up'):
 
         if rower.paidplan != 'coach':
             try:
-                coachgroup = coach.mycoachgroup
+                coachgroup = rower.mycoachgroup
             except CoachingGroup.DoesNotExist:
                 coachgroup = CoachingGroup()
                 coachgroup.save()
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 47d16854..1bf75511 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -346,7 +346,7 @@ def has_teams(user):
 def team_members(user):
     try:
         therower = Rower.objects.get(user=user)
-        if therower.rowerplan != 'coach':
+        if therower.rowerplan == 'basic':
             return []
         teams = Team.objects.filter(manager=user)
         members = Rower.objects.filter(
@@ -364,7 +364,7 @@ def team_members(user):
 def team_rowers(user):
     try:
         therower = Rower.objects.get(user=user)
-        if therower.rowerplan != 'coach':
+        if therower.rowerplan == 'basic':
             return []
         teams = Team.objects.filter(manager=user)
         members = Rower.objects.filter(team__in=teams).distinct().order_by(
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index add5c7c3..62cdb061 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -547,7 +547,7 @@ def plannedsession_multicreate_view(request,
     return render(request,'plannedsession_multicreate.html',context)
 
 # Manager creates sessions for entire team
-@user_passes_test(iscoachmember,login_url="/rowers/paidplans/",
+@user_passes_test(hasplannedsessions,login_url="/rowers/paidplans/",
                   redirect_field_name=None)
 def plannedsession_teamcreate_view(request,
                                    teamid=0,userid=0):
diff --git a/rowers/views/teamviews.py b/rowers/views/teamviews.py
index 1546a777..2c393f85 100644
--- a/rowers/views/teamviews.py
+++ b/rowers/views/teamviews.py
@@ -186,15 +186,22 @@ def rower_teams_view(request,message='',successmessage=''):
     invitedcoaches = [rekwest.coach for rekwest in mycoachrequests]
 
     coaches = teams.rower_get_coaches(r)
-    potentialcoaches = [t.manager for t in memberteams if t.manager not in coaches ]
-    potentialcoaches = [c for c in potentialcoaches if c.rower not in invitedcoaches]
+    print coaches,'aap'
+
+    potentialcoaches = [t.manager for t in memberteams if t.manager not in coaches and t.manager.rower.rowerplan == 'coach']
+    potentialcoaches = [c for c in potentialcoaches if c.rower not in invitedcoaches+coaches]
+
+    
     coachees = teams.coach_getcoachees(r)
 
-    potentialathletes = Rower.objects.filter(
-        team__in=myteams).exclude(
-            user__in=invitedathletes).exclude(
-                user=request.user
-            ).exclude(coachinggroups__in=[request.user.rower.mycoachgroup])
+    if request.user.rower.rowerplan == 'coach':
+        potentialathletes = Rower.objects.filter(
+            team__in=myteams).exclude(
+                user__in=invitedathletes).exclude(
+                    user=request.user
+                ).exclude(coachinggroups__in=[request.user.rower.mycoachgroup])
+    else:
+        potentialathletes = []
 
     
     #    clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user)