Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Updating uses of Exercises to use exericse_base

Harlene Samrae0d8bbc1433c
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index c251193b4..1d43c7303 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -21,12 +21,20 @@ from rest_framework import serializers
from wger.exercises.models import (
Equipment,
Exercise,
+ ExerciseBase,
ExerciseCategory,
ExerciseComment,
ExerciseImage,
Muscle
)
+class ExerciseBaseSerializer(serializers.ModelSerializer):
+ """
+ Exercise serializer
+ """
+ class Meta:
+ model = ExerciseBase
+ fields = '__all__'
class ExerciseSerializer(serializers.ModelSerializer):
"""
@@ -71,6 +79,7 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
images = ExerciseImageSerializer(source='exerciseimage_set', many=True)
comments = ExerciseCommentSerializer(source='exercisecomment_set', many=True)
+ exercise_base = ExerciseBaseSerializer(source='exercisebase_set', many=True)
class Meta:
model = Exercise
@@ -78,12 +87,9 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
fields = ("id",
"name",
"uuid",
- "category",
"description",
"creation_date",
- "muscles",
- "muscles_secondary",
- "equipment",
+ "exercise_base"
"language",
"license",
"license_author",
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 63c2f4969..bb0b664bb 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -33,6 +33,7 @@ from rest_framework.response import Response
from wger.config.models import LanguageConfig
from wger.exercises.api.serializers import (
EquipmentSerializer,
+ ExerciseBaseSerializer,
ExerciseCategorySerializer,
ExerciseCommentSerializer,
ExerciseImageSerializer,
@@ -55,6 +56,20 @@ from wger.utils.language import (
from wger.utils.permissions import CreateOnlyPermission
+class ExerciseBaseViewSet(viewsets.ModelViewSet):
+ """
+ API endpoint for exercise base objects. For a read-only endpoint with all
+ the information of an exercise, see /api/v2/exerciseinfo/
+ """
+ queryset = Exercise.objects.accepted()
+ serializer_class = ExerciseBaseSerializer
+ permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)
+ ordering_fields = '__all__'
+ filterset_fields = ('category',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment')
+
class ExerciseViewSet(viewsets.ModelViewSet):
"""
API endpoint for exercise objects. For a read-only endpoint with all
@@ -64,15 +79,11 @@ class ExerciseViewSet(viewsets.ModelViewSet):
serializer_class = ExerciseSerializer
permission_classes = (IsAuthenticatedOrReadOnly, CreateOnlyPermission)
ordering_fields = '__all__'
- filterset_fields = ('category',
- 'creation_date',
+ filterset_fields = ('creation_date',
'description',
'language',
- 'muscles',
- 'muscles_secondary',
'status',
'name',
- 'equipment',
'variations',
'license',
'license_author')
@@ -105,7 +116,7 @@ def search(request):
exercises = (Exercise.objects.filter(name__icontains=q)
.filter(language__in=languages)
.filter(status=Exercise.STATUS_ACCEPTED)
- .order_by('category__name', 'name')
+ .order_by('exercise_base__category__name', 'name')
.distinct())
for exercise in exercises:
@@ -143,14 +154,11 @@ class ExerciseInfoViewset(viewsets.ReadOnlyModelViewSet):
queryset = Exercise.objects.accepted()
serializer_class = ExerciseInfoSerializer
ordering_fields = '__all__'
- filterset_fields = ('category',
- 'creation_date',
+ filterset_fields = ('creation_date',
'description',
'language',
- 'muscles',
- 'muscles_secondary',
'name',
- 'equipment',
+ 'exercise_base',
'license',
'variations',
'license_author')
diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.html
index c6af40e8c..ff9f61326 100644
--- a/wger/exercises/templates/equipment/overview.html
+++ b/wger/exercises/templates/equipment/overview.html
@@ -45,37 +45,39 @@ $(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 in equipment.exercise_set.all %}
- {% 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.all %}
+ {% for exercise in exercise_base.exercises.all %}
+ {% 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.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 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 --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index 63438a08c..270d9d488 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 category as exercise_list %}
+{% regroup exercises by exercise_base.category as exercise_list %}
<div class="accordion" id="exerciseAccordion">
{% for item in exercise_list %}
<div class="card">
diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.html
index 9e9edb0ee..6f6c59287 100644
--- a/wger/exercises/templates/muscles/overview.html
+++ b/wger/exercises/templates/muscles/overview.html
@@ -47,37 +47,39 @@
{% render_muscles muscle %}
</div>
- {% for exercise in muscle.exercise_set.all %}
- {% 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 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 %}
+ <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 --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 562063b70..ccc73fcb5 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -73,6 +73,7 @@ from wger.exercises.models import (
Exercise,
ExerciseBase,
ExerciseCategory,
+ Equipment,
Muscle
)
from wger.manager.models import WorkoutLog
@@ -185,6 +186,10 @@ class ExercisesEditAddView(WgerFormMixin):
widget=CheckboxSelectMultiple(),
required=False)
+ equipment = ModelMultipleChoiceField(queryset=Equipment.objects.all(),
+ widget=CheckboxSelectMultiple(),
+ required=False)
+
description = CharField(label=_('Description'),
widget=Textarea,
required=False)
@@ -239,7 +244,7 @@ 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)
-
+ print(context)
return context
@@ -254,6 +259,16 @@ class ExerciseAddView(ExercisesEditAddView, LoginRequiredMixin, CreateView):
"""
form.instance.language = load_language()
form.instance.set_author(self.request)
+ 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())
+
+ form.instance.exercise_base = exercise_base
+ form.instance.save()
+
+ print(form.instance)
return super(ExerciseAddView, self).form_valid(form)
def dispatch(self, request, *args, **kwargs):
@@ -319,12 +334,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')