Self hosted FLOSS fitness/workout, nutrition and weight tracker
Further remaining base to exercise
Roland Geidereb3768eab5ef
diff --git a/wger/core/demo.py b/wger/core/demo.pyindex 983043e64..d5b870d19 100644--- a/wger/core/demo.py+++ b/wger/core/demo.py@@ -106,11 +106,11 @@ def create_demo_entries(user):day2.day.add(wednesday)# Biceps curls with dumbbell- base = ExerciseBase.objects.get(uuid=UUID_CURLS)+ exercise = ExerciseBase.objects.get(uuid=UUID_CURLS)day_set = Set(exerciseday=day, sets=4, order=2)day_set.save()- setting = Setting(set=day_set, exercise_base=base, reps=8, order=1)+ setting = Setting(set=day_set, exercise_base=exercise, reps=8, order=1)setting.save()# Weight log entries@@ -118,7 +118,7 @@ def create_demo_entries(user):for i in range(1, 8):log = WorkoutLog(user=user,- exercise_base=base,+ exercise_base=exercise,workout=workout,reps=reps,weight=18 - reps + random.randint(1, 4),@@ -127,18 +127,18 @@ def create_demo_entries(user):weight_log.append(log)# French press- base = ExerciseBase.objects.get(uuid=UUID_FRENCH_PRESS)+ exercise = ExerciseBase.objects.get(uuid=UUID_FRENCH_PRESS)day_set = Set(exerciseday=day, sets=4, order=2)day_set.save()- setting_list.append(Setting(set=day_set, exercise_base=base, reps=8, order=1))+ setting_list.append(Setting(set=day_set, exercise_base=exercise, reps=8, order=1))# Weight log entriesfor reps in (7, 10):for i in range(1, 8):log = WorkoutLog(user=user,- exercise_base=base,+ exercise_base=exercise,workout=workout,reps=reps,weight=30 - reps + random.randint(1, 4),@@ -147,18 +147,18 @@ def create_demo_entries(user):weight_log.append(log)# Squats- base = ExerciseBase.objects.get(uuid=UUID_SQUATS)+ exercise = ExerciseBase.objects.get(uuid=UUID_SQUATS)day_set = Set(exerciseday=day, sets=4, order=3)day_set.save()- setting_list.append(Setting(set=day_set, exercise_base=base, reps=10, order=1))+ setting_list.append(Setting(set=day_set, exercise_base=exercise, reps=10, order=1))# Weight log entriesfor reps in (5, 10, 12):for i in range(1, 8):log = WorkoutLog(user=user,- exercise_base=base,+ exercise_base=exercise,workout=workout,reps=reps,weight=110 - reps + random.randint(1, 10),@@ -167,20 +167,20 @@ def create_demo_entries(user):weight_log.append(log)# Crunches- base = ExerciseBase.objects.get(uuid=UUID_CRUNCHES)+ exercise = ExerciseBase.objects.get(uuid=UUID_CRUNCHES)day_set = Set(exerciseday=day, sets=4, order=4)day_set.save()- setting_list.append(Setting(set=day_set, exercise_base=base, reps=30, order=1))- setting_list.append(Setting(set=day_set, exercise_base=base, reps=99, order=2))- setting_list.append(Setting(set=day_set, exercise_base=base, reps=35, order=3))+ setting_list.append(Setting(set=day_set, exercise_base=exercise, reps=30, order=1))+ setting_list.append(Setting(set=day_set, exercise_base=exercise, reps=99, order=2))+ setting_list.append(Setting(set=day_set, exercise_base=exercise, reps=35, order=3))# Leg raises, supersets with crunches- base = ExerciseBase.objects.get(uuid=UUID_LEG_RAISES)+ exercise = ExerciseBase.objects.get(uuid=UUID_LEG_RAISES)- setting_list.append(Setting(set=day_set, exercise_base=base, reps=30, order=1))- setting_list.append(Setting(set=day_set, exercise_base=base, reps=40, order=2))- setting_list.append(Setting(set=day_set, exercise_base=base, reps=99, order=3))+ setting_list.append(Setting(set=day_set, exercise_base=exercise, reps=30, order=1))+ setting_list.append(Setting(set=day_set, exercise_base=exercise, reps=40, order=2))+ setting_list.append(Setting(set=day_set, exercise_base=exercise, reps=99, order=3))Setting.objects.bulk_create(setting_list)diff --git a/wger/exercises/sync.py b/wger/exercises/sync.pyindex 82e7699f0..af819d5f0 100644--- a/wger/exercises/sync.py+++ b/wger/exercises/sync.py@@ -390,7 +390,7 @@ def download_exercise_images(print_fn(f'Processing image {image_uuid}')try:- exercise_base = ExerciseBase.objects.get(uuid=image_data['exercise_base_uuid'])+ exercise = ExerciseBase.objects.get(uuid=image_data['exercise_base_uuid'])except ExerciseBase.DoesNotExist:print_fn(' Remote exercise base not found in local DB, skipping...')continue@@ -402,7 +402,7 @@ def download_exercise_images(except ExerciseImage.DoesNotExist:print_fn(' Image not found in local DB, creating now...')retrieved_image = requests.get(image_data['image'], headers=headers)- image = ExerciseImage.from_json(exercise_base, retrieved_image, image_data)+ image = ExerciseImage.from_json(exercise, retrieved_image, image_data)print_fn(style_fn(' successfully saved'))@@ -422,7 +422,7 @@ def download_exercise_videos(print_fn(f'Processing video {video_uuid}')try:- exercise_base = ExerciseBase.objects.get(uuid=video_data['exercise_base_uuid'])+ exercise = ExerciseBase.objects.get(uuid=video_data['exercise_base_uuid'])except ExerciseBase.DoesNotExist:print_fn(' Remote exercise base not found in local DB, skipping...')continue@@ -434,7 +434,7 @@ def download_exercise_videos(except ExerciseVideo.DoesNotExist:print_fn(' Video not found in local DB, creating now...')video = ExerciseVideo()- video.exercise_base = exercise_base+ video.exercise_base = exercisevideo.uuid = video_uuidvideo.is_main = video_data['is_main']video.license_id = video_data['license']diff --git a/wger/exercises/tests/test_change_exercise_author.py b/wger/exercises/tests/test_change_exercise_author.pyindex 1d288a0e0..c154a5899 100644--- a/wger/exercises/tests/test_change_exercise_author.py+++ b/wger/exercises/tests/test_change_exercise_author.py@@ -52,15 +52,15 @@ class ChangeExerciseAuthorTestCase(WgerTestCase):"""Test to ensure command can handle an exercise base id passed"""- exercise_base = ExerciseBase.objects.get(id=2)- self.assertNotEqual(exercise_base.license_author, 'tom')+ exercise = ExerciseBase.objects.get(id=2)+ self.assertNotEqual(exercise.license_author, 'tom')args = ['--author-name', 'tom', '--exercise-base-id', '2']call_command('change-exercise-author', *args, stdout=self.out, no_color=True)self.assertIn('Exercise and/or exercise base has been updated', self.out.getvalue())- exercise_base = ExerciseBase.objects.get(id=2)- self.assertEqual(exercise_base.license_author, 'tom')+ exercise = ExerciseBase.objects.get(id=2)+ self.assertEqual(exercise.license_author, 'tom')def test_can_update_exercise(self):"""diff --git a/wger/exercises/tests/test_deletion_log.py b/wger/exercises/tests/test_deletion_log.pyindex e6fc7b299..e6514e97a 100644--- a/wger/exercises/tests/test_deletion_log.py+++ b/wger/exercises/tests/test_deletion_log.py@@ -35,18 +35,18 @@ class DeletionLogTestCase(WgerTestCase):"""self.assertEqual(DeletionLog.objects.all().count(), 0)- base = ExerciseBase.objects.get(pk=1)- base.delete()+ exercise = ExerciseBase.objects.get(pk=1)+ exercise.delete()# Base is deletedcount_base_logs = DeletionLog.objects.filter(- model_type=DeletionLog.MODEL_BASE, uuid=base.uuid+ model_type=DeletionLog.MODEL_BASE, uuid=exercise.uuid).count()log = DeletionLog.objects.get(pk=1)self.assertEqual(count_base_logs, 1)self.assertEqual(log.model_type, 'base')- self.assertEqual(log.uuid, base.uuid)+ self.assertEqual(log.uuid, exercise.uuid)self.assertEqual(log.comment, 'Exercise base of An exercise')self.assertEqual(log.replaced_by, None)@@ -75,14 +75,14 @@ class DeletionLogTestCase(WgerTestCase):"""self.assertEqual(DeletionLog.objects.all().count(), 0)- base = ExerciseBase.objects.get(pk=1)- base.delete(replace_by='ae3328ba-9a35-4731-bc23-5da50720c5aa')+ exercise = ExerciseBase.objects.get(pk=1)+ exercise.delete(replace_by='ae3328ba-9a35-4731-bc23-5da50720c5aa')# Base is deletedlog = DeletionLog.objects.get(pk=1)self.assertEqual(log.model_type, 'base')- self.assertEqual(log.uuid, base.uuid)+ self.assertEqual(log.uuid, exercise.uuid)self.assertEqual(log.replaced_by, UUID('ae3328ba-9a35-4731-bc23-5da50720c5aa'))def test_base_with_nonexistent_replaced_by(self):@@ -92,8 +92,8 @@ class DeletionLogTestCase(WgerTestCase):"""self.assertEqual(DeletionLog.objects.all().count(), 0)- base = ExerciseBase.objects.get(pk=1)- base.delete(replace_by='12345678-1234-1234-1234-1234567890ab')+ exercise = ExerciseBase.objects.get(pk=1)+ exercise.delete(replace_by='12345678-1234-1234-1234-1234567890ab')# Base is deletedlog = DeletionLog.objects.get(pk=1)diff --git a/wger/exercises/tests/test_exercise_base.py b/wger/exercises/tests/test_exercise_base.pyindex 584c3b461..0fd6d9e5b 100644--- a/wger/exercises/tests/test_exercise_base.py+++ b/wger/exercises/tests/test_exercise_base.py@@ -43,14 +43,14 @@ class ExerciseBaseTestCase(WgerTestCase):"""Test that the properties return the correct data"""- exercise = Exercise.objects.get(pk=1)- base = exercise.exercise_base- self.assertEqual(base.category, exercise.category)- self.assertListEqual(self.get_ids(base.equipment), self.get_ids(exercise.equipment))- self.assertListEqual(self.get_ids(base.muscles), self.get_ids(exercise.muscles))+ translation = Exercise.objects.get(pk=1)+ exercise = translation.exercise_base+ self.assertEqual(exercise.category, translation.category)+ self.assertListEqual(self.get_ids(exercise.equipment), self.get_ids(translation.equipment))+ self.assertListEqual(self.get_ids(exercise.muscles), self.get_ids(translation.muscles))self.assertListEqual(- self.get_ids(base.muscles_secondary),self.get_ids(exercise.muscles_secondary),+ self.get_ids(translation.muscles_secondary),)def test_language_utils_translation_exists(self):@@ -82,17 +82,19 @@ class ExerciseBaseTestCase(WgerTestCase):# Even if these exercises have the same base, only the variations for# their respective languages are returned.- base = ExerciseBase.objects.get(pk=1)- self.assertListEqual(sorted([i.id for i in base.base_variations]), [2])+ exercise = ExerciseBase.objects.get(pk=1)+ self.assertListEqual(sorted([i.id for i in exercise.base_variations]), [2])- base2 = ExerciseBase.objects.get(pk=3)- self.assertEqual(sorted([i.id for i in base2.base_variations]), [4])+ exercise2 = ExerciseBase.objects.get(pk=3)+ self.assertEqual(sorted([i.id for i in exercise2.base_variations]), [4])def test_images(self):"""Test that the correct images are returned for the exercises"""- exercise = Exercise.objects.get(pk=1)- base = exercise.exercise_base- self.assertListEqual(self.get_ids(exercise.images), self.get_ids(base.exerciseimage_set))+ translation = Exercise.objects.get(pk=1)+ exercise = translation.exercise_base+ self.assertListEqual(+ self.get_ids(translation.images), self.get_ids(exercise.exerciseimage_set)+ )class ExerciseCustomApiTestCase(ExerciseCrudApiTestCase):diff --git a/wger/manager/templates/log/add.html b/wger/manager/templates/log/add.htmlindex 36ce866fb..fd8184e9c 100644--- a/wger/manager/templates/log/add.html+++ b/wger/manager/templates/log/add.html@@ -41,8 +41,8 @@ $(document).ready(function () {{% crispy session_form %}{% for set in day.set_set.select_related %}- {% for base in set.exercise_bases %}- {% with value=bases|get_item:base.id %}+ {% for exercise in set.exercise_bases %}+ {% with value=exercise_list|get_item:exercise.id %}<div class="row"><label class="col-md-12 font-weight-bold"><b>{{ value.obj.get_translation.name }}</b>diff --git a/wger/manager/templates/set/formset.html b/wger/manager/templates/set/formset.htmlindex e78bfb05d..8931c4cee 100644--- a/wger/manager/templates/set/formset.html+++ b/wger/manager/templates/set/formset.html@@ -1,7 +1,7 @@{% load wger_extras crispy_forms_tags i18n %}-<div id="formset-base-{{ base.id }}" class="mt-3">+<div id="formset-base-{{ exercise.id }}" class="mt-3"><label class="control-label fw-bold">- {{ base.get_translation.name }}+ {{ exercise.get_translation.name }}</label>{{ formset.management_form }}diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.pyindex 87d195095..a6acd0681 100644--- a/wger/manager/tests/test_set.py+++ b/wger/manager/tests/test_set.py@@ -266,13 +266,13 @@ class TestSetAddFormset(WgerTestCase):"""Helper function"""- base = ExerciseBase.objects.get(pk=1)+ exercise = ExerciseBase.objects.get(pk=1)response = self.client.get(reverse('manager:set:get-formset', kwargs={'base_pk': 1, 'reps': 4}))self.assertEqual(response.status_code, 200)- self.assertEqual(response.context['base'], base)+ self.assertEqual(response.context['exercise'], exercise)self.assertTrue(response.context['formset'])def test_get_formset_logged_in(self):diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex 909e59732..7a6649cc6 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -122,11 +122,11 @@ def add(request, pk):# exercise they belong besides the form-ID, from Django's formsetcounter = 0total_sets = 0- exercise_base_list = {}+ exercise_list = {}form_to_exercise_base = {}for set_set in day.set_set.all():- for base in set_set.exercise_bases:+ for exercise in set_set.exercise_bases:# Maximum possible valuestotal_sets += int(set_set.sets)counter_before = counter@@ -134,8 +134,8 @@ def add(request, pk):form_id_range = range(counter_before, counter + 1)# Add to list- exercise_base_list[base.id] = {- 'obj': base,+ exercise_list[exercise.id] = {+ 'obj': exercise,'sets': int(set_set.sets),'form_ids': form_id_range,}@@ -143,11 +143,14 @@ def add(request, pk):counter += 1# Helper mapping form-ID <--> Exercise basefor id in form_id_range:- form_to_exercise_base[id] = base+ form_to_exercise_base[id] = exercise# Define the formset here because now we know the value to pass to 'extra'WorkoutLogFormSet = modelformset_factory(- WorkoutLog, form=WorkoutLogForm, exclude=('date', 'workout'), extra=total_sets+ WorkoutLog,+ form=WorkoutLogForm,+ exclude=('date', 'workout'),+ extra=total_sets,)# Process the requestif request.method == 'POST':@@ -224,14 +227,14 @@ def add(request, pk):session_form = HelperWorkoutSessionForm()# Pass the correct forms to the exercise list- for base in exercise_base_list:- form_id_from = min(exercise_base_list[base]['form_ids'])- form_id_to = max(exercise_base_list[base]['form_ids'])- exercise_base_list[base]['forms'] = formset[form_id_from : form_id_to + 1]+ for exercise in exercise_list:+ form_id_from = min(exercise_list[exercise]['form_ids'])+ form_id_to = max(exercise_list[exercise]['form_ids'])+ exercise_list[exercise]['forms'] = formset[form_id_from : form_id_to + 1]context = {'day': day,- 'bases': exercise_base_list,+ 'exercise_list': exercise_list,'formset': formset,'helper': WorkoutLogFormHelper(),'session_form': session_form,diff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 5bb6d0a06..c1aa7b128 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -131,7 +131,7 @@ def get_formset(request, base_pk, reps=Set.DEFAULT_SETS):"""Returns a formset. This is then rendered inside the new set template"""- base = ExerciseBase.objects.get(pk=base_pk)+ exercise = ExerciseBase.objects.get(pk=base_pk)SettingFormSet = inlineformset_factory(Set,Setting,@@ -143,7 +143,7 @@ def get_formset(request, base_pk, reps=Set.DEFAULT_SETS):queryset=Setting.objects.none(),prefix=f'base{base_pk}',)- context = {'formset': formset, 'helper': WorkoutLogFormHelper(), 'base': base}+ context = {'formset': formset, 'helper': WorkoutLogFormHelper(), 'exercise': exercise}return render(request, 'set/formset.html', context)