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

Add an optional date parameter for Diaper Change types and remove some unused code.

This commit is contained in:
Christopher Charbonneau Wells 2017-11-19 10:05:45 -05:00
parent 58c1cc4cbc
commit 31f747e908
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dashboard/templatetags/cards.py
View File

@ -25,20 +25,26 @@ def card_diaperchange_last(child):
@register.inclusion_tag('cards/diaperchange_types.html') @register.inclusion_tag('cards/diaperchange_types.html')
def card_diaperchange_types(child): def card_diaperchange_types(child, date=None):
""" """
Creates a break down of wet and solid Diaper Change instances for the past Creates a break down of wet and solid Diaper Change instances for the past
seven days. seven days.
:param child: an instance of the Child model. :param child: an instance of the Child model.
:param date: a Date object for the day to filter.
:returns: a dictionary with the wet/dry statistics. :returns: a dictionary with the wet/dry statistics.
""" """
if not date:
time = timezone.localtime()
else:
time = timezone.datetime.combine(date, timezone.localtime().min.time())
time = timezone.make_aware(time)
stats = {} stats = {}
max_date = (timezone.localtime() + timezone.timedelta( max_date = (time + timezone.timedelta(days=1)).replace(
days=1)).replace(hour=0, minute=0, second=0) hour=0, minute=0, second=0)
min_date = (max_date - timezone.timedelta( min_date = (max_date - timezone.timedelta(days=7)).replace(
days=6)).replace(hour=0, minute=0, second=0) hour=0, minute=0, second=0)
for x in range(6): for x in range(7):
stats[x] = {'wet': 0, 'solid': 0} stats[x] = {'wet': 0, 'solid': 0}
instances = models.DiaperChange.objects.filter(child=child) \ instances = models.DiaperChange.objects.filter(child=child) \
@ -121,9 +127,6 @@ def card_sleep_day(child, date=None):
if start.date() != date: if start.date() != date:
start = start.replace(year=end.year, month=end.month, day=end.day, start = start.replace(year=end.year, month=end.month, day=end.day,
hour=0, minute=0, second=0) hour=0, minute=0, second=0)
elif end.date() != date:
end = start.replace(year=start.year, month=start.month,
day=start.day, hour=23, minute=59, second=59)
total += end - start total += end - start