diff --git a/application/user/templates/daily_log.html b/application/user/templates/daily_log.html index 71bf00a..9fd6017 100644 --- a/application/user/templates/daily_log.html +++ b/application/user/templates/daily_log.html @@ -11,14 +11,14 @@
Macros
{% for macro in macros %}
- {{ macro.name }}: {{ macro.current }} / {{ macro.target }} + {{ macro.name }}: {{ macro.current | int }} / {{ macro.target }}
- {{ (macro.current - macro.target) }}{{ macro.unit }} + {{ (macro.current - macro.target) | int}}{{ macro.unit }}
- {{ min(macro.current, macro.target) }}{{ macro.unit }} + {{ min(macro.current, macro.target) | int }}{{ macro.unit }}
@@ -30,15 +30,31 @@
Items Eaten Today
{% for log in logs %} -
- ({{ log.amount }}g) {{ log.food_item.name }} - {{ log.food_item.energy_100 * log.amount / 100 }} kcal +
+ + + ({{ log.amount | int }}g) + + + + + {{ log.food_item.name }} + + + + + {{ (log.food_item.energy_100 * log.amount / 100) | int }} kcal +
{% endfor %}
+ + +