linking back to plan

rowers/views.py

@@ -12483,6 +12483,7 @@ def plannedsession_multiclone_view(
 def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0):
 
     r = getrequestrower(request,rowerid=rowerid)
+    startdate,enddate = get_dates_timeperiod(timeperiod)
         
     if request.method == 'POST':
         sessioncreateform = PlannedSessionForm(request.POST)
@@ -12539,26 +12540,46 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0):
                 fstartdate = arrow.get(request.session['fstartdate']).date()
             except KeyError:
                 fstartdate = timezone.now().date()
+                if fstartdate < startdate:
+                    fstartdate = startdate
             try:
                 fenddate = arrow.get(request.session['fenddate']).date()
             except KeyError:
                 fenddate = timezone.now().date()
+                if fenddate > enddate:
+                    fenddate = enddate
             try:
                 fprefdate = arrow.get(request.session['fprefdate']).date()
             except KeyError:
                 fprefdate = timezone.now().date()
 
+            if fprefdate < startdate:
+                fprefdate = startdate
+
+            if fprefdate > enddate:
+                fprefdate = enddate
+
             forminitial = {
                 'startdate':fstartdate,
                 'enddate':fenddate,
                 'preferreddate':fprefdate
                 }
         else:
-            forminitial = {}
+            preferreddate = startdate
+            if preferreddate < timezone.now().date():
+                preferreddate = timezone.now().date()
+
+            if preferreddate > enddate:
+                preferreddate = enddate
+            
+            forminitial = {
+                'startdate':startdate,
+                'enddate':enddate,
+                'preferreddate':preferreddate,
+            }
 
         sessioncreateform = PlannedSessionForm(initial=forminitial)
 
-    startdate,enddate = get_dates_timeperiod(timeperiod)
     sps = get_sessions(r,startdate=startdate,enddate=enddate)
         
     return render(request,'plannedsessioncreate.html',
@@ -12943,7 +12964,15 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
     r = getrequestrower(request,rowerid=rowerid)
 
     startdate,enddate = get_dates_timeperiod(timeperiod)
-        
+
+    try:
+        trainingplan = TrainingPlan.objects.filter(
+            startdate__lte =  startdate,
+            enddate__gte =  enddate)[0]
+    except IndexError:
+        trainingplan = None
+
+    
     sps = get_sessions(r,startdate=startdate,enddate=enddate)
 
     completeness = {}
@@ -12966,6 +12995,7 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
                   {
                       'teams':get_my_teams(request.user),
                       'plannedsessions':sps,
+                      'plan':trainingplan,
                       'rower':r,
                       'timeperiod':timeperiod,
                       'completeness':completeness,
@@ -13120,6 +13150,7 @@ def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,
     
 
 # Clone an existing planned session
+# need clarity on cloning behavior time shift
 @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
                   redirect_field_name=None)
 def plannedsession_clone_view(request,id=0,rowerid=0,
@@ -13146,8 +13177,9 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
     
     ps.startdate = timezone.now().date()
     ps.enddate = (timezone.now()+deltadays).date()
+    ps.preferreddate = ps.preferreddate+deltadays
     ps.name += ' (copy)'
-    
+
     ps.save()
 
     for rower in rowers: