From 840b6c6eab5ce1ef96aa12477bfd904563717801 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 29 Oct 2018 21:55:36 +0100 Subject: [PATCH] showing actuals only for active plans --- rowers/templates/trainingplan.html | 2 +- rowers/views.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rowers/templates/trainingplan.html b/rowers/templates/trainingplan.html index 84c3ccac..1d29b18e 100644 --- a/rowers/templates/trainingplan.html +++ b/rowers/templates/trainingplan.html @@ -180,7 +180,7 @@ Meso {{ mesocycle.0.name }} ({{ mesocycle.0.startdate }} - {{ mesocycle.0.enddate }}) - {% if mesocycle.0.type == 'userdefined' and mesoocycle0.plan.plan.status %} + {% if mesocycle.0.type == 'userdefined' and mesocycle.0.plan.plan.status %} dist (m) diff --git a/rowers/views.py b/rowers/views.py index 3fe9813a..cb9e6023 100644 --- a/rowers/views.py +++ b/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)