Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix outputting of nutritional plan data

Roland Geider42e76c82dc85
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index 9ff8fa410..9161f95dc 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -104,19 +104,18 @@ day in your current workout:{% endblocktrans %} {{current_workout}}</p>
</a>
</p>
– {{ plan.creation_date }}
-
<ul>
<li>
- {% trans "Energy" %}: {{nutritional_info.energy|floatformat}} kcal
+ {% trans "Energy" %}: {{nutritional_info.total.energy|floatformat}} kcal
</li>
<li>
- {% trans "Protein" %}: {{nutritional_info.protein|floatformat}} g
+ {% trans "Protein" %}: {{nutritional_info.total.protein|floatformat}} g
</li>
<li>
- {% trans "Carbohydrates" %}: {{nutritional_info.carbohydrates|floatformat}} g
+ {% trans "Carbohydrates" %}: {{nutritional_info.total.carbohydrates|floatformat}} g
</li>
<li>
- {% trans "Fat" %}: {{nutritional_info.fat|floatformat}} g
+ {% trans "Fat" %}: {{nutritional_info.total.fat|floatformat}} g
</li>
</ul>
diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.html
index 6d965ec3e..64e132334 100644
--- a/wger/core/templates/mobile/index.html
+++ b/wger/core/templates/mobile/index.html
@@ -65,16 +65,16 @@
<ul>
<li>
- {% trans "Energy" %}: {{nutritional_info.energy|floatformat}} kcal
+ {% trans "Energy" %}: {{nutritional_info.total.energy|floatformat}} kcal
</li>
<li>
- {% trans "Protein" %}: {{nutritional_info.protein|floatformat}} g
+ {% trans "Protein" %}: {{nutritional_info.total.protein|floatformat}} g
</li>
<li>
- {% trans "Carbohydrates" %}: {{nutritional_info.carbohydrates|floatformat}} g
+ {% trans "Carbohydrates" %}: {{nutritional_info.total.carbohydrates|floatformat}} g
</li>
<li>
- {% trans "Fat" %}: {{nutritional_info.fat|floatformat}} g
+ {% trans "Fat" %}: {{nutritional_info.total.fat|floatformat}} g
</li>
</ul>