Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add image list as child of exercise
Roland Geiderf8d63296c101
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 1a5f4624a..7891317a3 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -128,6 +128,14 @@ class MusclesCanonicalFormSerializer(serializers.Serializer):backsecondary = serializers.ListField(child=MuscleSerializer())+class WorkoutCanonicalFormExerciseImagesListSerializer(serializers.Serializer):+ """+ Serializer for settings in the canonical form of a workout+ """+ image = serializers.ReadOnlyField()+ is_main = serializers.ReadOnlyField()++class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):"""Serializer for settings in the canonical form of a workout@@ -141,24 +149,17 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):repetition_units = RepetitionUnitSerializer(many=True)weight_units = WeightUnitSerializer(many=True)comment_list = serializers.ReadOnlyField()+ image_list = WorkoutCanonicalFormExerciseImagesListSerializer(many=True)obj = ExerciseSerializer()-class WorkoutCanonicalFormExerciseImagesListSerializer(serializers.Serializer):- """- Serializer for settings in the canonical form of a workout- """- image = serializers.ReadOnlyField()- is_main = serializers.ReadOnlyField()--class WorkoutCanonicalFormExerciseSerializer(serializers.Serializer):"""Serializer for an exercise in the canonical form of a workout"""obj = SetSerializer()exercise_list = WorkoutCanonicalFormExerciseListSerializer(many=True)- exercise_image_list = WorkoutCanonicalFormExerciseImagesListSerializer(many=True)+ #exercise_image_list = WorkoutCanonicalFormExerciseImagesListSerializer(many=True)has_settings = serializers.BooleanField()is_superset = serializers.BooleanField()muscles = MusclesCanonicalFormSerializer()diff --git a/wger/manager/models.py b/wger/manager/models.pyindex 1273f91a5..a99aae625 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -450,10 +450,11 @@ class Day(models.Model):for set_obj in self.set_set.select_related():exercise_tmp = []- exercise_images_tmp = []has_setting_tmp = True+for exercise in set_obj.exercises.select_related():setting_tmp = []+ exercise_images_tmp = []# Muscles for this setfor muscle in exercise.muscles.all():@@ -491,6 +492,13 @@ class Day(models.Model):has_weight = Truebreak+ # Collect exercise images+ for image in exercise.exerciseimage_set.all():+ exercise_images_tmp.append({'image': image.image.url,+ 'is_main': image.is_main,+ })++ # Put it all togetherexercise_tmp.append({'obj': exercise,'setting_obj_list': setting_tmp,'setting_list': setting_list,@@ -500,11 +508,8 @@ class Day(models.Model):'has_weight': has_weight,'reps_list': reps_list,'setting_text': setting_text,- 'comment_list': comment_list})- for image in exercise.exerciseimage_set.all():- exercise_images_tmp.append({'image': image.image.url,- 'is_main': image.is_main,- })+ 'comment_list': comment_list,+ 'image_list': exercise_images_tmp})# If it's a superset, check that all exercises have the same repetitions.# If not, just take the smallest number and drop the rest, because otherwise