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

Include all of the past five days in the diaper change types card.

This commit is contained in:
Christopher Charbonneau Wells 2017-08-21 19:00:08 -04:00
parent d659fc26e4
commit 0b8205a830
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dashboard/templatetags/dashboard.py
View File

@ -27,16 +27,16 @@ 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):
"""Diaper change statistics for the last five days including today.""" """Diaper change statistics for the last seven days including today."""
limit = timezone.now() - timezone.timedelta(days=4)
limit = limit.replace(hour=0, minute=0, second=0)
instances = DiaperChange.objects.filter(
child=child).filter(time__gt=limit).order_by('-time')
stats = OrderedDict() stats = OrderedDict()
for x in range(0, 5):
date = (timezone.now() - timezone.timedelta(days=x)).date()
stats[date] = {'wet': 0, 'solid': 0}
instances = DiaperChange.objects.filter(
child=child).filter(time__gt=list(stats.keys())[-1]).order_by('-time')
for instance in instances: for instance in instances:
date = instance.time.date() date = instance.time.date()
if date not in stats.keys():
stats[date] = {'wet': 0, 'solid': 0}
if instance.wet: if instance.wet:
stats[date]['wet'] += 1 stats[date]['wet'] += 1
if instance.solid: if instance.solid:
@ -44,8 +44,9 @@ def card_diaperchange_types(child):
for date, info in stats.items(): for date, info in stats.items():
total = info['wet'] + info['solid'] total = info['wet'] + info['solid']
stats[date]['wet_pct'] = info['wet'] / total * 100 if total > 0:
stats[date]['solid_pct'] = info['solid'] / total * 100 stats[date]['wet_pct'] = info['wet'] / total * 100
stats[date]['solid_pct'] = info['solid'] / total * 100
return {'stats': stats, 'last_change': instances.last()} return {'stats': stats, 'last_change': instances.last()}