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

passing tests again - now with coachinggroups

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-16 19:43:21 +01:00
parent ccdf24f671
commit 5f8fd9315a
8 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/views/teamviews.py
View File

@@ -185,14 +185,16 @@ def rower_teams_view(request,message='',successmessage=''):
invitedathletes = [rekwest.user for rekwest in mycoachoffers]
invitedcoaches = [rekwest.coach for rekwest in mycoachrequests]
coaches = rower_get_coaches(r)
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]
coachees = teams.coach_getcoachees(r)
potentialathletes = Rower.objects.filter(
team__in=myteams).exclude(
user__in=invitedathletes).exclude(user=request.user)
user__in=invitedathletes).exclude(
user=request.user
).exclude(coachinggroups__in=[request.user.rower.mycoachgroup])
# clubsize = teams.count_invites(request.user)+teams.count_club_members(request.user)
@@ -336,16 +338,16 @@ def offer_coaching_view(request,userid):
coach = getrequestrower(request)
res,text = teams.create_coaching_invite(coach,u)
res,text = teams.create_coaching_offer(coach,u)
if res:
message.info(request,text)
messages.info(request,text)
else:
messages.error(request,text)
url = reverse('rower_teams_view')
return HttpResponseRedirecet(url)
return HttpResponseRedirect(url)
@login_required()
def reject_revoke_coach_request(request,id=0):
@@ -662,7 +664,7 @@ def rower_accept_coachoffer_view(request,code=None):
if code:
res, text = teams.process_coachoffer_code(request.user,code)
if res:
message.info(request,text)
messages.info(request,text)
else:
messages.error(request,text)

6
rowers/views/workoutviews.py
View File

@@ -1,5 +1,5 @@
from statements import *
import rowers.teams as teams
# Show the EMpower Oarlock generated Stroke Profile
@user_passes_test(ispromember,login_url="/rowers/paidplans/",
@@ -4235,7 +4235,7 @@ def team_workout_upload_view(request,message="",
rowerform = TeamInviteForm(request.POST)
rowerform.fields.pop('email')
rowers = Rower.objects.filter(coaches__in=[request.user.rower]).distinct()
rowers = Rower.objects.filter(coachinggroups__in=[r.mycoachgroup]).distinct()
rowerform.fields['user'].queryset = User.objects.filter(rower__in=rowers).distinct()
if form.is_valid():
f = request.FILES['file']
@@ -4246,7 +4246,7 @@ def team_workout_upload_view(request,message="",
workouttype = form.cleaned_data['workouttype']
if rowerform.is_valid():
u = rowerform.cleaned_data['user']
if u and request.user.rower in u.rower.coaches.all():
if u and request.user.rower in teams.rower_get_coaches(u.rower):
r = getrower(u)
else:
message = 'Please select a rower'