From c0f102f2f60c6e0d936ddad3bdcdb700f3c0a565 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 3 Oct 2019 11:55:14 +0200
Subject: [PATCH 1/3] small bug fix active status not ignored any more plan
 creation

---
 rowers/views/planviews.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index 97e15a18..1e281888 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -2005,6 +2005,7 @@ def rower_create_trainingplan(request,userid=0):
                 except KeyError:
                     target = None
             startdate = form.cleaned_data['startdate']
+            status = form.cleaned_data['status']
             enddate = form.cleaned_data['enddate']
 
             try:
@@ -2017,7 +2018,7 @@ def rower_create_trainingplan(request,userid=0):
                 target=target,
                 manager=themanager,
                 startdate=startdate,
-                enddate=enddate,
+                enddate=enddate,status=status,
             )
 
             p.save()

From 9c3cb7d246a7e0cb2976a35d9bbfc235c9b604a9 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 3 Oct 2019 17:07:49 +0200
Subject: [PATCH 2/3] bla

---
 rowers/views/planviews.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index 1e281888..c9b28796 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -416,12 +416,12 @@ def plannedsession_create_view(request,
                 'preferreddate':fprefdate
                 }
         else:
-            preferreddate = startdate
+            preferreddate = startdate.date()
             if preferreddate < timezone.now().date():
                 preferreddate = timezone.now().date()
 
-            if preferreddate > enddate:
-                preferreddate = enddate
+            if preferreddate > enddate.date():
+                preferreddate = enddate.date()
             
             forminitial = {
                 'startdate':startdate,

From fc9e6808014fb03389edeb466f34ecbb252d870c Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 3 Oct 2019 17:53:47 +0200
Subject: [PATCH 3/3] bug fix cloning behavior

---
 rowers/views/planviews.py | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index c9b28796..1e2f47b4 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -416,12 +416,20 @@ def plannedsession_create_view(request,
                 'preferreddate':fprefdate
                 }
         else:
-            preferreddate = startdate.date()
+            try:
+                preferreddate = startdate.date()
+            except AttributeError:
+                preferreddate = startdate
             if preferreddate < timezone.now().date():
                 preferreddate = timezone.now().date()
 
-            if preferreddate > enddate.date():
-                preferreddate = enddate.date()
+            try:
+                enddate = enddate.date()
+            except AttributeError:
+                pass
+                
+            if preferreddate > enddate:
+                preferreddate = enddate
             
             forminitial = {
                 'startdate':startdate,
@@ -1427,16 +1435,20 @@ def plannedsession_clone_view(request,id=0,userid=0):
         ps.name += ' (copy)'
     ps.is_template = False
 
-    deltadays = ps.enddate-ps.startdate
+    deltadays = ps.preferreddate-ps.startdate
     
-    ps.startdate = timezone.now().date()
-    ps.enddate = (timezone.now()+deltadays).date()
-    ps.preferreddate = ps.preferreddate+deltadays
+    ps.startdate = startdate
+    ps.enddate = enddate
+    ps.preferreddate = ps.startdate+deltadays
 
+    
     ps.save()
 
-    for rower in rowers:
-        add_rower_session(rower,ps)
+    if rowers:
+        for rower in rowers:
+            add_rower_session(rower,ps)
+    else:
+        add_rower_session(r,ps)
     for team in teams:
         add_team_session(team,ps)
 
@@ -1602,6 +1614,7 @@ def plannedsession_edit_view(request,id=0,userid=0):
                 cd['sessionmode'] = 'distance'
             
 
+                
             res,message = update_plannedsession(ps,cd)
 
             if res: