From 2f705d0aeae74cf143b714f0bcb830658be6a282 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 9 Nov 2018 14:07:18 +0100
Subject: [PATCH] all plan pages now have date range form

---
 .../.#plannedsessions_multiclone_select.html  |  1 +
 .../templates/plannedsession_multicreate.html | 10 ++++
 rowers/templates/plannedsessioncreate.html    | 44 ++++++++------
 rowers/templates/plannedsessionedit.html      | 15 ++++-
 rowers/templates/plannedsessions.html         |  2 +-
 .../plannedsessions_multiclone_select.html    |  9 +++
 rowers/templates/plannedsessionscoach.html    |  9 +++
 rowers/templates/plannedsessionsmanage.html   | 10 ++++
 .../templates/plannedsessionteamcreate.html   | 10 ++++
 rowers/templates/plannedsessionteamedit.html  | 11 ++++
 rowers/views.py                               | 57 +++++++++++++++++--
 11 files changed, 152 insertions(+), 26 deletions(-)
 create mode 100644 rowers/templates/.#plannedsessions_multiclone_select.html

diff --git a/rowers/templates/.#plannedsessions_multiclone_select.html b/rowers/templates/.#plannedsessions_multiclone_select.html
new file mode 100644
index 00000000..1fc71768
--- /dev/null
+++ b/rowers/templates/.#plannedsessions_multiclone_select.html
@@ -0,0 +1 @@
+E408191@CZ27LT9RCGN72.15176:1541580768
\ No newline at end of file
diff --git a/rowers/templates/plannedsession_multicreate.html b/rowers/templates/plannedsession_multicreate.html
index c445b54b..03716395 100644
--- a/rowers/templates/plannedsession_multicreate.html
+++ b/rowers/templates/plannedsession_multicreate.html
@@ -8,6 +8,16 @@
 <h1>Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
 <ul class="main-content">
+  <li>
+    <p>
+      <form enctype="multipart/form-data" method="get">
+        <table>
+          {{ dateform.as_table }}
+        </table>
+        <input type="Submit" value="Set Date Range">
+      </form>
+    </p>
+  </li>
   <li class="grid_4">
     <p>
       On this page, you can create and edit sessions for an entire time
diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html
index a47cbfe2..1e7b0900 100644
--- a/rowers/templates/plannedsessioncreate.html
+++ b/rowers/templates/plannedsessioncreate.html
@@ -8,8 +8,34 @@
 <h1>Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
 <p>{{ timeperiod }}</p>
+<p>
+  <form enctype="multipart/form-data" method="get">
+    <table>
+      {{ dateform.as_table }}
+    </table>
+    <input type="Submit" value="Set Date Range">
+  </form>
+</p>
 
 <ul class="main-content">
+  <li class="grid_2">
+    <h1>New Session</h1>
+    <form enctype="multipart/form-data" action=""
+          method="post">
+      {% if form.errors %}
+      <p style="color: red;">
+        Please correct the error{{ form.errors|pluralize }} below.
+      </p>
+      {% endif %}
+      
+      <table>
+        {{ form.as_table }}
+      </table>
+      {% csrf_token %}
+      <input class="button green" type="submit" value="Save">
+    </form>
+    <div class="padded" id="id_guidance">
+  </li>
   <li class="grid_2">
     <h1>Plan</h1>
     <p>
@@ -59,24 +85,6 @@
       </tbody>
     </table>
   </li>
-  <li class="grid_2">
-    <h1>New Session</h1>
-    <form enctype="multipart/form-data" action=""
-          method="post">
-      {% if form.errors %}
-      <p style="color: red;">
-        Please correct the error{{ form.errors|pluralize }} below.
-      </p>
-      {% endif %}
-      
-      <table>
-        {{ form.as_table }}
-      </table>
-      {% csrf_token %}
-      <input class="button green" type="submit" value="Save">
-    </form>
-    <div class="padded" id="id_guidance">
-  </li>
 </ul>
 
 {% endblock %}
diff --git a/rowers/templates/plannedsessionedit.html b/rowers/templates/plannedsessionedit.html
index af68b856..edb574c7 100644
--- a/rowers/templates/plannedsessionedit.html
+++ b/rowers/templates/plannedsessionedit.html
@@ -6,16 +6,27 @@
 
 {% block main %}
 <h1>Edit Session</h1>
-{% if user.is_authenticated and user|is_manager %}
-{% endif %}
+
+<p>
+  <form enctype="multipart/form-data" method="get">
+    <table>
+      {{ dateform.as_table }}
+    </table>
+    <input type="Submit" value="Set Date Range">
+  </form>
+</p>
+
+
 <ul class="main-content">
   <li class="grid_2">
     <h2>{{ thesession.name }}</h2>
