sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'hotfix/v8.34'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-29 21:57:58 +01:00
parent 1811e45d7f 840b6c6eab
commit c81f11864d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/templates/trainingplan.html
+6 -4
View File
@@ -70,7 +70,7 @@
{{ macrocycle.0.name }} ({{ macrocycle.0.startdate }} - {{ macrocycle.0.enddate }}) {{ macrocycle.0.name }} ({{ macrocycle.0.startdate }} - {{ macrocycle.0.enddate }})
</th> </th>
</tr> </tr>
{% if macrocycle.0.type == 'userdefined' %} {% if macrocycle.0.type == 'userdefined' and macrocycle.0.plan.status %}
<tr> <tr>
<td></td> <td></td>
<td>dist (m)</td> <td>dist (m)</td>
@@ -180,7 +180,7 @@
Meso {{ mesocycle.0.name }} ({{ mesocycle.0.startdate }} - {{ mesocycle.0.enddate }}) Meso {{ mesocycle.0.name }} ({{ mesocycle.0.startdate }} - {{ mesocycle.0.enddate }})
</th> </th>
</tr> </tr>
{% if mesocycle.0.type == 'userdefined' %} {% if mesocycle.0.type == 'userdefined' and mesocycle.0.plan.plan.status %}
<tr> <tr>
<td></td> <td></td>
<td>dist (m)</td> <td>dist (m)</td>
@@ -259,7 +259,7 @@
</th> </th>
</tr> </tr>
{% if todays_date <= microcycle.enddate|date:"Y-m-d" %} {% if todays_date <= microcycle.enddate|date:"Y-m-d" %}
{% if microcycle.plan.type == 'userdefined' %} {% if microcycle.plan.type == 'userdefined' %}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
@@ -276,7 +276,7 @@
</tr> </tr>
{% endif %} {% endif %}
{% else %} {% else %}
{% if microcycle.plan.type == 'userdefined' %} {% if microcycle.plan.type == 'userdefined' %}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
@@ -299,6 +299,7 @@
Micro {{ microcycle.name }} ({{ microcycle.startdate }} - {{ microcycle.enddate }}) Micro {{ microcycle.name }} ({{ microcycle.startdate }} - {{ microcycle.enddate }})
</th> </th>
</tr> </tr>
{% if microcycle.plan.plan.plan.status %}
<tr> <tr>
<td></td> <td></td>
<td>dist (m)</td> <td>dist (m)</td>
@@ -320,6 +321,7 @@
<td>{{ microcycle.actualrscore }}</td> <td>{{ microcycle.actualrscore }}</td>
<td>{{ microcycle.actualtrimp }}</td> <td>{{ microcycle.actualtrimp }}</td>
</tr> </tr>
{% endif %}
{% if todays_date <= microcycle.enddate|date:"Y-m-d" %} {% if todays_date <= microcycle.enddate|date:"Y-m-d" %}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
rowers/templates/trainingplan_create.html
+2 -2
View File
@@ -73,13 +73,13 @@
<td><a href="/rowers/plan/{{ plan.id }}">{{ plan.name }}</a></td> <td><a href="/rowers/plan/{{ plan.id }}">{{ plan.name }}</a></td>
<td> {% if plan.status %} active {% else %} inactive {% endif %}</td> <td> {% if plan.status %} active {% else %} inactive {% endif %}</td>
<td> <td>
{% if request.user == plan.manager %} {% if request.user.rower == plan.manager %}
<a href="/rowers/editplan/{{ plan.id }}">Edit</a> <a href="/rowers/editplan/{{ plan.id }}">Edit</a>
{% endif %} {% endif %}
</td> </td>
<td> <a href="/rowers/plan/{{ plan.id }}">Plan</a></td> <td> <a href="/rowers/plan/{{ plan.id }}">Plan</a></td>
<td> <td>
{% if request.user == plan.manager %} {% if request.user.rower == plan.manager %}
<a href="/rowers/deleteplan/{{ plan.id }}">Delete</a> <a href="/rowers/deleteplan/{{ plan.id }}">Delete</a>
{% endif %} {% endif %}
</td> </td>
rowers/views.py
+1 -3
View File
@@ -16597,8 +16597,6 @@ def rower_trainingplan_view(request,
type='userdefined').order_by("startdate") type='userdefined').order_by("startdate")
r = plan.rower
for m in macrocycles: for m in macrocycles:
createmesofillers(m) createmesofillers(m)
m.plantime = 0 m.plantime = 0
@@ -16631,7 +16629,7 @@ def rower_trainingplan_view(request,
for mm in microcycles: for mm in microcycles:
sps = PlannedSession.objects.filter( sps = PlannedSession.objects.filter(
rower = plan.rower, rower = r,
startdate__lte=mm.enddate, startdate__lte=mm.enddate,
enddate__gte=mm.startdate) enddate__gte=mm.startdate)