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

showing actuals only for active plans

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-29 21:55:36 +01:00
parent bdf86d7321
commit 840b6c6eab
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/trainingplan.html
View File

@@ -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' and mesoocycle0.plan.plan.status %} {% 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>

4
rowers/views.py
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)