From d343eb6748ffe630c0370398f5c3ee342fdc68a0 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 19 Oct 2018 16:11:45 +0200
Subject: [PATCH] sessions by date now working

---
 rowers/templates/trainingplan.html | 24 ++++++++++++------------
 rowers/urls.py                     |  4 ++++
 rowers/views.py                    | 15 +++++++++++++--
 3 files changed, 29 insertions(+), 14 deletions(-)

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 @@
                   /
                   <a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a>
                   /
-                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
+                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                 </td>
               </tr>
               {% else %}
@@ -51,7 +51,7 @@
                 &nbsp;
               </tr>
               <tr>
-                <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
+                <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
               </tr>
               {% endif %}
             </table>
@@ -99,7 +99,7 @@
                   /
                   <a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a>
                   /
-                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
+                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                 </td>
               </tr>
               {% else %}
@@ -108,7 +108,7 @@
               </tr>
               <tr>
                 <td colspan="4">
-                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
+                  <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                 </td>
               </tr>
               {% endif %}
@@ -144,7 +144,7 @@
                         /
                         <a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a>
                         /
-                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
+                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                       </td>
                     </tr>
                     {% endif %}
@@ -153,7 +153,7 @@
                       &nbsp;
                     </tr>
                     <tr>
-                      <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
+                      <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                     </tr>
                     {% endif %}
                   </table>
@@ -201,7 +201,7 @@
                         /
                         <a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a>
                         /
-                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
+                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                       </td>
                     </tr>
                     {% else %}
@@ -210,7 +210,7 @@
                     </tr>
                     <tr>
                       <td colspan="4">
-                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a>
+                        <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                       </td>
                     </tr>
                     {% endif %}
@@ -251,7 +251,7 @@
                             /
                             <a href="/rowers/deletemicrocycle/{{ microcycle.id }}/">delete</a>
                             /
-                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a>
+                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                           </td>
                         </tr>
                         {% endif %}
@@ -262,7 +262,7 @@
                         </tr>
                         <tr>
                           <td colspan="4">
-                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a>
+                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                           </td>
                         </tr>
                         {% endif %}
@@ -310,7 +310,7 @@
                             /
                             <a href="/rowers/deletemicrocycle/{{ microcycle.id }}">delete</a>
                             /
-                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a>
+                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                           </td>
                         </tr>
                         {% else %}
@@ -319,7 +319,7 @@
                         </tr>
                         <tr>
                           <td colspan="4">
-                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a>
+                            <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
                           </td>
                         </tr>
                         {% 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<userid>\d+)$',views.plannedsessions_print_view),
     url(r'^sessions/$',views.plannedsessions_view),
     url(r'^sessions/user/(?P<userid>\d+)$',views.plannedsessions_view),
+    url(r'^sessions/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',
+         views.plannedsessions_view),
+    url(r'^sessions/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/user/(?P<userid>\d+)$',
+         views.plannedsessions_view),
     url(r'^courses/(?P<id>\d+)/edit$',views.course_edit_view,
         name='course_edit_view'),
     url(r'^courses/(?P<id>\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,