Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Small refactor of canonical form of workout

Roland Geider69b2885deb15
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 4a030149f..1aeefcab3 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -106,6 +106,8 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):
'''
setting_obj_list = SettingSerializer(many=True)
setting_list = serializers.ReadOnlyField()
+ reps_list = serializers.ReadOnlyField()
+ has_weight = serializers.ReadOnlyField()
weight_list = serializers.ReadOnlyField()
setting_text = serializers.ReadOnlyField()
comment_list = serializers.ReadOnlyField()
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.py
index 69c9b4c9e..25bb4804e 100644
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@ -149,9 +149,11 @@ def reps_smart_text(settings, set_obj):
setting_text = ''
setting_list = []
weight_list = []
+ reps_list = []
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)
+ setting_list_text = u'{0}'.format(reps)
# 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
@@ -163,7 +165,9 @@ def reps_smart_text(settings, set_obj):
if weight:
setting_text += ' ({0}{1})'.format(weight, unit)
- setting_list = [settings[0].reps] * set_obj.sets
+ setting_list_text += ' ({0}{1})'.format(weight, unit)
+ setting_list = [setting_list_text] * set_obj.sets
+ reps_list = [settings[0].reps] * set_obj.sets
weight_list = [weight] * set_obj.sets
elif len(settings) > 1:
@@ -182,10 +186,11 @@ def reps_smart_text(settings, set_obj):
tmp_weight.append(weight)
setting_text = u' – '.join(tmp_reps_text)
- setting_list = tmp_reps
+ setting_list = tmp_reps_text
+ reps_list = tmp_reps
weight_list = tmp_weight
- return setting_text, setting_list, weight_list
+ return setting_text, setting_list, weight_list, reps_list
class WorkoutCalendar(HTMLCalendar):
diff --git a/wger/manager/models.py b/wger/manager/models.py
index f402d71f0..9b01a6038 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -440,7 +440,8 @@ class Day(models.Model):
setting_tmp.append(setting)
# "Smart" textual representation
- setting_text, setting_list, weight_list = reps_smart_text(setting_tmp, set_obj)
+ setting_text, setting_list, weight_list, reps_list \
+ = reps_smart_text(setting_tmp, set_obj)
# Flag indicating whether all exercises have settings
has_setting_tmp = True if len(setting_tmp) > 0 else False
@@ -450,10 +451,19 @@ class Day(models.Model):
for i in exercise.exercisecomment_set.all():
comment_list.append(i.comment)
+ # Flag indicating whether any of the settings has saved weight
+ has_weight = False
+ for i in setting_tmp:
+ if i.weight:
+ has_weight = True
+ break
+
exercise_tmp.append({'obj': exercise,
'setting_obj_list': setting_tmp,
'setting_list': setting_list,
'weight_list': weight_list,
+ 'has_weight': has_weight,
+ 'reps_list': reps_list,
'setting_text': setting_text,
'comment_list': comment_list})
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index f7d2c9664..e6a2d609e 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -50,7 +50,9 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'obj': Day.objects.get(pk=1),
'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1),
'comment_list': [u'test 123'],
- 'setting_list': [8, 8],
+ 'has_weight': False,
+ 'setting_list': [u'8', u'8'],
+ 'reps_list': [8, 8],
'weight_list': [None, None],
'setting_obj_list': [setting_1],
'setting_text': u'2 \xd7 8'}],
@@ -66,7 +68,12 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'muscles': {'back': [2], 'front': []},
'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),
'comment_list': [u'Foobar'],
- 'setting_list': [10, 10, 10, 10],
+ 'has_weight': True,
+ 'reps_list': [10, 10, 10, 10],
+ 'setting_list': [u'10 (15kg)',
+ u'10 (15kg)',
+ u'10 (15kg)',
+ u'10 (15kg)'],
'weight_list': [Decimal(15)] * 4,
'setting_obj_list': [setting_2],
'setting_text': u'4 \xd7 10 (15kg)'}],
@@ -98,7 +105,9 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
canonical_form = [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),
'comment_list': [u'Foobar'],
- 'setting_list': [10, 10, 10, 10],
+ 'reps_list': [10, 10, 10, 10],
+ 'has_weight': False,
+ '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'}],