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

make it pass tests (planviews)

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-14 21:25:19 +01:00
parent abb7b85f74
commit 5482e52238
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/views/planviews.py
View File

@@ -869,7 +869,7 @@ def plannedsession_teamedit_view(request,
url = reverse(plannedsession_teamedit_view,
kwargs = {
'sessionid':sessionid,
'id':id,
})
startdatestring = startdate.strftime('%Y-%m-%d')
@@ -1491,7 +1491,7 @@ def plannedsession_teamclone_view(request,id=0):
url = reverse(plannedsession_teamedit_view,
kwargs = {
'sessionid':ps.id,
'id':ps.id,
'userid':r.user.id,
}
)
@@ -1557,7 +1557,7 @@ def plannedsession_edit_view(request,id=0,userid=0):
if ps.team.all() or ps.rower.all().count()>1:
url = reverse(plannedsession_teamedit_view,
kwargs={
'sessionid':id,
'id':id,
})
return HttpResponseRedirect(url)
@@ -1910,7 +1910,6 @@ class PlannedSessionDelete(DeleteView):
message="This functionality requires a Coach or Self-Coach plan",
redirect_field_name=None)
def rower_create_trainingplan(request,userid=0):
therower = getrequestrower(request,userid=userid)
theuser = therower.user
themanager = getrower(request.user)
@@ -2349,7 +2348,7 @@ def rower_trainingplan_execution_view(request,
@user_passes_test(isplanmember,login_url="/rowers/paidplans",
message="This functionality requires a Coach or Self-Coach plan",
redirect_field_name=None)
@permission_required('plan.can_view',fn=get_plan_by_pk,raise_exception=True)
@permission_required('plan.view_plan',fn=get_plan_by_pk,raise_exception=True)
def rower_trainingplan_view(request,
id=0,
userid=0,
@@ -2361,6 +2360,7 @@ def rower_trainingplan_view(request,
startdate,enddate = get_dates_timeperiod(request)
plan = get_object_or_404(TrainingPlan,pk=id)
r = getrequestrower(request,userid=userid)
createmacrofillers(plan)
macrocycles = TrainingMacroCycle.objects.filter(