From 232c144efa9c7aa9423e8210111cf446b72078bc Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 5 Mar 2021 17:58:18 +0100
Subject: [PATCH] small UI improvements planned session

---
 rowers/templates/plannedsessions.html | 10 ++++++++++
 rowers/views/planviews.py             | 21 +++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html
index 1b583cc6..7a5f6261 100644
--- a/rowers/templates/plannedsessions.html
+++ b/rowers/templates/plannedsessions.html
@@ -8,6 +8,16 @@
 
 <h1>Planned Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
 
+<p>
+	<a href="/rowers/sessions/create/?when={{ timeperiod }}">  <i class="far fa-calendar-plus fa-fw"></i>&nbsp;Add Session
+	</a>
+	{% if request.user|user_teams %}
+	<a href="/rowers/sessions/teamcreate/?when={{ timeperiod }}">
+		<i class="fas fa-whistle fa-fw"></i>&nbsp;Add Group Session
+	</a>
+{% endif %}
+</p>
+
 <ul class="main-content">
   <li class="grid_2">
     <p>
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index f9b4e29c..7497d901 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -531,6 +531,11 @@ def plannedsession_create_view(request,
             request.session['fenddate'] = str(arrow.get(ps.enddate))
             request.session['fprefdate'] = str(arrow.get(ps.preferreddate))
 
+            url = reverse(plannedsessions_view,kwargs={
+                'userid':userid,
+            })
+            return HttpResponseRedirect(url)
+
     else:
         if 'fstartdate' in request.session:
             try:
@@ -921,15 +926,19 @@ def plannedsession_teamcreate_view(request,
                 for r in rs:
                     add_rower_session(r,ps)
 
+            url = reverse(plannedsessions_view,kwargs={
+                'userid':userid,
+            })
+            return HttpResponseRedirect(url)
 
-            url = reverse(plannedsession_teamcreate_view)
-            startdatestring = startdate.strftime('%Y-%m-%d')
-            enddatestring = enddate.strftime('%Y-%m-%d')
-            url += '?when='+startdatestring+'/'+enddatestring
+            #url = reverse(plannedsession_teamcreate_view)
+            #startdatestring = startdate.strftime('%Y-%m-%d')
+            #enddatestring = enddate.strftime('%Y-%m-%d')
+            #url += '?when='+startdatestring+'/'+enddatestring
 
-            next = request.GET.get('next', url)
+            #next = request.GET.get('next', url)
 
-            return HttpResponseRedirect(next)
+            #return HttpResponseRedirect(next)
         else:
             timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
             breadcrumbs = [