diff --git a/rowers/templates/trainingplan.html b/rowers/templates/trainingplan.html
index d4f209c1..a7cdab89 100644
--- a/rowers/templates/trainingplan.html
+++ b/rowers/templates/trainingplan.html
@@ -43,7 +43,7 @@
/
delete
/
- sessions
+ sessions
{% else %}
@@ -51,7 +51,7 @@
- sessions
+ sessions
{% endif %}
@@ -99,7 +99,7 @@
/
delete
/
- sessions
+ sessions
{% else %}
@@ -108,7 +108,7 @@
|
- sessions
+ sessions
|
{% endif %}
@@ -144,7 +144,7 @@
/
delete
/
- sessions
+ sessions
{% endif %}
@@ -153,7 +153,7 @@
- sessions
+ sessions
{% endif %}
@@ -201,7 +201,7 @@
/
delete
/
- sessions
+ sessions
{% else %}
@@ -210,7 +210,7 @@
|
- sessions
+ sessions
|
{% endif %}
@@ -251,7 +251,7 @@
/
delete
/
- sessions
+ sessions
{% endif %}
@@ -262,7 +262,7 @@
|
- sessions
+ sessions
|
{% endif %}
@@ -310,7 +310,7 @@
/
delete
/
- sessions
+ sessions
{% else %}
@@ -319,7 +319,7 @@
|
- sessions
+ sessions
|
{% endif %}
diff --git a/rowers/urls.py b/rowers/urls.py
index 498829c0..04b75c9a 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -483,6 +483,10 @@ urlpatterns = [
url(r'^sessions/print/user/(?P\d+)$',views.plannedsessions_print_view),
url(r'^sessions/$',views.plannedsessions_view),
url(r'^sessions/user/(?P\d+)$',views.plannedsessions_view),
+ url(r'^sessions/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',
+ views.plannedsessions_view),
+ url(r'^sessions/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)$',
+ views.plannedsessions_view),
url(r'^courses/(?P\d+)/edit$',views.course_edit_view,
name='course_edit_view'),
url(r'^courses/(?P\d+)/delete$',views.course_delete_view),
diff --git a/rowers/views.py b/rowers/views.py
index 7696a75e..c3cd5f85 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -6678,7 +6678,6 @@ def workouts_view(request,message='',successmessage='',
'name':'Workouts'
},
]
-
return render(request, 'list_workouts.html',
{'workouts': workouts,
'active': 'nav-workouts',
@@ -14395,7 +14394,7 @@ def plannedsessions_coach_view(request,
@login_required()
def plannedsessions_view(request,
- userid=0):
+ userid=0,startdatestring='',enddatestring=''):
r = getrequestrower(request,userid=userid)
@@ -14407,6 +14406,18 @@ def plannedsessions_view(request,
startdate,enddate = get_dates_timeperiod(timeperiod)
+ if startdatestring:
+ try:
+ startdate = iso8601.parse_date(startdatestring)
+ except ParseError:
+ pass
+
+ if enddatestring:
+ try:
+ enddate = iso8601.parse_date(enddatestring)
+ except ParseError:
+ pass
+
try:
trainingplan = TrainingPlan.objects.filter(
startdate__lte = startdate,