Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Correctly output the nutritional values for a plan

Roland Geider1ca81d4a9533
diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.py
index c60abeb05..efb1228ff 100644
--- a/wger/nutrition/api/serializers.py
+++ b/wger/nutrition/api/serializers.py
@@ -295,9 +295,11 @@ class NutritionPlanInfoSerializer(serializers.ModelSerializer):
"""
Nutritional plan info serializer
"""
-
meals = MealInfoSerializer(source='meal_set', many=True)
- get_nutritional_values = NutritionalValuesSerializer(read_only=True)
+ get_nutritional_values = NutritionalValuesSerializer(
+ source='get_nutritional_values.total',
+ read_only=True
+ )
class Meta:
model = NutritionPlan
diff --git a/wger/nutrition/models/meal.py b/wger/nutrition/models/meal.py
index e025435f0..6cb16e9e9 100644
--- a/wger/nutrition/models/meal.py
+++ b/wger/nutrition/models/meal.py
@@ -83,7 +83,7 @@ class Meal(models.Model):
def get_nutritional_values(self, use_metric=True):
"""
- Sums the nutrional info of all items in the meal
+ Sums the nutritional info of all items in the meal
:param use_metric Flag that controls the units used
"""