+      {% if user.is_authenticated and user|is_manager %}
     <p>
       <a href="/rowers/sessions/teamedit/{{ thesession.id }}/">
         Assign to my Teams
       </a>
     </p>
+    {% endif %}
     <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
       {% if form.errors %}
       <p style="color: red;">
diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html
index 2055d467..b2f0fdca 100644
--- a/rowers/templates/plannedsessions.html
+++ b/rowers/templates/plannedsessions.html
@@ -15,7 +15,7 @@
         <table>
           {{ dateform.as_table }}
         </table>
-        <input type="Submit">
+        <input type="Submit" value="Set Date Range">
       </form>
     </p>
   </li>
diff --git a/rowers/templates/plannedsessions_multiclone_select.html b/rowers/templates/plannedsessions_multiclone_select.html
index 7dd17c53..e39e9037 100644
--- a/rowers/templates/plannedsessions_multiclone_select.html
+++ b/rowers/templates/plannedsessions_multiclone_select.html
@@ -66,6 +66,15 @@
 
 <h1>Clone Multiple Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
+<p>
+  <form enctype="multipart/form-data" method="get">
+    <table>
+      {{ dateform.as_table }}
+    </table>
+    <input type="Submit" value="Set Date Range">
+  </form>
+</p>
+
 
 <form enctype="multipart/form-data" method="post">
   <ul class="main-content">
diff --git a/rowers/templates/plannedsessionscoach.html b/rowers/templates/plannedsessionscoach.html
index c4416ec4..8e552d9a 100644
--- a/rowers/templates/plannedsessionscoach.html
+++ b/rowers/templates/plannedsessionscoach.html
@@ -11,6 +11,15 @@
 <h1>Coach Overview</h1>
 {% endif %}
 
+<p>
+  <form enctype="multipart/form-data" method="get">
+    <table>
+      {{ dateform.as_table }}
+    </table>
+    <input type="Submit" value="Set Date Range">
+  </form>
+</p>
+
 
 <table width="90%" class="listtable">
   <thead>
diff --git a/rowers/templates/plannedsessionsmanage.html b/rowers/templates/plannedsessionsmanage.html
index 35311a35..eb551dc8 100644
--- a/rowers/templates/plannedsessionsmanage.html
+++ b/rowers/templates/plannedsessionsmanage.html
@@ -19,6 +19,16 @@
 {% block main %}
 <h1>Manage Plan Execution for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
+<p>
+  <form enctype="multipart/form-data" method="get">
+    <table>
+      {{ dateform.as_table }}
+    </table>
+    <input type="Submit" value="Set Date Range">
+  </form>
+</p>
+
+
 <p>Select one session on the left, and one or more workouts on the right
   to match the workouts to the session. For tests and training sessions,
   the selected workouts must be done on the same date. For all sessions,
diff --git a/rowers/templates/plannedsessionteamcreate.html b/rowers/templates/plannedsessionteamcreate.html
index 69f0f2fe..0a437804 100644
--- a/rowers/templates/plannedsessionteamcreate.html
+++ b/rowers/templates/plannedsessionteamcreate.html
@@ -7,6 +7,16 @@
 {% block main %}
 <h1>Create Team Session</h1>
 
+<p>
+  <form enctype="multipart/form-data" method="get">
+    <table>
+      {{ dateform.as_table }}
+    </table>
+    <input type="Submit" value="Set Date Range">
+  </form>
+</p>
+
+
 <form enctype="multipart/form-data" action="" method="post">
   {% if form.errors %}
   <p style="color: red;">
diff --git a/rowers/templates/plannedsessionteamedit.html b/rowers/templates/plannedsessionteamedit.html
index a01f5c74..e36ebf79 100644
--- a/rowers/templates/plannedsessionteamedit.html
+++ b/rowers/templates/plannedsessionteamedit.html
@@ -6,6 +6,17 @@
 
 {% block main %}
 <h1>Edit Team Session</h1>
+
+<p>
+  <form enctype="multipart/form-data" method="get">
+    <table>
+      {{ dateform.as_table }}
+    </table>
+    <input type="Submit" value="Set Date Range">
+  </form>
+</p>
+
+
 <form enctype="multipart/form-data" action="" method="post">
   {% if form.errors %}
   <p style="color: red;">
diff --git a/rowers/views.py b/rowers/views.py
index f93683a3..009f2bc8 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -14091,6 +14091,11 @@ def plannedsession_multiclone_view(
             'name': 'Clone Multiple Sessions'
             }
         ]
