Self hosted FLOSS fitness/workout, nutrition and weight tracker
Render trained muscles with render_muscles tag
Roland Geider10f9aae484e3
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex a084aa79a..9d82a9713 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -24,7 +24,10 @@ from wger.core.api.serializers import (RepetitionUnitSerializer,WeightUnitSerializer)-from wger.exercises.api.serializers import ExerciseSerializer+from wger.exercises.api.serializers import (+ ExerciseSerializer,+ MuscleSerializer+)from wger.manager.models import (Day,Schedule,@@ -115,6 +118,16 @@ class SettingSerializer(serializers.ModelSerializer):## Custom helper serializers for the canonical form of a workout#+class MusclesCanonicalFormSerializer(serializers.Serializer):+ """+ Serializer for the muscles in the canonical form of a day/workout+ """+ front = serializers.ListField(child=MuscleSerializer())+ back = serializers.ListField(child=MuscleSerializer())+ frontsecondary = serializers.ListField(child=MuscleSerializer())+ backsecondary = serializers.ListField(child=MuscleSerializer())++class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):"""Serializer for settings in the canonical form of a workout@@ -139,7 +152,7 @@ class WorkoutCanonicalFormExerciseSerializer(serializers.Serializer):exercise_list = WorkoutCanonicalFormExerciseListSerializer(many=True)has_settings = serializers.BooleanField()is_superset = serializers.BooleanField()- muscles = serializers.ReadOnlyField()+ muscles = MusclesCanonicalFormSerializer()class DaysOfWeekCanonicalFormSerializer(serializers.Serializer):@@ -159,7 +172,7 @@ class DayCanonicalFormSerializer(serializers.Serializer):obj = DaySerializer()set_list = WorkoutCanonicalFormExerciseSerializer(many=True)days_of_week = DaysOfWeekCanonicalFormSerializer()- muscles = serializers.ReadOnlyField()+ muscles = MusclesCanonicalFormSerializer()class WorkoutCanonicalFormSerializer(serializers.Serializer):@@ -167,5 +180,5 @@ class WorkoutCanonicalFormSerializer(serializers.Serializer):Serializer for the canonical form of a workout"""obj = WorkoutSerializer()- muscles = serializers.ReadOnlyField()day_list = DayCanonicalFormSerializer(many=True)+ muscles = MusclesCanonicalFormSerializer()diff --git a/wger/manager/models.py b/wger/manager/models.pyindex 89173baaa..c3402c915 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -456,16 +456,16 @@ class Day(models.Model):# Muscles for this setfor muscle in exercise.muscles.all():- if muscle.is_front and muscle.id not in muscles_front:- muscles_front.append(muscle.id)- elif not muscle.is_front and muscle.id not in muscles_back:- muscles_back.append(muscle.id)+ 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():- if muscle.is_front and muscle.id not in muscles_front:- muscles_front_secondary.append(muscle.id)+ 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.id)+ muscles_back_secondary.append(muscle)for setting in Setting.objects.filter(set=set_obj,exercise=exercise).order_by('order', 'id'):diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.htmlindex fe75ba13c..620e059c1 100644--- a/wger/manager/templates/workout/view.html+++ b/wger/manager/templates/workout/view.html@@ -98,16 +98,10 @@ $(document).ready(function () {<div class="row"><div class="col-6">- <div id="muscle-front"- class="muscle-background"- style="width: 120px; height: 220px; background-size: 120px; background-image: {% for background in muscle_backgrounds_front %}url({% static background %}){% if not forloop.last %},{% endif %}{% endfor %};">- </div>+ {% render_muscles muscles.front muscles.frontsecondary %}</div><div class="col-6">- <div id="muscle-back"- class="muscle-background"- style="width: 120px; height: 220px; background-size: 120px; background-image: {% for background in muscle_backgrounds_back %}url({% static background %}){% if not forloop.last %},{% endif %}{% endfor %};">- </div>+ {% render_muscles muscles.back muscles.backsecondary %}</div></div>diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex 07132ccee..b94a4905a 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -25,7 +25,10 @@ from wger.core.models import (WeightUnit)from wger.core.tests.base_testcase import WgerTestCase-from wger.exercises.models import Exercise+from wger.exercises.models import (+ Exercise,+ Muscle+)from wger.manager.models import (Day,Set,@@ -51,16 +54,21 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):setting_2 = Setting.objects.get(pk=2)repetition_unit = RepetitionUnit.objects.get(pk=1)weight_unit = WeightUnit.objects.get(pk=1)+ muscle1 = Muscle.objects.get(pk=1)+ muscle2 = Muscle.objects.get(pk=2)self.assertEqual(workout.canonical_representation['muscles'],- {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': [1]})+ {'back': [muscle2],+ 'frontsecondary': [muscle1],+ 'backsecondary': [muscle1],+ 'front': [muscle1]})self.assertEqual(workout.canonical_representation['obj'], workout)canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=2)],'text': u'Tuesday'},- 'muscles': {'back': [2],+ 'muscles': {'back': [muscle2],'frontsecondary': [],'backsecondary': [],- 'front': [1]},+ 'front': [muscle1]},'obj': Day.objects.get(pk=1),'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1),'comment_list': [u'test 123'],@@ -76,17 +84,19 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weight_unit]}],'is_superset': False,'has_settings': True,- 'muscles': {'back': [2], 'frontsecondary': [],+ 'muscles': {'back': [muscle2],+ 'frontsecondary': [],'backsecondary': [],- 'front': [1]},+ 'front': [muscle1]},'obj': Set.objects.get(pk=1)}]}self.assertEqual(workout.canonical_representation['day_list'][0], canonical_form)canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=4)],'text': u'Thursday'},'obj': Day.objects.get(pk=2),- 'muscles': {'back': [2],- 'frontsecondary': [1], 'backsecondary': [1],+ 'muscles': {'back': [muscle2],+ 'frontsecondary': [muscle1],+ 'backsecondary': [muscle1],'front': []},'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),'comment_list': [u'Foobar'],@@ -109,8 +119,9 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weight_unit]}],'is_superset': False,'has_settings': True,- 'muscles': {'back': [2],- 'frontsecondary': [1], 'backsecondary': [1],+ 'muscles': {'back': [muscle2],+ 'frontsecondary': [muscle1],+ 'backsecondary': [muscle1],'front': []},'obj': Set.objects.get(pk=2)}]}self.assertEqual(workout.canonical_representation['day_list'][1], canonical_form)@@ -118,8 +129,10 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=5)],'text': u'Friday'},'obj': Day.objects.get(pk=4),- 'muscles': {'back': [], 'front': [],- 'frontsecondary': [], 'backsecondary': []},+ 'muscles': {'back': [],+ 'front': [],+ 'frontsecondary': [],+ 'backsecondary': []},'set_list': []}self.assertEqual(workout.canonical_representation['day_list'][2], canonical_form)@@ -133,10 +146,15 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weekday2 = DaysOfWeek.objects.get(pk=5)repetition_unit = RepetitionUnit.objects.get(pk=1)weight_unit = WeightUnit.objects.get(pk=1)+ muscle1 = Muscle.objects.get(pk=1)+ muscle2 = Muscle.objects.get(pk=2)self.assertEqual(day.canonical_representation['days_of_week'],{'day_list': [weekday1, weekday2], 'text': u'Wednesday, Friday'})self.assertEqual(day.canonical_representation['muscles'],- {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': []})+ {'back': [muscle2],+ 'frontsecondary': [muscle1],+ 'backsecondary': [muscle1],+ 'front': []})self.assertEqual(day.canonical_representation['obj'], day)canonical_form = [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),@@ -157,8 +175,10 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weight_unit]}],'is_superset': False,'has_settings': True,- 'muscles': {'back': [2], 'frontsecondary': [1],- 'backsecondary': [1], 'front': []},+ 'muscles': {'back': [muscle2],+ 'frontsecondary': [muscle1],+ 'backsecondary': [muscle1],+ 'front': []},'obj': Set.objects.get(pk=3)}]self.assertEqual(day.canonical_representation['set_list'], canonical_form)diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex d9371bad0..58a9f0a12 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -105,31 +105,8 @@ def view(request, pk):canonical = workout.canonical_representationuid, token = make_token(user)- # Create the backgrounds that show what muscles the workout will work on- muscles_front = []- muscles_back = []- for i in canonical['muscles']['front']:- if i not in muscles_front:- muscles_front.append('images/muscles/main/muscle-{0}.svg'.format(i))- for i in canonical['muscles']['back']:- if i not in muscles_back:- muscles_back.append('images/muscles/main/muscle-{0}.svg'.format(i))-- for i in canonical['muscles']['frontsecondary']:- if i not in muscles_front and i not in canonical['muscles']['front']:- muscles_front.append('images/muscles/secondary/muscle-{0}.svg'.format(i))- for i in canonical['muscles']['backsecondary']:- if i not in muscles_back and i not in canonical['muscles']['back']:- muscles_back.append('images/muscles/secondary/muscle-{0}.svg'.format(i))-- # Append the silhouette of the human body as the last entry so the browser- # renders it in the background- muscles_front.append('images/muscles/muscular_system_front.svg')- muscles_back.append('images/muscles/muscular_system_back.svg')-template_data['workout'] = workout- template_data['muscle_backgrounds_front'] = muscles_front- template_data['muscle_backgrounds_back'] = muscles_back+ template_data['muscles'] = canonical['muscles']template_data['uid'] = uidtemplate_data['token'] = tokentemplate_data['is_owner'] = is_owner