Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add RiR to RPE conversion

Roland Geider9d804f437cc2
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 3fe04ea00..4440e3707 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -307,6 +307,7 @@ class SetConfigDataSerializer(serializers.Serializer):
reps_unit = serializers.IntegerField()
reps_rounding = serializers.DecimalField(max_digits=4, decimal_places=2)
rir = serializers.DecimalField(max_digits=5, decimal_places=2)
+ rpe = serializers.DecimalField(max_digits=5, decimal_places=2)
rest = serializers.DecimalField(max_digits=5, decimal_places=2)
max_rest = serializers.DecimalField(max_digits=5, decimal_places=2)
type = serializers.CharField()
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index c1eab971f..84aaea1e7 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -61,6 +61,19 @@ class SetConfigData:
type: str = 'normal'
slot_config_id: int | None = None
+ @property
+ def rpe(self):
+ """Converts the RiR scale to RPE"""
+
+ if not self.rir:
+ return None
+
+ # If the RiR is too high, just approximate to 4
+ if self.rir > 5:
+ return 4
+
+ return 10 - self.rir
+
@property
def text_repr(self) -> str:
"""
diff --git a/wger/manager/tests/test_set_config_data.py b/wger/manager/tests/test_set_config_data.py
index a3fce4b91..77bc29d92 100644
--- a/wger/manager/tests/test_set_config_data.py
+++ b/wger/manager/tests/test_set_config_data.py
@@ -42,58 +42,69 @@ class SetConfigDataTestCase(WgerTestCase):
def test_text_repr(self):
self.assertEqual(self.config.text_repr, '4 × 20 kg @ 3 RiR')
- def test_normalize_decimals(self):
+ def test_text_repr_normalize_decimals(self):
self.config.weight = 22.50
self.assertEqual(self.config.text_repr, '4 × 22.5 kg @ 3 RiR')
- def test_weight_unit(self):
+ def test_text_repr_weight_unit(self):
self.config.weight_unit = 2
self.assertEqual(self.config.text_repr, '4 × 20 lb @ 3 RiR')
- def test_no_rir(self):
+ def test_text_repr_no_rir(self):
self.config.rir = None
self.assertEqual(self.config.text_repr, '4 × 20 kg')
- def test_no_weight(self):
+ def test_text_repr_no_weight(self):
self.config.weight = None
self.assertEqual(self.config.text_repr, '4 × @ 3 RiR')
- def test_sets(self):
+ def test_text_repr_sets(self):
self.config.sets = 3
self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20 kg @ 3 RiR')
- def test_weight_rounding(self):
+ def test_text_repr_weight_rounding(self):
self.config.weight = 22.499
self.config.weight_rounding = 5
self.assertEqual(self.config.text_repr, '4 × 20 kg @ 3 RiR')
- def test_reps_unit(self):
+ def test_text_repr_reps_unit(self):
self.config.reps = 90
self.config.reps_unit = 3
self.assertEqual(self.config.text_repr, '90 Seconds × 20 kg @ 3 RiR')
- def test_reps_rounding(self):
+ def test_text_repr_reps_rounding(self):
self.config.reps = 4.72
self.config.reps_rounding = 2.5
self.assertEqual(self.config.text_repr, '5 × 20 kg @ 3 RiR')
- def test_rir_rounding(self):
+ def test_text_repr_rir_rounding(self):
self.config.rir = 2.50
self.assertEqual(self.config.text_repr, '4 × 20 kg @ 2.5 RiR')
- def test_amrap(self):
+ def test_text_repr_amrap(self):
self.config.reps_unit = 2
self.assertEqual(self.config.text_repr, '∞ × 20 kg @ 3 RiR')
- def test_reps_range(self):
+ def test_text_repr_reps_range(self):
self.config.max_reps = 6
self.assertEqual(self.config.text_repr, '4-6 × 20 kg @ 3 RiR')
- def test_weight_range(self):
+ def test_text_repr_weight_range(self):
self.config.max_weight = 30
self.assertEqual(self.config.text_repr, '4 × 20-30 kg @ 3 RiR')
- def test_sets_and_weight_range(self):
+ def test_text_repr_sets_and_weight_range(self):
self.config.sets = 3
self.config.max_weight = 30
self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20-30 kg @ 3 RiR')
+
+ def test_rpe_calculation(self):
+ self.assertEqual(self.config.rpe, 7)
+
+ def test_no_rpe_calculation(self):
+ self.config.rir = None
+ self.assertEqual(self.config.rpe, None)
+
+ def test_high_rpe_calculation(self):
+ self.config.rir = 7
+ self.assertEqual(self.config.rpe, 4)