Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add weight unit to workout canonical form
Roland Geiderc2423bf446ad
diff --git a/wger/core/fixtures/repetition_units.json b/wger/core/fixtures/setting_repetition_units.jsonsimilarity index 82%rename from wger/core/fixtures/repetition_units.jsonrename to wger/core/fixtures/setting_repetition_units.jsonindex bd702dd55..b10347ffb 100644--- a/wger/core/fixtures/repetition_units.json+++ b/wger/core/fixtures/setting_repetition_units.json@@ -33,5 +33,12 @@"name": "Kilometers"},"model": "core.repetitionunit"+ },+ {+ "pk": 6,+ "fields": {+ "name": "Until Failure"+ },+ "model": "core.repetitionunit"}]diff --git a/wger/core/fixtures/weight_units.json b/wger/core/fixtures/setting_weight_units.jsonsimilarity index 93%rename from wger/core/fixtures/weight_units.jsonrename to wger/core/fixtures/setting_weight_units.jsonindex 33e124f2c..90b865030 100644--- a/wger/core/fixtures/weight_units.json+++ b/wger/core/fixtures/setting_weight_units.json@@ -2,14 +2,14 @@{"pk": 1,"fields": {- "name": "Kg"+ "name": "kg"},"model": "core.weightunit"},{"pk": 2,"fields": {- "name": "Lb"+ "name": "lb"},"model": "core.weightunit"},diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 2f3a98d54..440a0bae3 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -17,7 +17,11 @@from rest_framework import serializers-from wger.core.api.serializers import DaysOfWeekSerializer, RepetitionUnitSerializer+from wger.core.api.serializers import (+ DaysOfWeekSerializer,+ RepetitionUnitSerializer,+ WeightUnitSerializer+)from wger.exercises.api.serializers import ExerciseSerializerfrom wger.manager.models import (@@ -117,6 +121,7 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):weight_list = serializers.ReadOnlyField()setting_text = serializers.ReadOnlyField()repetition_units = RepetitionUnitSerializer(many=True)+ weight_units = WeightUnitSerializer(many=True)comment_list = serializers.ReadOnlyField()obj = ExerciseSerializer()diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex f06e85853..9b0bd4fa1 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -208,6 +208,7 @@ def reps_smart_text(settings, set_obj):weight_list = []reps_list = []repetition_units = []+ weight_units = []# Only one setting entry, this is a "compact" representation such as e.g.# 4x10 or similar@@ -219,6 +220,7 @@ def reps_smart_text(settings, set_obj):rep_unit = ''setting_text = u'{0} × {1} {2}'.format(set_obj.sets, reps, rep_unit).strip()setting_list_text = u'{0} {1}'.format(reps, rep_unit).strip()+ weight_unit = settings[0].weight_unit# The weight can be None, or a decimal. In that case, normalize so# that we don't return e.g. '15.00', but always '15', independently of@@ -229,12 +231,13 @@ def reps_smart_text(settings, set_obj):weight = settings[0].weightif weight:- setting_text += ' ({0}{1})'.format(weight, weight_unit)- setting_list_text += ' ({0}{1})'.format(weight, weight_unit)+ setting_text += ' ({0} {1})'.format(weight, weight_unit)+ setting_list_text += ' ({0} {1})'.format(weight, weight_unit)setting_list = [setting_list_text] * set_obj.setsreps_list = [settings[0].reps] * set_obj.setsweight_list = [weight] * set_obj.setsrepetition_units = [settings[0].repetition_unit] * set_obj.sets+ weight_units = [settings[0].weight_unit] * set_obj.sets# There's more than one setting, each set can have a different combination# of repetitions, weight, etc. e.g. 10, 8, 8, 12@@ -242,28 +245,31 @@ def reps_smart_text(settings, set_obj):tmp_reps_text = []tmp_reps = []tmp_weight = []- tmp_unit = []- for i in settings:- rep_unit = _(i.repetition_unit.name) if i.repetition_unit.id != 1 else ''- reps = "{0} {1}".format(i.reps, rep_unit).strip() if i.reps != 99 else u'∞'-- weight = i.weight- if i.weight:+ tmp_repetition_unit = []+ tmp_weight_unit = []+ for setting in settings:+ rep_unit = _(setting.repetition_unit.name) if setting.repetition_unit.id != 1 else ''+ reps = "{0} {1}".format(setting.reps, rep_unit).strip() if setting.reps != 99 else u'∞'++ weight = setting.weight+ if setting.weight:# Normalize, see comment above- weight = normalize_decimal(i.weight)- reps += ' ({0}{1})'.format(weight, weight_unit)+ weight = normalize_decimal(setting.weight)+ reps += ' ({0} {1})'.format(weight, setting.weight_unit)tmp_reps_text.append(reps)- tmp_reps.append(i.reps)+ tmp_reps.append(setting.reps)tmp_weight.append(weight)- tmp_unit.append(i.repetition_unit)+ tmp_repetition_unit.append(setting.repetition_unit)+ tmp_weight_unit.append(setting.weight_unit)setting_text = u' – '.join(tmp_reps_text)setting_list = tmp_reps_text- repetition_units = tmp_unit+ repetition_units = tmp_repetition_unit+ weight_units = tmp_weight_unitreps_list = tmp_repsweight_list = tmp_weight- return setting_text, setting_list, weight_list, reps_list, repetition_units+ return setting_text, setting_list, weight_list, reps_list, repetition_units, weight_unitsclass WorkoutCalendar(HTMLCalendar):diff --git a/wger/manager/models.py b/wger/manager/models.pyindex b2553e003..4939d0586 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -445,7 +445,7 @@ class Day(models.Model):setting_tmp.append(setting)# "Smart" textual representation- setting_text, setting_list, weight_list, reps_list, repetition_units \+ setting_text, setting_list, weight_list, reps_list, repetition_units, weight_units \= reps_smart_text(setting_tmp, set_obj)# Flag indicating whether all exercises have settings@@ -467,6 +467,7 @@ class Day(models.Model):'setting_obj_list': setting_tmp,'setting_list': setting_list,'repetition_units': repetition_units,+ 'weight_units': weight_units,'weight_list': weight_list,'has_weight': has_weight,'reps_list': reps_list,@@ -486,7 +487,8 @@ 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, repetition_units = \+ setting_text, setting_list, weight_list,\+ reps_list, repetition_units, weight_units = \reps_smart_text(exercise['setting_obj_list'], set_obj)exercise['setting_text'] = setting_textexercise['repetition_units'] = repetition_unitsdiff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex 14133fb9a..bd15b928b 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -16,12 +16,18 @@ from decimal import Decimalfrom django.core.cache import cache-from wger.core.models import DaysOfWeek, RepetitionUnitfrom wger.exercises.models import Exercise-from wger.manager.models import Workout-from wger.manager.models import Day-from wger.manager.models import Set-from wger.manager.models import Setting+from wger.core.models import (+ DaysOfWeek,+ RepetitionUnit,+ WeightUnit+)+from wger.manager.models import (+ Workout,+ Day,+ Set,+ Setting+)from wger.manager.tests.testcase import WorkoutManagerTestCasefrom wger.utils.cache import cache_mapper@@ -42,6 +48,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):setting_1 = Setting.objects.get(pk=1)setting_2 = Setting.objects.get(pk=2)repetition_unit = RepetitionUnit.objects.get(pk=1)+ weight_unit = WeightUnit.objects.get(pk=1)self.assertEqual(workout.canonical_representation['muscles'], {'back': [2], 'front': [1]})self.assertEqual(workout.canonical_representation['obj'], workout)@@ -58,7 +65,9 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'setting_obj_list': [setting_1],'setting_text': u'2 \xd7 8','repetition_units': [repetition_unit,- repetition_unit]}],+ repetition_unit],+ 'weight_units': [weight_unit,+ weight_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': [1]},@@ -73,17 +82,21 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'comment_list': [u'Foobar'],'has_weight': True,'reps_list': [10, 10, 10, 10],- 'setting_list': [u'10 (15kg)',- u'10 (15kg)',- u'10 (15kg)',- u'10 (15kg)'],+ 'setting_list': [u'10 (15 kg)',+ u'10 (15 kg)',+ u'10 (15 kg)',+ u'10 (15 kg)'],'weight_list': [Decimal(15)] * 4,'setting_obj_list': [setting_2],- 'setting_text': u'4 \xd7 10 (15kg)',+ 'setting_text': u'4 \xd7 10 (15 kg)','repetition_units': [repetition_unit,repetition_unit,repetition_unit,- repetition_unit]}],+ repetition_unit],+ 'weight_units': [weight_unit,+ weight_unit,+ weight_unit,+ weight_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': []},@@ -106,6 +119,7 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):weekday1 = DaysOfWeek.objects.get(pk=3)weekday2 = DaysOfWeek.objects.get(pk=5)repetition_unit = RepetitionUnit.objects.get(pk=1)+ weight_unit = WeightUnit.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': []})@@ -122,7 +136,11 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):'repetition_units': [repetition_unit,repetition_unit,repetition_unit,- repetition_unit]}],+ repetition_unit],+ 'weight_units': [weight_unit,+ weight_unit,+ weight_unit,+ weight_unit]}],'is_superset': False,'has_settings': True,'muscles': {'back': [2], 'front': []},