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

in side menu show only plans that are in today's range

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-31 10:33:47 +01:00
parent ae41061d8c
commit 3d06bf5ad1
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/models.py
View File

@@ -945,6 +945,7 @@ class TrainingTarget(models.Model):
def __unicode__(self): def __unicode__(self):
date = self.date date = self.date
name = self.name name = self.name
id = self.pk
try: try:
ownerfirst = self.manager.user.first_name ownerfirst = self.manager.user.first_name
ownerlast = self.manager.user.last_name ownerlast = self.manager.user.last_name
@@ -952,11 +953,12 @@ class TrainingTarget(models.Model):
ownerfirst = '' ownerfirst = ''
ownerlast = '' ownerlast = ''
stri = u'{ownerfirst} {ownerlast} {d} {n}'.format( stri = u'{id} {n} {d} {ownerfirst} {ownerlast}'.format(
ownerfirst = ownerfirst, ownerfirst = ownerfirst,
ownerlast = ownerlast, ownerlast = ownerlast,
d = date.strftime('%Y-%m-%d'), d = date.strftime('%Y-%m-%d'),
n = name n = name,
id = id,
) )
return stri return stri

5
rowers/templatetags/rowerfilters.py
View File

@@ -397,9 +397,12 @@ def timeurl(path,timestring):
@register.filter @register.filter
def trainingplans(rower): def trainingplans(rower):
today = datetime.date.today()
plans = TrainingPlan.objects.filter( plans = TrainingPlan.objects.filter(
rowers=rower, rowers=rower,
status=True).order_by("-startdate") status=True,
startdate__lte=today,
enddate__gte=today).order_by("-startdate")
return plans return plans