diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html
index fb967acd..fdb42941 100644
--- a/rowers/templates/plannedsessionview.html
+++ b/rowers/templates/plannedsessionview.html
@@ -81,7 +81,7 @@
{{ workout.date|date:"Y-m-d" }} |
-
+
{{ workout.name }}
{{ workout.notes }}
diff --git a/rowers/views.py b/rowers/views.py
index 0e758f81..0b761670 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -13868,7 +13868,6 @@ def plannedsession_create_view(request,
url = reverse(plannedsession_create_view,
kwargs = {
'userid':r.user.id,
- 'timeperiod':timeperiod,
})
return HttpResponseRedirect(url)
else:
@@ -14057,7 +14056,7 @@ def plannedsession_multicreate_view(request,
# Manager creates sessions for entire team
@user_passes_test(iscoachmember,login_url="/rowers/planmembership/",
redirect_field_name=None)
-def plannedsession_teamcreate_view(request,timeperiod='thisweek',
+def plannedsession_teamcreate_view(request,
teamid=0,userid=0):
therower = getrequestrower(request,userid=userid)
@@ -14139,10 +14138,10 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
add_rower_session(r,ps)
- url = reverse(plannedsession_teamcreate_view,
- kwargs = {
- 'timeperiod':timeperiod,
- })
+ url = reverse(plannedsession_teamcreate_view)
+ if when:
+ url += '?when='+when
+
return HttpResponseRedirect(url)
else:
initial = {
@@ -14843,6 +14842,7 @@ def plannedsession_view(request,id=0,userid=0):
coursediv = ''
m = ps.manager
+ mm = Rower.objects.get(user=m)
if ps.manager != request.user:
if r.rowerplan == 'coach':
@@ -14967,7 +14967,6 @@ def plannedsession_view(request,id=0,userid=0):
}
]
-
return render(request,'plannedsessionview.html',
{
'psdict': psdict,
@@ -14980,7 +14979,7 @@ def plannedsession_view(request,id=0,userid=0):
'workouts': ws,
'active':'nav-plan',
'breadcrumbs':breadcrumbs,
- 'manager':m,
+ 'manager':mm,
'rower':r,
'ratio':ratio,
'plan':trainingplan,
|