From 3d06bf5ad17091474d261f00aa190d677bc0ce29 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 31 Oct 2018 10:33:47 +0100
Subject: [PATCH] in side menu show only plans that are in today's range

---
 rowers/models.py                    | 6 ++++--
 rowers/templatetags/rowerfilters.py | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index 14aec8d2..cafcc47b 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -945,6 +945,7 @@ class TrainingTarget(models.Model):
     def __unicode__(self):
         date = self.date
         name = self.name
+        id = self.pk
         try:
             ownerfirst = self.manager.user.first_name
             ownerlast = self.manager.user.last_name
@@ -952,11 +953,12 @@ class TrainingTarget(models.Model):
             ownerfirst = ''
             ownerlast = ''
 
-        stri = u'{ownerfirst} {ownerlast} {d} {n}'.format(
+        stri = u'{id} {n} {d} {ownerfirst} {ownerlast}'.format(
             ownerfirst = ownerfirst,
             ownerlast = ownerlast,
             d = date.strftime('%Y-%m-%d'),
-            n = name
+            n = name,
+            id = id,
             )
 
         return stri
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 1707661d..7f4334eb 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -397,9 +397,12 @@ def timeurl(path,timestring):
 
 @register.filter
 def trainingplans(rower):
+    today = datetime.date.today()
     plans = TrainingPlan.objects.filter(
         rowers=rower,
-        status=True).order_by("-startdate")
+        status=True,
+        startdate__lte=today,
+        enddate__gte=today).order_by("-startdate")
 
     return plans