going through the tests
This commit is contained in:
@@ -318,7 +318,7 @@ def plannedsession_multiclone_view(
|
||||
add_rower_session(rower, ps)
|
||||
for team in teams:
|
||||
add_team_session(team, ps)
|
||||
for rower in team.rower.all().exclude(rowerplan='freecoach'):
|
||||
for rower in team.rower.all():
|
||||
add_rower_session(rower, ps)
|
||||
|
||||
startdatestring = shiftstartdate.strftime('%Y-%m-%d')
|
||||
@@ -974,7 +974,7 @@ def plannedsession_teamcreate_view(request,
|
||||
for team in teams:
|
||||
add_team_session(team, ps)
|
||||
rs = Rower.objects.filter(
|
||||
team__in=[team]).exclude(rowerplan='freecoach')
|
||||
team__in=[team])
|
||||
for r in rs:
|
||||
add_rower_session(r, ps)
|
||||
|
||||
@@ -1297,17 +1297,14 @@ def plannedsessions_coach_view(request,
|
||||
rteams = therower.team.filter(viewing='allmembers')
|
||||
sps = get_sessions(therower, startdate=startdate, enddate=enddate)
|
||||
|
||||
if therower.rowerplan != 'freecoach':
|
||||
rowers = [therower]
|
||||
else: # pragma: no cover
|
||||
rowers = []
|
||||
rowers = [therower]
|
||||
|
||||
for ps in sps:
|
||||
if is_coach(request.user) or is_coachtrial(request.user):
|
||||
rowers += ps.rower.all().exclude(rowerplan='freecoach')
|
||||
rowers += ps.rower.all()
|
||||
else: # pragma: no cover
|
||||
rowers += ps.rower.filter(
|
||||
team__in=rteams).exclude(rowerplan='freecoach')
|
||||
team__in=rteams)
|
||||
|
||||
rowers = list(set(rowers))
|
||||
|
||||
@@ -1861,7 +1858,7 @@ def plannedsession_clone_view(request, id=0, userid=0):
|
||||
add_rower_session(r, ps)
|
||||
for team in teams:
|
||||
add_team_session(team, ps)
|
||||
for rower in team.rower.all().exclude(rowerplan='freecoach'):
|
||||
for rower in team.rower.all():
|
||||
add_rower_session(rower, ps)
|
||||
|
||||
url = reverse(plannedsession_edit_view,
|
||||
|
||||
Reference in New Issue
Block a user