stef_buwalda/cal_counter
1
0
Fork 0
mirror of https://github.com/StefBuwalda/cal_counter.git synced 2025-10-29 10:50:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted GUI of daily dashboard to better deal with float values (#9)

Browse Source
This commit is contained in:
Stef
2025-10-08 11:56:20 +02:00
committed by GitHub
parent 4bc319c32a
commit 573437f4cf
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
application/user/templates/daily_log.html
View File

@@ -11,14 +11,14 @@
<h5>Macros</h5>
{% for macro in macros %}
<div class="mb-2">
<span class="macro-text">{{ macro.name }}: {{ macro.current }} / {{ macro.target }}</span>
<span class="macro-text">{{ macro.name }}: {{ macro.current | int }} / {{ macro.target }}</span>
<div class="progress rounded" style="height: 24px;">
<div class="progress-bar bg-danger macro-bar" role="progressbar"
style="width: {{ macro.bar_width_overflow }}%">
{{ (macro.current - macro.target) }}{{ macro.unit }}
{{ (macro.current - macro.target) | int}}{{ macro.unit }}
</div>
<div class="progress-bar bg-success macro-bar" role="progressbar" style="width: {{ macro.bar_width }}%">
{{ min(macro.current, macro.target) }}{{ macro.unit }}
{{ min(macro.current, macro.target) | int }}{{ macro.unit }}
</div>
</div>
</div>
@@ -30,15 +30,31 @@
<h5>Items Eaten Today</h5>
<div class="list-group list-group-flush">
{% for log in logs %}
<div class="list-group-item item-row d-flex justify-content-between align-items-center">
<span>({{ log.amount }}g) {{ log.food_item.name }}</span>
<span>{{ log.food_item.energy_100 * log.amount / 100 }} kcal</span>
<div class="list-group-item d-flex align-items-center">
<!-- Weight: fixed width, right-aligned -->
<span class="text-end" style="width: 6ch; flex-shrink: 0;">
({{ log.amount | int }}g)
</span>
<!-- Food name: flexible, truncates if too long -->
<span class="text-truncate flex-grow-1"
style="min-width: 0; margin-left: 0.5rem; margin-right: 0.5rem;">
{{ log.food_item.name }}
</span>
<!-- kcal: fixed width, right-aligned, pushed to the right -->
<span class="d-inline-block text-end ms-auto" style="width: 9ch; flex-shrink: 0;">
{{ (log.food_item.energy_100 * log.amount / 100) | int }} kcal
</span>
</div>
{% endfor %}
</div>
</div>
</div>
<!-- Bottom Navigation Buttons -->