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

free coach upload form

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-16 10:13:24 +02:00
parent fcc8725a97
commit 8bd6373212
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/templatetags/rowerfilters.py
View File

@@ -389,7 +389,7 @@ def team_members(user):
team__in=teams team__in=teams
).distinct().order_by( ).distinct().order_by(
"user__last_name","user__first_name" "user__last_name","user__first_name"
) ).exclude(rowerplan='freecoach')
return [rower.user for rower in members] return [rower.user for rower in members]
except TypeError: except TypeError:
return [] return []
@@ -405,7 +405,7 @@ def team_rowers(user):
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(
"user__last_name","user__last_name" "user__last_name","user__last_name"
) ).exclude(rowerplan='freecoach')
return members return members
except TypeError: except TypeError:
return [] return []
@@ -416,7 +416,10 @@ from rowers.teams import coach_getcoachees
@register.filter @register.filter
def coach_rowers(user): def coach_rowers(user):
thelist = [user.rower]+[c for c in coach_getcoachees(user.rower)] if user.rower.rowerplan != 'freecoach':
thelist = [user.rower]+[c for c in coach_getcoachees(user.rower)]
else:
thelist = [c for c in coach_getcoachees(user.rower)]
return thelist return thelist

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

22
rowers/views/workoutviews.py
View File

@@ -4298,7 +4298,14 @@ def team_workout_upload_view(request,message="",
rowerform = TeamInviteForm(request.POST) rowerform = TeamInviteForm(request.POST)
rowerform.fields.pop('email') rowerform.fields.pop('email')
rowers = Rower.objects.filter(coachinggroups__in=[r.mycoachgroup]).distinct() rowers = Rower.objects.filter(
coachinggroups__in=[r.mycoachgroup]
).exclude(
rowerplan='freecoach'
).distinct()
if r.rowerplan == 'freecoach':
rowers = rowers.exclude(rowerplan='basic')
rowerform.fields['user'].queryset = User.objects.filter(rower__in=rowers).distinct() rowerform.fields['user'].queryset = User.objects.filter(rower__in=rowers).distinct()
if form.is_valid(): if form.is_valid():
f = request.FILES['file'] f = request.FILES['file']
@@ -4423,7 +4430,18 @@ def team_workout_upload_view(request,message="",
optionsform = TeamUploadOptionsForm(initial=uploadoptions) optionsform = TeamUploadOptionsForm(initial=uploadoptions)
rowerform = TeamInviteForm() rowerform = TeamInviteForm()
rowerform.fields.pop('email') rowerform.fields.pop('email')
rowerform.fields['user'].queryset = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct()
rowers = Rower.objects.filter(
coachinggroups__in=[r.mycoachgroup]
).exclude(
rowerplan='freecoach'
).distinct()
if r.rowerplan == 'freecoach':
rowers = rowers.exclude(rowerplan='basic')
rowerform.fields['user'].queryset = User.objects.filter(rower__in=rowers).distinct()
return render(request, 'team_document_form.html', return render(request, 'team_document_form.html',
{'form':form, {'form':form,
# 'teams':get_my_teams(request.user), # 'teams':get_my_teams(request.user),