diff --git a/core/templates/core/diaperchange_list.html b/core/templates/core/diaperchange_list.html index 796981ee..2e6020e1 100644 --- a/core/templates/core/diaperchange_list.html +++ b/core/templates/core/diaperchange_list.html @@ -21,6 +21,7 @@ + {% if not unique_child %} @@ -28,24 +29,13 @@ - {% for change in object_list %} {% cycle "odd" "even" as row_class silent %} - - {% if not unique_child %} - - {% endif %} - - - - + + {% if not unique_child %} + + {% endif %} + + + {% if change.notes %} diff --git a/core/templates/core/feeding_list.html b/core/templates/core/feeding_list.html index b2cfae3a..79586ea2 100644 --- a/core/templates/core/feeding_list.html +++ b/core/templates/core/feeding_list.html @@ -21,6 +21,7 @@
{% trans "Actions" %} {% trans "Time" %}{% trans "Child" %}{% trans "Contents" %} {% trans "Color" %} {% trans "Amount" %}{% trans "Actions" %}
{{ change.time|datetime_short }}{{ change.child }} - {% if change.wet %}💦{% endif %} - {% if change.solid %}💩{% endif %} - {{ change.get_color_display }}{{ change.amount|default_if_none:"" }} +
{% if perms.core.change_diaperchange %} @@ -62,6 +52,16 @@
{{ change.time|datetime_short }}{{ change.child }} + {% if change.wet %}💦{% endif %} + {% if change.solid %}💩{% endif %} + {{ change.get_color_display }}{{ change.amount|default_if_none:"" }}
+ {% if not unique_child %} @@ -30,26 +31,13 @@ {% comment %}Abbreviation of "Amount"{% endcomment %} - {% for feeding in object_list %} {% cycle "odd" "even" as row_class silent %} - - {% if not unique_child %} - - {% endif %} - - - - + + {% if not unique_child %} + + {% endif %} + + + + {% if feeding.notes %} diff --git a/core/templates/core/note_list.html b/core/templates/core/note_list.html index 46b7ba19..bad148b2 100644 --- a/core/templates/core/note_list.html +++ b/core/templates/core/note_list.html @@ -21,23 +21,18 @@
{% trans "Actions" %} {% trans "Date" %}{% trans "Child" %}{% trans "Amt." %} {% trans "Duration" %}{% trans "Actions" %}
{{ feeding.start|datetime_short }}{{ feeding.child }}{{ feeding.get_method_display }}{{ feeding.get_type_display }} - {% if feeding.amount %} - {{ feeding.amount }} - {% endif %} - {{ feeding.duration|duration_string }}
{% if perms.core.change_feeding %} @@ -66,6 +54,18 @@
{{ feeding.start|datetime_short }}{{ feeding.child }}{{ feeding.get_method_display }}{{ feeding.get_type_display }} + {% if feeding.amount %} + {{ feeding.amount }} + {% endif %} + {{ feeding.duration|duration_string }}
+ {% if not unique_child %} {% endif %} - {% for note in object_list %} - - {% if not unique_child %} - - {% endif %} - - + + {% if not unique_child %} + + {% endif %} + {% empty %} diff --git a/core/templates/core/sleep_list.html b/core/templates/core/sleep_list.html index 3bd7cce0..186d65ff 100644 --- a/core/templates/core/sleep_list.html +++ b/core/templates/core/sleep_list.html @@ -21,6 +21,7 @@
{% trans "Actions" %} {% trans "Time" %}{% trans "Child" %}{% trans "Note" %}{% trans "Actions" %}
{{ note.time|datetime_short }}{{ note.child }}{{ note.note }} +
{% if perms.core.change_note %} @@ -54,6 +49,11 @@
{{ note.time|datetime_short }}{{ note.child }}{{ note.note }}
+ {% if not unique_child %} @@ -28,21 +29,13 @@ {% endif %} - {% for sleep in object_list %} {% cycle "odd" "even" as row_class silent %} - - - {% if not unique_child %} - - {% endif %} - - - + + + {% if not unique_child %} + + {% endif %} + + {% if sleep.notes %} diff --git a/core/templates/core/temperature_list.html b/core/templates/core/temperature_list.html index 74997636..7d1c0ce8 100644 --- a/core/templates/core/temperature_list.html +++ b/core/templates/core/temperature_list.html @@ -21,24 +21,19 @@
{% trans "Actions" %} {% trans "Start" %} {% trans "End" %}{% trans "Duration" %} {% trans "Nap" %}{% trans "Actions" %}
{{ sleep.start|datetime_short }}{{ sleep.end|datetime_short }}{{ sleep.child }}{{ sleep.duration|duration_string }}{{ sleep.nap|bool_icon }} +
{% if perms.core.change_sleep %} @@ -59,6 +52,13 @@
{{ sleep.start|datetime_short }}{{ sleep.end|datetime_short }}{{ sleep.child }}{{ sleep.duration|duration_string }}{{ sleep.nap|bool_icon }}
+ {% if not unique_child %} {% endif %} - {% for temperature in object_list %} {% cycle "odd" "even" as row_class silent %} - - {% if not unique_child %} - - {% endif %} - - + + {% if not unique_child %} + + {% endif %} + {% if temperature.notes %} diff --git a/core/templates/core/tummytime_list.html b/core/templates/core/tummytime_list.html index c9f50113..c9dd2626 100644 --- a/core/templates/core/tummytime_list.html +++ b/core/templates/core/tummytime_list.html @@ -20,6 +20,7 @@
{% trans "Actions" %} {% trans "Time" %}{% trans "Child" %}{% trans "Temperature" %}{% trans "Actions" %}
{{ temperature.time|datetime_short }}{{ temperature.child }}{{ temperature.temperature }} +
{% if perms.core.change_temperature %} @@ -55,6 +50,11 @@
{{ temperature.time|datetime_short }}{{ temperature.child }}{{ temperature.temperature }}
+ {% if not unique_child %} @@ -27,20 +28,12 @@ {% endif %} - {% for tummytime in object_list %} - - - {% if not unique_child %} - - {% endif %} - - - + + + {% if not unique_child %} + + {% endif %} + + {% empty %} diff --git a/core/templates/core/weight_list.html b/core/templates/core/weight_list.html index d89a79cd..a252f963 100644 --- a/core/templates/core/weight_list.html +++ b/core/templates/core/weight_list.html @@ -21,24 +21,19 @@
{% trans "Actions" %} {% trans "Start" %} {% trans "End" %}{% trans "Duration" %} {% trans "Milestone" %}{% trans "Actions" %}
{{ tummytime.start|datetime_short }}{{ tummytime.end|datetime_short }}{{ tummytime.child }}{{ tummytime.duration|duration_string }}{{ tummytime.milestone }} +
{% if perms.core.change_tummytime %} @@ -57,6 +50,13 @@
{{ tummytime.start|datetime_short }}{{ tummytime.end|datetime_short }}{{ tummytime.child }}{{ tummytime.duration|duration_string }}{{ tummytime.milestone }}
+ {% if not unique_child %} {% endif %} - {% for weight in object_list %} {% cycle "odd" "even" as row_class silent %} - - {% if not unique_child %} - - {% endif %} - - + + {% if not unique_child %} + + {% endif %} + {% if weight.notes %}
{% trans "Actions" %} {% trans "Date" %}{% trans "Child" %}{% trans "Weight" %}{% trans "Actions" %}
{{ weight.date }}{{ weight.child }}{{ weight.weight }} +
{% if perms.core.change_weight %} @@ -55,6 +50,11 @@
{{ weight.date }}{{ weight.child }}{{ weight.weight }}