+
+    dateform = DateRangeForm(initial={
+        'startdate':startdate,
+        'enddate':enddate,
+        })
     
     return render(request, 'plannedsessions_multiclone_select.html',
                   {'plannedsessions':sps,
@@ -14227,11 +14232,17 @@ def plannedsession_create_view(request,
         trainingplan = None
 
     timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
+
+    dateform = DateRangeForm(initial={
+        'startdate':startdate,
+        'enddate':enddate,
+        })
         
     return render(request,'plannedsessioncreate.html',
                   {
                       'teams':get_my_teams(request.user),
                       'plan':trainingplan,
+                      'dateform':dateform,
                       'form':sessioncreateform,
                       'active':'nav-plan',
                       'plannedsessions':sps,
@@ -14330,17 +14341,24 @@ def plannedsession_multicreate_view(request,
             }
         ]
 
+    dateform = DateRangeForm(initial={
+        'startdate':startdate,
+        'enddate':enddate
+        })
+
     context = {
         'ps_formset':ps_formset,
         'breadcrumbs':breadcrumbs,
         'rower':r,
         'active':'nav-plan',
+        'dateform':dateform,
         'plan':trainingplan,
         'timeperiod':timeperiod,
         'teams':get_my_teams(request.user),
         'extrasessions': extrasessions+1
         }
 
+
     return render(request,'plannedsession_multicreate.html',context)
 
 # Manager creates sessions for entire team
@@ -14476,11 +14494,17 @@ def plannedsession_teamcreate_view(request,
             'name': 'Add Team Session'
             }
         ]
+
+        dateform = DateRangeForm(initial={
+            'startdate':startdate,
+            'enddate':enddate,
+            })
         
         return render(request,'plannedsessionteamcreate.html',
                   {
                       'teams':get_my_teams(request.user),
                       'plan':trainingplan,
+                      'dateform':dateform,
                       'breadcrumbs':breadcrumbs,
                       'form':sessioncreateform,
                       'teamform':sessionteamselectform,
@@ -14621,12 +14645,17 @@ def plannedsession_teamedit_view(request,
             'name': 'Add Team Session'
         }
     ]
-    
+
+    dateform = DateRangeForm(initial={
+        'startdate':startdate,
+        'enddate':enddate,
+        })
         
     return render(request,'plannedsessionteamedit.html',
                   {
                       'plannedsession':ps,
                       'plan':trainingplan,
+                      'dateform':dateform,
                       'breadcrumbs':breadcrumbs,
                       'rower':r,
                       'active':'nav-plan',
@@ -14710,6 +14739,11 @@ def plannedsessions_coach_view(request,
             }
         ]
 
+    dateform = DateRangeForm(initial={
+        'startdate':startdate,
+        'enddate':enddate,
+        })
+
     return render(request,'plannedsessionscoach.html',
                   {
                       'myteams':myteams,
@@ -14717,6 +14751,7 @@ def plannedsessions_coach_view(request,
                       'breadcrumbs':breadcrumbs,
                       'plan':trainingplan,
                       'statusdict':statusdict,
+                      'dateform':dateform,
                       'timeperiod':timeperiod,
                       'rowers':rowers,
                       'rower':therower,
@@ -14987,11 +15022,19 @@ def plannedsessions_manage_view(request,userid=0,
             'name': 'Link Sessions to Workouts'
             },
     ]
+    
     timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
+
+    dateform = DateRangeForm(initial={
+        'startdate':startdate,
+        'enddate':enddate,
+        })
+    
     return render(request,'plannedsessionsmanage.html',
                   {
                       'teams':get_my_teams(request.user),
                       'plan':trainingplan,
+                      'dateform':dateform,
                       'plannedsessions':sps,
                       'workouts':ws,
                       'active':'nav-plan',
@@ -15077,10 +15120,6 @@ def plannedsession_edit_view(request,id=0,userid=0):
     r = getrequestrower(request,userid=userid)
 
     
-    if when:
-        timeperiod = when
-    else:
-        timeperiod = 'thisweek'
 
     startdate,enddate = get_dates_timeperiod(request)
 
@@ -15172,6 +15211,13 @@ def plannedsession_edit_view(request,id=0,userid=0):
             }
         ]
 
+
+    dateform = DateRangeForm(initial={
+        'startdate':startdate,
+        'enddate':enddate,
+        })
+
+    timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')    
     
     return render(request,'plannedsessionedit.html',
                   {
@@ -15182,6 +15228,7 @@ def plannedsession_edit_view(request,id=0,userid=0):
                       'active':'nav-plan',
                       'plannedsessions':sps,
                       'thesession':ps,
+                      'dateform':dateform,
                       'rower':r,
                       'timeperiod':timeperiod,
                   })