+ -
{% csrf_token %}
-
-
Select Team
-
-
- {{ teamform.as_table }}
-
- {% if plannedsessions %}
-
Team Plan Sessions
-
-
-
-
- | After |
- Before |
- Name |
- Value |
- |
- Edit |
- Clone |
- Delete |
-
-
-
- {% for ps in plannedsessions %}
-
- | {{ ps.startdate|date:"Y-m-d" }} |
- {{ ps.enddate|date:"Y-m-d" }} |
-
- {% if ps.name != '' %}
- {{ ps.name }}
- {% else %}
- Unnamed Session
- {% endif %}
- |
- {{ ps.sessionvalue }} |
- {{ ps.sessionunit }} |
-
- Edit
- |
-
- Clone
- |
-
-
- Delete
- |
-
- {% endfor %}
-
-
-
- {% endif %}
-
-
New Session
+
Select Team
+
+
+ {{ teamform.as_table }}
+
+ {% if plannedsessions %}
+
Team Plan Sessions
+
+
+
+
+ | After |
+ Before |
+ Name |
+ Value |
+ |
+ Edit |
+ Clone |
+ Delete |
+
+
+
+ {% for ps in plannedsessions %}
+
+ | {{ ps.startdate|date:"Y-m-d" }} |
+ {{ ps.enddate|date:"Y-m-d" }} |
+
+ {% if ps.name != '' %}
+ {{ ps.name }}
+ {% else %}
+ Unnamed Session
+ {% endif %}
+ |
+ {{ ps.sessionvalue }} |
+ {{ ps.sessionunit }} |
+
+ Edit
+ |
+
+ Clone
+ |
+
+
+ Delete
+ |
+
+ {% endfor %}
+
+
+
+ {% endif %}
+
+
-
+
New Session
-
-
- Please correct the error{{ form.errors|pluralize }} below.
-
- {% endif %}
-
-
Stroke Data for workout {{ id }}
+{% block main %}
+{% if form.errors %}
+
+ Please correct the error{{ form.errors|pluralize }} below.
+
+{% endif %}
+
Stroke Data for workout
-
|
- edit
+ edit
/
- delete
+ delete
/
sessions
|
@@ -95,9 +95,9 @@
|
- edit
+ edit
/
- delete
+ delete
/
sessions
|
@@ -140,9 +140,9 @@
|
- edit
+ edit
/
- delete
+ delete
/
sessions
|
@@ -197,9 +197,9 @@
|
- edit
+ edit
/
- delete
+ delete
/
sessions
|
@@ -247,9 +247,9 @@
|
- edit
+ edit
/
- delete
+ delete
/
sessions
|
diff --git a/rowers/templates/trainingplan_edit.html b/rowers/templates/trainingplan_edit.html
index 1dc67326..3f24d8d7 100644
--- a/rowers/templates/trainingplan_edit.html
+++ b/rowers/templates/trainingplan_edit.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
@@ -8,25 +8,20 @@
{% endblock %}
-{% block content %}
-
+{% block main %}
-
- {% endblock %}
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_plan.html' %}
+{% endblock %}
+
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 223736a2..66fde5a2 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -57,7 +57,10 @@ def secondstotimestring(tdelta):
@register.filter
def aantalcomments(workout):
- comments = WorkoutComment.objects.filter(workout=workout)
+ try:
+ comments = WorkoutComment.objects.filter(workout=workout)
+ except:
+ return 0
aantalcomments = len(comments)
diff --git a/rowers/urls.py b/rowers/urls.py
index 510e2008..a88f39ad 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -415,9 +415,9 @@ urlpatterns = [
url(r'^createplan/$',views.rower_create_trainingplan),
url(r'^createplan/user/(?P\d+)/$',views.rower_create_trainingplan),
url(r'^deleteplan/(?P\d+)$',views.TrainingPlanDelete.as_view()),
- url(r'^deletemicrocycle/(?P\d+)$',views.MicroCycleDelete.as_view()),
- url(r'^deletemesocycle/(?P\d+)$',views.MesoCycleDelete.as_view()),
- url(r'^deletemacrocycle/(?P\d+)$',views.MacroCycleDelete.as_view()),
+ url(r'^deletemicrocycle/(?P\d+)/$',views.MicroCycleDelete.as_view()),
+ url(r'^deletemesocycle/(?P\d+)/$',views.MesoCycleDelete.as_view()),
+ url(r'^deletemacrocycle/(?P\d+)/$',views.MacroCycleDelete.as_view()),
# url(r'^deleteplan/(?P\d+)$',views.rower_delete_trainingplan),
url(r'^plan/(?P\d+)/$',views.rower_trainingplan_view),
url(r'^plan/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view),
@@ -427,22 +427,24 @@ urlpatterns = [
url(r'^plan/(?P\d+)/meso/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view),
url(r'^plan/(?P\d+)/macro/(?P\d+)/$',views.rower_trainingplan_view),
url(r'^plan/(?P\d+)/macro/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view),
- url(r'^macrocycle/(?P\d+)$',views.TrainingMacroCycleUpdate.as_view()),
- url(r'^mesocycle/(?P\d+)$',views.TrainingMesoCycleUpdate.as_view()),
- url(r'^microcycle/(?P\d+)$',views.TrainingMicroCycleUpdate.as_view()),
- url(r'^deletetarget/(?P\d+)$',views.rower_delete_trainingtarget),
- url(r'^editplan/(?P\d+)$',views.TrainingPlanUpdate.as_view()),
- url(r'^edittarget/(?P\d+)$',views.TrainingTargetUpdate.as_view()),
+ url(r'^macrocycle/(?P\d+)/$',views.TrainingMacroCycleUpdate.as_view(),
+ name='macrocycle_update_view'),
+ url(r'^mesocycle/(?P\d+)/$',views.TrainingMesoCycleUpdate.as_view(),
+ name='mesocycle_update_view'),
+ url(r'^microcycle/(?P\d+)/$',views.TrainingMicroCycleUpdate.as_view(),
+ name='microcycle_update_view'),
+ url(r'^deletetarget/(?P\d+)/$',views.rower_delete_trainingtarget),
+ url(r'^editplan/(?P\d+)$',views.TrainingPlanUpdate.as_view(),
+ name='trainingplan_update_view'),
+ url(r'^edittarget/(?P\d+)/$',views.TrainingTargetUpdate.as_view(),
+ name='trainingtarget_update_view'),
url(r'^workout/(?P\d+)/test\_strokedata$',views.strokedataform),
-
- url(r'^sessions/teamcreate$',views.plannedsession_teamcreate_view),
- url(r'^sessions/teamcreate/(?P[\w\ ]+.*)$',
+ url(r'^sessions/teamcreate/user/(?P\d+)/$',views.plannedsession_teamcreate_view),
+ url(r'^sessions/teamcreate/team/(?P\d+)/user/(?P\d+)/$',
views.plannedsession_teamcreate_view),
- url(r'^sessions/teamcreate/(?P[\w\ ]+.*)/team/(?P\d+)$',
+ url(r'^sessions/teamcreate/$',views.plannedsession_teamcreate_view),
+ url(r'^sessions/teamcreate/team/$',
views.plannedsession_teamcreate_view),
- url(r'^sessions/teamcreate/team/(?P\d+)$',
- views.plannedsession_teamcreate_view),
-
url(r'^sessions/teamedit/(?P\d+)$',views.plannedsession_teamedit_view),
url(r'^sessions/teamedit/(?P\d+)/(?P[\w\ ]+.*)$',views.plannedsession_teamedit_view),
diff --git a/rowers/views.py b/rowers/views.py
index 1289cec3..fbd9ba5c 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -12663,13 +12663,25 @@ def trydf(df,aantal,column):
# Stroke data form to test API upload
@login_required()
def strokedataform(request,id=0):
+
+ try:
+ id=int(id)
+ except ValueError:
+ id = 0
+
+ try:
+ w = Workout.objects.get(id=id)
+ except Workout.DoesNotExist:
+ raise Http404("Workout doesn't exist")
+
if request.method == 'GET':
form = StrokeDataForm()
return render(request, 'strokedata_form.html',
{
'form':form,
'teams':get_my_teams(request.user),
- 'id':int(id),
+ 'id':id,
+ 'workout':w,
})
elif request.method == 'POST':
form = StrokeDataForm()
@@ -12678,7 +12690,8 @@ def strokedataform(request,id=0):
{
'form':form,
'teams':get_my_teams(request.user),
- 'id':int(id),
+ 'id':id,
+ 'workout':w,
})
# Process the POSTed stroke data according to the API definition
@@ -13860,9 +13873,16 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
@user_passes_test(iscoachmember,login_url="/rowers/planmembership/",
redirect_field_name=None)
def plannedsession_teamcreate_view(request,timeperiod='thisweek',
- teamid=0):
+ teamid=0,userid=0):
+ therower = getrequestrower(request,userid=userid)
+ when = request.GET.get('when')
+ if when:
+ timeperiod = when
+ else:
+ timeperiod = 'thisweek'
+
teams = Team.objects.filter(manager=request.user)
if len(teams)>0:
teamchoices = [(team.id, team.name) for team in teams]
@@ -13940,7 +13960,13 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
})
return HttpResponseRedirect(url)
else:
- sessioncreateform = PlannedSessionForm()
+ initial = {
+ 'startdate':startdate,
+ 'enddate':enddate,
+ 'preferreddate':startdate,
+ }
+
+ sessioncreateform = PlannedSessionForm(initial=initial)
sessionteamselectform = PlannedSessionTeamForm(
request.user
)
@@ -13953,7 +13979,8 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
'teamform':sessionteamselectform,
'timeperiod':timeperiod,
'plannedsessions':sps,
- 'rower':getrower(request.user),
+ 'rower':therower,
+ 'active':'nav-plan'
})
# Manager edits sessions for entire team
@@ -15584,6 +15611,51 @@ class MicroCycleDelete(DeleteView):
model = TrainingMicroCycle
template_name = 'trainingplan_delete.html'
+ # extra parameters
+ def get_context_data(self, **kwargs):
+ context = super(MicroCycleDelete, self).get_context_data(**kwargs)
+
+ if 'userid' in kwargs:
+ userid = kwargs['userid']
+ else:
+ userid=0
+
+ breadcrumbs = [
+ {
+ 'url':reverse(plannedsessions_view,
+ kwargs={'userid':userid}),
+ 'name': 'Plan'
+ },
+ {
+ 'url':reverse(rower_trainingplan_view,
+ kwargs={'userid':userid,
+ 'id':self.object.plan.plan.plan.id}),
+ 'name': self.object.plan.plan.plan.name
+ },
+ {
+ 'url':reverse('macrocycle_update_view',
+ kwargs={'pk':self.object.plan.plan.pk}),
+ 'name': self.object.plan.plan.name
+ },
+ {
+ 'url':reverse('mesocycle_update_view',
+ kwargs={'pk':self.object.plan.pk}),
+ 'name': self.object.plan.name
+ },
+ {
+ 'url':reverse('microcycle_update_view',
+ kwargs={'pk':self.object.pk}),
+ 'name': self.object.name
+ }
+
+ ]
+
+ context['active'] = 'nav-plan'
+ context['breadcrumbs'] = breadcrumbs
+ context['rower'] = getrequestrower(self.request,userid=userid)
+
+ return context
+
def get_success_url(self):
plan = self.object.plan.plan.plan
createmacrofillers(plan)
@@ -15605,6 +15677,46 @@ class MesoCycleDelete(DeleteView):
model = TrainingMesoCycle
template_name = 'trainingplan_delete.html'
+ # extra parameters
+ def get_context_data(self, **kwargs):
+ context = super(MesoCycleDelete, self).get_context_data(**kwargs)
+
+ if 'userid' in kwargs:
+ userid = kwargs['userid']
+ else:
+ userid=0
+
+ breadcrumbs = [
+ {
+ 'url':reverse(plannedsessions_view,
+ kwargs={'userid':userid}),
+ 'name': 'Plan'
+ },
+ {
+ 'url':reverse(rower_trainingplan_view,
+ kwargs={'userid':userid,
+ 'id':self.object.plan.plan.id}),
+ 'name': self.object.plan.plan.name
+ },
+ {
+ 'url':reverse('macrocycle_update_view',
+ kwargs={'pk':self.object.plan.pk}),
+ 'name': self.object.plan.name
+ },
+ {
+ 'url':reverse('mesocycle_update_view',
+ kwargs={'pk':self.object.pk}),
+ 'name': self.object.name
+ }
+
+ ]
+
+ context['active'] = 'nav-plan'
+ context['breadcrumbs'] = breadcrumbs
+ context['rower'] = getrequestrower(self.request,userid=userid)
+
+ return context
+
def get_success_url(self):
plan = self.object.plan.plan
thismacroid = self.object.plan.pk
@@ -15725,6 +15837,40 @@ class MacroCycleDelete(DeleteView):
model = TrainingMacroCycle
template_name = 'trainingplan_delete.html'
+ # extra parameters
+ def get_context_data(self, **kwargs):
+ context = super(MacroCycleDelete, self).get_context_data(**kwargs)
+
+ if 'userid' in kwargs:
+ userid = kwargs['userid']
+ else:
+ userid=0
+
+ breadcrumbs = [
+ {
+ 'url':reverse(plannedsessions_view,
+ kwargs={'userid':userid}),
+ 'name': 'Plan'
+ },
+ {
+ 'url':reverse(rower_trainingplan_view,
+ kwargs={'userid':userid,
+ 'id':self.object.plan.id}),
+ 'name': self.object.plan.name
+ },
+ {
+ 'url':reverse('macrocycle_update_view',
+ kwargs={'pk':self.object.pk}),
+ 'name': self.object.name
+ }
+ ]
+
+ context['active'] = 'nav-plan'
+ context['breadcrumbs'] = breadcrumbs
+ context['rower'] = getrequestrower(self.request,userid=userid)
+
+ return context
+
def get_success_url(self):
plan = self.object.plan
createmacrofillers(plan)
@@ -15750,6 +15896,13 @@ def rower_trainingplan_view(request,
thismicroid=0,
thismacroid=0,
thismesoid=0):
+
+ when = request.GET.get('when')
+ if when:
+ startdate,enddate = get_dates_timeperiod(when)
+ else:
+ startdate = datetime.date.today()
+
try:
plan = TrainingPlan.objects.get(id=id)
except TrainingPlan.DoesNotExist:
@@ -15901,7 +16054,7 @@ def rower_trainingplan_view(request,
thismicro = TrainingMicroCycle.objects.get(id=int(thismicroid))
else:
if not thismacroid and not thismesoid:
- thismicro = get_todays_micro(plan)
+ thismicro = get_todays_micro(plan,thedate=startdate)
else:
thismicro = None
@@ -15935,6 +16088,39 @@ class TrainingMacroCycleUpdate(UpdateView):
template_name = 'trainingplan_edit.html'
form_class = TrainingMacroCycleForm
+ # extra parameters
+ def get_context_data(self, **kwargs):
+ context = super(TrainingMacroCycleUpdate, self).get_context_data(**kwargs)
+
+ if 'userid' in kwargs:
+ userid = kwargs['userid']
+ else:
+ userid=0
+
+ breadcrumbs = [
+ {
+ 'url':reverse(plannedsessions_view,
+ kwargs={'userid':userid}),
+ 'name': 'Plan'
+ },
+ {
+ 'url':reverse(rower_trainingplan_view,
+ kwargs={'userid':userid,
+ 'id':self.object.plan.id}),
+ 'name': self.object.plan.name
+ },
+ {
+ 'url':reverse('macrocycle_update_view',
+ kwargs={'pk':self.object.pk}),
+ 'name': self.object.name
+ }
+ ]
+
+ context['active'] = 'nav-plan'
+ context['breadcrumbs'] = breadcrumbs
+ context['rower'] = getrequestrower(self.request,userid=userid)
+
+ return context
def get_success_url(self):
plan = self.object.plan
@@ -15967,6 +16153,45 @@ class TrainingMesoCycleUpdate(UpdateView):
template_name = 'trainingplan_edit.html'
form_class = TrainingMesoCycleForm
+ # extra parameters
+ def get_context_data(self, **kwargs):
+ context = super(TrainingMesoCycleUpdate, self).get_context_data(**kwargs)
+
+ if 'userid' in kwargs:
+ userid = kwargs['userid']
+ else:
+ userid=0
+
+ breadcrumbs = [
+ {
+ 'url':reverse(plannedsessions_view,
+ kwargs={'userid':userid}),
+ 'name': 'Plan'
+ },
+ {
+ 'url':reverse(rower_trainingplan_view,
+ kwargs={'userid':userid,
+ 'id':self.object.plan.plan.id}),
+ 'name': self.object.plan.plan.name
+ },
+ {
+ 'url':reverse('macrocycle_update_view',
+ kwargs={'pk':self.object.plan.pk}),
+ 'name': self.object.plan.name
+ },
+ {
+ 'url':reverse('mesocycle_update_view',
+ kwargs={'pk':self.object.pk}),
+ 'name': self.object.name
+ }
+
+ ]
+
+ context['active'] = 'nav-plan'
+ context['breadcrumbs'] = breadcrumbs
+ context['rower'] = getrequestrower(self.request,userid=userid)
+
+ return context
def get_success_url(self):
plan = self.object.plan
@@ -16002,6 +16227,50 @@ class TrainingMicroCycleUpdate(UpdateView):
template_name = 'trainingplan_edit.html'
form_class = TrainingMicroCycleForm
+ # extra parameters
+ def get_context_data(self, **kwargs):
+ context = super(TrainingMicroCycleUpdate, self).get_context_data(**kwargs)
+
+ if 'userid' in kwargs:
+ userid = kwargs['userid']
+ else:
+ userid=0
+
+ breadcrumbs = [
+ {
+ 'url':reverse(plannedsessions_view,
+ kwargs={'userid':userid}),
+ 'name': 'Plan'
+ },
+ {
+ 'url':reverse(rower_trainingplan_view,
+ kwargs={'userid':userid,
+ 'id':self.object.plan.plan.plan.id}),
+ 'name': self.object.plan.plan.plan.name
+ },
+ {
+ 'url':reverse('macrocycle_update_view',
+ kwargs={'pk':self.object.plan.plan.pk}),
+ 'name': self.object.plan.plan.name
+ },
+ {
+ 'url':reverse('mesocycle_update_view',
+ kwargs={'pk':self.object.plan.pk}),
+ 'name': self.object.plan.name
+ },
+ {
+ 'url':reverse('microcycle_update_view',
+ kwargs={'pk':self.object.pk}),
+ 'name': self.object.name
+ }
+
+ ]
+
+ context['active'] = 'nav-plan'
+ context['breadcrumbs'] = breadcrumbs
+ context['rower'] = getrequestrower(self.request,userid=userid)
+
+ return context
def get_success_url(self):
plan = self.object.plan