From b4255c4e2a6e3bf6a008e18c79acf40675cdcbe2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 31 Oct 2018 11:49:23 +0100 Subject: [PATCH] target unicode representation and target selection --- rowers/models.py | 2 +- rowers/views.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index cafcc47b..b0d71fb0 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -953,7 +953,7 @@ class TrainingTarget(models.Model): ownerfirst = '' ownerlast = '' - stri = u'{id} {n} {d} {ownerfirst} {ownerlast}'.format( + stri = u'#{id}: {n} {d} {ownerfirst} {ownerlast}'.format( ownerfirst = ownerfirst, ownerlast = ownerlast, d = date.strftime('%Y-%m-%d'), diff --git a/rowers/views.py b/rowers/views.py index 96d76a03..713869b9 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -16188,7 +16188,10 @@ def rower_create_trainingplan(request,userid=0): p.rowers.add(therower) - targets = TrainingTarget.objects.filter(rowers=therower).order_by("date") + targets = TrainingTarget.objects.filter( + rowers=therower, + date__gte=datetime.date.today(), + ).order_by("date") targetform = TrainingTargetForm() plans = TrainingPlan.objects.filter(rowers=therower).order_by("-startdate")