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

bug fix

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-17 13:29:46 +02:00
parent 5ff9a81c63
commit 4f1ba0e802
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/plannedsessionview.html
View File

@@ -81,7 +81,7 @@
<td> {{ workout.date|date:"Y-m-d" }} </td> <td> {{ workout.date|date:"Y-m-d" }} </td>
<td> <td>
<div class="tooltip"> <div class="tooltip">
<a href={% url manager.defaultlandingpage id=workout.id %}> <a href="{% url manager.defaultlandingpage id=workout.id %}">
{{ workout.name }} {{ workout.name }}
</a> </a>
<span class="tooltiptext">{{ workout.notes }}</span> <span class="tooltiptext">{{ workout.notes }}</span>

15
rowers/views.py
View File

@@ -13868,7 +13868,6 @@ def plannedsession_create_view(request,
url = reverse(plannedsession_create_view, url = reverse(plannedsession_create_view,
kwargs = { kwargs = {
'userid':r.user.id, 'userid':r.user.id,
'timeperiod':timeperiod,
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
@@ -14057,7 +14056,7 @@ def plannedsession_multicreate_view(request,
# Manager creates sessions for entire team # Manager creates 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_teamcreate_view(request,timeperiod='thisweek', def plannedsession_teamcreate_view(request,
teamid=0,userid=0): teamid=0,userid=0):
therower = getrequestrower(request,userid=userid) therower = getrequestrower(request,userid=userid)
@@ -14139,10 +14138,10 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
add_rower_session(r,ps) add_rower_session(r,ps)
url = reverse(plannedsession_teamcreate_view, url = reverse(plannedsession_teamcreate_view)
kwargs = { if when:
'timeperiod':timeperiod, url += '?when='+when
})
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
initial = { initial = {
@@ -14843,6 +14842,7 @@ def plannedsession_view(request,id=0,userid=0):
coursediv = '' coursediv = ''
m = ps.manager m = ps.manager
mm = Rower.objects.get(user=m)
if ps.manager != request.user: if ps.manager != request.user:
if r.rowerplan == 'coach': if r.rowerplan == 'coach':
@@ -14967,7 +14967,6 @@ def plannedsession_view(request,id=0,userid=0):
} }
] ]
return render(request,'plannedsessionview.html', return render(request,'plannedsessionview.html',
{ {
'psdict': psdict, 'psdict': psdict,
@@ -14980,7 +14979,7 @@ def plannedsession_view(request,id=0,userid=0):
'workouts': ws, 'workouts': ws,
'active':'nav-plan', 'active':'nav-plan',
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'manager':m, 'manager':mm,
'rower':r, 'rower':r,
'ratio':ratio, 'ratio':ratio,
'plan':trainingplan, 'plan':trainingplan,