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

Make the dashboard cards layout more opinionated. 

This puts all the "last" cards in one row consistently, assuming that the tummy time and diaper change cards should always have fairly large heights. The shifting heights were causing cards to appear in different places with the masonry setup.
This commit is contained in:
Christopher Charbonneau Wells 2017-08-21 19:53:21 -04:00
parent 51946dd28a
commit faaa67995f
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
{% block header %}Diaper Changes{% endblock %} {% block header %}Diaper Changes{% endblock %}
{% block title %} {% block title %}
<strong>Past 5 Days</strong> <strong>Past Week</strong>
{% endblock %} {% endblock %}
{% block content %} {% block content %}

26
dashboard/templates/dashboard/child.html
View File

@ -5,12 +5,24 @@
{% block content %} {% block content %}
<h1 class="text-center">{{ object }}</h1> <h1 class="text-center">{{ object }}</h1>
<div class="card-columns"> <div class="row align-items-start">
{% card_feeding_last object %} <div class="col-lg-4 col-sm-12">
{% card_diaperchange_last object %} <div class="row">
{% card_tummytime_last object %} <div class="col-lg-12 col-sm-6">
{% card_tummytime_day object %} {% card_diaperchange_last object %}
{% card_sleep_last object %} {% card_feeding_last object %}
{% card_diaperchange_types object %} </div>
<div class="col-lg-12 col-sm-6">
{% card_tummytime_last object %}
{% card_sleep_last object %}
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
{% card_tummytime_day object %}
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
{% card_diaperchange_types object %}
</div>
</div> </div>
{% endblock %} {% endblock %}

2
dashboard/templatetags/dashboard.py
View File

@ -29,7 +29,7 @@ def card_diaperchange_last(child):
def card_diaperchange_types(child): def card_diaperchange_types(child):
"""Diaper change statistics for the last seven days including today.""" """Diaper change statistics for the last seven days including today."""
stats = OrderedDict() stats = OrderedDict()
for x in range(0, 5): for x in range(0, 7):
date = (timezone.now() - timezone.timedelta(days=x)).date() date = (timezone.now() - timezone.timedelta(days=x)).date()
stats[date] = {'wet': 0, 'solid': 0} stats[date] = {'wet': 0, 'solid': 0}