Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Small fixes, also expose slot comment

Roland Geiderb83434e43bda
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 3ef22477d..75d20deee 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -292,7 +292,7 @@ class SetConfigSerializer(serializers.ModelSerializer):
class SetConfigDataSerializer(serializers.Serializer):
"""
- SetData serializer
+ SetConfigData serializer
"""
slot_config_id = serializers.IntegerField()
@@ -308,6 +308,7 @@ class SetConfigDataSerializer(serializers.Serializer):
rest = serializers.DecimalField(max_digits=5, decimal_places=2)
type = serializers.CharField()
text_repr = serializers.CharField()
+ comment = serializers.CharField()
class SetExerciseDataSerializer(serializers.Serializer):
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index b40c1e697..533e0e842 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -53,6 +53,7 @@ class SetConfigData:
weight_rounding: Decimal | int | None = 1.25
reps_rounding: Decimal | int | None = 1
+ comment: str = ''
type: str = 'normal'
slot_config_id: int | None = None
@@ -64,8 +65,8 @@ class SetConfigData:
This converts the values to something readable like "10 × 100 kg @ 2.00RiR"
"""
- def round_value(x: int | float, base=5) -> Decimal:
- return normalize_decimal(Decimal(base * round(x / base)))
+ def round_value(x: int | float, base: float = 5) -> Decimal:
+ return normalize_decimal(Decimal(base * round(Decimal(x) / Decimal(base))))
out = []
@@ -96,7 +97,8 @@ class SetConfigData:
out.append(f'{weight} {unit}'.strip())
if self.rir:
- out.append(f'@ {self.rir}{_("RiR")}')
+ rir = round_value(self.rir, 0.5)
+ out.append(f'@ {rir} {_("RiR")}')
return ' '.join(out)
diff --git a/wger/manager/models/slot.py b/wger/manager/models/slot.py
index 2660ea912..290ae3fdc 100644
--- a/wger/manager/models/slot.py
+++ b/wger/manager/models/slot.py
@@ -85,11 +85,16 @@ class Slot(models.Model):
- Exercise 2
- Exercise 1
"""
-
- result = []
set_data = self.set_data(iteration)
- sets = [slot.data.sets for slot in set_data] # Create a list of sets
+ # If this is not a superset, just return the data
+ if len(set_data) == 1:
+ return [
+ set_data[0].data,
+ ]
+
+ result = []
+ sets = [slot.data.sets for slot in set_data]
while any(repeat > 0 for repeat in sets):
for i, slot in enumerate(set_data):
diff --git a/wger/manager/models/slot_config.py b/wger/manager/models/slot_config.py
index e0cdceda8..7942aed32 100644
--- a/wger/manager/models/slot_config.py
+++ b/wger/manager/models/slot_config.py
@@ -227,6 +227,7 @@ class SlotConfig(models.Model):
sets = self.get_sets(iteration)
return SetConfigData(
+ slot_config_id=self.id,
exercise=self.exercise.id,
sets=sets if sets is not None else 1,
weight=weight,
@@ -238,7 +239,7 @@ class SlotConfig(models.Model):
rir=self.get_rir(iteration),
rest=self.get_rest(iteration),
type=self.type,
- slot_config_id=self.id,
+ comment=self.comment,
)
def get_sets(self, iteration: int) -> Decimal | None:
diff --git a/wger/manager/tests/test_set_config_data.py b/wger/manager/tests/test_set_config_data.py
index 63f4afce1..3185bbc08 100644
--- a/wger/manager/tests/test_set_config_data.py
+++ b/wger/manager/tests/test_set_config_data.py
@@ -40,15 +40,15 @@ class SetConfigDataTestCase(WgerTestCase):
)
def test_text_repr(self):
- self.assertEqual(self.config.text_repr, '4 × 20 kg @ 3RiR')
+ self.assertEqual(self.config.text_repr, '4 × 20 kg @ 3 RiR')
def test_normalize_decimals(self):
self.config.weight = 22.50
- self.assertEqual(self.config.text_repr, '4 × 22.5 kg @ 3RiR')
+ self.assertEqual(self.config.text_repr, '4 × 22.5 kg @ 3 RiR')
def test_weight_unit(self):
self.config.weight_unit = 2
- self.assertEqual(self.config.text_repr, '4 × 20 lb @ 3RiR')
+ self.assertEqual(self.config.text_repr, '4 × 20 lb @ 3 RiR')
def test_no_rir(self):
self.config.rir = None
@@ -56,27 +56,31 @@ class SetConfigDataTestCase(WgerTestCase):
def test_no_weight(self):
self.config.weight = None
- self.assertEqual(self.config.text_repr, '4 × @ 3RiR')
+ self.assertEqual(self.config.text_repr, '4 × @ 3 RiR')
def test_sets(self):
self.config.sets = 3
- self.assertEqual(self.config.text_repr, '3 Sets – 4 × 20 kg @ 3RiR')
+ self.assertEqual(self.config.text_repr, '3 Sets – 4 × 20 kg @ 3 RiR')
def test_weight_rounding(self):
self.config.weight = 22.499
self.config.weight_rounding = 5
- self.assertEqual(self.config.text_repr, '4 × 20 kg @ 3RiR')
+ self.assertEqual(self.config.text_repr, '4 × 20 kg @ 3 RiR')
def test_reps_unit(self):
self.config.reps = 90
self.config.reps_unit = 3
- self.assertEqual(self.config.text_repr, '90 Seconds × 20 kg @ 3RiR')
+ self.assertEqual(self.config.text_repr, '90 Seconds × 20 kg @ 3 RiR')
def test_reps_rounding(self):
self.config.reps = 4.72
self.config.reps_rounding = 2.5
- self.assertEqual(self.config.text_repr, '5 × 20 kg @ 3RiR')
+ self.assertEqual(self.config.text_repr, '5 × 20 kg @ 3 RiR')
+
+ def test_rir_rounding(self):
+ self.config.rir = 2.50
+ self.assertEqual(self.config.text_repr, '4 × 20 kg @ 2.5 RiR')
def test_amrap(self):
self.config.reps_unit = 2
- self.assertEqual(self.config.text_repr, '∞ × 20 kg @ 3RiR')
+ self.assertEqual(self.config.text_repr, '∞ × 20 kg @ 3 RiR')
diff --git a/wger/manager/tests/test_slot.py b/wger/manager/tests/test_slot.py
index a6e450dce..706e4d298 100644
--- a/wger/manager/tests/test_slot.py
+++ b/wger/manager/tests/test_slot.py
@@ -12,6 +12,9 @@
#
# You should have received a copy of the GNU Affero General Public License
+# Standard Library
+from decimal import Decimal
+
# wger
from wger.core.tests.base_testcase import WgerTestCase
from wger.manager.models import (
@@ -34,15 +37,15 @@ class SlotTestCase(WgerTestCase):
self.slot = Slot(day_id=1, order=1)
self.slot.save()
- config1 = SlotConfig(slot=self.slot, exercise_id=1, order=1)
+ config1 = SlotConfig(id=100, slot=self.slot, exercise_id=1, order=1)
config1.save()
SetsConfig(slot_config=config1, iteration=1, value=4).save()
- config2 = SlotConfig(slot=self.slot, exercise_id=2, order=2)
+ config2 = SlotConfig(id=101, slot=self.slot, exercise_id=2, order=2)
config2.save()
SetsConfig(slot_config=config2, iteration=1, value=3).save()
- config3 = SlotConfig(slot=self.slot, exercise_id=3, order=3)
+ config3 = SlotConfig(id=102, slot=self.slot, exercise_id=3, order=3)
config3.save()
SetsConfig(slot_config=config3, iteration=1, value=2).save()
@@ -53,6 +56,8 @@ class SlotTestCase(WgerTestCase):
result = self.slot.get_sets(1)
+ self.assertEqual(len(result), 9)
+
self.assertEqual(result[0].exercise, 1)
self.assertEqual(result[0].sets, 1)
self.assertEqual(result[1].exercise, 2)
@@ -78,3 +83,15 @@ class SlotTestCase(WgerTestCase):
self.assertEqual(result[0], 1)
self.assertEqual(result[1], 2)
self.assertEqual(result[2], 3)
+
+ def test_get_sets_one_exercise(self):
+ """
+ Test that the correct sets are returned for regular sets
+ """
+ SlotConfig.objects.filter(id__in=(101, 102)).delete()
+
+ result = self.slot.get_sets(1)
+
+ self.assertEqual(len(result), 1)
+ self.assertEqual(result[0].exercise, 1)
+ self.assertEqual(result[0].sets, Decimal(4))