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

Standardize card language for "no data"

This commit is contained in:
Christopher C. Wells 2020-02-15 13:48:17 -08:00 committed by Christopher Charbonneau Wells
parent cb1712377b
commit 4d34a48652
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard/templates/cards/diaperchange_last.html
View File

@ -9,7 +9,7 @@
{{ time }} ago {{ time }} ago
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
{% trans "Never" %} {% trans "None" %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

4
dashboard/templates/cards/diaperchange_types.html
View File

@ -4,7 +4,11 @@
{% block header %}{% trans "Diaper Changes" %}{% endblock %} {% block header %}{% trans "Diaper Changes" %}{% endblock %}
{% block title %} {% block title %}
{% if total == 0 %}
{% trans "None" %}
{% else %}
{% trans "Past Week" %} {% trans "Past Week" %}
{% endif %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}

2
dashboard/templates/cards/feeding_last.html
View File

@ -9,7 +9,7 @@
{{ time }} ago {{ time }} ago
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
{% trans "Never" %} {% trans "None" %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

4
dashboard/templates/cards/sleep_day.html
View File

@ -7,9 +7,7 @@
{% if total %} {% if total %}
{{ total|duration_string }} {{ total|duration_string }}
{% else %} {% else %}
<i class="icon icon-sad" aria-hidden="true"></i> {% trans "None" %}
{% trans "None yet today" %}
<i class="icon icon-sad" aria-hidden="true"></i>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

4
dashboard/templates/cards/sleep_last.html
View File

@ -1,7 +1,7 @@
{% extends 'cards/base.html' %} {% extends 'cards/base.html' %}
{% load duration i18n %} {% load duration i18n %}
{% block header %}{% trans "Last Slept" %}{% endblock %} {% block header %}{% trans "Last Sleep" %}{% endblock %}
{% block title %} {% block title %}
{% if sleep %} {% if sleep %}
@ -9,7 +9,7 @@
{{ time }} ago {{ time }} ago
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
{% trans "Never" %} {% trans "None" %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

4
dashboard/templates/cards/sleep_naps_day.html
View File

@ -9,9 +9,7 @@
{{ count }} nap{{ plural }} {{ count }} nap{{ plural }}
{% endblocktrans %} {% endblocktrans %}
{% else %} {% else %}
<i class="icon icon-sad" aria-hidden="true"></i> {% trans "None" %}
{% trans "None yet today" %}
<i class="icon icon-sad" aria-hidden="true"></i>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

4
dashboard/templates/cards/tummytime_day.html
View File

@ -7,9 +7,7 @@
{% if stats.count > 0 %} {% if stats.count > 0 %}
{{ stats.total|duration_string }} {{ stats.total|duration_string }}
{% else %} {% else %}
<i class="icon icon-sad" aria-hidden="true"></i> {% trans "None" %}
{% trans "None yet today" %}
<i class="icon icon-sad" aria-hidden="true"></i>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

4
dashboard/templatetags/cards.py
View File

@ -38,6 +38,7 @@ def card_diaperchange_types(child, date=None):
time = timezone.datetime.combine(date, timezone.localtime().min.time()) time = timezone.datetime.combine(date, timezone.localtime().min.time())
time = timezone.make_aware(time) time = timezone.make_aware(time)
stats = {} stats = {}
week_total = 0
max_date = (time + timezone.timedelta(days=1)).replace( max_date = (time + timezone.timedelta(days=1)).replace(
hour=0, minute=0, second=0) hour=0, minute=0, second=0)
min_date = (max_date - timezone.timedelta(days=7)).replace( min_date = (max_date - timezone.timedelta(days=7)).replace(
@ -57,11 +58,12 @@ def card_diaperchange_types(child, date=None):
for key, info in stats.items(): for key, info in stats.items():
total = info['wet'] + info['solid'] total = info['wet'] + info['solid']
week_total += total
if total > 0: if total > 0:
stats[key]['wet_pct'] = info['wet'] / total * 100 stats[key]['wet_pct'] = info['wet'] / total * 100
stats[key]['solid_pct'] = info['solid'] / total * 100 stats[key]['solid_pct'] = info['solid'] / total * 100
return {'type': 'diaperchange', 'stats': stats} return {'type': 'diaperchange', 'stats': stats, 'total': week_total}
@register.inclusion_tag('cards/feeding_last.html') @register.inclusion_tag('cards/feeding_last.html')