From 2ba45964f9ba470e81f415e8925126bb39d28609 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 14 Mar 2021 16:59:50 +0100
Subject: [PATCH] ui improvements in session creation

---
 rowers/views/planviews.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index 95d6e24c..215e4e4f 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -513,6 +513,8 @@ def plannedsession_create_view(request,
     startdate,enddate = get_dates_timeperiod(request,startdatestring=startdatestring,
                                              enddatestring=enddatestring)
 
+    timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
+
 
 
     if request.method == 'POST':
@@ -536,6 +538,7 @@ def plannedsession_create_view(request,
                 'userid':userid,
             })
 
+
             if '_continue' in request.POST:
                 url = reverse('plannedsession_edit_view',kwargs={
                     'id':ps.id,
@@ -543,6 +546,8 @@ def plannedsession_create_view(request,
             elif '_addanother' in request.POST:
                 url = reverse('plannedsession_create_view',kwargs={'userid':userid})
 
+            url = url+'?when='+timeperiod
+
             return HttpResponseRedirect(url)
 
     else:
@@ -641,7 +646,7 @@ def plannedsession_create_view(request,
     except IndexError:
         trainingplan = None
 
-    timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
+
 
     dateform = DateRangeForm(initial={
         'startdate':startdate,
@@ -653,6 +658,10 @@ def plannedsession_create_view(request,
             'url': reverse(plannedsessions_view),
             'name': 'Planned Sessions'
         },
+        {
+            'url': reverse(plannedsessions_view)+'?when='+timeperiod,
+            'name': timeperiod,
+        },
         {
             'url': reverse(plannedsession_create_view),
             'name': 'Add Session'
@@ -910,7 +919,8 @@ def plannedsession_teamcreate_view(request,
 
     therower = getrequestplanrower(request,userid=userid)
 
-
+    startdate,enddate = get_dates_timeperiod(request)
+    timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
 
     teams = Team.objects.filter(manager=request.user)
     if teams.count()>0:
@@ -921,7 +931,7 @@ def plannedsession_teamcreate_view(request,
         url = reverse('rower_teams_view')
         return HttpResponseRedirect(url)
 
-    startdate,enddate = get_dates_timeperiod(request)
+
 
     trainingplan = None
 
@@ -970,7 +980,9 @@ def plannedsession_teamcreate_view(request,
                     'id':ps.id,
                 })
             elif '_addanother' in request.POST:
-                url = reverse('plannedsession_create_view',kwargs={'userid':userid})
+                url = reverse('plannedsession_teamcreate_view',kwargs={'userid':userid})
+
+            url = url+'?when='+timeperiod
 
             return HttpResponseRedirect(url)
 
@@ -2446,12 +2458,11 @@ def rower_view_instantplan(request,id='',userid=0):
         return HttpResponseRedirect(reverse('rower_select_instantplan'))
 
     plansteps = response.json()
-    trainingdays = plansteps['plan']['trainingDays']
-
+    trainingdays = plansteps['trainingDays']
 
     trainingdays2 = []
     nextday = trainingdays.pop(0)
-    for i in range(plansteps['plan']['duration']):
+    for i in range(plansteps['duration']):
         if nextday['order'] == i+1:
             nextday['week'] = (divmod(i,7)[0])+1
             trainingdays2.append(nextday)
@@ -2475,6 +2486,7 @@ def rower_view_instantplan(request,id='',userid=0):
 
     if request.method == 'POST':
         form = TrainingPlanForm(request.POST,user=request.user)
+
         if form.is_valid():
             plansteps = response.json()
             name = form.cleaned_data['name']