Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove trailing comma from the text representation

Roland Geider8dbc0096e252
diff --git a/manage.py b/manage.py
old mode 100644
new mode 100755
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index 73c871e51..b8cc1df9c 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -135,7 +135,7 @@ class SetConfigData:
rir = round_value(self.rir, 0.5)
out.append(f'@ {rir} {_("RiR")}')
- return ' '.join(out)
+ return ' '.join(out).strip(',')
@dataclass
diff --git a/wger/manager/tests/test_set_config_data.py b/wger/manager/tests/test_set_config_data.py
index 52888939d..1ecb1e117 100644
--- a/wger/manager/tests/test_set_config_data.py
+++ b/wger/manager/tests/test_set_config_data.py
@@ -104,6 +104,15 @@ class SetConfigDataTestCase(WgerTestCase):
self.config.max_weight = 30
self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20-30 kg @ 3 RiR')
+ def test_text_repr_only_sets(self):
+ self.config.sets = 3
+ self.config.weight = None
+ self.config.max_weight = None
+ self.config.max_reps = None
+ self.config.reps = None
+ self.config.rir = None
+ self.assertEqual(self.config.text_repr, '3 Sets')
+
def test_rpe_calculation(self):
self.assertEqual(self.config.rpe, 7)