From 37147dc4d461ddffef3115f3392164b0b7e1a88e Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 12 Oct 2018 17:26:44 +0200
Subject: [PATCH] plannedsessioncreate

---
 rowers/templates/plannedsessioncreate.html | 91 ++++------------------
 rowers/urls.py                             |  7 +-
 rowers/views.py                            | 13 +++-
 3 files changed, 28 insertions(+), 83 deletions(-)

diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html
index d803e32c..162646f2 100644
--- a/rowers/templates/plannedsessioncreate.html
+++ b/rowers/templates/plannedsessioncreate.html
@@ -1,71 +1,14 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 {% load rowerfilters %}
 
 {% block title %}New Planned Session{% endblock %}
 
-{% block content %}
-<div class="grid_12 alpha">
-  {% include "planningbuttons.html" %}
-</div>
+{% block main %}
+<h1>Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
-<div class="grid_12 alpha">
-  <div id="left" class="grid_6 alpha">
-    <h1>Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
-  </div>
-  <div id="timeperiod" class="grid_2 dropdown">
-    <button class="grid_2 alpha button gray small dropbtn">Select Time Period  ({{ timeperiod|verbosetimeperiod }})</button>
-    <div class="dropdown-content">
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/today/rower/{{ rower.id }}">
-      Today
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/thisweek/rower/{{ rower.id }}">
-      This Week
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/thismonth/rower/{{ rower.id }}">
-      This Month
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/lastweek/rower/{{ rower.id }}">
-      Last Week
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/lastmonth/rower/{{ rower.id }}">
-      Last Month
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/nextweek/rower/{{ rower.id }}">
-      Next Week
-    </a>
-    <a class="button gray small alpha"
-       href="/rowers/sessions/create/nextmonth/rower/{{ rower.id }}">
-      Next Month
-    </a>
-    </div>
-  </div>
-{% if user.is_authenticated and user|is_manager %}
-<div class="grid_2 dropdown">
-  <button class="grid_2 alpha button green small dropbtn">
-    {{ rower.user.first_name }} {{ rower.user.last_name }}
-  </button>
-  <div class="dropdown-content">
-    {% for member in user|team_rowers %}
-    <a class="button green small" href="/rowers/sessions/create/{{ timeperiod }}/rower/{{ member.id }}">{{ member.user.first_name }} {{ member.user.last_name }}</a>
-    {% endfor %}
-  </div>
-</div>
-
-{% endif %}
-<div class="grid_2 omega">
-  <a class="button small gray" href="/rowers/list-courses">Courses</a>
-</div>
-</div>
-
-<div class="grid_12 alpha">
-  <div id="right" class="grid_6 alpha">
+<ul class="main-content">
+  <li class="grid_2">
     <h1>Plan</h1>
     <p>
       Click on session name to view
@@ -113,11 +56,8 @@
         {% endfor %}
       </tbody>
     </table>
-  </div>
-  
-
-
-  <div class="grid_6 omega">
+  </li>
+  <li class="grid_2">
     <h1>New Session</h1>
     <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
       {% if form.errors %}
@@ -130,15 +70,12 @@
         {{ form.as_table }}
       </table>
       {% csrf_token %}
-      <div id="formbutton" class="grid_1 prefix_4 suffix_1">
-        <input class="button green" type="submit" value="Save">
-      </div>
-  </form>
-  </div>
-</div>
-  <div class="grid_6 prefix_6" id="id_guidance">
+      <input class="button green" type="submit" value="Save">
+    </form>
+    <div class="padded" id="id_guidance">
+  </li>
+</ul>
 
-  </div>
 {% endblock %}
 
 {% block scripts %}
@@ -240,3 +177,7 @@
 
 </script>
 {% endblock %}
+
+{% block sidebar %}
+{% include 'menu_plan.html' %}
+{% endblock %}
diff --git a/rowers/urls.py b/rowers/urls.py
index a88f39ad..e2833eb2 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -448,14 +448,9 @@ urlpatterns = [
     url(r'^sessions/teamedit/(?P<sessionid>\d+)$',views.plannedsession_teamedit_view),
     url(r'^sessions/teamedit/(?P<sessionid>\d+)/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsession_teamedit_view),
 
-    url(r'^sessions/create$',views.plannedsession_create_view),
+    url(r'^sessions/create/$',views.plannedsession_create_view),
     url(r'^sessions/create/user/(?P<userid>\d+)$',
         views.plannedsession_create_view),
-    url(
-        r'^sessions/create/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',
-        views.plannedsession_create_view),
-    url(r'^sessions/create/(?P<timeperiod>[\w\ ]+.*)$',
-        views.plannedsession_create_view),
 
     url(r'^sessions/multiclone$',views.plannedsession_multiclone_view),
     url(r'^sessions/multiclone/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)/extra/(?P<extrasessions>\d+)$',
diff --git a/rowers/views.py b/rowers/views.py
index 22cdbcd7..0d59dc38 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -13645,9 +13645,17 @@ def plannedsession_multiclone_view(
 # Individual user creates training for himself
 @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
                   redirect_field_name=None)
-def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0,userid=0):
+def plannedsession_create_view(request,
+                               userid=0):
 
-    r = getrequestrower(request,rowerid=rowerid)
+    r = getrequestrower(request,userid=userid)
+
+    when = request.GET.get('when')
+    if when:
+        timeperiod = when
+    else:
+        timeperiod = 'thisweek'
+        
     startdate,enddate = get_dates_timeperiod(timeperiod)
         
     if request.method == 'POST':
@@ -13761,6 +13769,7 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0,userid=0)
                       'teams':get_my_teams(request.user),
                       'plan':trainingplan,
                       'form':sessioncreateform,
+                      'active':'nav-plan',
                       'plannedsessions':sps,
                       'rower':r,
                       'timeperiod':timeperiod,