steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Include year and month for Sleep and Tummy Time card filters.

This commit is contained in:
Christopher Charbonneau Wells 2017-10-05 11:17:28 -04:00
parent f567de8934
commit b12f59bc52
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dashboard/templatetags/cards.py
View File

@ -80,8 +80,13 @@ def card_sleep_day(child, date=None):
""" """
if not date: if not date:
date = timezone.localtime().date() date = timezone.localtime().date()
instances = Sleep.objects.filter(child=child).filter(start__day=date.day) \ instances = Sleep.objects.filter(child=child).filter(
| Sleep.objects.filter(child=child).filter(end__day=date.day) start__year=date.year,
start__month=date.month,
start__day=date.day) | Sleep.objects.filter(child=child).filter(
end__year=date.year,
end__month=date.month,
end__day=date.day)
total = timezone.timedelta(seconds=0) total = timezone.timedelta(seconds=0)
for instance in instances: for instance in instances:
@ -129,7 +134,8 @@ def card_tummytime_day(child, date=None):
if not date: if not date:
date = timezone.localtime().date() date = timezone.localtime().date()
instances = TummyTime.objects.filter( instances = TummyTime.objects.filter(
child=child, end__day=date.day).order_by('-end') child=child, end__year=date.year, end__month=date.month,
end__day=date.day).order_by('-end')
stats = { stats = {
'total': timezone.timedelta(seconds=0), 'total': timezone.timedelta(seconds=0),
'count': instances.count() 'count': instances.count()