Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Normalize the decimals used for saved weight

Roland Geider86b62193c6d6
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.py
index cc962ed4d..10babc27e 100644
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@ -143,21 +143,31 @@ def reps_smart_text(settings, set_obj):
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)
- if settings[0].weight:
- setting_text += ' ({0}{1})'.format(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
+ # the database used.
+ weight = settings[0].weight.normalize() if settings[0].weight else settings[0].weight
+
+ if weight:
+ setting_text += ' ({0}{1})'.format(weight, unit)
setting_list = [settings[0].reps] * set_obj.sets
- weight_list = [settings[0].weight] * set_obj.sets
+ weight_list = [weight] * set_obj.sets
+
elif len(settings) > 1:
tmp_reps_text = []
tmp_reps = []
tmp_weight = []
for i in settings:
reps = str(i.reps) if i.reps != 99 else u'∞'
+ weight = i.weight
if i.weight:
- reps += ' ({0}{1})'.format(i.weight, unit)
+ # Normalize, see comment above
+ weight = i.weight.normalize()
+ reps += ' ({0}{1})'.format(weight, unit)
tmp_reps_text.append(reps)
tmp_reps.append(i.reps)
- tmp_weight.append(i.weight)
+ tmp_weight.append(weight)
setting_text = u' – '.join(tmp_reps_text)
setting_list = tmp_reps