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

fixed major issues

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-19 18:06:18 +01:00
parent d11d95d350
commit a0bd17b593
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/braintreestuff.py
View File

@@ -172,7 +172,7 @@ def update_subscription(rower,data,method='up'):
if rower.paidplan != 'coach': if rower.paidplan != 'coach':
try: try:
coachgroup = coach.mycoachgroup coachgroup = rower.mycoachgroup
except CoachingGroup.DoesNotExist: except CoachingGroup.DoesNotExist:
coachgroup = CoachingGroup() coachgroup = CoachingGroup()
coachgroup.save() coachgroup.save()

4
rowers/templatetags/rowerfilters.py
View File

@@ -346,7 +346,7 @@ def has_teams(user):
def team_members(user): def team_members(user):
try: try:
therower = Rower.objects.get(user=user) therower = Rower.objects.get(user=user)
if therower.rowerplan != 'coach': if therower.rowerplan == 'basic':
return [] return []
teams = Team.objects.filter(manager=user) teams = Team.objects.filter(manager=user)
members = Rower.objects.filter( members = Rower.objects.filter(
@@ -364,7 +364,7 @@ def team_members(user):
def team_rowers(user): def team_rowers(user):
try: try:
therower = Rower.objects.get(user=user) therower = Rower.objects.get(user=user)
if therower.rowerplan != 'coach': if therower.rowerplan == 'basic':
return [] return []
teams = Team.objects.filter(manager=user) teams = Team.objects.filter(manager=user)
members = Rower.objects.filter(team__in=teams).distinct().order_by( members = Rower.objects.filter(team__in=teams).distinct().order_by(

2
rowers/views/planviews.py
View File

@@ -547,7 +547,7 @@ def plannedsession_multicreate_view(request,
return render(request,'plannedsession_multicreate.html',context) return render(request,'plannedsession_multicreate.html',context)
# Manager creates sessions for entire team # 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) redirect_field_name=None)
def plannedsession_teamcreate_view(request, def plannedsession_teamcreate_view(request,
teamid=0,userid=0): teamid=0,userid=0):

21
rowers/views/teamviews.py
View File

@@ -186,15 +186,22 @@ def rower_teams_view(request,message='',successmessage=''):
invitedcoaches = [rekwest.coach for rekwest in mycoachrequests] invitedcoaches = [rekwest.coach for rekwest in mycoachrequests]
coaches = teams.rower_get_coaches(r) coaches = teams.rower_get_coaches(r)
potentialcoaches = [t.manager for t in memberteams if t.manager not in coaches ] print coaches,'aap'
potentialcoaches = [c for c in potentialcoaches if c.rower not in invitedcoaches]
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) coachees = teams.coach_getcoachees(r)
potentialathletes = Rower.objects.filter( if request.user.rower.rowerplan == 'coach':
team__in=myteams).exclude( potentialathletes = Rower.objects.filter(
user__in=invitedathletes).exclude( team__in=myteams).exclude(
user=request.user user__in=invitedathletes).exclude(
).exclude(coachinggroups__in=[request.user.rower.mycoachgroup]) user=request.user
).exclude(coachinggroups__in=[request.user.rower.mycoachgroup])
else:
potentialathletes = []
# clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user) # clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user)