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

prevent free coach from showing up in plan

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-16 16:43:32 +02:00
parent f45aea0aa3
commit cb424ead67
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/plannedsessions.py
View File

@@ -465,12 +465,12 @@ def add_team_session(t,ps):
def add_rower_session(r,ps): def add_rower_session(r,ps):
teams = Team.objects.filter(manager=ps.manager) teams = Team.objects.filter(manager=ps.manager)
members = Rower.objects.filter(team__in=teams).distinct() members = Rower.objects.filter(team__in=teams).distinct()
if r in members: if r in members and r.rowerplan != 'freecoach':
ps.rower.add(r) ps.rower.add(r)
ps.save() ps.save()
return 1 return 1
elif ps.manager.rower == r: elif ps.manager.rower == r and r.rowerplan != 'freecoach':
ps.rower.add(r) ps.rower.add(r)
ps.save() ps.save()

10
rowers/views/planviews.py
View File

@@ -632,7 +632,7 @@ def plannedsession_teamcreate_view(request,
request.session['teams'] = [team.id for team in teams] request.session['teams'] = [team.id for team in teams]
for team in teams: for team in teams:
add_team_session(team,ps) add_team_session(team,ps)
rs = Rower.objects.filter(team__in=[team]) rs = Rower.objects.filter(team__in=[team]).exclude(rowerplan='freecoach')
for r in rs: for r in rs:
add_rower_session(r,ps) add_rower_session(r,ps)
@@ -912,12 +912,16 @@ def plannedsessions_coach_view(request,
rteams = therower.team.filter(viewing='allmembers') rteams = therower.team.filter(viewing='allmembers')
sps = get_sessions(therower,startdate=startdate,enddate=enddate) sps = get_sessions(therower,startdate=startdate,enddate=enddate)
if therower.rowerplan != 'freecoach':
rowers = [therower] rowers = [therower]
else:
rowers = []
for ps in sps: for ps in sps:
if 'coach' in request.user.rower.rowerplan: if 'coach' in request.user.rower.rowerplan:
rowers += ps.rower.all() rowers += ps.rower.all().exclude(rowerplan='freecoach')
else: else:
rowers += ps.rower.filter(team__in=rteams) rowers += ps.rower.filter(team__in=rteams).exclude(rowerplan='freecoach')
rowers = list(set(rowers)) rowers = list(set(rowers))