Self hosted FLOSS fitness/workout, nutrition and weight tracker
Further work on migrating from exercise to exercise bases
Roland Geidera49f539d7335
diff --git a/extras/docker/development/entrypoint.sh b/extras/docker/development/entrypoint.shindex 44fe02d5f..b51b500c4 100644--- a/extras/docker/development/entrypoint.sh+++ b/extras/docker/development/entrypoint.sh@@ -1,6 +1,8 @@#!/bin/bash# Copy a settings file if nothing's found (e.g. when mounting a fresh checkout)+# This is a bit ugly, but it's needed since we use this image for development+# and "production".if [ ! -f /home/wger/src/settings.py ]; thencp /tmp/settings.py /home/wger/srcfidiff --git a/wger/config/fixtures/test-languages.json b/wger/config/fixtures/test-languages.jsonindex 955e9c657..cd4924781 100644--- a/wger/config/fixtures/test-languages.json+++ b/wger/config/fixtures/test-languages.json@@ -15,6 +15,14 @@"short_name": "en"}},+ {+ "pk": 3,+ "model": "core.language",+ "fields": {+ "full_name": "Français",+ "short_name": "fr"+ }+ },{"pk": 1,"model": "config.languageconfig",diff --git a/wger/core/demo.py b/wger/core/demo.pyindex 463d27502..648031f1a 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, reps=8, order=1)+ setting = Setting(set=day_set, exercise=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=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, reps=8, order=1))+ setting_list.append(Setting(set=day_set, exercise=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=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, reps=10, order=1))+ setting_list.append(Setting(set=day_set, exercise=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=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, reps=30, order=1))- setting_list.append(Setting(set=day_set, exercise=exercise, reps=99, order=2))- setting_list.append(Setting(set=day_set, exercise=exercise, reps=35, order=3))+ 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))# 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, reps=30, order=1))- setting_list.append(Setting(set=day_set, exercise=exercise, reps=40, order=2))- setting_list.append(Setting(set=day_set, exercise=exercise, reps=99, order=3))+ 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.objects.bulk_create(setting_list)@@ -214,7 +214,7 @@ def create_demo_entries(user):plan = NutritionPlan()plan.user = userplan.language = language- plan.description = _('Sample nutrional plan')+ plan.description = _('Sample nutritional plan')plan.save()# Breakfastdiff --git a/wger/core/static/js/wger-core.js b/wger/core/static/js/wger-core.jsindex ceca4ea83..ba02bce4c 100644--- a/wger/core/static/js/wger-core.js+++ b/wger/core/static/js/wger-core.js@@ -408,13 +408,13 @@ function addExercise(exercise) {$exerciseSearchLog.trigger('create');}-function getExerciseFormset(exerciseId) {+function getExerciseFormset(baseId) {var formsetUrl;var setValue;setValue = $('#id_sets').val();- if (setValue && parseInt(setValue, 10) && exerciseId && parseInt(exerciseId, 10)) {+ if (setValue && parseInt(setValue, 10) && baseId && parseInt(baseId, 10)) {formsetUrl = '/' + getCurrentLanguage() +- '/workout/set/get-formset/' + exerciseId + '/' + setValue;+ '/workout/set/get-formset/' + baseId + '/' + setValue;$.get(formsetUrl, function (data) {var $formsets;@@ -482,12 +482,12 @@ function wgerInitEditSet() {onSelect: function (suggestion) {// Add the exercise to the listaddExercise({- id: suggestion.data.id,+ id: suggestion.data.base_id,value: suggestion.value});// Load formsets- getExerciseFormset(suggestion.data.id);+ getExerciseFormset(suggestion.data.base_id);// Init the remove buttonsinitRemoveExerciseFormset();diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.htmlindex e4500b5d4..b4423134a 100644--- a/wger/core/templates/tags/render_day.html+++ b/wger/core/templates/tags/render_day.html@@ -97,15 +97,17 @@{% endif %}<div class="exercise-list">- {% for exercise in set.exercises %}- <div id="exercise-{{ exercise.id }}" class="ajax-set-edit-target">+ {% for base in set.exercise_bases %}+ {% with exercise as base.get_by_language %}++ <div id="exercise-{{ base.id }}" class="ajax-set-edit-target"><div class="media"><div style="width: 64px; height: 64px;"><a href="{{ exercise.get_absolute_url }}">- {% if exercise.main_image %}+ {% if base.main_image %}<img class="img-fluid"- src="{{ exercise.main_image.image|thumbnail_url:'small' }}"+ src="{{ base.main_image.image|thumbnail_url:'small' }}"alt="{{ exercise }}"style="max-width: 100%; max-height: 100%;">{% else %}@@ -122,11 +124,11 @@{{ exercise.name }}</p><p>- {{ exercise.settings }}+ {{ base.settings }}</p>{% if editable %}- {% if not exercise.settings %}+ {% if not base.settings %}<p>{% translate "This exercise has no repetitions." %}<br><a href="{% url 'manager:set:edit' set.id %}"@@ -136,9 +138,9 @@</p>{% endif %}- {% if exercise.exercisecomment_set.all %}+ {% if base.exercisecomment_set.all %}<p class="text-muted exercise-comments">- {% for comment in exercise.exercisecomment_set.all %}+ {% for comment in base.exercisecomment_set.all %}{{ comment }}<br>{% endfor %}</p>@@ -147,6 +149,7 @@</div></div></div>+ {% endwith %}{% endfor %} <!--for exercise in set--></div></td>diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex 8c6b112c8..f0838d4cf 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -240,6 +240,7 @@ def search(request):'value': exercise.name,'data': {'id': exercise.id,+ 'base_id': exercise.exercise_base_id,'name': exercise.name,'category': _(exercise.category.name),'image': image,diff --git a/wger/exercises/fixtures/test-exercises.json b/wger/exercises/fixtures/test-exercises.jsonindex d6e01bec8..abe06b725 100644--- a/wger/exercises/fixtures/test-exercises.json+++ b/wger/exercises/fixtures/test-exercises.json@@ -217,6 +217,34 @@"update_date": "2022-02-02T06:45:11+01:00"}},+ {+ "pk": 5,+ "model": "exercises.exercise",+ "fields": {+ "uuid": "37b5813c76bd4658820a572d9dd93f31",+ "language": 2,+ "description": "",+ "exercise_base": 1,+ "license_author": "test",+ "name": "Test exercise 123",+ "creation_date": "2022-01-10",+ "update_date": "2022-02-02T06:45:11+01:00"+ }+ },+ {+ "pk": 6,+ "model": "exercises.exercise",+ "fields": {+ "uuid": "37b5813c76bd4658820a572d9dd93f31",+ "language": 3,+ "description": "",+ "exercise_base": 3,+ "license_author": "test",+ "name": "Some other exercise",+ "creation_date": "2022-01-10",+ "update_date": "2022-02-02T06:45:11+01:00"+ }+ },{"pk": 35,"model": "exercises.exercise",diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.pyindex a53748442..e27f32c7d 100644--- a/wger/exercises/models/base.py+++ b/wger/exercises/models/base.py@@ -18,13 +18,18 @@import uuid# Django+from typing import List, Optional++from django.core.checks import translationfrom django.db import models-from django.utils.translation import gettext_lazy as _+from django.utils.translation import gettext_lazy as _, get_language# Third Partyfrom simple_history.models import HistoricalRecords# wger+from wger.utils.constants import DEFAULT_LANGUAGE+from wger.core.models import Languagefrom wger.utils.models import AbstractLicenseModel@@ -107,8 +112,31 @@ class ExerciseBase(AbstractLicenseModel, models.Model):#@property- def get_languages(self):+ def get_languages(self) -> List[Language]:"""Returns the languages from the exercises that use this base"""return [exercise.language for exercise in self.exercises.all()]++ def get_exercise(self, language: Optional[str] = None):+ """+ Returns the exercise for the given language. If the language is not+ available, return the English translation.++ Note that as a fallback, if no English translation is found, the+ first available one is returned. While this is kind of wrong, it won't+ happen in our dataset, but it is possible that some local installations+ have deleted the English translation or similar+ """++ language = language or get_language()++ try:+ exercise = self.exercises.get(language__short_name=language)+ except: # can't do Exercise.DoesNotExist because of circular imports+ try:+ exercise = self.exercises.get(language__short_name=DEFAULT_LANGUAGE)+ except:+ exercise = self.exercises.first()++ return exercisediff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.htmlindex a7e387d8e..a21a274a0 100644--- a/wger/exercises/templates/equipment/overview.html+++ b/wger/exercises/templates/equipment/overview.html@@ -33,7 +33,6 @@ $(function() {Main Content-->{% block content %}-{% cache cache_timeout equipment-overview language.id %}<div class="accordion" id="equipmentAccordion">{% for equipment in equipment_list %}<div class="card">@@ -45,9 +44,8 @@ $(function() {<div class="collapse" id="collapse-{{equipment.pk}}" data-parent="#equipmentAccordion"><div class="card-body px-0"><div class="list-group list-group-flush">- {% for exercise_base in equipment.exercisebase_set.accepted %}- {% for exercise in exercise_base.exercises.accepted %}- {% if exercise.language in exercise_languages %}+ {% for base in equipment.exercisebase_set.all %}+ {% with base.get_exercise as exercise %}<a href="{{ exercise.get_absolute_url }}" class="list-group-item"><div class="media">{% if exercise.main_image %}@@ -74,10 +72,9 @@ $(function() {</div></div></a>- {% endif %}- {% empty %}- {% translate "No exercises for this equipment. Add or edit an exercise and set the equipment." %}- {% endfor %}+ {% endwith %}+ {% empty %}+ {% translate "No exercises for this equipment. Add or edit an exercise and set the equipment." %}{% endfor %}</div></div>@@ -85,7 +82,6 @@ $(function() {</div>{% endfor %}</div>-{% endcache %}{% endblock %}diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.htmlindex c7ab73873..155382b0b 100644--- a/wger/exercises/templates/exercise/overview.html+++ b/wger/exercises/templates/exercise/overview.html@@ -39,7 +39,7 @@ $(document).ready(function() {{% block content %}{% cache cache_timeout exercise-overview language.id %}-{% regroup exercises by exercise_base.category as exercise_list %}+{% regroup bases by category as exercise_list %}<div class="accordion" id="exerciseAccordion">{% for item in exercise_list %}<div class="card">@@ -51,7 +51,8 @@ $(document).ready(function() {<div class="collapse" id="collapse-{{item.grouper.id}}" data-parent="#exerciseAccordion"><div class="card-body px-0"><div class="list-group list-group-flush">- {% for exercise in item.list|dictsort:"name" %}+ {% for base in item.list %}+ {% with base.get_exercise as exercise %}<a href="{{ exercise.get_absolute_url }}" class="list-group-item"><div class="media">{% if exercise.main_image %}@@ -79,6 +80,7 @@ $(document).ready(function() {</div></div></a>+ {% endwith %}{% endfor %}</div></div>diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.htmlindex 1ea88988e..cfe292ddd 100644--- a/wger/exercises/templates/muscles/overview.html+++ b/wger/exercises/templates/muscles/overview.html@@ -47,8 +47,8 @@{% render_muscles muscle %}</div>- {% for exercise_base in muscle.exercisebase_set.accepted %}- {% for exercise in exercise_base.exercises.accepted %}+ {% for exercise_base in muscle.exercisebase_set.all %}+ {% with exercise_base.get_exercise as exercise %}{% if exercise.language in active_languages %}<a href="{{ exercise.get_absolute_url }}" class="list-group-item"><div class="media">@@ -77,9 +77,9 @@</div></a>{% endif %}- {% empty %}- {% translate "No exercises for this muscle. Add or edit an exercise and set the muscle." %}- {% endfor %}+ {% endwith %}+ {% empty %}+ {% translate "No exercises for this muscle. Add or edit an exercise and set the muscle." %}{% endfor %}</div></div>diff --git a/wger/exercises/tests/test_exercise_base.py b/wger/exercises/tests/test_exercise_base.pyindex 0e9265fef..cfc7a762c 100644--- a/wger/exercises/tests/test_exercise_base.py+++ b/wger/exercises/tests/test_exercise_base.py@@ -14,7 +14,10 @@# wgerfrom wger.core.tests.base_testcase import WgerTestCase-from wger.exercises.models import Exercise+from wger.exercises.models import (+ Exercise,+ ExerciseBase+)class ExerciseBaseTestCase(WgerTestCase):@@ -41,6 +44,30 @@ class ExerciseBaseTestCase(WgerTestCase):self.get_ids(exercise.muscles_secondary),)+ def test_language_utils_translation_exists(self):+ """+ Test that the base correctly returns translated exercises+ """+ exercise = ExerciseBase.objects.get(pk=1).get_exercise('de')+ self.assertEqual(exercise.name, 'An exercise')++ def test_language_utils_no_translation_exists(self):+ """+ Test that the base correctly returns the English translation if the+ requested language does not exist+ """+ exercise = ExerciseBase.objects.get(pk=1).get_exercise('fr')+ self.assertEqual(exercise.name, 'Test exercise 123')++ def test_language_utils_no_translation_fallback(self):+ """+ Test that the base correctly returns the first translation if for whatever+ reason English is not available+ """+ exercise = ExerciseBase.objects.get(pk=2).get_exercise('pt')++ self.assertEqual(exercise.name, 'Very cool exercise')+def test_variations(self):"""Test that the variations are correctly returned"""diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.pyindex d49f4453f..90e86e8a6 100644--- a/wger/exercises/views/equipment.py+++ b/wger/exercises/views/equipment.py@@ -135,7 +135,6 @@ class EquipmentOverviewView(ListView):Send some additional data to the template"""context = super(EquipmentOverviewView, self).get_context_data(**kwargs)- context['exercise_languages'] = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)for equipment in context['equipment_list']:equipment.name = _(equipment.name)context['equipment_list'] = sorted(context['equipment_list'], key=lambda e: e.name)diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex e460b863e..a0fd0b3e9 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -100,23 +100,16 @@ class ExerciseListView(ListView):Generic view to list all exercises"""- model = Exercise+ model = ExerciseBasetemplate_name = 'exercise/overview.html'- context_object_name = 'exercises'-- def get(self, request, *args, **kwargs):- response = super(ListView, self).get(request, *args, **kwargs)- patch_vary_headers(response, ['User-Agent'])- return response+ context_object_name = 'bases'def get_queryset(self):"""Filter to only active exercises in the configured languages"""- languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)- return Exercise.objects.all() \- .filter(language__in=languages) \- .order_by('exercise_base__category__id') \+ return ExerciseBase.objects.all() \+ .order_by('category_id') \.select_related()def get_context_data(self, **kwargs):diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex cc9a900ad..c08c8b10e 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -139,7 +139,7 @@ class SettingSerializer(serializers.ModelSerializer):fields = ['id','set',- 'exercise',+ 'exercise_base','repetition_unit','reps','weight',diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.jsonindex df2359f43..9a5f7bc9b 100644--- a/wger/manager/fixtures/test-workout-data.json+++ b/wger/manager/fixtures/test-workout-data.json@@ -128,7 +128,7 @@"weight_unit_id": 1,"weight": null,"order": 1,- "exercise": 1,+ "exercise_base": 1,"rir": 3}},@@ -143,7 +143,7 @@"weight_unit_id": 1,"weight": 15,"order": 1,- "exercise": 2+ "exercise_base": 2}},{@@ -157,7 +157,7 @@"weight_unit_id": 1,"weight": null,"order": 1,- "exercise": 2+ "exercise_base": 2}},diff --git a/wger/manager/forms.py b/wger/manager/forms.pyindex fa56a1111..06e69c238 100644--- a/wger/manager/forms.py+++ b/wger/manager/forms.py@@ -121,7 +121,7 @@ class OrderedModelMultipleChoiceField(ModelMultipleChoiceField):class SetForm(ModelForm):exercises = OrderedModelMultipleChoiceField(- queryset=Exercise.objects.all(),+ queryset=ExerciseBase.objects.all(),label=_('Exercises'),required=False,widget=ExerciseAjaxSelect,diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 69b5e7fab..7e3783998 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -94,12 +94,12 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_tagroup_exercise_marker[set_obj.id] = {'start': len(data), 'end': len(data)}# Exercises- for exercise in set_obj.exercises:+ for base in set_obj.exercise_bases:group_exercise_marker[set_obj.id]['end'] = len(data)# Process the settingssetting_out = []- for i in set_obj.reps_smart_text(exercise).split('–'):+ for i in set_obj.reps_smart_text(base).split('–'):setting_out.append(Paragraph(i, styleSheet["Small"], bulletText=''))# Collect a list of the exercise comments@@ -107,13 +107,13 @@ 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 exercise.exercisecomment_set.all()+ for i in base.exercisecomment_set.all()]# Add the exercise's main imageimage = Paragraph('', styleSheet["Small"])if images:- if exercise.main_image:+ if base.main_image:# Make the images somewhat larger when printing only the workout and not# also the columns for weight logs@@ -122,13 +122,13 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_taelse:image_size = 1.5- image = Image(exercise.main_image.image)+ image = Image(base.main_image.image)image.drawHeight = image_size * cm * image.drawHeight / image.drawWidthimage.drawWidth = image_size * cm# Put the name and images and comments togetherexercise_content = [- Paragraph(exercise.name, styleSheet["Small"]), image,+ Paragraph(base.name, styleSheet["Small"]), image,ListFlowable(item_list,bulletType='bullet',diff --git a/wger/manager/migrations/0016_alter_workoutlog_exercise.py b/wger/manager/migrations/0016_alter_workoutlog_exercise.pydeleted file mode 100644index 450aeae20..000000000--- a/wger/manager/migrations/0016_alter_workoutlog_exercise.py+++ /dev/null@@ -1,20 +0,0 @@-# Generated by Django 3.2.10 on 2022-04-20 12:39--from django.db import migrations, models-import django.db.models.deletion---class Migration(migrations.Migration):-- dependencies = [- ('exercises', '0020_auto_20220302_2136'),- ('manager', '0015_auto_20211028_1113'),- ]-- operations = [- migrations.RenameField(- model_name='workoutlog',- old_name='exercise',- new_name='exercise_base',- ),- ]diff --git a/wger/manager/migrations/0016_move_to_exercise_base.py b/wger/manager/migrations/0016_move_to_exercise_base.pynew file mode 100644index 000000000..eca9923aa--- /dev/null+++ b/wger/manager/migrations/0016_move_to_exercise_base.py@@ -0,0 +1,88 @@+# Generated by Django 3.2.10 on 2022-04-20 12:39++from django.db import migrations, models+import django.db.models.deletion++"""+Migration script to move foreign keys in Settings and WorkoutLog from+Exercise to ExerciseBase. We first add a nullable FK to ExerciseBase,+then we migrate the data.+"""+++def migrate_setting_to_exercise_base(apps, schema_editor):+ Setting = apps.get_model('manager', 'Setting')+ for setting in Setting.objects.all():+ setting.exercise_base = setting.exercise.exercise_base+ setting.save()+++def migrate_log_to_exercise_base(apps, schema_editor):+ WorkoutLog = apps.get_model('manager', 'WorkoutLog')+ for log in WorkoutLog.objects.all():+ log.exercise_base = log.exercise.exercise_base+ log.save()+++class Migration(migrations.Migration):++ dependencies = [+ ('exercises', '0020_auto_20220302_2136'),+ ('manager', '0015_auto_20211028_1113'),+ ]++ operations = [+ # Settings+ migrations.AddField(+ model_name='setting',+ name='exercise_base',+ field=models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ to='exercises.exercisebase',+ verbose_name='Exercises'+ ),+ ),+ migrations.RunPython(migrate_setting_to_exercise_base),+ migrations.AlterField(+ model_name='setting',+ name='exercise_base',+ field=models.ForeignKey(+ null=False,+ on_delete=django.db.models.deletion.CASCADE,+ to='exercises.exercisebase',+ verbose_name='Exercises'+ ),+ ),+ migrations.RemoveField(+ model_name='setting',+ name='exercise',+ ),++ # WorkoutLog+ migrations.AddField(+ model_name='workoutlog',+ name='exercise_base',+ field=models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ to='exercises.exercisebase',+ verbose_name='Exercises'+ ),+ ),+ migrations.RunPython(migrate_log_to_exercise_base),+ migrations.AlterField(+ model_name='workoutlog',+ name='exercise_base',+ field=models.ForeignKey(+ null=False,+ on_delete=django.db.models.deletion.CASCADE,+ to='exercises.exercisebase',+ verbose_name='Exercises'+ ),+ ),+ migrations.RemoveField(+ model_name='workoutlog',+ name='exercise',+ ),+ ]diff --git a/wger/manager/models/day.py b/wger/manager/models/day.pyindex 87fdd6896..9c4ef98e4 100644--- a/wger/manager/models/day.py+++ b/wger/manager/models/day.py@@ -111,34 +111,34 @@ class Day(models.Model):for set_obj in self.set_set.select_related():exercise_tmp = []- for exercise in set_obj.exercises:+ for base in set_obj.exercise_bases:setting_tmp = []exercise_images_tmp = []# Muscles for this set- for muscle in exercise.muscles.all():+ for muscle in base.muscles.all():if muscle.is_front and muscle not in muscles_front:muscles_front.append(muscle)elif not muscle.is_front and muscle not in muscles_back:muscles_back.append(muscle)- for muscle in exercise.muscles_secondary.all():+ for muscle in base.muscles_secondary.all():if muscle.is_front and muscle not in muscles_front:muscles_front_secondary.append(muscle)elif not muscle.is_front and muscle.id not in muscles_back:muscles_back_secondary.append(muscle)for setting in Setting.objects.filter(set=set_obj,- exercise=exercise).order_by('order', 'id'):+ exercise_base=base).order_by('order', 'id'):setting_tmp.append(setting)# "Smart" textual representation- setting_text = set_obj.reps_smart_text(exercise)+ setting_text = set_obj.reps_smart_text(base)# Exercise commentscomment_list = []- for i in exercise.exercisecomment_set.all():- comment_list.append(i.comment)+ #for i in base.exercisecomment_set.all():+ # comment_list.append(i.comment)# Flag indicating whether any of the settings has saved weighthas_weight = False@@ -148,7 +148,7 @@ class Day(models.Model):break# Collect exercise images- for image in exercise.images.all():+ for image in base.exerciseimage_set.all():exercise_images_tmp.append({'image': image.image.url,@@ -159,7 +159,7 @@ class Day(models.Model):# Put it all togetherexercise_tmp.append({- 'obj': exercise,+ 'obj': base,'setting_obj_list': setting_tmp,'setting_text': setting_text,'has_weight': has_weight,diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex a107c16ce..28c2af0d0 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -46,11 +46,13 @@ class WorkoutLog(models.Model):editable=False,on_delete=models.CASCADE,)+exercise_base = models.ForeignKey(ExerciseBase,verbose_name=_('Exercise'),on_delete=models.CASCADE,)+workout = models.ForeignKey(Workout,verbose_name=_('Workout'),diff --git a/wger/manager/models/set.py b/wger/manager/models/set.pyindex b4c7a2f41..32a04e9ed 100644--- a/wger/manager/models/set.py+++ b/wger/manager/models/set.py@@ -26,7 +26,7 @@ from django.db import modelsfrom django.utils.translation import gettext_lazy as _# wger-from wger.exercises.models import Exercise+from wger.exercises.models import Exercise, ExerciseBasefrom wger.utils.cache import reset_workout_canonical_formfrom wger.utils.helpers import normalize_decimal@@ -94,9 +94,9 @@ class Set(models.Model):super(Set, self).delete(*args, **kwargs)@property- def exercises(self) -> typing.List[Exercise]:+ def exercise_bases(self) -> typing.List[ExerciseBase]:"""Returns the exercises for this set"""- out = list(dict.fromkeys([s.exercise for s in self.setting_set.select_related().all()]))+ out = list(dict.fromkeys([s.exercise_base for s in self.setting_set.select_related().all()]))for exercise in out:exercise.settings = self.reps_smart_text(exercise)@@ -117,19 +117,19 @@ class Set(models.Model):* Exercise 2, 8 reps, 10 kg"""setting_lists = []- for exercise in self.exercises:- setting_lists.append(self.computed_settings_exercise(exercise))+ for base in self.exercise_bases:+ setting_lists.append(self.computed_settings_exercise(base))# Interleave all listsreturn [val for tup in zip(*setting_lists) for val in tup]- def computed_settings_exercise(self, exercise: Exercise): # -> typing.List[Setting]+ def computed_settings_exercise(self, exercise_base: ExerciseBase): # -> typing.List[Setting]"""Returns a computed list of settingsIf a set has only one set"""- settings = self.setting_set.filter(exercise=exercise)+ settings = self.setting_set.filter(exercise_base=exercise_base)if settings.count() == 0:return []@@ -139,7 +139,7 @@ class Set(models.Model):else:return list(settings.all())- def reps_smart_text(self, exercise: Exercise):+ def reps_smart_text(self, exercise_base: ExerciseBase):""""Smart" textual representation@@ -148,7 +148,7 @@ class Set(models.Model):This helper also takes care to process, hide or show the different repetitionand weight units as appropriate, e.g. "8 x 2 Plates", "10, 20, 30, ∞"- :param exercise:+ :param exercise_base::return setting_text, setting_list:"""@@ -217,7 +217,7 @@ class Set(models.Model):return out- settings = self.setting_set.select_related().filter(exercise=exercise)+ settings = self.setting_set.select_related().filter(exercise_base=exercise_base)setting_text = ''# Only one setting entry, this is a "compact" representation such as e.g.diff --git a/wger/manager/models/setting.py b/wger/manager/models/setting.pyindex d9da49c34..7afd7ee9d 100644--- a/wger/manager/models/setting.py+++ b/wger/manager/models/setting.py@@ -27,7 +27,7 @@ from wger.core.models import (RepetitionUnit,WeightUnit,)-from wger.exercises.models import Exercise+from wger.exercises.models import ExerciseBase, Exercisefrom wger.utils.cache import reset_workout_canonical_form# Local@@ -40,8 +40,17 @@ class Setting(models.Model):Settings for an exercise (weight, reps, etc.)"""- set = models.ForeignKey(Set, verbose_name=_('Sets'), on_delete=models.CASCADE)- exercise = models.ForeignKey(Exercise, verbose_name=_('Exercises'), on_delete=models.CASCADE)+ set = models.ForeignKey(+ Set,+ verbose_name=_('Sets'),+ on_delete=models.CASCADE,+ )++ exercise_base = models.ForeignKey(+ ExerciseBase,+ verbose_name=_('Exercises'),+ on_delete=models.CASCADE,+ )repetition_unit = models.ForeignKey(RepetitionUnit,verbose_name=_('Unit'),@@ -106,7 +115,7 @@ class Setting(models.Model):"""Return a more human-readable representation"""- return f"setting {self.id} for exercise {self.exercise_id} in set {self.set_id}"+ return f"setting {self.id} for exercise base {self.exercise_base_id} in set {self.set_id}"def save(self, *args, **kwargs):"""diff --git a/wger/manager/templates/set/add.html b/wger/manager/templates/set/add.htmlindex e32573d86..cc515b7e7 100644--- a/wger/manager/templates/set/add.html+++ b/wger/manager/templates/set/add.html@@ -59,7 +59,7 @@ automatically becomes "4 x 10".{% endblocktranslate %}</span><div class="form-group"><div id="formsets">{% for formset in formsets %}- {% include 'set/formset.html' with exercise=formset.exercise formset=formset.formset helper=helper %}+ {% include 'set/formset.html' with base=formset.exercise_base formset=formset.formset helper=helper %}{% endfor %}</div></div>diff --git a/wger/manager/templates/set/formset.html b/wger/manager/templates/set/formset.htmlindex ef632dbd7..c004527d2 100644--- a/wger/manager/templates/set/formset.html+++ b/wger/manager/templates/set/formset.html@@ -1,8 +1,7 @@-{% load wger_extras crispy_forms_tags %}-{% load i18n %}-<div id="formset-exercise-{{exercise.id}}" class="mt-3">+{% load wger_extras crispy_forms_tags i18n %}+<div id="formset-base-{{base.id}}" class="mt-3"><label class="control-label font-weight-bold">- {{exercise}}+ {{base.uuid}}</label>{{ formset.management_form }}diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.pyindex f704f26c7..02bf77653 100644--- a/wger/manager/tests/test_copy_workout.py+++ b/wger/manager/tests/test_copy_workout.py@@ -79,11 +79,11 @@ class CopyWorkoutTestCase(WgerTestCase):self.assertEqual(sets_original[j].order, sets_copy[j].order)self.assertEqual(sets_original[j].comment, sets_copy[j].comment)- exercises_original = sets_original[j].exercises- exercises_copy = sets_copy[j].exercises+ bases_original = sets_original[j].exercise_bases+ bases_copy = sets_copy[j].exercise_bases- for k in range(len(sets_original[j].exercises)):- self.assertEqual(exercises_original[k], exercises_copy[k])+ for k in range(len(sets_original[j].exercise_bases)):+ self.assertEqual(bases_original[k], bases_copy[k])settings_original = sets_original[j].setting_set.all()settings_copy = sets_copy[j].setting_set.all()diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.pyindex 5ce9151cb..11e20fae4 100644--- a/wger/manager/tests/test_set.py+++ b/wger/manager/tests/test_set.py@@ -31,7 +31,7 @@ from wger.core.tests.base_testcase import (WgerAddTestCase,WgerTestCase,)-from wger.exercises.models import Exercise+from wger.exercises.models import ExerciseBasefrom wger.manager.models import (Day,Set,@@ -97,7 +97,7 @@ class SetAddTestCase(WgerAddTestCase):# POST the dataself.user_login('test')- exercises_id = [1, 2]+ base_ids = [1, 2]post_data = {'exercise_list': 1, # Only for mobile version'sets': 4,@@ -136,15 +136,15 @@ class SetAddTestCase(WgerAddTestCase):self.assertEqual(response.status_code, 302)set_obj = Set.objects.get(pk=Set.objects.latest('id').id)- exercise1 = Exercise.objects.get(pk=1)+ base1 = ExerciseBase.objects.get(pk=1)# Check that everything got where it's supposed to- for exercise in set_obj.exercises:- self.assertIn(exercise.id, exercises_id)+ for bases in set_obj.exercise_bases:+ self.assertIn(bases.id, base_ids)settings = Setting.objects.filter(set=set_obj)for setting in settings:- if setting.exercise == exercise1:+ if setting.exercise_base == base1:self.assertIn(setting.reps, (10, 12))else:self.assertIn(setting.reps, (8, 10))@@ -265,16 +265,16 @@ class TestSetAddFormset(WgerTestCase):"""Helper function"""- exercise = Exercise.objects.get(pk=1)+ base = ExerciseBase.objects.get(pk=1)response = self.client.get(reverse('manager:set:get-formset', kwargs={- 'exercise_pk': 1,+ 'base_pk': 1,'reps': 4}))self.assertEqual(response.status_code, 200)- self.assertEqual(response.context['exercise'], exercise)+ self.assertEqual(response.context['base'], base)self.assertTrue(response.context['formset'])def test_get_formset_logged_in(self):@@ -427,7 +427,7 @@ class SetSmartReprTestCase(WgerTestCase):"""set_obj = Set.objects.get(pk=1)- setting_text = set_obj.reps_smart_text(set_obj.exercises[0])+ setting_text = set_obj.reps_smart_text(set_obj.exercise_bases[0])self.assertEqual(setting_text, '2 × 8 (3 RiR)')def test_smart_repr_custom_setting(self):@@ -438,7 +438,7 @@ class SetSmartReprTestCase(WgerTestCase):set_obj.save()setting1 = Setting(set=set_obj,- exercise_id=1,+ exercise_base_id=1,repetition_unit_id=1,reps=8,weight=Decimal(90),@@ -449,7 +449,7 @@ class SetSmartReprTestCase(WgerTestCase):setting1.save()setting2 = Setting(set=set_obj,- exercise_id=1,+ exercise_base_id=1,repetition_unit_id=1,reps=10,weight=Decimal(80),@@ -460,7 +460,7 @@ class SetSmartReprTestCase(WgerTestCase):setting2.save()setting3 = Setting(set=set_obj,- exercise_id=1,+ exercise_base_id=1,repetition_unit_id=1,reps=10,weight=Decimal(80),@@ -471,7 +471,7 @@ class SetSmartReprTestCase(WgerTestCase):setting3.save()setting4 = Setting(set=set_obj,- exercise_id=1,+ exercise_base_id=1,repetition_unit_id=1,reps=12,weight=Decimal(80),@@ -481,7 +481,7 @@ class SetSmartReprTestCase(WgerTestCase):)setting4.save()- setting_text = set_obj.reps_smart_text(Exercise.objects.get(pk=1))+ setting_text = set_obj.reps_smart_text(ExerciseBase.objects.get(pk=1))self.assertEqual(setting_text,'8 (90 kg, 3 RiR) – 10 (80 kg, 2.5 RiR) – '@@ -493,7 +493,7 @@ class SetSmartReprTestCase(WgerTestCase):set_obj.save()setting1 = Setting(set=set_obj,- exercise_id=1,+ exercise_base_id=1,repetition_unit_id=1,reps=8,weight=Decimal(90),@@ -504,7 +504,7 @@ class SetSmartReprTestCase(WgerTestCase):setting1.save()setting2 = Setting(set=set_obj,- exercise_id=3,+ exercise_base_id=3,repetition_unit_id=1,reps=10,weight=Decimal(80),@@ -521,12 +521,12 @@ class SetSmartReprTestCase(WgerTestCase):# Check interleaved settingsfor i in range(0, len(settings)):if (i % 2) == 0:- self.assertEqual(settings[i].exercise_id, 1)+ self.assertEqual(settings[i].exercise_base_id, 1)self.assertEqual(settings[i].reps, 8)self.assertEqual(settings[i].weight, Decimal(90))self.assertEqual(settings[i].rir, '3')else:- self.assertEqual(settings[i].exercise_id, 3)+ self.assertEqual(settings[i].exercise_base_id, 3)self.assertEqual(settings[i].reps, 10)self.assertEqual(settings[i].weight, Decimal(80))self.assertEqual(settings[i].rir, '2.5')diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex 76f9ff27b..a10c3f1b2 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -19,7 +19,7 @@ from django.core.cache import cachefrom wger.core.models import DaysOfWeekfrom wger.core.tests.base_testcase import WgerTestCasefrom wger.exercises.models import (- Exercise,+ ExerciseBase,Muscle,)from wger.manager.models import (@@ -78,8 +78,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):{'exercise_list': [{- 'obj':- Exercise.objects.get(pk=1),+ 'obj': ExerciseBase.objects.get(pk=1),'image_list': [{'image': image1,@@ -105,8 +104,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'backsecondary': [],'front': [muscle1]},- 'obj':- Set.objects.get(pk=1),+ 'obj': Set.objects.get(pk=1),'settings_computed': [setting1] * 2}]@@ -126,8 +124,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'day_list': [DaysOfWeek.objects.get(pk=4)],'text': 'Thursday'},- 'obj':- Day.objects.get(pk=2),+ 'obj': Day.objects.get(pk=2),'muscles': {'back': [muscle2],'frontsecondary': [muscle1],@@ -138,7 +135,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):{'exercise_list': [{- 'obj': Exercise.objects.get(pk=2),+ 'obj': ExerciseBase.objects.get(pk=2),'image_list': [{'image': image2,'is_main': False@@ -220,7 +217,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):{'exercise_list': [{- 'obj': Exercise.objects.get(pk=2),+ 'obj': ExerciseBase.objects.get(pk=2),'image_list': [{'image': image2,'is_main': Falsediff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 5cc1e4983..a86811976 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -250,7 +250,7 @@ patterns_set = [name='add',),path(- 'get-formset/<int:exercise_pk>/<int:reps>',+ 'get-formset/<int:base_pk>/<int:reps>',set.get_formset,name='get-formset',), # Used by JSdiff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.pyindex 0ee538307..53bb93843 100644--- a/wger/manager/views/ical.py+++ b/wger/manager/views/ical.py@@ -95,8 +95,8 @@ def get_events_workout(calendar, workout, duration, start_date=None):# Make the description of the event with the day's exercisesdescription_list = []for set_obj in day.set_set.all():- for exercise in set_obj.exercises:- description_list.append(str(exercise))+ for bases in set_obj.exercise_bases:+ description_list.append(str(bases))description = ', '.join(description_list) if description_list else day.description# Make an event for each weekdaydiff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex d80de3644..43146a56c 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -134,7 +134,7 @@ def add(request, pk):form_to_exercise = {}for exercise_set in day.set_set.all():- for exercise in exercise_set.exercises:+ for bases in exercise_set.exercise_bases:# Maximum possible valuestotal_sets += int(exercise_set.sets)@@ -143,8 +143,8 @@ def add(request, pk):form_id_range = range(counter_before, counter + 1)# Add to list- exercise_list[exercise.id] = {- 'obj': exercise,+ exercise_list[bases.id] = {+ 'obj': bases,'sets': int(exercise_set.sets),'form_ids': form_id_range}@@ -152,7 +152,7 @@ def add(request, pk):counter += 1# Helper mapping form-ID <--> Exercisefor id in form_id_range:- form_to_exercise[id] = exercise+ form_to_exercise[id] = bases# Define the formset here because now we know the value to pass to 'extra'WorkoutLogFormSet = modelformset_factory(@@ -237,11 +237,11 @@ def add(request, pk):session_form = HelperWorkoutSessionForm()# Pass the correct forms to the exercise list- for exercise in exercise_list:+ for bases 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]+ form_id_from = min(exercise_list[bases]['form_ids'])+ form_id_to = max(exercise_list[bases]['form_ids'])+ exercise_list[bases]['forms'] = formset[form_id_from:form_id_to + 1]context = {'day': day,@@ -280,12 +280,12 @@ class WorkoutLogDetailView(DetailView, LoginRequiredMixin):workout_log[day_id] = {}for set_obj in day_obj.set_set.all():exercise_log = {}- for exercise_obj in set_obj.exercises:- exercise_id = exercise_obj.id- exercise_log[exercise_id] = []+ for base_obj in set_obj.exercise_bases:+ exercise_base_id = base_obj.id+ exercise_log[exercise_base_id] = []# Filter the logs for user and exclude all units that are not weight- logs = exercise_obj.exercise_base.workoutlog_set.filter(+ logs = base_obj.workoutlog_set.filter(user=self.owner_user,weight_unit__in=(1, 2),repetition_unit=1,@@ -293,13 +293,13 @@ class WorkoutLogDetailView(DetailView, LoginRequiredMixin):)entry_log, chart_data = process_log_entries(logs)if entry_log:- exercise_log[exercise_obj.id].append(entry_log)+ exercise_log[base_obj.id].append(entry_log)if exercise_log:- workout_log[day_id][exercise_id] = {}- workout_log[day_id][exercise_id]['log_by_date'] = entry_log- workout_log[day_id][exercise_id]['div_uuid'] = 'div-' + str(uuid.uuid4())- workout_log[day_id][exercise_id]['chart_data'] = chart_data+ workout_log[day_id][exercise_base_id] = {}+ workout_log[day_id][exercise_base_id]['log_by_date'] = entry_log+ workout_log[day_id][exercise_base_id]['div_uuid'] = 'div-' + str(uuid.uuid4())+ workout_log[day_id][exercise_base_id]['chart_data'] = chart_datacontext['workout_log'] = workout_logcontext['owner_user'] = self.owner_userdiff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 1393681cf..52415361a 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -35,7 +35,7 @@ from django.shortcuts import (from django.urls import reverse# wger-from wger.exercises.models import Exercise+from wger.exercises.models import ExerciseBasefrom wger.manager.forms import (SetForm,SettingForm,@@ -83,13 +83,13 @@ def create(request, day_pk):if request.method == "POST":form = SetForm(request.POST)if form.is_valid():- for exercise in form.cleaned_data['exercises']:+ for base in form.cleaned_data['exercises']:formset = SettingFormset(request.POST,queryset=Setting.objects.none(),- prefix='exercise{0}'.format(exercise.id)+ prefix=f'base{base.id}')- formsets.append({'exercise': exercise, 'formset': formset})+ formsets.append({'exercise_base': base, 'formset': formset})all_valid = Truefor formset in formsets:@@ -103,13 +103,16 @@ def create(request, day_pk):form.instance.exerciseday = dayset_obj = form.save()+ print(formsets)+ print('---------------------')+order = 1for formset in formsets:instances = formset['formset'].save(commit=False)for instance in instances:instance.set = set_objinstance.order = order- instance.exercise = formset['exercise']+ instance.exercise_base = formset['exercise_base']instance.save()order += 1@@ -129,11 +132,11 @@ def create(request, day_pk):@login_required-def get_formset(request, exercise_pk, reps=Set.DEFAULT_SETS):+def get_formset(request, base_pk, reps=Set.DEFAULT_SETS):"""Returns a formset. This is then rendered inside the new set template"""- exercise = Exercise.objects.get(pk=exercise_pk)+ base = ExerciseBase.objects.get(pk=base_pk)SettingFormSet = inlineformset_factory(Set,Setting,@@ -143,9 +146,9 @@ def get_formset(request, exercise_pk, reps=Set.DEFAULT_SETS):)formset = SettingFormSet(queryset=Setting.objects.none(),- prefix='exercise{0}'.format(exercise_pk),+ prefix=f'base{base_pk}',)- context = {'formset': formset, 'helper': WorkoutLogFormHelper(), 'exercise': exercise}+ context = {'formset': formset, 'helper': WorkoutLogFormHelper(), 'base': base}return render(request, "set/formset.html", context)@@ -188,16 +191,16 @@ def edit(request, pk):)formsets = []- for exercise in set_obj.exercises:- queryset = Setting.objects.filter(set=set_obj, exercise=exercise)- formset = SettingFormsetEdit(queryset=queryset, prefix='exercise{0}'.format(exercise.id))- formsets.append({'exercise': exercise, 'formset': formset})+ for base in set_obj.exercise_bases:+ queryset = Setting.objects.filter(set=set_obj, exercise=base)+ formset = SettingFormsetEdit(queryset=queryset, prefix='exercise{0}'.format(base.id))+ formsets.append({'base': base, 'formset': formset})if request.method == "POST":formsets = []- for exercise in set_obj.exercises:- formset = SettingFormsetEdit(request.POST, prefix='exercise{0}'.format(exercise.id))- formsets.append({'exercise': exercise, 'formset': formset})+ for base in set_obj.exercises:+ formset = SettingFormsetEdit(request.POST, prefix='exercise{0}'.format(base.id))+ formsets.append({'base': base, 'formset': formset})# If all formsets validate, save themall_valid = Truediff --git a/wger/utils/constants.py b/wger/utils/constants.pyindex 23c509474..7b8d6c797 100644--- a/wger/utils/constants.py+++ b/wger/utils/constants.py@@ -58,3 +58,6 @@ MIN_EDIT_DISTANCE_THRESHOLD = 2# CC-BY-SA-4DEFAULT_LICENSE_ID = 2++# Default language+DEFAULT_LANGUAGE = 'en'