Merge branch 'hotfix/v8.34'

rowers/templates/trainingplan.html

@@ -70,7 +70,7 @@
                   {{ macrocycle.0.name }} ({{ macrocycle.0.startdate }} - {{ macrocycle.0.enddate }})
                 </th>
               </tr>
-              {% if macrocycle.0.type == 'userdefined' %}
+              {% if macrocycle.0.type == 'userdefined' and macrocycle.0.plan.status %}
               <tr>
                 <td></td>
                 <td>dist (m)</td>
@@ -180,7 +180,7 @@
                         Meso {{ mesocycle.0.name }} ({{ mesocycle.0.startdate }} - {{ mesocycle.0.enddate }})
                       </th>
                     </tr>
-                    {% if mesocycle.0.type == 'userdefined' %}
+                    {% if mesocycle.0.type == 'userdefined' and mesocycle.0.plan.plan.status  %}
                     <tr>
                       <td></td>
                       <td>dist (m)</td>
@@ -299,6 +299,7 @@
                             Micro {{ microcycle.name }} ({{ microcycle.startdate }} - {{ microcycle.enddate }})
                           </th>
                         </tr>
+                        {%  if microcycle.plan.plan.plan.status %}
                         <tr>
                           <td></td>
                           <td>dist (m)</td>
@@ -320,6 +321,7 @@
                           <td>{{ microcycle.actualrscore }}</td>
                           <td>{{ microcycle.actualtrimp }}</td>
                         </tr>
+                        {% endif %}
                         {% if todays_date <= microcycle.enddate|date:"Y-m-d" %}
                         <tr>
                           <td>&nbsp;</td>

rowers/templates/trainingplan_create.html

@@ -73,13 +73,13 @@
           <td><a href="/rowers/plan/{{ plan.id }}">{{ plan.name }}</a></td>
           <td> {% if plan.status %} active {% else %} inactive {% endif %}</td>
           <td>
-            {% if request.user == plan.manager %}
+            {% if request.user.rower == plan.manager %}
             <a href="/rowers/editplan/{{ plan.id }}">Edit</a>
             {% endif %}
           </td>
           <td> <a href="/rowers/plan/{{ plan.id }}">Plan</a></td>
           <td>
-            {% if request.user == plan.manager %}
+            {% if request.user.rower == plan.manager %}
             <a href="/rowers/deleteplan/{{ plan.id }}">Delete</a>
             {% endif %}
           </td>

rowers/views.py

@@ -16597,8 +16597,6 @@ def rower_trainingplan_view(request,
         type='userdefined').order_by("startdate")
 
 
-    r = plan.rower
-    
     for m in macrocycles:
         createmesofillers(m)
         m.plantime = 0
@@ -16631,7 +16629,7 @@ def rower_trainingplan_view(request,
 
             for mm in microcycles:
                 sps = PlannedSession.objects.filter(
-                    rower = plan.rower,
+                    rower = r,
                     startdate__lte=mm.enddate,
                     enddate__gte=mm.startdate)