diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html index 8856d4f6..e50c938e 100644 --- a/rowers/templates/plannedsessions.html +++ b/rowers/templates/plannedsessions.html @@ -92,7 +92,7 @@ {{ ps.sessionvalue }} {{ actualvalue|lookup:ps.id }} {{ ps.sessionunit }} - {% if completeness|lookup:ps.id == 'partial' %} + {% if completeness|lookup:ps.id != 'on target' %} {{ completiondate|lookup:ps.id|date:"Y-m-d" }} {% else %} {{ completiondate|lookup:ps.id|date:"Y-m-d" }} diff --git a/rowers/templates/teamedit.html b/rowers/templates/teamedit.html index 0f5b065a..3219025b 100644 --- a/rowers/templates/teamedit.html +++ b/rowers/templates/teamedit.html @@ -25,8 +25,16 @@
  • diff --git a/rowers/views.py b/rowers/views.py index 79c139c7..cc9cdd8d 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -14723,15 +14723,14 @@ def plannedsession_teamedit_view(request, 'plannedsessions':sps, }) -@user_passes_test(iscoachmember,login_url="/rowers/promembership/", - redirect_field_name=None) +#@user_passes_test(iscoachmember,login_url="/rowers/promembership/", +# redirect_field_name=None) def plannedsessions_coach_view(request, teamid=0,userid=0): therower = getrower(request.user) - - + startdate,enddate = get_dates_timeperiod(request) @@ -14745,14 +14744,21 @@ def plannedsessions_coach_view(request, theteam = False else: theteam = False - - sps = get_sessions_manager(request.user,teamid=teamid, - enddate=enddate, - startdate=startdate) - rowers = [] + if request.user.rower.rowerplan == 'coach': + sps = get_sessions_manager(request.user,teamid=teamid, + enddate=enddate, + startdate=startdate) + else: + rteams = therower.team.filter(viewing='allmembers') + sps = get_sessions(therower,startdate=startdate,enddate=enddate) + + rowers = [therower] for ps in sps: - rowers += ps.rower.all() + if request.user.rower.rowerplan == 'coach': + rowers += ps.rower.all() + else: + rowers += ps.rower.filter(team__in=rteams) rowers = list(set(rowers))