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

Merge branch 'feature/groups' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-08-29 08:00:38 +02:00
parent b5935b9a19 b6a1a7646b
commit 890a93044c
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/teams.py
View File

@@ -135,8 +135,8 @@ def add_member(id,rower):
t= Team.objects.get(id=id) t= Team.objects.get(id=id)
try: try:
rower.team.add(t) rower.team.add(t)
except ValidationError: except ValidationError as e:
return(0,"Couldn't add member") return(0,"Couldn't add member: "+str(e.message))
# code to add all workouts # code to add all workouts
ws = Workout.objects.filter(user=rower) ws = Workout.objects.filter(user=rower)

26
rowers/views/teamviews.py
View File

@@ -15,12 +15,17 @@ def team_view(request,id=0,userid=0):
myteams, memberteams, otherteams = get_teams(request) myteams, memberteams, otherteams = get_teams(request)
teams.remove_expired_invites() teams.remove_expired_invites()
try: try:
t = Team.objects.get(id=id) t = Team.objects.get(id=id)
except Team.DoesNotExist: except Team.DoesNotExist:
raise Http404("Team doesn't exist") raise Http404("Team doesn't exist")
if r.rowerplan == 'basic' and t.manager.rower.rowerplan != 'coach':
raise PermissionDenied("You need to be on a Paid Plan to see or join this team")
q = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct().exclude(rower__team__name=t.name) q = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct().exclude(rower__team__name=t.name)
mygroups = [request.user.rower.mycoachgroup] mygroups = [request.user.rower.mycoachgroup]
q2 = User.objects.filter(rower__isnull=False,rower__coachinggroups__in=mygroups).distinct().exclude(rower__team__name=t.name) q2 = User.objects.filter(rower__isnull=False,rower__coachinggroups__in=mygroups).distinct().exclude(rower__team__name=t.name)
@@ -168,19 +173,22 @@ def get_teams(request):
private='open').exclude( private='open').exclude(
rower=r).exclude(manager=request.user).order_by('name') rower=r).exclude(manager=request.user).order_by('name')
if r.rowerplan == 'basic':
otherteams = otherteams.filter(manager__rower__rowerplan='coach')
return myteams, memberteams, otherteams return myteams, memberteams, otherteams
@login_required() @login_required()
def rower_teams_view(request,message='',successmessage=''): def rower_teams_view(request):
if request.method == 'POST': if request.method == 'POST':
form = TeamInviteCodeForm(request.POST) form = TeamInviteCodeForm(request.POST)
if form.is_valid(): if form.is_valid():
code = form.cleaned_data['code'] code = form.cleaned_data['code']
res,text = teams.process_invite_code(request.user,code) res,text = teams.process_invite_code(request.user,code)
if res: if res:
successmessage = text messages.info(request,text)
else: else:
message = text messages.error(request,text)
else: else:
form = TeamInviteCodeForm() form = TeamInviteCodeForm()
@@ -249,8 +257,6 @@ def rower_teams_view(request,message='',successmessage=''):
# clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user) # clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user)
# max_clubsize = r.clubsize # max_clubsize = r.clubsize
messages.info(request,successmessage)
messages.error(request,message)
breadcrumbs = [ breadcrumbs = [
{ {
@@ -312,18 +318,14 @@ def manager_member_drop_view(request,teamid,userid,
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@login_required() @login_required()
def manager_requests_view(request,code=None,message='',successmessage=''): def manager_requests_view(request,code=None):
if code: if code:
res,text = teams.process_request_code(request.user,code) res,text = teams.process_request_code(request.user,code)
if res: if res:
successmessage = text messages.info(request,text)
message = ''
else: else:
message = text messages.error(request,text)
successmessage = ''
messages.info(request,successmessage)
messages.error(request,message)
url = reverse(rower_teams_view,kwargs={ url = reverse(rower_teams_view,kwargs={
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)