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

team invite form

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-20 20:39:21 +01:00
parent 1052c61589
commit 29cb93a322
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rowers/views/teamviews.py
View File

@@ -16,10 +16,16 @@ def team_view(request,id=0,userid=0):
except Team.DoesNotExist: except Team.DoesNotExist:
raise Http404("Team doesn't exist") raise Http404("Team doesn't exist")
q = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct().exclude(rower__team__name=t.name)
mygroups = [request.user.rower.mycoachgroup]
q2 = User.objects.filter(rower__isnull=False,rower__coachinggroups__in=mygroups).distinct().exclude(rower__team__name=t.name)
q = q | q2
if request.method == 'POST' and request.user == t.manager: if request.method == 'POST' and request.user == t.manager:
inviteform = TeamInviteForm(request.POST) inviteform = TeamInviteForm(request.POST)
inviteform.fields['user'].queryset = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct().exclude(rower__team__name=t.name)
inviteform.fields['user'].queryset = q
if inviteform.is_valid(): if inviteform.is_valid():
cd = inviteform.cleaned_data cd = inviteform.cleaned_data
newmember = cd['user'] newmember = cd['user']
@@ -37,7 +43,7 @@ def team_view(request,id=0,userid=0):
elif request.user == t.manager: elif request.user == t.manager:
inviteform = TeamInviteForm() inviteform = TeamInviteForm()
inviteform.fields['user'].queryset = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct().exclude(rower__team__name=t.name) inviteform.fields['user'].queryset = q
else: else:
inviteform = '' inviteform = ''
@@ -186,9 +192,13 @@ 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)
print coaches,'aap'
potentialcoaches = [t.manager for t in memberteams if t.manager not in coaches and t.manager.rower.rowerplan == 'coach'] potentialcoaches = [t.manager for t in memberteams if t.manager not in coaches and t.manager.rower.rowerplan == 'coach']
offercoaches = [
r.user for r in Rower.objects.filter(
offercoaching=True,rowerplan='coach').exclude(user=request.user)
]
potentialcoaches = list(set(potentialcoaches+offercoaches))
potentialcoaches = [c for c in potentialcoaches if c.rower not in invitedcoaches+coaches] potentialcoaches = [c for c in potentialcoaches if c.rower not in invitedcoaches+coaches]