Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Re-add the IDs to the different serializers

Roland Geiderbdfcb1dd1eb1
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index a95f4ab2f..8c4257773 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -109,7 +109,8 @@ class LicenseSerializer(serializers.ModelSerializer):
"""
class Meta:
model = License
- fields = ['full_name',
+ fields = ['id',
+ 'full_name',
'short_name',
'url']
@@ -120,7 +121,8 @@ class RepetitionUnitSerializer(serializers.ModelSerializer):
"""
class Meta:
model = RepetitionUnit
- fields = ['name']
+ fields = ['id',
+ 'name']
class WeightUnitSerializer(serializers.ModelSerializer):
@@ -129,4 +131,4 @@ class WeightUnitSerializer(serializers.ModelSerializer):
"""
class Meta:
model = WeightUnit
- fields = ['name']
+ fields = ['id', 'name']
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 5656ae1b2..1ee31fa1d 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -34,7 +34,7 @@ class ExerciseSerializer(serializers.ModelSerializer):
"""
class Meta:
model = Exercise
- fields = ['objects',
+ fields = ['id',
'category',
'description',
'name',
@@ -54,7 +54,8 @@ class EquipmentSerializer(serializers.ModelSerializer):
"""
class Meta:
model = Equipment
- fields = ['name']
+ fields = ['id',
+ 'name']
class ExerciseImageSerializer(serializers.ModelSerializer):
@@ -63,7 +64,7 @@ class ExerciseImageSerializer(serializers.ModelSerializer):
"""
class Meta:
model = ExerciseImage
- fields = ['objects',
+ fields = ['id',
'exercise',
'image',
'is_main']
@@ -75,7 +76,8 @@ class ExerciseCommentSerializer(serializers.ModelSerializer):
"""
class Meta:
model = ExerciseComment
- fields = ['exercise',
+ fields = ['id',
+ 'exercise',
'comment']
@@ -113,7 +115,8 @@ class ExerciseCategorySerializer(serializers.ModelSerializer):
"""
class Meta:
model = ExerciseCategory
- fields = ['name']
+ fields = ['id',
+ 'name']
class MuscleSerializer(serializers.ModelSerializer):
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 0ee746c91..a2d493fa1 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -60,7 +60,7 @@ class WorkoutSessionSerializer(serializers.ModelSerializer):
class Meta:
model = WorkoutSession
- fields = ['user', 'workout', 'date', 'notes', 'impression', 'time_start', 'time_end']
+ fields = ['id', 'user', 'workout', 'date', 'notes', 'impression', 'time_start', 'time_end']
class WorkoutLogSerializer(serializers.ModelSerializer):
@@ -78,7 +78,10 @@ class ScheduleStepSerializer(serializers.ModelSerializer):
"""
class Meta:
model = ScheduleStep
- fields = ['schedule', 'workout', 'duration']
+ fields = ['id',
+ 'schedule',
+ 'workout',
+ 'duration']
class ScheduleSerializer(serializers.ModelSerializer):
@@ -97,7 +100,7 @@ class DaySerializer(serializers.ModelSerializer):
class Meta:
model = Day
- fields = ['training', 'description', 'day']
+ fields = ['id', 'training', 'description', 'day']
class SetSerializer(serializers.ModelSerializer):
@@ -107,7 +110,7 @@ class SetSerializer(serializers.ModelSerializer):
class Meta:
model = Set
- fields = ['exerciseday', 'exercises', 'sets', 'order']
+ fields = ['id', 'exerciseday', 'exercises', 'sets', 'order']
class SettingSerializer(serializers.ModelSerializer):
@@ -116,7 +119,7 @@ class SettingSerializer(serializers.ModelSerializer):
"""
class Meta:
model = Setting
- fields = ['set', 'exercise', 'repetition_unit', 'reps',
+ fields = ['id', 'set', 'exercise', 'repetition_unit', 'reps',
'weight', 'weight_unit', 'rir', 'order', 'comment']
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 7e765fc5a..c735166b9 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -765,13 +765,12 @@ class BaseMealItem(object):
nutritional_info['energy'] += self.ingredient.energy * item_weight / 100
nutritional_info['protein'] += self.ingredient.protein * item_weight / 100
nutritional_info['carbohydrates'] += self.ingredient.carbohydrates * item_weight / 100
+ nutritional_info['fat'] += self.ingredient.fat * item_weight / 100
if self.ingredient.carbohydrates_sugar:
nutritional_info['carbohydrates_sugar'] += \
self.ingredient.carbohydrates_sugar * item_weight / 100
- nutritional_info['fat'] += self.ingredient.fat * item_weight / 100
-
if self.ingredient.fat_saturated:
nutritional_info['fat_saturated'] += self.ingredient.fat_saturated * item_weight / 100
diff --git a/wger/weight/api/serializers.py b/wger/weight/api/serializers.py
index aa13f5a34..f29dfbf19 100644
--- a/wger/weight/api/serializers.py
+++ b/wger/weight/api/serializers.py
@@ -32,6 +32,7 @@ class WeightEntrySerializer(serializers.ModelSerializer):
class Meta:
model = WeightEntry
- fields = ['date',
+ fields = ['id',
+ 'date',
'weight',
'user']