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

Unify "wet" and "solid" columns 

Note that change is always at least either wet or solid.

Fixes #235
This commit is contained in:
Ohad Lutzky 2021-08-03 20:52:39 +01:00 committed by Christopher Charbonneau Wells
parent 51c70c1746
commit 20538ce59d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/templates/core/diaperchange_list.html
View File

@ -23,8 +23,7 @@
<tr> <tr>
<th>{% trans "Time" %}</th> <th>{% trans "Time" %}</th>
<th>{% trans "Child" %}</th> <th>{% trans "Child" %}</th>
<th class="text-center">{% trans "Wet" %}</th> <th class="text-center">{% trans "Contents" %}</th>
<th class="text-center">{% trans "Solid" %}</th>
<th>{% trans "Color" %}</th> <th>{% trans "Color" %}</th>
<th>{% trans "Amount" %}</th> <th>{% trans "Amount" %}</th>
<th class="text-center">{% trans "Actions" %}</th> <th class="text-center">{% trans "Actions" %}</th>
@ -36,8 +35,10 @@
<tr class="{{ row_class }}"> <tr class="{{ row_class }}">
<th scope="row">{{ change.time|datetime_short }}</th> <th scope="row">{{ change.time|datetime_short }}</th>
<td><a href="{% url 'core:child' change.child.slug %}">{{ change.child }}</a></td> <td><a href="{% url 'core:child' change.child.slug %}">{{ change.child }}</a></td>
<td class="text-center">{{ change.wet|bool_icon }}</td> <td class="text-center">
<td class="text-center">{{ change.solid|bool_icon }}</td> {% if change.wet %}<span title="{% trans "Wet" %}">💦</span>{% endif %}
{% if change.solid %}<span title="{% trans "Solid" %}">💩</span>{% endif %}
</td>
<td>{{ change.get_color_display }}</td> <td>{{ change.get_color_display }}</td>
<td>{{ change.amount|default_if_none:"" }}</td> <td>{{ change.amount|default_if_none:"" }}</td>
<td class="text-center"> <td class="text-center">