Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add the rep units to the workout canonical rep
Roland Geider5a5ac06c8c54
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 2f9391596..3bfbb1703 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -17,7 +17,7 @@from rest_framework import serializers-from wger.core.api.serializers import DaysOfWeekSerializer+from wger.core.api.serializers import DaysOfWeekSerializer, SettingUnitSerializerfrom wger.exercises.api.serializers import ExerciseSerializerfrom wger.manager.models import (@@ -116,6 +116,7 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):has_weight = serializers.ReadOnlyField()weight_list = serializers.ReadOnlyField()setting_text = serializers.ReadOnlyField()+ setting_units = SettingUnitSerializer(many=True)comment_list = serializers.ReadOnlyField()obj = ExerciseSerializer()diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 364484dfd..71292e441 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -152,6 +152,7 @@ def reps_smart_text(settings, set_obj):setting_list = []weight_list = []reps_list = []+ setting_units = []elif len(settings) == 1:reps = settings[0].reps if settings[0].reps != 99 else u'∞'setting_text = u'{0} × {1}'.format(set_obj.sets, reps)@@ -171,11 +172,13 @@ def reps_smart_text(settings, set_obj):setting_list = [setting_list_text] * set_obj.setsreps_list = [settings[0].reps] * set_obj.setsweight_list = [weight] * set_obj.sets+ setting_units = [settings[0].unit] * set_obj.setselif len(settings) > 1:tmp_reps_text = []tmp_reps = []tmp_weight = []+ tmp_unit = []for i in settings:reps = str(i.reps) if i.reps != 99 else u'∞'weight = i.weight@@ -186,13 +189,15 @@ def reps_smart_text(settings, set_obj):tmp_reps_text.append(reps)tmp_reps.append(i.reps)tmp_weight.append(weight)+ tmp_unit.append(unit)setting_text = u' – '.join(tmp_reps_text)setting_list = tmp_reps_text+ setting_units = tmp_unitreps_list = tmp_repsweight_list = tmp_weight- return setting_text, setting_list, weight_list, reps_list+ return setting_text, setting_list, weight_list, reps_list, setting_unitsclass WorkoutCalendar(HTMLCalendar):diff --git a/wger/manager/models.py b/wger/manager/models.pyindex 515f8ef66..6ee838195 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -444,7 +444,7 @@ class Day(models.Model):setting_tmp.append(setting)# "Smart" textual representation- setting_text, setting_list, weight_list, reps_list \+ setting_text, setting_list, weight_list, reps_list, setting_units \= reps_smart_text(setting_tmp, set_obj)# Flag indicating whether all exercises have settings@@ -465,6 +465,7 @@ class Day(models.Model):exercise_tmp.append({'obj': exercise,'setting_obj_list': setting_tmp,'setting_list': setting_list,+ 'setting_units': setting_units,'weight_list': weight_list,'has_weight': has_weight,'reps_list': reps_list,@@ -484,9 +485,10 @@ class Day(models.Model):if len(exercise['setting_list']) > common_reps:exercise['setting_list'].pop(-1)exercise['setting_obj_list'].pop(-1)- setting_text, setting_list, weight_list, reps_list = \+ setting_text, setting_list, weight_list, reps_list, setting_units = \reps_smart_text(exercise['setting_obj_list'], set_obj)exercise['setting_text'] = setting_text+ exercise['setting_units'] = setting_unitscanonical_repr.append({'obj': set_obj,'exercise_list': exercise_tmp,diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex e6a2d609e..be4eb9448 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -16,7 +16,7 @@ from decimal import Decimalfrom django.core.cache import cache-from wger.core.models import DaysOfWeek+from wger.core.models import DaysOfWeek, SettingUnitfrom wger.exercises.models import Exercisefrom wger.manager.models import Workoutfrom wger.manager.models import Day@@ -41,6 +41,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):workout = Workout.objects.get(pk=1)setting_1 = Setting.objects.get(pk=1)setting_2 = Setting.objects.get(pk=2)+ setting_unit = SettingUnit.objects.get(pk=1)self.assertEqual(workout.canonical_representation['muscles'], {'back': [2], 'front': [1]})self.assertEqual(workout.canonical_representation['obj'], workout)@@ -55,7 +56,9 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'reps_list': [8, 8],'weight_list': [None, None],'setting_obj_list': [setting_1],- 'setting_text': u'2 \xd7 8'}],+ 'setting_text': u'2 \xd7 8',+ 'setting_units': [setting_unit,+ setting_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': [1]},@@ -76,7 +79,11 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):u'10 (15kg)'],'weight_list': [Decimal(15)] * 4,'setting_obj_list': [setting_2],- 'setting_text': u'4 \xd7 10 (15kg)'}],+ 'setting_text': u'4 \xd7 10 (15kg)',+ 'setting_units': [setting_unit,+ setting_unit,+ setting_unit,+ setting_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': []},@@ -98,6 +105,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):day = Day.objects.get(pk=5)weekday1 = DaysOfWeek.objects.get(pk=3)weekday2 = DaysOfWeek.objects.get(pk=5)+ setting_unit = SettingUnit.objects.get(pk=1)self.assertEqual(day.canonical_representation['days_of_week'],{'day_list': [weekday1, weekday2], 'text': u'Wednesday, Friday'})self.assertEqual(day.canonical_representation['muscles'], {'back': [2], 'front': []})@@ -110,7 +118,11 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'setting_list': [u'10', u'10', u'10', u'10'],'weight_list': [None, None, None, None],'setting_obj_list': [Setting.objects.get(pk=3)],- 'setting_text': u'4 \xd7 10'}],+ 'setting_text': u'4 \xd7 10',+ 'setting_units': [setting_unit,+ setting_unit,+ setting_unit,+ setting_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': []},