- {% for exercise in equipment.exercise_set.all %}
- {% if exercise.language in exercise_languages %}
-
-
-
- {% 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 %}
diff --git a/wger/exercises/templates/exercise/email_correction.tpl b/wger/exercises/templates/exercise/email_correction.tpl
index 5813c1a4b..4addff4b3 100644
--- a/wger/exercises/templates/exercise/email_correction.tpl
+++ b/wger/exercises/templates/exercise/email_correction.tpl
@@ -15,7 +15,7 @@ Changes to the exercise:
- New: {{ form_data.name }}
* Category:
- - Original: {{ exercise.category }}
+ - Original: {{ exercise.exercise_base.category }}
- New: {{ form_data.category }}
* Description:
@@ -23,15 +23,15 @@ Changes to the exercise:
- New: {{ form_data.description }}
* Muscles (primary):
- - Original: {{ exercise.muscles.all|join:", " }}
+ - Original: {{ exercise.exercise_base.muscles.all|join:", " }}
- New: {{ form_data.muscles.all|join:", " }}
* Muscles (secondary):
- - Original: {{ exercise.muscles_secondary.all|join:", " }}
+ - Original: {{ exercise.exercise_base.muscles_secondary.all|join:", " }}
- New: {{ form_data.muscles_secondary.all|join:", " }}
* Equipment:
- - Original: {{ exercise.equipment.all|join:", " }}
+ - Original: {{ exercise.exercise_base.equipment.all|join:", " }}
- New: {{ form_data.equipment.all|join:", " }}
* License:
diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index 64910d975..270d9d488 100644
--- a/wger/exercises/templates/exercise/overview.html
+++ b/wger/exercises/templates/exercise/overview.html
@@ -39,7 +39,7 @@
{% block content %}
{% cache cache_timeout exercise-overview language.id %}
-{% regroup exercises by category as exercise_list %}
+{% regroup exercises by exercise_base.category as exercise_list %}
{% for item in exercise_list %}
@@ -69,11 +69,11 @@
{{ exercise.name }}
- {{ exercise.equipment.all|join:", " }}
+ {{ exercise.exercise_base.equipment.all|join:", " }}
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index 38a7a72de..cc5e6bfe0 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -74,11 +74,11 @@
{% trans "Category" %}:
-{% trans exercise.category.name %}
+{% trans exercise.exercise_base.category.name %}
-{% if exercise.equipment.all %}
+{% if exercise.exercise_base.equipment.all %}
{% trans "Equipment" %}:
- {% for equipment in exercise.equipment.all %}
+ {% for equipment in exercise.exercise_base.equipment.all %}
{% trans equipment.name %}
{% if not forloop.last %}, {% endif %}
{% endfor %}
diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.html
index 8a26b5198..6f6c59287 100644
--- a/wger/exercises/templates/muscles/overview.html
+++ b/wger/exercises/templates/muscles/overview.html
@@ -47,37 +47,39 @@
{% render_muscles muscle %}
- {% for exercise in muscle.exercise_set.all %}
- {% if exercise.language in active_languages %}
-
-
-
- {% endif %}
- {% empty %}
- {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}
+ {% for exercise_base in muscle.exercisebase_set.all %}
+ {% for exercise in exercise_base.exercises.all %}
+ {% if exercise.language in active_languages %}
+
+
+
+ {% endif %}
+ {% empty %}
+ {% trans "No exercises for this muscle. Add or edit an exercise and set the muscle." %}
+ {% endfor %}
{% endfor %}
diff --git a/wger/exercises/tests/test_corrected_exercise.py b/wger/exercises/tests/test_corrected_exercise.py
index 7c8341462..332adfa07 100644
--- a/wger/exercises/tests/test_corrected_exercise.py
+++ b/wger/exercises/tests/test_corrected_exercise.py
@@ -32,11 +32,11 @@ def correct_exercise(self, fail=True):
"""
description = 'a nice, long and accurate description for the exercise'
response = self.client.post(reverse('exercise:exercise:correct', kwargs={'pk': 1}),
- {'category': 3,
- 'name_original': 'my test exercise',
+ {'name_original': 'my test exercise',
'license': 2,
'description': description,
- 'muscles': [3]})
+ 'muscles': [3],
+ 'category': 3})
if fail:
self.assertEqual(response.status_code, 403)
@@ -50,10 +50,10 @@ def correct_exercise(self, fail=True):
exercise = Exercise.objects.get(pk=1)
self.assertEqual(exercise.name, 'An exercise')
self.assertEqual(exercise.description, '')
- self.assertEqual(exercise.category_id, 2)
+ self.assertEqual(exercise.exercise_base.category_id, 2)
self.assertEqual(exercise.language_id, 1)
- self.assertEqual([i.pk for i in exercise.muscles.all()], [1, 2])
- self.assertEqual([i.pk for i in exercise.muscles_secondary.all()], [3])
+ self.assertEqual([i.pk for i in exercise.exercise_base.muscles.all()], [1, 2])
+ self.assertEqual([i.pk for i in exercise.exercise_base.muscles_secondary.all()], [3])
# Check the notification email
if fail:
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index 745d51769..4d15c875f 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -164,7 +164,7 @@ def test_equipmet_cache_update(self):
exercise = Exercise.objects.get(pk=2)
exercise.name = 'Very cool exercise 2'
exercise.description = 'New description'
- exercise.equipment.add(Equipment.objects.get(pk=2))
+ exercise.exercise_base.equipment.add(Equipment.objects.get(pk=2))
exercise.save()
self.assertFalse(cache.get(make_template_fragment_key('equipment-overview', [2])))
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index a97f37948..0b9543f35 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -89,18 +89,20 @@ def exercise_index(self, logged_in=True, demo=False, admin=False):
self.assertEqual(response.context['active_tab'], WORKOUT_TAB)
# Correct categories are shown
- category_1 = response.context['exercises'][0].category
+ category_1 = response.context['exercises'][0].exercise_base.category
self.assertEqual(category_1.id, 2)
self.assertEqual(category_1.name, "Another category")
- category_2 = response.context['exercises'][1].category
+ category_2 = response.context['exercises'][1].exercise_base.category
self.assertEqual(category_2.id, 3)
self.assertEqual(category_2.name, "Yet another category")
# Correct exercises in the categories
- exercises_1 = category_1.exercise_set.all()
+ exercise_bases_1 = category_1.exercisebase_set.all()
+ exercises_1 = exercise_bases_1[0].exercises.all()
+ exercises_2 = exercise_bases_1[1].exercises.all()
exercise_1 = exercises_1[0]
- exercise_2 = exercises_1[1]
+ exercise_2 = exercises_2[0]
self.assertEqual(exercise_1.id, 1)
self.assertEqual(exercise_1.name, "An exercise")
@@ -181,7 +183,7 @@ def exercise_detail(self, editor=False):
exercise_1 = response.context['exercise']
self.assertEqual(exercise_1.id, 1)
- muscles = exercise_1.muscles.all()
+ muscles = exercise_1.exercise_base.muscles.all()
muscle_1 = muscles[0]
muscle_2 = muscles[1]
@@ -241,10 +243,12 @@ def add_exercise_user_fail(self):
# Add an exercise
count_before = Exercise.objects.count()
response = self.client.post(reverse('exercise:exercise:add'),
- {'category': 2,
- 'name_original': 'my test exercise',
+ {'name_original': 'my test exercise',
'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)
@@ -277,10 +281,10 @@ def add_exercise_success(self, admin=False):
count_before = Exercise.objects.count()
description = 'a nice, long and accurate description for the exercise'
response = self.client.post(reverse('exercise:exercise:add'),
- {'category': 2,
- 'name_original': 'my test exercise',
+ {'name_original': 'my test exercise',
'license': 1,
'description': description,
+ 'category': 2,
'muscles': [1, 2]})
count_after = Exercise.objects.count()
self.assertEqual(response.status_code, 302)
@@ -310,18 +314,20 @@ def add_exercise_success(self, admin=False):
# Wrong category - adding
response = self.client.post(reverse('exercise:exercise:add'),
- {'category': 111,
- 'name_original': 'my test exercise',
+ {'name_original': 'my test exercise',
'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'}),
- {'category': 111,
- 'name_original': 'my test exercise',
+ {'name_original': 'my test exercise',
'license': 1,
- 'muscles': [1, 2]})
+ 'category': 111,
+ 'muscles': [1, 2]
+ })
if admin:
self.assertTrue(response.context['form'].errors['category'])
else:
@@ -329,18 +335,20 @@ def add_exercise_success(self, admin=False):
# No muscles - adding
response = self.client.post(reverse('exercise:exercise:add'),
- {'category': 1,
- 'name_original': 'my test exercise',
+ {'name_original': 'my test exercise',
'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'}),
- {'category': 1,
- 'name_original': 'my test exercise',
+ {'name_original': 'my test exercise',
'license': 1,
- 'muscles': []})
+ 'category': 1,
+ 'muscles': []
+ })
if admin:
self.assertEqual(response.status_code, 302)
else:
@@ -449,7 +457,7 @@ def test_overview_cache_update(self):
exercise = Exercise.objects.get(pk=2)
exercise.name = 'Very cool exercise 2'
exercise.description = 'New description'
- exercise.muscles_secondary.add(Muscle.objects.get(pk=2))
+ exercise.exercise_base.muscles_secondary.add(Muscle.objects.get(pk=2))
exercise.save()
self.assertFalse(cache.get(make_template_fragment_key('muscle-overview', [2])))
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 64c7aacae..c8d88e68b 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -70,7 +70,9 @@
# wger
from wger.config.models import LanguageConfig
from wger.exercises.models import (
+ Equipment,
Exercise,
+ ExerciseBase,
ExerciseCategory,
Muscle
)
@@ -111,7 +113,7 @@ def get_queryset(self):
languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)
return Exercise.objects.accepted() \
.filter(language__in=languages) \
- .order_by('category__id') \
+ .order_by('exercise_base__category__id') \
.select_related()
def get_context_data(self, **kwargs):
@@ -133,13 +135,14 @@ def view(request, id, slug=None):
template_data['show_shariff'] = True
exercise = get_object_or_404(Exercise, pk=id)
+ exercise_base = exercise.exercise_base
template_data['exercise'] = exercise
- template_data["muscles_main_front"] = exercise.muscles.filter(is_front=True)
- template_data["muscles_main_back"] = exercise.muscles.filter(is_front=False)
- template_data["muscles_sec_front"] = exercise.muscles_secondary.filter(is_front=True)
- template_data["muscles_sec_back"] = exercise.muscles_secondary.filter(is_front=False)
+ template_data["muscles_main_front"] = exercise_base.muscles.filter(is_front=True)
+ template_data["muscles_main_back"] = exercise_base.muscles.filter(is_front=False)
+ template_data["muscles_sec_front"] = exercise_base.muscles_secondary.filter(is_front=True)
+ template_data["muscles_sec_back"] = exercise_base.muscles_secondary.filter(is_front=False)
# If the user is logged in, load the log and prepare the entries for
# rendering in the D3 chart
@@ -184,6 +187,10 @@ class ExerciseForm(ModelForm):
widget=CheckboxSelectMultiple(),
required=False)
+ equipment = ModelMultipleChoiceField(queryset=Equipment.objects.all(),
+ widget=CheckboxSelectMultiple(),
+ required=False)
+
description = CharField(label=_('Description'),
widget=Textarea,
required=False)
@@ -207,6 +214,13 @@ class Media:
def get_form(self, form_class=None):
form = super(ExercisesEditAddView, self).get_form(form_class)
+ exercise = self.get_form_kwargs()['instance']
+ if exercise is not None:
+ form.fields['category'].initial = exercise.exercise_base.category
+ form.fields['equipment'].initial = exercise.exercise_base.equipment.all()
+ form.fields['muscles'].initial = exercise.exercise_base.muscles.all()
+ form.fields['muscles_secondary'].initial = \
+ exercise.exercise_base.muscles_secondary.all()
form.helper.layout = Layout(
"name_original",
"description",
@@ -225,6 +239,16 @@ def get_form(self, form_class=None):
)
return form
+ def form_valid(self, form):
+ exercise_base = Exercise.objects.filter(name=form.instance.name)[0].exercise_base
+ 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())
+
+ form.instance.exercise_base = exercise_base
+ form.instance.save()
+ return super(ExercisesEditAddView, self).form_valid(form)
+
class ExerciseUpdateView(ExercisesEditAddView,
LoginRequiredMixin,
@@ -238,7 +262,6 @@ class ExerciseUpdateView(ExercisesEditAddView,
def get_context_data(self, **kwargs):
context = super(ExerciseUpdateView, self).get_context_data(**kwargs)
context['title'] = _('Edit {0}').format(self.object.name)
-
return context
@@ -253,6 +276,26 @@ def form_valid(self, form):
"""
form.instance.language = load_language()
form.instance.set_author(self.request)
+ existing = ExerciseBase.objects.filter(
+ category=ExerciseCategory.objects.get(name=form.cleaned_data['category']))
+ for elem in form.cleaned_data['equipment'].all():
+ existing = existing.filter(equipment=elem)
+ for elem in form.cleaned_data['muscles'].all():
+ existing = existing.filter(muscles=elem)
+ for elem in form.cleaned_data['muscles_secondary'].all():
+ existing = existing.filter(equipment=elem)
+ if not existing:
+ exercise_base = ExerciseBase.objects.create(
+ category=ExerciseCategory.objects.get(name=form.cleaned_data['category']))
+ 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())
+ else:
+ exercise_base = existing.first()
+
+ form.instance.exercise_base = exercise_base
+ form.instance.save()
+
return super(ExerciseAddView, self).form_valid(form)
def dispatch(self, request, *args, **kwargs):
@@ -318,12 +361,8 @@ class ExerciseDeleteView(WgerDeleteMixin,
"""
model = Exercise
- fields = ('category',
- 'description',
- 'name_original',
- 'muscles',
- 'muscles_secondary',
- 'equipment')
+ fields = ('description',
+ 'name_original')
success_url = reverse_lazy('exercise:exercise:overview')
delete_message_extra = ugettext_lazy('This will delete the exercise from all workouts.')
messages = ugettext_lazy('Successfully deleted')
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 85ec7deeb..4cec2c4f8 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -468,13 +468,13 @@ def get_canonical_representation(self):
exercise_images_tmp = []
# Muscles for this set
- for muscle in exercise.muscles.all():
+ for muscle in exercise.exercise_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 exercise.exercise_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:
diff --git a/wger/manager/signals.py b/wger/manager/signals.py
index f3a6df408..ee18a4296 100644
--- a/wger/manager/signals.py
+++ b/wger/manager/signals.py
@@ -55,7 +55,9 @@ def update_activity_cache(sender, instance, **kwargs):
def reset_muscle_cache(sender, instance, **kwargs):
- exercises = Exercise.objects.filter(Q(muscles=instance) | Q(muscles_secondary=instance)).all()
+ exercises = Exercise.objects.filter(
+ Q(exercise_base__muscles=instance)
+ | Q(exercise_base__muscles_secondary=instance)).all()
languages = Language.objects.all()
for exercise in exercises:
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 11054c2f7..f55be50bb 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -47,8 +47,8 @@
# wger
from wger.nutrition.forms import (
- UnitChooserForm,
IngredientForm,
+ UnitChooserForm
)
from wger.nutrition.models import Ingredient
from wger.utils.cache import cache_mapper
diff --git a/wger/settings.tpl b/wger/settings.tpl
index 3475daffd..e70362b2e 100644
--- a/wger/settings.tpl
+++ b/wger/settings.tpl
@@ -67,4 +67,3 @@ WGER_SETTINGS['EMAIL_FROM'] = 'wger Workout Manager 
- {% else %}
- 
+ {% for exercise_base in equipment.exercisebase_set.all %}
+ {% for exercise in exercise_base.exercises.all %}
+ {% if exercise.language in exercise_languages %}
+
+