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

solves #478

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-10 13:56:44 +02:00
parent 0308028dac
commit 935d521b4f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/templates/trainingplan.html
View File

@@ -48,7 +48,7 @@
{{ macrocycle.0.name }} ({{ macrocycle.0.startdate }} - {{ macrocycle.0.enddate }}) {{ macrocycle.0.name }} ({{ macrocycle.0.startdate }} - {{ macrocycle.0.enddate }})
</th> </th>
</tr> </tr>
{% if todays_date <= macrocycle.0.enddate|date:"Y-m-d" %} {% if todays_date <= macrocycle.0.enddate %}
<tr> <tr>
&nbsp; &nbsp;
</tr> </tr>
@@ -115,7 +115,7 @@
<td>{{ macrocycle.0.actualtrimp }}</td> <td>{{ macrocycle.0.actualtrimp }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% if todays_date <= macrocycle.0.enddate|date:"Y-m-d" %} {% if todays_date <= macrocycle.0.enddate %}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
@@ -167,7 +167,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 todays_date <= mesocycle.0.enddate|date:"Y-m-d" %} {% if todays_date <= mesocycle.0.enddate %}
{% if mesocycle.0.plan.type == 'userdefined' %} {% if mesocycle.0.plan.type == 'userdefined' %}
<tr> <tr>
&nbsp; &nbsp;
@@ -236,7 +236,7 @@
<td>{{ mesocycle.0.actualtrimp }}</td> <td>{{ mesocycle.0.actualtrimp }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% if todays_date <= mesocycle.0.enddate|date:"Y-m-d" %} {% if todays_date <= mesocycle.0.enddate %}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
@@ -293,7 +293,7 @@
Micro {{ microcycle.name }} ({{ microcycle.startdate }} - {{ microcycle.enddate }}) Micro {{ microcycle.name }} ({{ microcycle.startdate }} - {{ microcycle.enddate }})
</th> </th>
</tr> </tr>
{% if todays_date <= microcycle.enddate|date:"Y-m-d" %} {% if todays_date <= microcycle.enddate %}
{% if microcycle.plan.type == 'userdefined' %} {% if microcycle.plan.type == 'userdefined' %}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
@@ -366,7 +366,7 @@
<td>{{ microcycle.actualtrimp }}</td> <td>{{ microcycle.actualtrimp }}</td>
</tr> </tr>
{% endif %} {% endif %}
{% if todays_date <= microcycle.enddate|date:"Y-m-d" %} {% if todays_date <= microcycle.enddate %}
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>

1
rowers/views/planviews.py
View File

@@ -2301,6 +2301,7 @@ def rower_trainingplan_view(request,
return render(request,'trainingplan.html', return render(request,'trainingplan.html',
{ {
'plan':plan, 'plan':plan,
'todays_date': timezone.now().date(),
'active':'nav-plan', 'active':'nav-plan',
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'rower':r, 'rower':r,