From 3131aeb328152f563a610b424790b24241aec294 Mon Sep 17 00:00:00 2001 From: "Jose V. Herrera Gallegos" Date: Wed, 6 Dec 2023 11:46:51 -0800 Subject: [PATCH] fix #699, add diaper change count to card stats --- dashboard/templates/cards/diaperchange_types.html | 3 +++ dashboard/templatetags/cards.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dashboard/templates/cards/diaperchange_types.html b/dashboard/templates/cards/diaperchange_types.html index ef88cf28..85839ca3 100644 --- a/dashboard/templates/cards/diaperchange_types.html +++ b/dashboard/templates/cards/diaperchange_types.html @@ -49,6 +49,9 @@ {% else %} {% blocktrans with days_ago=key %}{{ days_ago }} days ago{% endblocktrans %} {% endif %} + {% if info.changes > 0 %} + ({{ info.changes|floatformat:'0' }} {% trans "changes" %}) + {% endif %} {% endif %} {% endfor %} diff --git a/dashboard/templatetags/cards.py b/dashboard/templatetags/cards.py index 364f31b0..0d98d28b 100644 --- a/dashboard/templatetags/cards.py +++ b/dashboard/templatetags/cards.py @@ -70,7 +70,7 @@ def card_diaperchange_types(context, child, date=None): ) for x in range(7): - stats[x] = {"wet": 0.0, "solid": 0.0, "empty": 0.0} + stats[x] = {"wet": 0.0, "solid": 0.0, "empty": 0.0, "changes": 0.0} instances = ( models.DiaperChange.objects.filter(child=child) @@ -82,6 +82,7 @@ def card_diaperchange_types(context, child, date=None): for instance in instances: key = (max_date - instance.time).days + stats[key]["changes"] += 1 if instance.wet: stats[key]["wet"] += 1 if instance.solid: