Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into split-exercise-translations

Roland Geiderda536ea03756
diff --cc AUTHORS.rst
index 9a35ff914,53c2fe551..5f83b4abb
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@@ -32,16 -32,18 +32,24 @@@ Developer
* Biplov - https://github.com/beingbiplov
* Rashmi Kamath - https://github.com/Rkamath2
* Anthony (Ryo) Wright - https://github.com/ryowright
+* Nikitha Murikinati - https://github.com/nikithamurikinati
+* Harlene Samra - https://github.com/harlenesamra
+* Justine Cho - https://github.com/jcho17
+* Vaheeshta Mehrshahi - https://github.com/vaheeshta
+* Jeevika Ghosh - https://github.com/jeevikaghosh
* Austin Leung - https://github.com/austin-leung
+ * Harlene Samra - https://github.com/harlenesamra
+ * Nikitha Murikinati - https://github.com/nikithamurikinati
+ * Justine Cho - https://github.com/jcho1
+ * Lydia Xing - https://github.com/lydiaxing
+ * Ellie Qiu - https://github.com/eq8913
+ * Hita Kambhamettu - https://github.com/Hita-K
* Derek Li - https://github.com/derekli17
* Noah Pinter - https://github.com/nopinter
+ * Kevin Geng - https://github.com/gengkev
+ * Karmen Lu - https://github.com/klu17
+
Translators
-----------
diff --cc wger/exercises/api/serializers.py
index eb9045182,1ee31fa1d..4216254e5
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@@ -34,8 -33,19 +34,13 @@@ class ExerciseBaseSerializer(serializer
Exercise serializer
"""
class Meta:
- model = Exercise
+ model = ExerciseBase
- fields = '__all__'
+ fields = ['id',
+ 'category',
- 'description',
- 'name',
- 'name_original',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment',
- 'creation_date',
- 'language',
- 'uuid',
- 'variations']
++ 'creation_date']
class EquipmentSerializer(serializers.ModelSerializer):
@@@ -62,65 -76,14 +71,72 @@@ class ExerciseCommentSerializer(seriali
"""
class Meta:
model = ExerciseComment
- fields = '__all__'
+ fields = ['id',
+ 'exercise',
+ 'comment']
+class ExerciseCategorySerializer(serializers.ModelSerializer):
+ """
+ ExerciseCategory serializer
+ """
+ class Meta:
+ model = ExerciseCategory
- fields = '__all__'
++ fields = ['id',
++ 'name']
+
+
+class MuscleSerializer(serializers.ModelSerializer):
+ """
+ Muscle serializer
+ """
+ class Meta:
+ model = Muscle
- fields = '__all__'
++ fields = ['id',
++ 'name',
++ 'is_front',
++ 'image_url_main',
++ 'image_url_secondary']
+
+
+class ExerciseSerializer(serializers.ModelSerializer):
+ """
+ Exercise serializer
+
+ The fields from the new ExerciseBase are retrieved here as to retain
+ compatibility with the old model where all the fields where in Exercise.
+ """
+ category = serializers.PrimaryKeyRelatedField(source='exercise_base.category',
+ read_only=True)
+ muscles = serializers.PrimaryKeyRelatedField(source='exercise_base.muscles',
+ many=True,
+ read_only=True)
+ muscles_secondary = serializers.PrimaryKeyRelatedField(source='exercise_base.muscles_secondary',
+ many=True,
+ read_only=True)
+ equipment = serializers.PrimaryKeyRelatedField(source='exercise_base.equipment',
+ many=True,
+ read_only=True)
+
+ class Meta:
+ model = Exercise
+ fields = ("id",
+ "uuid",
+ "name",
+ "description",
+ "creation_date",
+ "category",
+ "muscles",
+ "muscles_secondary",
+ "equipment",
+ "language",
+ "license",
+ "license_author")
+
+
class ExerciseInfoSerializer(serializers.ModelSerializer):
"""
- Equipment serializer
+ Exercise info serializer
"""
images = ExerciseImageSerializer(source='exerciseimage_set', many=True)
@@@ -133,12 -92,12 +149,12 @@@
class Meta:
model = Exercise
depth = 1
- fields = ("id",
+ fields = ["id",
"name",
"uuid",
- "category",
"description",
"creation_date",
+ "category",
"muscles",
"muscles_secondary",
"equipment",
@@@ -147,4 -106,27 +163,4 @@@
"license_author",
"images",
"variations",
- "comments")
+ "comments"]
-
-
-class ExerciseCategorySerializer(serializers.ModelSerializer):
- """
- ExerciseCategory serializer
- """
- class Meta:
- model = ExerciseCategory
- fields = ['id',
- 'name']
-
-
-class MuscleSerializer(serializers.ModelSerializer):
- """
- Muscle serializer
- """
- class Meta:
- model = Muscle
- fields = ['id',
- 'name',
- 'is_front',
- 'image_url_main',
- 'image_url_secondary']
diff --cc wger/exercises/fixtures/test-exercises.json
index 8ca9a13d6,c74c63550..b1ce2f1cc
--- a/wger/exercises/fixtures/test-exercises.json
+++ b/wger/exercises/fixtures/test-exercises.json
@@@ -77,9 -77,11 +77,10 @@@
},
{
"pk": 1,
- "model": "exercises.exercise",
+ "model": "exercises.exercisebase",
"fields": {
- "status": "2",
"category": 2,
- "language": 1,
++ "status": "2",
"muscles": [
1,
2
@@@ -91,65 -95,18 +92,69 @@@
},
{
"pk": 2,
- "model": "exercises.exercise",
+ "model": "exercises.exercisebase",
"fields": {
- "status": "2",
"category": 2,
- "language": 2,
++ "status": "2",
"muscles": [
2
],
"muscles_secondary": [
1,
3
+ ]
+ }
+ },
+ {
+ "pk": 3,
+ "model": "exercises.exercisebase",
+ "fields": {
+ "category": 3,
++ "status": "2",
+ "muscles": [
+ 1
+ ]
+ }
+ },
+ {
+ "pk": 4,
+ "model": "exercises.exercisebase",
+ "fields": {
+ "category": 3,
++ "status": "2",
+ "muscles": [
+ 1
],
+ "muscles_secondary":[]
+ }
+ },
+ {
+ "pk": 6,
+ "model": "exercises.exercisebase",
+ "fields": {
+ "category": 1,
++ "status": "2",
+ "muscles": []
+ }
+ },
+ {
+ "pk": 1,
+ "model": "exercises.exercise",
+ "fields": {
+ "status": "2",
+ "language": 1,
- "exercise_base": 1,
++ "exercise_base": 1,
+ "description": "",
+ "name": "An exercise"
+ }
+ },
+ {
+ "pk": 2,
+ "model": "exercises.exercise",
+ "fields": {
- "status": "2",
++ "status": "2",
+ "language": 2,
+ "exercise_base": 2,
"description": "",
"name": "Very cool exercise"
}
@@@ -159,8 -116,11 +164,8 @@@
"model": "exercises.exercise",
"fields": {
"status": "2",
- "language": 1,
- "category": 3,
+ "language": 1,
- "muscles": [
- 1
- ],
+ "exercise_base": 3,
"description": "",
"name": "Boring exercise"
}
diff --cc wger/exercises/models.py
index 1bdd9842c,8dbd1ce7b..46af18bbf
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@@ -245,7 -246,7 +256,7 @@@ class Exercise(AbstractSubmissionModel
verbose_name=_('Variations'),
on_delete=models.CASCADE,
null=True,
-- default=""
++ blank=True
)
"""Variations of this exercise"""
diff --cc wger/exercises/templates/equipment/overview.html
index ff9f61326,16dc9f138..e499baf7a
--- a/wger/exercises/templates/equipment/overview.html
+++ b/wger/exercises/templates/equipment/overview.html
@@@ -34,6 -34,6 +34,7 @@@ $(function()
-->
{% block content %}
{% cache cache_timeout equipment-overview language.id %}
++{{language}}
<div class="accordion" id="equipmentAccordion">
{% for equipment in equipment_list %}
<div class="card">
@@@ -45,39 -45,37 +46,39 @@@
<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.all %}
- {% for exercise in exercise_base.exercises.all %}
- {% for exercise in equipment.exercise_set.accepted %}
- {% if exercise.language in exercise_languages %}
- <a href="{{ exercise.get_absolute_url }}" class="list-group-item">
- <div class="media">
- {% if exercise.main_image %}
- <img alt="{{ exercise.name }}"
- class="mr-3"
- style="width: 50px;"
- src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">
- {% else %}
- <img alt="{% trans 'Placeholder image for exercise' %}"
- class="mr-3"
- style="width: 50px;"
- src="{% static 'images/icons/image-placeholder.svg' %}">
++ {% for exercise_base in equipment.exercisebase_set.accepted %}
++ {% for exercise in exercise_base.exercises.accepted %}
+ {% if exercise.language in exercise_languages %}
+ <a href="{{ exercise.get_absolute_url }}" class="list-group-item">
+ <div class="media">
+ {% if exercise.main_image %}
+ <img alt="{{ exercise.name }}"
+ class="mr-3"
+ style="width: 50px;"
+ src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">
+ {% else %}
+ <img alt="{% trans 'Placeholder image for exercise' %}"
+ class="mr-3"
+ style="width: 50px;"
+ src="{% static 'images/icons/image-placeholder.svg' %}">
+ {% endif %}
+ <div class="media-body">
+ <p class="media-heading h5">{{ exercise.name }}</p>
+ <span class="text-muted small">
+ {% trans exercise_base.category.name %}
+ <!--
+ {% trans "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}
+ <br>
+ {% trans "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}
+ -->
+ </span>
+ </div>
+ </div>
+ </a>
{% endif %}
- <div class="media-body">
- <p class="media-heading h5">{{ exercise.name }}</p>
- <span class="text-muted small">
- {% trans exercise.category.name %}
- <!--
- {% trans "Main muscles" %}: {{ exercise.muscles.all|join:", " }}
- <br>
- {% trans "Secondary muscles" %}: {{ exercise.muscles_secondary.all|join:", " }}
- -->
- </span>
- </div>
- </div>
- </a>
- {% endif %}
- {% empty %}
- {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}
+ {% empty %}
+ {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}
+ {% endfor %}
{% endfor %}
</div>
</div>
diff --cc wger/exercises/templates/muscles/overview.html
index 6f6c59287,db4c41bee..3d167b237
--- a/wger/exercises/templates/muscles/overview.html
+++ b/wger/exercises/templates/muscles/overview.html
@@@ -47,39 -47,37 +47,39 @@@
{% render_muscles muscle %}
</div>
- {% for exercise_base in muscle.exercisebase_set.all %}
- {% for exercise in exercise_base.exercises.all %}
- {% for exercise in muscle.exercise_set.accepted %}
- {% if exercise.language in active_languages %}
- <a href="{{ exercise.get_absolute_url }}" class="list-group-item">
- <div class="media">
- {% if exercise.main_image %}
- <img alt="{{ exercise.name }}"
- class="mr-3"
- style="width: 50px;"
- src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">
- {% else %}
- <img alt="{% trans 'Placeholder image for exercise' %}"
- class="mr-3"
- style="width: 50px;"
- src="{% static 'images/icons/image-placeholder.svg' %}">
- {% endif %}
- <div class="media-body">
- <p class="media-heading h5">{{ exercise.name }}</p>
- <span class="text-muted small">
- {% trans exercise.category.name %}
- <!--
- {% trans "Main muscles" %}: {{ exercise.muscles.all|join:", " }}
- <br>
- {% trans "Secondary muscles" %}: {{ exercise.muscles_secondary.all|join:", " }}
- -->
- </span>
- </div>
- </div>
- </a>
- {% endif %}
- {% empty %}
- {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}
++ {% for exercise_base in muscle.exercisebase_set.accepted %}
++ {% for exercise in exercise_base.exercises.accepted %}
+ {% if exercise.language in active_languages %}
+ <a href="{{ exercise.get_absolute_url }}" class="list-group-item">
+ <div class="media">
+ {% if exercise.main_image %}
+ <img alt="{{ exercise.name }}"
+ class="mr-3"
+ style="width: 50px;"
+ src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">
+ {% else %}
+ <img alt="{% trans 'Placeholder image for exercise' %}"
+ class="mr-3"
+ style="width: 50px;"
+ src="{% static 'images/icons/image-placeholder.svg' %}">
+ {% endif %}
+ <div class="media-body">
+ <p class="media-heading h5">{{ exercise.name }}</p>
+ <span class="text-muted small">
+ {% trans exercise.exercise_base.category.name %}
+ <!--
+ {% trans "Main muscles" %}: {{ exercise.exercise_base.muscles.all|join:", " }}
+ <br>
+ {% trans "Secondary muscles" %}: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}
+ -->
+ </span>
+ </div>
+ </div>
+ </a>
+ {% endif %}
+ {% empty %}
+ {% trans "No exercises for this muscle. Add or edit an exercise and set the muscle." %}
+ {% endfor %}
{% endfor %}
</div>
</div>
diff --cc wger/exercises/tests/test_equipment.py
index 4d15c875f,745d51769..1b7b672fb
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@@ -148,7 -148,7 +148,7 @@@ class EquipmentCacheTestCase(WgerTestCa
self.client.get(reverse('exercise:equipment:overview'))
self.assertTrue(cache.get(make_template_fragment_key('equipment-overview', [2])))
-- def test_equipmet_cache_update(self):
++ def test_equipment_cache_update(self):
"""
Test that the template cache for the overview is correctly reseted when
performing certain operations
@@@ -157,9 -157,9 +157,9 @@@
self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))
self.client.get(reverse('exercise:equipment:overview'))
-- self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
old_overview = cache.get(make_template_fragment_key('equipment-overview', [2]))
++ self.assertTrue(old_overview)
exercise = Exercise.objects.get(pk=2)
exercise.name = 'Very cool exercise 2'
@@@ -168,9 -168,9 +168,7 @@@
exercise.save()
self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))
--
self.client.get(reverse('exercise:equipment:overview'))
-- self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
new_overview = cache.get(make_template_fragment_key('equipment-overview', [2]))
diff --cc wger/exercises/tests/test_exercise.py
index 0b9543f35,ffbffd0df..1a927a697
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@@ -243,12 -242,10 +244,12 @@@ class ExercisesTestCase(WgerTestCase)
# Add an exercise
count_before = Exercise.objects.count()
response = self.client.post(reverse('exercise:exercise:add'),
- {'name_original': 'my test exercise',
- {'category': 2,
- 'name_original': random_string(),
++ {'name_original': random_string(),
'license': 1,
- 'muscles': [1, 2]})
+ 'exercise_base': {
+ 'category': 2,
+ 'muscles': [1, 2]
+ }})
count_after = Exercise.objects.count()
self.assertIn(response.status_code, STATUS_CODES_FAIL)
@@@ -280,11 -294,12 +298,12 @@@
# Add an exercise
count_before = Exercise.objects.count()
description = 'a nice, long and accurate description for the exercise'
+ name_original = random_string()
response = self.client.post(reverse('exercise:exercise:add'),
- {'name_original': 'my test exercise',
- {'category': 2,
- 'name_original': name_original,
++ {'name_original': name_original,
'license': 1,
'description': description,
+ 'category': 2,
'muscles': [1, 2]})
count_after = Exercise.objects.count()
self.assertEqual(response.status_code, 302)
@@@ -314,20 -329,18 +333,22 @@@
# Wrong category - adding
response = self.client.post(reverse('exercise:exercise:add'),
- {'name_original': 'my test exercise',
+ {'category': 111,
+ 'name_original': random_string(),
'license': 1,
- 'muscles': [1, 2]})
+ 'category': 111,
+ 'muscles': [1, 2]
+ })
self.assertTrue(response.context['form'].errors['category'])
# Wrong category - editing
response = self.client.post(reverse('exercise:exercise:edit', kwargs={'pk': '1'}),
- {'name_original': 'my test exercise',
+ {'category': 111,
+ 'name_original': random_string(),
'license': 1,
- 'muscles': [1, 2]})
+ 'category': 111,
+ 'muscles': [1, 2]
+ })
if admin:
self.assertTrue(response.context['form'].errors['category'])
else:
@@@ -335,20 -348,18 +356,22 @@@
# No muscles - adding
response = self.client.post(reverse('exercise:exercise:add'),
- {'name_original': 'my test exercise',
+ {'category': 1,
+ 'name_original': random_string(),
'license': 1,
- 'muscles': []})
+ 'category': 1,
+ 'muscles': []
+ })
self.assertEqual(response.status_code, 302)
# No muscles - editing
response = self.client.post(reverse('exercise:exercise:edit', kwargs={'pk': '1'}),
- {'name_original': 'my test exercise',
+ {'category': 1,
+ 'name_original': random_string(),
'license': 1,
- 'muscles': []})
+ 'category': 1,
+ 'muscles': []
+ })
if admin:
self.assertEqual(response.status_code, 302)
else:
diff --cc wger/exercises/views/exercises.py
index c8d88e68b,8443b66b3..3a1ec1220
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@@ -160,6 -160,59 +163,63 @@@ def view(request, id, slug=None)
return render(request, 'exercise/view.html', template_data)
+ class ExerciseForm(ModelForm):
+ # Redefine some fields here to set some properties
+ # (some of this could be done with a crispy form helper and would be
+ # a cleaner solution)
+ category = ModelChoiceField(queryset=ExerciseCategory.objects.all(),
+ widget=Select())
+ muscles = ModelMultipleChoiceField(queryset=Muscle.objects.all(),
+ widget=CheckboxSelectMultiple(),
+ required=False)
+
+ muscles_secondary = ModelMultipleChoiceField(queryset=Muscle.objects.all(),
+ widget=CheckboxSelectMultiple(),
+ required=False)
+
++ equipment = ModelMultipleChoiceField(queryset=Equipment.objects.all(),
++ widget=CheckboxSelectMultiple(),
++ required=False)
++
+ description = CharField(label=_('Description'),
+ widget=Textarea,
+ required=False)
+
+ class Meta:
+ model = Exercise
+ widgets = {'equipment': TranslatedSelectMultiple()}
+ fields = ['name_original',
+ 'category',
+ 'description',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment',
+ 'license',
+ 'license_author']
+
+ class Media:
+ js = (settings.STATIC_URL + 'yarn/tinymce/tinymce.min.js',)
+
+ def clean_name_original(self):
+ """
+ Throws a validation error if the submitted name is too similar to an existing
+ exercise's name
+ """
+ name_original = self.cleaned_data['name_original']
+ language = load_language()
+ exercises = Exercise.objects.accepted() \
+ .filter(language=language)
+ for exercise in exercises:
+ exercise_name = str(exercise)
+ min_edit_dist = levenshtein(exercise_name.casefold(), name_original.casefold())
+ if min_edit_dist < MIN_EDIT_DISTANCE_THRESHOLD:
+ raise ValidationError(
+ _('%(name_original)s is too similar to existing exercise "%(exercise_name)s"'),
+ params={'name_original': name_original, 'exercise_name': exercise_name},
+ )
+ return name_original
+
+
class ExercisesEditAddView(WgerFormMixin):
"""
Generic view to subclass from for exercise adding and editing, since they