Merge branch 'release/v10.26'

rowers/templates/trainingplan_create.html

@@ -35,6 +35,51 @@
         {% endfor %}
       </tbody>
     </table>
+    {% if old_targets %}
+    <p>Old Targets</p>
+    <table width="100%" class="listtable shortpadded">
+      <thead>
+	<tr>
+	  <th>Target Date</th>
+	  <th>Name</th>
+	  <th>Notes</th>
+	</tr>
+      </thead>
+      <tbody>
+	{% for target in old_targets %}
+        <tr>
+          <td> {{ target.date }}</td>
+          <td> {{ target.name }}</td>
+          <td> {{ target.notes|linebreaks }}</td>
+          <td> <a href="/rowers/edittarget/{{ target.id }}">Edit</a>
+          <td> <a href="/rowers/deletetarget/{{ target.id }}">Delete</a>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+    {% endif %}
+    {% elif old_targets %}
+    <p>Old Targets</p>
+    <table width="100%" class="listtable shortpadded">
+      <thead>
+	<tr>
+	  <th>Target Date</th>
+	  <th>Name</th>
+	  <th>Notes</th>
+	</tr>
+      </thead>
+      <tbody>
+	{% for target in old_targets %}
+        <tr>
+          <td> {{ target.date }}</td>
+          <td> {{ target.name }}</td>
+          <td> {{ target.notes|linebreaks }}</td>
+          <td> <a href="/rowers/edittarget/{{ target.id }}">Edit</a>
+          <td> <a href="/rowers/deletetarget/{{ target.id }}">Delete</a>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
     {% else %}
     No training targets found
     {% endif %}

rowers/views/planviews.py

@@ -1917,10 +1917,26 @@ def rower_create_trainingplan(request,userid=0):
         rowers=therower,
         date__gte=datetime.date.today(),
     ).order_by("date")
+
+    old_targets = TrainingTarget.objects.filter(
+        rowers=therower,
+        date__lt=datetime.date.today(),
+        ).order_by("-date")
+    
     targetform = TrainingTargetForm(user=request.user)
     
     plans = TrainingPlan.objects.filter(rowers=therower).order_by("-startdate")
 
+    plans_to_deactivate = TrainingPlan.objects.filter(
+        rowers=therower,
+        enddate__lt=datetime.date.today(),
+        status=True,
+    ).order_by("-startdate")
+
+    for p in plans_to_deactivate:
+        p.status = False
+        p.save()
+
     
     form = TrainingPlanForm(targets=targets,
                             initial={'status':False,'rowers':[therower]},
@@ -1949,6 +1965,7 @@ def rower_create_trainingplan(request,userid=0):
                       'active':'nav-plan',
                       'targets':targets,
                       'targetform':targetform,
+                      'old_targets':old_targets,
                       })
 
 @user_passes_test(hasplannedsessions,login_url="/rowers/paidplans",