Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add exercise name aliases
Roland Geidercd638f64c9ce
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex 0c8e6d8af..fc8fbdb1a 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -21,6 +21,7 @@ from rest_framework import serializersfrom wger.exercises.models import (Equipment,Exercise,+ ExerciseAlias,ExerciseBase,ExerciseCategory,ExerciseComment,@@ -80,6 +81,27 @@ class ExerciseCommentSerializer(serializers.ModelSerializer):'comment']+class ExerciseAliasSerializer(serializers.ModelSerializer):+ """+ ExerciseAlias serializer+ """+ class Meta:+ model = ExerciseAlias+ fields = ['id',+ 'exercise',+ 'alias']+++class ExerciseInfoAliasSerializer(serializers.ModelSerializer):+ """+ Exercise alias serializer for info endpoint+ """+ class Meta:+ model = ExerciseAlias+ fields = ['id',+ 'alias']++class ExerciseCategorySerializer(serializers.ModelSerializer):"""ExerciseCategory serializer@@ -151,12 +173,14 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):muscles_secondary = MuscleSerializer(many=True, read_only=True)equipment = EquipmentSerializer(many=True, read_only=True)variations = serializers.PrimaryKeyRelatedField(many=True, read_only=True)+ aliases = ExerciseInfoAliasSerializer(source='exercisealias_set', many=True, read_only=True)class Meta:model = Exercisedepth = 1fields = ["id","name",+ "aliases","uuid","description","creation_date",diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.pyindex dbf6ba240..caa714ee1 100644--- a/wger/exercises/api/views.py+++ b/wger/exercises/api/views.py@@ -19,6 +19,7 @@import logging# Django+from django.db.models import Qfrom django.utils.translation import gettext as _# Third Party@@ -38,6 +39,7 @@ from wger.core.api.viewsets import CreateUpdateModelViewSetfrom wger.exercises.api.permissions import CanEditExercisesfrom wger.exercises.api.serializers import (EquipmentSerializer,+ ExerciseAliasSerializer,ExerciseBaseSerializer,ExerciseCategorySerializer,ExerciseCommentSerializer,@@ -49,6 +51,7 @@ from wger.exercises.api.serializers import (from wger.exercises.models import (Equipment,Exercise,+ ExerciseAlias,ExerciseBase,ExerciseCategory,ExerciseComment,@@ -207,7 +210,8 @@ def search(request):if q:languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES,language_code=request.GET.get('language', None))- exercises = (Exercise.objects.filter(name__icontains=q)+ name_lookup = Q(name__icontains=q) | Q(exercisealias__alias__icontains=q)+ exercises = (Exercise.objects.filter(name_lookup).accepted().filter(language__in=languages).order_by('exercise_base__category__name', 'name')@@ -342,6 +346,18 @@ class ExerciseCommentViewSet(CreateUpdateModelViewSet):return qs+class ExerciseAliasViewSet(CreateUpdateModelViewSet):+ """+ API endpoint for exercise aliases objects+ """+ serializer_class = ExerciseAliasSerializer+ queryset = ExerciseAlias.objects.all()+ permission_classes = (CanEditExercises,)+ ordering_fields = '__all__'+ filterset_fields = ('alias',+ 'exercise')++class MuscleViewSet(viewsets.ReadOnlyModelViewSet):"""API endpoint for muscle objectsdiff --git a/wger/exercises/migrations/0015_auto_20210613_2349.py b/wger/exercises/migrations/0015_auto_20210613_2349.pynew file mode 100644index 000000000..8d07b3c5b--- /dev/null+++ b/wger/exercises/migrations/0015_auto_20210613_2349.py@@ -0,0 +1,81 @@+# Generated by Django 3.2.3 on 2021-06-13 21:49++from django.conf import settings+from django.db import migrations, models+import django.db.models.deletion+import simple_history.models+++class Migration(migrations.Migration):+ dependencies = [+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),+ ('exercises', '0014_historicalexercise_historicalexercisebase_historicalexercisecomment'),+ ]++ operations = [+ migrations.AlterField(+ model_name='exercisecomment',+ name='exercise',+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,+ to='exercises.exercise',+ verbose_name='Exercise'),+ ),+ migrations.AlterField(+ model_name='historicalexercise',+ name='license_author',+ field=models.CharField(blank=True,+ help_text='If you are not the author, enter the name or source '+ 'here. This is needed for some licenses e.g. the '+ 'CC-BY-SA.',+ max_length=50, null=True, verbose_name='Author'),+ ),+ migrations.AlterField(+ model_name='historicalexercisecomment',+ name='exercise',+ field=models.ForeignKey(blank=True, db_constraint=False, null=True,+ on_delete=django.db.models.deletion.DO_NOTHING,+ related_name='+', to='exercises.exercise',+ verbose_name='Exercise'),+ ),+ migrations.CreateModel(+ name='HistoricalExerciseAlias',+ fields=[+ ('id', models.IntegerField(auto_created=True,+ blank=True,+ db_index=True,+ verbose_name='ID')),+ ('alias', models.CharField(max_length=200,+ verbose_name='Alias for an exercise')),+ ('history_id', models.AutoField(primary_key=True,+ serialize=False)),+ ('history_date', models.DateTimeField()),+ ('history_change_reason', models.CharField(max_length=100, null=True)),+ ('history_type',+ models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')],+ max_length=1)),+ ('exercise', models.ForeignKey(blank=True, db_constraint=False, null=True,+ on_delete=django.db.models.deletion.DO_NOTHING,+ related_name='+', to='exercises.exercise',+ verbose_name='Exercise')),+ ('history_user',+ models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL,+ related_name='+', to=settings.AUTH_USER_MODEL)),+ ],+ options={+ 'verbose_name': 'historical exercise alias',+ 'ordering': ('-history_date', '-history_id'),+ 'get_latest_by': 'history_date',+ },+ bases=(simple_history.models.HistoricalChanges, models.Model),+ ),+ migrations.CreateModel(+ name='ExerciseAlias',+ fields=[+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False,+ verbose_name='ID')),+ ('alias', models.CharField(max_length=200, verbose_name='Alias for an exercise')),+ ('exercise', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,+ to='exercises.exercise', verbose_name='Exercise')),+ ],+ ),+ ]diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 455ecc57a..001cd51af 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -592,7 +592,7 @@ class ExerciseComment(models.Model):"""return self.comment- def save22(self, *args, **kwargs):+ def save(self, *args, **kwargs):"""Reset cached workouts"""@@ -615,3 +615,38 @@ class ExerciseComment(models.Model):Comment has no owner information"""return False+++class ExerciseAlias(models.Model):+ """+ Model for an exercise (name)alias+ """+ exercise = models.ForeignKey(Exercise,+ verbose_name=_('Exercise'),+ on_delete=models.CASCADE)+ alias = models.CharField(max_length=200,+ verbose_name=_('Alias for an exercise'),)++ history = HistoricalRecords()+ """Edit history"""++ def __str__(self):+ """+ Return a more human-readable representation+ """+ return self.alias++ def delete(self, *args, **kwargs):+ """+ Reset cached workouts+ """+ for setting in self.exercise.setting_set.all():+ reset_workout_canonical_form(setting.set.exerciseday.training.pk)++ super(ExerciseAlias, self).delete(*args, **kwargs)++ def get_owner_object(self):+ """+ Comment has no owner information+ """+ return Falsediff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmlindex 338dd6c8a..3a2c217b4 100644--- a/wger/exercises/templates/exercise/view.html+++ b/wger/exercises/templates/exercise/view.html@@ -29,11 +29,12 @@{# Header #}{# #}{% block header %}-<script>-$(document).ready(function() {- wgerDrawWeightLogChart({{json|safe}}, "{{svg_uuid}}");-});-</script>+ <link rel="stylesheet" type="text/css" href="{% static 'angular/styles.css' %}">++ <script src="{% static 'angular/runtime.js' %}" defer></script>+ <script src="{% static 'angular/polyfills.js' %}" defer></script>+ <script src="{% static 'angular/main.js' %}" defer></script>+{% endblock %}@@ -41,7 +42,7 @@ $(document).ready(function() {{# Content #}{# #}{% block content %}-+ <app-root></app-root>{% if exercise.status == exercise.STATUS_PENDING %}<div class="card text-white bg-dark mb-4"><div class="card-header">diff --git a/wger/urls.py b/wger/urls.pyindex 76ef6b100..ea8eed48e 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -80,6 +80,7 @@ router.register(r'equipment', exercises_api_views.EquipmentViewSet, basename='aprouter.register(r'exercisecategory', exercises_api_views.ExerciseCategoryViewSet, basename='exercisecategory')router.register(r'exerciseimage', exercises_api_views.ExerciseImageViewSet, basename='exerciseimage')router.register(r'exercisecomment', exercises_api_views.ExerciseCommentViewSet, basename='exercisecomment')+router.register(r'exercisealias', exercises_api_views.ExerciseAliasViewSet, basename='exercisealias')router.register(r'muscle', exercises_api_views.MuscleViewSet, basename='muscle')# Nutrition app