Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add exercise images to workout canonical form
Roland Geider56848ce92875
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 9d82a9713..1a5f4624a 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -144,12 +144,21 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):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)has_settings = serializers.BooleanField()is_superset = serializers.BooleanField()muscles = MusclesCanonicalFormSerializer()diff --git a/wger/manager/models.py b/wger/manager/models.pyindex 654cb773f..1273f91a5 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -450,6 +450,7 @@ class Day(models.Model):for set_obj in self.set_set.select_related():exercise_tmp = []+ exercise_images_tmp = []has_setting_tmp = Truefor exercise in set_obj.exercises.select_related():setting_tmp = []@@ -500,6 +501,10 @@ class Day(models.Model):'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,+ })# 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@@ -522,6 +527,7 @@ class Day(models.Model):canonical_repr.append({'obj': set_obj,'exercise_list': exercise_tmp,+ 'exercise_image_list': exercise_images_tmp,'is_superset': True if len(exercise_tmp) > 1 else False,'has_settings': has_setting_tmp,'muscles': {diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex aadf0a1d8..e8ed969ea 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -82,6 +82,9 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):repetition_unit],'weight_units': [weight_unit,weight_unit]}],+ 'exercise_image_list': [{+ 'image': '/media/exercise-images/1/protestschwein.jpg',+ 'is_main': True}],'is_superset': False,'has_settings': True,'muscles': {'back': [muscle2],@@ -89,7 +92,22 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'backsecondary': [],'front': [muscle1]},'obj': Set.objects.get(pk=1)}]}- self.assertEqual(workout.canonical_representation['day_list'][0], canonical_form)++ days_test_data = workout.canonical_representation['day_list'][0]+ self.assertEqual(days_test_data['days_of_week'], canonical_form['days_of_week'])+ self.assertEqual(days_test_data['muscles'], canonical_form['muscles'])+ self.assertEqual(days_test_data['obj'], canonical_form['obj'])+ self.assertEqual(days_test_data['set_list'][0]['exercise_list'],+ canonical_form['set_list'][0]['exercise_list'])+ self.assertEqual(days_test_data['set_list'][0]['exercise_image_list'][0],+ canonical_form['set_list'][0]['exercise_image_list'][0])+ self.assertEqual(days_test_data['set_list'][0]['is_superset'],+ canonical_form['set_list'][0]['is_superset'])+ self.assertEqual(days_test_data['set_list'][0]['has_settings'],+ canonical_form['set_list'][0]['has_settings'])+ self.assertEqual(days_test_data['set_list'][0]['muscles'],+ canonical_form['set_list'][0]['muscles'])+ self.assertEqual(days_test_data['set_list'][0]['obj'], canonical_form['set_list'][0]['obj'])canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=4)],'text': 'Thursday'},@@ -117,6 +135,9 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weight_unit,weight_unit,weight_unit]}],+ 'exercise_image_list': [{+ 'image': '/media/exercise-images/1/wildschwein.jpg',+ 'is_main': False}],'is_superset': False,'has_settings': True,'muscles': {'back': [muscle2],@@ -124,7 +145,21 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'backsecondary': [muscle1],'front': []},'obj': Set.objects.get(pk=2)}]}- self.assertEqual(workout.canonical_representation['day_list'][1], canonical_form)+ days_test_data = workout.canonical_representation['day_list'][1]+ self.assertEqual(days_test_data['days_of_week'], canonical_form['days_of_week'])+ self.assertEqual(days_test_data['muscles'], canonical_form['muscles'])+ self.assertEqual(days_test_data['obj'], canonical_form['obj'])+ self.assertEqual(days_test_data['set_list'][0]['exercise_list'],+ canonical_form['set_list'][0]['exercise_list'])+ self.assertEqual(days_test_data['set_list'][0]['exercise_image_list'][0],+ canonical_form['set_list'][0]['exercise_image_list'][0])+ self.assertEqual(days_test_data['set_list'][0]['is_superset'],+ canonical_form['set_list'][0]['is_superset'])+ self.assertEqual(days_test_data['set_list'][0]['has_settings'],+ canonical_form['set_list'][0]['has_settings'])+ self.assertEqual(days_test_data['set_list'][0]['muscles'],+ canonical_form['set_list'][0]['muscles'])+ self.assertEqual(days_test_data['set_list'][0]['obj'], canonical_form['set_list'][0]['obj'])canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=5)],'text': 'Friday'},