Self hosted FLOSS fitness/workout, nutrition and weight tracker
Some more (test) fixes
Roland Geider4152f380aec4
diff --git a/wger/core/demo.py b/wger/core/demo.pyindex 648031f1a..361fd9e2f 100644--- a/wger/core/demo.py+++ b/wger/core/demo.py@@ -103,7 +103,7 @@ def create_demo_entries(user):day_set = Set(exerciseday=day, sets=4, order=2)day_set.save()- setting = Setting(set=day_set, exercise=exercise.exercise_base, reps=8, order=1)+ setting = Setting(set=day_set, exercise_base=exercise.exercise_base, reps=8, order=1)setting.save()# Weight log entries@@ -111,7 +111,7 @@ def create_demo_entries(user):for i in range(1, 8):log = WorkoutLog(user=user,- exercise=exercise.exercise_base,+ exercise_base=exercise.exercise_base,workout=workout,reps=reps,weight=18 - reps + random.randint(1, 4),@@ -127,14 +127,14 @@ def create_demo_entries(user):day_set = Set(exerciseday=day, sets=4, order=2)day_set.save()- setting_list.append(Setting(set=day_set, exercise=exercise.exercise_base, reps=8, order=1))+ setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=8, order=1))# Weight log entriesfor reps in (7, 10):for i in range(1, 8):log = WorkoutLog(user=user,- exercise=exercise.exercise_base,+ exercise_base=exercise.exercise_base,workout=workout,reps=reps,weight=30 - reps + random.randint(1, 4),@@ -150,14 +150,14 @@ def create_demo_entries(user):day_set = Set(exerciseday=day, sets=4, order=3)day_set.save()- setting_list.append(Setting(set=day_set, exercise=exercise.exercise_base, reps=10, order=1))+ setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=10, order=1))# Weight log entriesfor reps in (5, 10, 12):for i in range(1, 8):log = WorkoutLog(user=user,- exercise=exercise.exercise_base,+ exercise_base=exercise.exercise_base,workout=workout,reps=reps,weight=110 - reps + random.randint(1, 10),@@ -173,9 +173,9 @@ def create_demo_entries(user):day_set = Set(exerciseday=day, sets=4, order=4)day_set.save()- setting_list.append(Setting(set=day_set, exercise=exercise.exercise_base, reps=30, order=1))- setting_list.append(Setting(set=day_set, exercise=exercise.exercise_base, reps=99, order=2))- setting_list.append(Setting(set=day_set, exercise=exercise.exercise_base, reps=35, order=3))+ setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=30, order=1))+ setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=99, order=2))+ setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=35, order=3))# Leg raises, supersets with crunchesif language.short_name == 'de':@@ -183,9 +183,9 @@ def create_demo_entries(user):else:exercise = Exercise.objects.get(pk=126)- setting_list.append(Setting(set=day_set, exercise=exercise.exercise_base, reps=30, order=1))- setting_list.append(Setting(set=day_set, exercise=exercise.exercise_base, reps=40, order=2))- setting_list.append(Setting(set=day_set, exercise=exercise.exercise_base, reps=99, order=3))+ setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=30, order=1))+ setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=40, order=2))+ setting_list.append(Setting(set=day_set, exercise_base=exercise.exercise_base, reps=99, order=3))Setting.objects.bulk_create(setting_list)diff --git a/wger/exercises/models/comment.py b/wger/exercises/models/comment.pyindex bb7bba978..65c3dd1c8 100644--- a/wger/exercises/models/comment.py+++ b/wger/exercises/models/comment.py@@ -56,7 +56,7 @@ class ExerciseComment(models.Model):"""Reset cached workouts"""- for setting in self.exercise.setting_set.all():+ for setting in self.exercise.exercise_base.setting_set.all():reset_workout_canonical_form(setting.set.exerciseday.training_id)super(ExerciseComment, self).save(*args, **kwargs)@@ -65,7 +65,7 @@ class ExerciseComment(models.Model):"""Reset cached workouts"""- for setting in self.exercise.setting_set.all():+ for setting in self.exercise.exercise_base.setting_set.all():reset_workout_canonical_form(setting.set.exerciseday.training.pk)super(ExerciseComment, self).delete(*args, **kwargs)diff --git a/wger/exercises/models/exercise.py b/wger/exercises/models/exercise.pyindex e09cb3b76..43119261b 100644--- a/wger/exercises/models/exercise.py+++ b/wger/exercises/models/exercise.py@@ -128,7 +128,7 @@ class Exercise(AbstractLicenseModel, models.Model):delete_template_fragment_cache('equipment-overview', language.id)# Cached workouts- for setting in self.setting_set.all():+ for setting in self.exercise_base.setting_set.all():reset_workout_canonical_form(setting.set.exerciseday.training_id)def delete(self, *args, **kwargs):@@ -143,7 +143,7 @@ class Exercise(AbstractLicenseModel, models.Model):delete_template_fragment_cache('equipment-overview', language.id)# Cached workouts- for setting in self.setting_set.all():+ for setting in self.exercise_base.setting_set.all():reset_workout_canonical_form(setting.set.exerciseday.training.pk)super(Exercise, self).delete(*args, **kwargs)diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.pyindex 5004d1c8b..3cce3ddff 100644--- a/wger/exercises/tests/test_exercise.py+++ b/wger/exercises/tests/test_exercise.py@@ -91,11 +91,11 @@ class ExerciseIndexTestCase(WgerTestCase):self.assertEqual(response.context['active_tab'], WORKOUT_TAB)# Correct categories are shown- category_1 = response.context['exercises'][0].exercise_base.category+ category_1 = response.context['bases'][0].categoryself.assertEqual(category_1.id, 2)self.assertEqual(category_1.name, "Another category")- category_2 = response.context['exercises'][1].exercise_base.category+ category_2 = response.context['bases'][1].categoryself.assertEqual(category_2.id, 3)self.assertEqual(category_2.name, "Yet another category")@@ -656,7 +656,7 @@ class WorkoutCacheTestCase(WgerTestCase):Tests the workout cache when saving"""exercise = Exercise.objects.get(pk=2)- for setting in exercise.setting_set.all():+ for setting in exercise.exercise_base.setting_set.all():setting.set.exerciseday.training.canonical_representationworkout_id = setting.set.exerciseday.training_idself.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))@@ -671,7 +671,7 @@ class WorkoutCacheTestCase(WgerTestCase):exercise = Exercise.objects.get(pk=2)workout_ids = []- for setting in exercise.setting_set.all():+ for setting in exercise.exercise_base.setting_set.all():workout_id = setting.set.exerciseday.training_idworkout_ids.append(workout_id)setting.set.exerciseday.training.canonical_representationdiff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.pyindex 052406cb6..6eff47bcf 100644--- a/wger/exercises/tests/test_exercise_comments.py+++ b/wger/exercises/tests/test_exercise_comments.py@@ -128,7 +128,7 @@ class WorkoutCacheTestCase(WgerTestCase):Tests the workout cache when saving"""comment = ExerciseComment.objects.get(pk=1)- for setting in comment.exercise.setting_set.all():+ for setting in comment.exercise.exercise_base.setting_set.all():setting.set.exerciseday.training.canonical_representationworkout_id = setting.set.exerciseday.training_idself.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))@@ -143,7 +143,7 @@ class WorkoutCacheTestCase(WgerTestCase):comment = ExerciseComment.objects.get(pk=1)workout_ids = []- for setting in comment.exercise.setting_set.all():+ for setting in comment.exercise.exercise_base.setting_set.all():workout_id = setting.set.exerciseday.training_idworkout_ids.append(workout_id)setting.set.exerciseday.training.canonical_representationdiff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex b4a92ad62..502b246a1 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -268,7 +268,7 @@ class ExercisesEditAddView(WgerFormMixin):return formdef form_valid(self, form):- exercise_base = Exercise.objects.filter(name=form.instance.name)[0].exercise_base+ exercise_base = ExerciseBase.objects.filter(id=form.instance.id)exercise_base.equipment.set(form.cleaned_data['equipment'].all())exercise_base.muscles.set(form.cleaned_data['muscles'].all())exercise_base.muscles_secondary.set(form.cleaned_data['muscles_secondary'].all())diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 7e3783998..806a5c97d 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -95,6 +95,7 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_ta# Exercisesfor base in set_obj.exercise_bases:+ exercise = base.get_exercise()group_exercise_marker[set_obj.id]['end'] = len(data)# Process the settings@@ -107,7 +108,7 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_taif comments:item_list = [ListItem(Paragraph(i.comment, style=styleSheet["ExerciseComments"]))- for i in base.exercisecomment_set.all()+ for i in exercise.exercisecomment_set.all()]# Add the exercise's main image@@ -128,7 +129,7 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_ta# Put the name and images and comments togetherexercise_content = [- Paragraph(base.name, styleSheet["Small"]), image,+ Paragraph(exercise.name, styleSheet["Small"]), image,ListFlowable(item_list,bulletType='bullet',diff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 45abcfd33..2957b2b76 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -190,7 +190,7 @@ def edit(request, pk):formsets = []for base in set_obj.exercise_bases:- queryset = Setting.objects.filter(set=set_obj, exercise=base)+ queryset = Setting.objects.filter(set=set_obj, exercise_base=base)formset = SettingFormsetEdit(queryset=queryset, prefix='exercise{0}'.format(base.id))formsets.append({'base': base, 'formset': formset})