Self hosted FLOSS fitness/workout, nutrition and weight tracker
Show rest time in text representation
Roland Geiderd251906dab0e
diff --git a/wger/core/tests/base_testcase.py b/wger/core/tests/base_testcase.pyindex c7242c73d..2a52d227a 100644--- a/wger/core/tests/base_testcase.py+++ b/wger/core/tests/base_testcase.py@@ -129,9 +129,9 @@ class BaseTestCase:'test-ingredients','test-nutrition-data','test-nutrition-diary',- 'test-workout-log-data',- 'test-workout-session','test-routine-data',+ 'test-workout-session',+ 'test-workout-log-data','test-gallery-images','test-measurement-categories','test-measurements',diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pyindex 5e61b3b0e..7549ab254 100644--- a/wger/manager/dataclasses.py+++ b/wger/manager/dataclasses.py@@ -136,6 +136,13 @@ class SetConfigData:rir = round_value(self.rir, 0.5)out.append(f'@ {rir} {_("RiR")}')+ if self.rest:+ rest = self.rest+ if self.max_rest:+ rest = f'{rest}-{self.max_rest}'++ out.append(f'{rest}s {_("rest")}')+return ' '.join(out).strip(',')diff --git a/wger/manager/tests/test_set_config_data.py b/wger/manager/tests/test_set_config_data.pyindex 1ecb1e117..2bec3d9af 100644--- a/wger/manager/tests/test_set_config_data.py+++ b/wger/manager/tests/test_set_config_data.py@@ -36,7 +36,7 @@ class SetConfigDataTestCase(WgerTestCase):weight=20,weight_unit=1,rir=3,- rest=40,+ rest=None,)def test_text_repr(self):@@ -104,6 +104,18 @@ class SetConfigDataTestCase(WgerTestCase):self.config.max_weight = 30self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20-30 kg @ 3 RiR')+ def test_text_repr_sets_weight_and_rest_range(self):+ self.config.sets = 3+ self.config.max_weight = 30+ self.config.rest = 100+ self.config.max_rest = 120+ self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20-30 kg @ 3 RiR 100-120s rest')++ def test_text_repr_sets_weight_and_rest(self):+ self.config.sets = 3+ self.config.rest = 100+ self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20 kg @ 3 RiR 100s rest')+def test_text_repr_only_sets(self):self.config.sets = 3self.config.weight = None@@ -113,9 +125,13 @@ class SetConfigDataTestCase(WgerTestCase):self.config.rir = Noneself.assertEqual(self.config.text_repr, '3 Sets')- def test_rpe_calculation(self):+ def test_rpe_calculation_1(self):self.assertEqual(self.config.rpe, 7)+ def test_rpe_calculation_2(self):+ self.config.rir = 1+ self.assertEqual(self.config.rpe, 9)+def test_no_rpe_calculation(self):self.config.rir = Noneself.assertEqual(self.config.rpe, None)