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

plannedsession_view

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-15 10:27:30 +02:00
parent e479a45941
commit 296f8af6d0
5 changed files with 289 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
rowers/templates/plannedsessionedit.html
View File

@@ -1,65 +1,21 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Update Planned Session{% endblock %} {% block title %}Update Planned Session{% endblock %}
{% block content %} {% block main %}
<div class="grid_12 alpha"> <h1>Edit Session</h1>
{% include "planningbuttons.html" %}
</div>
<div class="grid_12 alpha">
<div id="left" class="grid_6 alpha">
<h1>Edit Session</h1>
</div>
<div id="timeperiod" class="grid_2 dropdown">
<button class="grid_2 alpha button gray small dropbtn">Select Time Period ({{ timeperiod|verbosetimeperiod }})</button>
<div class="dropdown-content">
<a class="button gray small alpha"
href="/rowers/sessions/create/today/rower/{{ rower.id }}">
Today
</a>
<a class="button gray small alpha"
href="/rowers/sessions/create/thisweek/rower/{{ rower.id }}">
This Week
</a>
<a class="button gray small alpha"
href="/rowers/sessions/create/thismonth/rower/{{ rower.id }}">
This Month
</a>
<a class="button gray small alpha"
href="/rowers/sessions/create/lastweek/rower/{{ rower.id }}">
Last Week
</a>
<a class="button gray small alpha"
href="/rowers/sessions/create/lastmonth/rower/{{ rower.id }}">
Last Month
</a>
<a class="button gray small alpha"
href="/rowers/sessions/create/nextweek/rower/{{ rower.id }}">
Next Week
</a>
<a class="button gray small alpha"
href="/rowers/sessions/create/nextmonth/rower/{{ rower.id }}">
Next Month
</a>
</div>
</div>
{% if user.is_authenticated and user|is_manager %} {% if user.is_authenticated and user|is_manager %}
<div class="grid_2"> <p>
<a class="button green small alpha" href="/rowers/sessions/teamedit/{{ thesession.id }}/{{ timeperiod}}"> <a href="/rowers/sessions/teamedit/{{ thesession.id }}/">
Assign to my Teams Assign to my Teams
</a> </a>
</div> </p>
{% endif %} {% endif %}
<div class="grid_2 omega"> <ul class="main-content">
<a class="button small gray" href="/rowers/list-courses">Courses</a> <li class="grid_2">
</div> <h2>Plan</h2>
</div>
<div class="grid_12 alpha">
<div id="right" class="grid_6 alpha">
<h1>Plan</h1>
<p> <p>
Click on session name to view Click on session name to view
</p> </p>
@@ -93,11 +49,11 @@
<td> {{ ps.sessionvalue }} </td> <td> {{ ps.sessionvalue }} </td>
<td> {{ ps.sessionunit }} </td> <td> {{ ps.sessionunit }} </td>
<td> <td>
<a class="small" href="/rowers/sessions/{{ ps.id }}/edit/{{ timeperiod }}/rower/{{ rower.id }}">Edit</a> <a class="small" href="/rowers/sessions/{{ ps.id }}/edit/user/{{ rower.user.id }}">Edit</a>
</td> </td>
<td> <td>
<a class="small" <a class="small"
href="/rowers/sessions/{{ ps.id }}/clone/{{ timeperiod }}/rower/{{ rower.id }}">Clone</a> href="/rowers/sessions/{{ ps.id }}/clone/user/{{ rower.user.id }}">Clone</a>
</td> </td>
<td> <td>
<a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm">Delete</a> <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm">Delete</a>
@@ -106,41 +62,42 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div> </li>
<li class="grid_2">
<div class="grid_6 omega"> <h2>{{ thesession.name }}</h2>
<h1>{{ thesession.name }}</h1>
<form enctype="multipart/form-data" action="{{ formloc }}" method="post"> <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
{% if form.errors %} {% if form.errors %}
<p style="color: red;"> <p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below. Please correct the error{{ form.errors|pluralize }} below.
</p> </p>
{% endif %} {% endif %}
<p>
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table> </table>
</p>
{% csrf_token %} {% csrf_token %}
<div class="grid_1 prefix_2 alpha"> <div id="id_guidance">
<a class="red button small" href="/rowers/sessions/{{ thesession.id }}/deleteconfirm">Delete</a>
</div>
<div class="grid_1">
<a class="gray button small" href="/rowers/sessions/{{ thesession.id }}/clone">Clone</a>
</div>
<div id="formbutton" class="grid_1 suffix_1 omega">
<input class="button green" action="/rowers/sessions/{{ thesession.id }}/edit/{{ timeperiod }}/rower/{{ rower.id }}" type="submit" value="Save">
</div>
<div class="grid_6" id="id_guidance">
</div> </div>
<p>
</div> <a href="/rowers/sessions/{{ thesession.id }}/deleteconfirm">Delete</a>
<a href="/rowers/sessions/{{ thesession.id }}/clone/?when={{ timeperiod }}">Clone</a>
</p>
<input class="button green"
action="/rowers/sessions/{{ thesession.id }}/edit/user/{{ rower.user.id }}" type="submit" value="Save">
</form> </form>
</div>
</li>
</ul>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_plan.html' %}
{% endblock %}
{% block scripts %} {% block scripts %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script> <script>

2
rowers/templates/plannedsessions_multiclone_select.html
View File

@@ -64,7 +64,7 @@
</script> </script>
<h1>Clone Multiple Sessions</h1> <h1>Clone Multiple Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
<form enctype="multipart/form-data" method="post"> <form enctype="multipart/form-data" method="post">

71
rowers/templates/plannedsessionview.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
@@ -7,32 +7,18 @@
{% block title %}Planned Session{% endblock %} {% block title %}Planned Session{% endblock %}
{% block content %} {% block main %}
<div class="grid_12 alpha"> {% if user.is_authenticated and psdict.id.1|is_session_manager:user %}
{% include "planningbuttons.html" %} <p>
<a href="/rowers/sessions/{{ psdict.id.1 }}/edit/user/{{ rower.user.id }}">
</div>
<div class="grid_12 alpha">
<div class="grid_2 alpha">
{% if user.is_authenticated and psdict.id.1|is_session_manager:user %}
<a class="button small gray" href="/rowers/sessions/{{ psdict.id.1 }}/edit/rower/{{ rower.id }}">
Edit Session</a> Edit Session</a>
{% else %} </p>
&nbsp; {% endif %}
{% endif %} <h1>Session {{ psdict.name.1 }}</h1>
</div>
<div class="grid_2"> <ul class="main-content">
{% if plannedsession.sessiontype == 'coursetest' %} <li class="grid_2">
<a class="button small gray" href="/rowers/list-courses">Courses</a>
{% else %}
&nbsp;
{% endif %}
</div>
</div>
<div class="grid_12 alpha">
<div id="left" class="grid_6 alpha">
<h1>Session {{ psdict.name.1 }}</h1>
<table class="listtable shortpadded" width="95%"> <table class="listtable shortpadded" width="95%">
{% for attr in attrs %} {% for attr in attrs %}
{% for key,value in psdict.items %} {% for key,value in psdict.items %}
@@ -48,10 +34,10 @@
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
</table> </table>
</div> </li>
<div id="right" class="grid_6 omega"> <li class="grid_2">
{% if plannedsession.sessiontype == 'test' or plannedsession.sessiontype == 'coursetest' %} {% if plannedsession.sessiontype == 'test' or plannedsession.sessiontype == 'coursetest' %}
<h1>Ranking</h1> <h2>Ranking</h2>
<table id="rankingtable" class="listtable shortpadded tablesorter" width="80%"> <table id="rankingtable" class="listtable shortpadded tablesorter" width="80%">
<thead> <thead>
<tr> <tr>
@@ -107,16 +93,14 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div> </li>
</div> <li class="grid_2">
<div class="grid_12 alpha"> <h2>{{ rower.user.first_name }} {{ rower.user.last_name }}</h2>
<div id="left" class="grid_6 alpha">
<h1>{{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
<p>Status: {{ status }}</p> <p>Status: {{ status }}</p>
<p>Percentage complete: {{ ratio }} </p> <p>Percentage complete: {{ ratio }} </p>
</div> </li>
<div id="right" class="grid_6 omega"> <li class="grid_2">
<h1>Stats</h1> <h2>Stats</h2>
<table class="listtable shortpadded" width="100%"> <table class="listtable shortpadded" width="100%">
<thead> <thead>
<tr> <tr>
@@ -143,22 +127,25 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div> </li>
<div class="grid_12 alpha">
<div id="left" class="grid_6 alpha">
{% if coursescript %} {% if coursescript %}
<h1>Course</h1> <li class="grid_2">
<h2>Course</h2>
{{ coursediv|safe }} {{ coursediv|safe }}
{{ coursescript|safe }} {{ coursescript|safe }}
</li>
{% endif %} {% endif %}
</div>
</div> </ul>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_plan.html' %}
{% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript" src="/static/admin/js/jquery.min.js"></script> <script type="text/javascript" src="/static/admin/js/jquery.min.js"></script>
<script type="text/javascript" src="/static/admin/js/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="/static/admin/js/jquery.tablesorter.min.js"></script>

9
rowers/urls.py
View File

@@ -445,13 +445,12 @@ urlpatterns = [
url(r'^sessions/teamcreate/$',views.plannedsession_teamcreate_view), url(r'^sessions/teamcreate/$',views.plannedsession_teamcreate_view),
url(r'^sessions/teamcreate/team/$', url(r'^sessions/teamcreate/team/$',
views.plannedsession_teamcreate_view), views.plannedsession_teamcreate_view),
url(r'^sessions/teamedit/(?P<sessionid>\d+)$',views.plannedsession_teamedit_view), url(r'^sessions/teamedit/(?P<sessionid>\d+)/$',views.plannedsession_teamedit_view),
url(r'^sessions/teamedit/(?P<sessionid>\d+)/user/(?P<userid>\d+)/$',views.plannedsession_teamedit_view),
url(r'^sessions/create/$',views.plannedsession_create_view), url(r'^sessions/create/$',views.plannedsession_create_view),
url(r'^sessions/create/user/(?P<userid>\d+)$', url(r'^sessions/create/user/(?P<userid>\d+)$',
views.plannedsession_create_view), views.plannedsession_create_view),
url(r'^sessions/multiclone/$',views.plannedsession_multiclone_view), url(r'^sessions/multiclone/$',views.plannedsession_multiclone_view),
url(r'^sessions/multiclone/user/(?P<userid>\d+)/extra/(?P<extrasessions>\d+)$/',
views.plannedsession_multiclone_view),
url(r'^sessions/multiclone/user/(?P<userid>\d+)/$', url(r'^sessions/multiclone/user/(?P<userid>\d+)/$',
views.plannedsession_multiclone_view), views.plannedsession_multiclone_view),
url(r'^sessions/multicreate/$',views.plannedsession_multicreate_view), url(r'^sessions/multicreate/$',views.plannedsession_multicreate_view),
@@ -460,8 +459,8 @@ urlpatterns = [
url(r'^sessions/multicreate/user/(?P<userid>\d+)/$', url(r'^sessions/multicreate/user/(?P<userid>\d+)/$',
views.plannedsession_multicreate_view), views.plannedsession_multicreate_view),
url(r'^sessions/(?P<id>\d+)/edit/$',views.plannedsession_edit_view), url(r'^sessions/(?P<id>\d+)/edit/$',views.plannedsession_edit_view),
url(r'^sessions/(?P<id>\d+)/edit/user/(?P<userid>/$',views.plannedsession_edit_view), url(r'^sessions/(?P<id>\d+)/edit/user/(?P<userid>\d+)/$',views.plannedsession_edit_view),
url(r'^sessions/(?P<id>\d+)/clone/user/(?P<userid>/$',views.plannedsession_clone_view), url(r'^sessions/(?P<id>\d+)/clone/user/(?P<userid>\d+)/$',views.plannedsession_clone_view),
url(r'^sessions/(?P<id>\d+)/clone/$',views.plannedsession_clone_view), url(r'^sessions/(?P<id>\d+)/clone/$',views.plannedsession_clone_view),
url(r'^sessions/(?P<id>\d+)$',views.plannedsession_view, url(r'^sessions/(?P<id>\d+)$',views.plannedsession_view,
name='plannedsession_view'), name='plannedsession_view'),

161
rowers/views.py
View File

@@ -12318,7 +12318,7 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""):
# Page where user can set his details # Page where user can set his details
# Add email address to form so user can change his email address # Add email address to form so user can change his email address
@login_required() @login_required()
def rower_prefs_view(request,rowerid=0,userid=0,message=""): def rower_prefs_view(request,userid=0,message=""):
r = getrequestrower(request,rowerid=rowerid,userid=userid,notpermanent=True) r = getrequestrower(request,rowerid=rowerid,userid=userid,notpermanent=True)
rowerid = r.id rowerid = r.id
@@ -13598,7 +13598,7 @@ def plannedsession_multiclone_view(
kwargs = { kwargs = {
'userid':r.user.id, 'userid':r.user.id,
}) })
if when:
url += '?when='+when url += '?when='+when
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -13657,6 +13657,7 @@ def plannedsession_create_view(request,
r = getrequestrower(request,userid=userid) r = getrequestrower(request,userid=userid)
when = request.GET.get('when') when = request.GET.get('when')
if when: if when:
timeperiod = when timeperiod = when
@@ -13710,7 +13711,7 @@ def plannedsession_create_view(request,
url = reverse(plannedsession_create_view, url = reverse(plannedsession_create_view,
kwargs = { kwargs = {
'rowerid':r.id, 'userid':r.user.id,
'timeperiod':timeperiod, 'timeperiod':timeperiod,
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -13739,6 +13740,7 @@ def plannedsession_create_view(request,
if fprefdate > enddate: if fprefdate > enddate:
fprefdate = enddate fprefdate = enddate
forminitial = { forminitial = {
'startdate':fstartdate, 'startdate':fstartdate,
'enddate':fenddate, 'enddate':fenddate,
@@ -13871,10 +13873,14 @@ def plannedsession_multicreate_view(request,
url = reverse(plannedsession_multicreate_view, url = reverse(plannedsession_multicreate_view,
kwargs = { kwargs = {
'rowerid':r.id, 'userid':r.user.id,
'timeperiod':timeperiod
} }
) )
if when:
url += '?when='+when
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
ps_formset = PlannedSessionFormSet(queryset = qset, ps_formset = PlannedSessionFormSet(queryset = qset,
@@ -14009,10 +14015,17 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
# Manager edits sessions for entire team # Manager edits sessions for entire team
@user_passes_test(iscoachmember,login_url="/rowers/planmembership/", @user_passes_test(iscoachmember,login_url="/rowers/planmembership/",
redirect_field_name=None) redirect_field_name=None)
def plannedsession_teamedit_view(request,timeperiod='thisweek', def plannedsession_teamedit_view(request,
sessionid=0): sessionid=0,userid=0):
r = getrequestrower(request,userid=userid)
when = request.GET.get('when')
if when:
timeperiod = when
else:
timeperiod = 'thisweek'
r = getrequestrower(request)
try: try:
ps = PlannedSession.objects.get(id=sessionid) ps = PlannedSession.objects.get(id=sessionid)
@@ -14103,8 +14116,11 @@ def plannedsession_teamedit_view(request,timeperiod='thisweek',
url = reverse(plannedsession_teamedit_view, url = reverse(plannedsession_teamedit_view,
kwargs = { kwargs = {
'sessionid':sessionid, 'sessionid':sessionid,
'timeperiod':timeperiod,
}) })
if when:
url += '?when='+when
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
sessioncreateform = PlannedSessionForm(instance=ps) sessioncreateform = PlannedSessionForm(instance=ps)
@@ -14202,9 +14218,9 @@ def plannedsessions_coach_view(request,timeperiod='thisweek',
) )
@login_required() @login_required()
def plannedsessions_view(request,timeperiod='thisweek',rowerid=0,userid=0): def plannedsessions_view(request,timeperiod='thisweek',userid=0):
r = getrequestrower(request,rowerid=rowerid) r = getrequestrower(request,userid=userid)
startdate,enddate = get_dates_timeperiod(timeperiod) startdate,enddate = get_dates_timeperiod(timeperiod)
@@ -14249,9 +14265,9 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0,userid=0):
}) })
@login_required() @login_required()
def plannedsessions_print_view(request,timeperiod='thisweek',rowerid=0,userid=0): def plannedsessions_print_view(request,timeperiod='thisweek',userid=0):
r = getrequestrower(request,rowerid=rowerid) r = getrequestrower(request,userid=userid)
startdate,enddate = get_dates_timeperiod(timeperiod) startdate,enddate = get_dates_timeperiod(timeperiod)
@@ -14282,14 +14298,14 @@ def plannedsessions_print_view(request,timeperiod='thisweek',rowerid=0,userid=0)
@login_required() @login_required()
def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,userid=0, def plannedsessions_manage_view(request,timeperiod='thisweek',userid=0,
initialsession=0): initialsession=0):
is_ajax = False is_ajax = False
if request.is_ajax(): if request.is_ajax():
is_ajax = True is_ajax = True
r = getrequestrower(request,rowerid=rowerid) r = getrequestrower(request,userid=userid)
startdate,enddate = get_dates_timeperiod(timeperiod) startdate,enddate = get_dates_timeperiod(timeperiod)
@@ -14415,10 +14431,15 @@ def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,userid=0
# need clarity on cloning behavior time shift # need clarity on cloning behavior time shift
@user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None) redirect_field_name=None)
def plannedsession_clone_view(request,id=0,rowerid=0,userid=0, def plannedsession_clone_view(request,id=0,userid=0):
timeperiod='thisweek'):
r = getrequestrower(request,rowerid=rowerid) r = getrequestrower(request,userid=userid)
when = request.GET.get('when')
if when:
timeperiod = when
else:
timeperiod = 'thisweek'
startdate,enddate = get_dates_timeperiod(timeperiod) startdate,enddate = get_dates_timeperiod(timeperiod)
@@ -14460,20 +14481,28 @@ def plannedsession_clone_view(request,id=0,rowerid=0,userid=0,
url = reverse(plannedsession_edit_view, url = reverse(plannedsession_edit_view,
kwargs = { kwargs = {
'id':ps.id, 'id':ps.id,
'timeperiod':timeperiod, 'userid':r.user.id,
'rowerid':r.id,
} }
) )
if when:
url += '?when='+when
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
# Edit an existing planned session # Edit an existing planned session
@user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None) redirect_field_name=None)
def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0,userid=0): def plannedsession_edit_view(request,id=0,userid=0):
r = getrequestrower(request,rowerid=rowerid) r = getrequestrower(request,userid=userid)
when = request.GET.get('when')
if when:
timeperiod = when
else:
timeperiod = 'thisweek'
startdate,enddate = get_dates_timeperiod(timeperiod) startdate,enddate = get_dates_timeperiod(timeperiod)
@@ -14497,7 +14526,6 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0,userid
if ps.team.all() or len(ps.rower.all())>1: if ps.team.all() or len(ps.rower.all())>1:
url = reverse(plannedsession_teamedit_view, url = reverse(plannedsession_teamedit_view,
kwargs={ kwargs={
'timeperiod':timeperiod,
'sessionid':id, 'sessionid':id,
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -14523,20 +14551,57 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0,userid
url = reverse(plannedsession_edit_view, url = reverse(plannedsession_edit_view,
kwargs={ kwargs={
'id':int(ps.id), 'id':int(ps.id),
'timeperiod':timeperiod, 'userid':r.user.id,
'rowerid':r.id,
}) })
if when:
url += '?when='+when
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
sessioncreateform = PlannedSessionForm(instance=ps) sessioncreateform = PlannedSessionForm(instance=ps)
sps = get_sessions(r,startdate=startdate,enddate=enddate) sps = get_sessions(r,startdate=startdate,enddate=enddate)
breadcrumbs = [
{
'url':reverse(plannedsessions_view,
kwargs={'userid':userid}),
'name': 'Plan'
},
{
'url': reverse(plannedsessions_view,
kwargs={'userid':userid}),
'name': 'Sessions'
},
{
'url':reverse(plannedsession_view,
kwargs={
'userid':userid,
'id':id,
}
),
'name': ps.id
},
{
'url':reverse(plannedsession_edit_view,
kwargs={
'userid':userid,
'id':id,
}
),
'name': 'Edit'
}
]
return render(request,'plannedsessionedit.html', return render(request,'plannedsessionedit.html',
{ {
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
'plan':trainingplan, 'plan':trainingplan,
'breadcrumbs':breadcrumbs,
'form':sessioncreateform, 'form':sessioncreateform,
'active':'nav-plan',
'plannedsessions':sps, 'plannedsessions':sps,
'thesession':ps, 'thesession':ps,
'rower':r, 'rower':r,
@@ -14546,16 +14611,16 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0,userid
@login_required() @login_required()
def plannedsession_view(request,id=0,rowerid=0,userid=0, def plannedsession_view(request,id=0,userid=0):
timeperiod='thisweek'):
m = getrower(request.user) r = getrequestrower(request,userid=userid)
when = request.GET.get('when')
if not rowerid: if when:
r = m timeperiod = when
else: else:
r = Rower.objects.get(id=rowerid) timeperiod = 'thisweek'
try: try:
ps = PlannedSession.objects.get(id=id) ps = PlannedSession.objects.get(id=id)
@@ -14569,6 +14634,8 @@ def plannedsession_view(request,id=0,rowerid=0,userid=0,
coursescript = '' coursescript = ''
coursediv = '' coursediv = ''
m = ps.manager
if ps.manager != request.user: if ps.manager != request.user:
if r.rowerplan == 'coach': if r.rowerplan == 'coach':
teams = Team.objects.filter(manager=request.user) teams = Team.objects.filter(manager=request.user)
@@ -14669,6 +14736,30 @@ def plannedsession_view(request,id=0,rowerid=0,userid=0,
except IndexError: except IndexError:
trainingplan = None trainingplan = None
breadcrumbs = [
{
'url':reverse(plannedsessions_view,
kwargs={'userid':userid}),
'name': 'Plan'
},
{
'url': reverse(plannedsessions_view,
kwargs={'userid':userid}),
'name': 'Sessions'
},
{
'url':reverse(plannedsession_view,
kwargs={
'userid':userid,
'id':id,
}
),
'name': ps.id
}
]
return render(request,'plannedsessionview.html', return render(request,'plannedsessionview.html',
{ {
'psdict': psdict, 'psdict': psdict,
@@ -14679,6 +14770,8 @@ def plannedsession_view(request,id=0,rowerid=0,userid=0,
'sessionvalue','sessionunit','comment', 'sessionvalue','sessionunit','comment',
], ],
'workouts': ws, 'workouts': ws,
'active':'nav-plan',
'breadcrumbs':breadcrumbs,
'manager':m, 'manager':m,
'rower':r, 'rower':r,
'ratio':ratio, 'ratio':ratio,
@@ -15106,7 +15199,7 @@ def virtualevent_addboat_view(request,id=0):
{ {
'form':form, 'form':form,
'race':race, 'race':race,
'rowerid':r.id, 'userid':r.user.id,
'active': 'nav-racing', 'active': 'nav-racing',
}) })
@@ -15199,7 +15292,7 @@ def virtualevent_register_view(request,id=0):
{ {
'form':form, 'form':form,
'race':race, 'race':race,
'rowerid':r.id, 'userid':r.user.id,
}) })