Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add configuration to calculate the number of sets as well as the rounding value

Roland Geider9720d015bda8
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 2d2fd55c9..6e7bd95e2 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -72,6 +72,7 @@ class DayNgSerializer(serializers.ModelSerializer):
model = DayNg
fields = (
'id',
+ 'name',
'description',
'is_rest',
'need_logs_to_advance',
@@ -87,6 +88,7 @@ class SetNgSerializer(serializers.ModelSerializer):
class Meta:
model = SetNg
fields = (
+ 'id',
'day',
'order',
'comment',
@@ -102,6 +104,7 @@ class SetConfigSerializer(serializers.ModelSerializer):
class Meta:
model = SetConfig
fields = (
+ 'id',
'set',
'exercise',
'repetition_unit',
@@ -193,10 +196,13 @@ class SetConfigDataSerializer(serializers.Serializer):
SetData serializer
"""
+ sets = serializers.IntegerField()
weight = serializers.DecimalField(max_digits=5, decimal_places=2)
weight_unit = serializers.IntegerField()
+ weight_rounding = serializers.DecimalField(max_digits=4, decimal_places=2)
reps = serializers.DecimalField(max_digits=5, decimal_places=2)
reps_unit = serializers.IntegerField()
+ reps_rounding = serializers.DecimalField(max_digits=4, decimal_places=2)
rir = serializers.DecimalField(max_digits=5, decimal_places=2)
rest = serializers.DecimalField(max_digits=5, decimal_places=2)
diff --git a/wger/manager/config_calculations/calculations.py b/wger/manager/config_calculations/calculations.py
index fc358a3a4..1417eafb8 100644
--- a/wger/manager/config_calculations/calculations.py
+++ b/wger/manager/config_calculations/calculations.py
@@ -31,6 +31,7 @@ from wger.manager.models import (
class AbstractSetCalculations(ABC):
iteration: int
+ sets_configs: list[AbstractChangeConfig]
weight_configs: list[AbstractChangeConfig]
reps_configs: list[AbstractChangeConfig]
rir_configs: list[AbstractChangeConfig]
@@ -40,6 +41,7 @@ class AbstractSetCalculations(ABC):
def __init__(
self,
iteration: int,
+ sets_configs: list[AbstractChangeConfig],
weight_configs: list[AbstractChangeConfig],
reps_configs: list[AbstractChangeConfig],
rir_configs: list[AbstractChangeConfig],
@@ -47,6 +49,7 @@ class AbstractSetCalculations(ABC):
logs: list[WorkoutLog],
):
self.iteration = iteration
+ self.sets_configs = sets_configs
self.weight_configs = weight_configs
self.reps_configs = reps_configs
self.rir_configs = rir_configs
diff --git a/wger/manager/config_calculations/dummy.py b/wger/manager/config_calculations/dummy.py
index 13ec738ed..09bcbf701 100644
--- a/wger/manager/config_calculations/dummy.py
+++ b/wger/manager/config_calculations/dummy.py
@@ -23,6 +23,7 @@ class SetCalculations(AbstractSetCalculations):
def calculate(self):
if self.iteration == 1:
return SetConfigData(
+ sets=2,
weight=24,
reps=1,
rir=2,
@@ -30,6 +31,7 @@ class SetCalculations(AbstractSetCalculations):
)
else:
return SetConfigData(
+ sets=4,
weight=42,
reps=10,
rir=1,
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index c9ceb310d..490e29eb2 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -27,6 +27,7 @@ from typing import List
@dataclass
class SetConfigData:
+ sets: Decimal | int
weight: Decimal | int
reps: Decimal | int
rir: Decimal | int
@@ -34,6 +35,8 @@ class SetConfigData:
weight_unit: int = 1
reps_unit: int = 1
+ weight_rounding: Decimal | int = 1.25
+ reps_rounding: Decimal | int = 1
@dataclass
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 25b0494ab..2506fde49 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -259,6 +259,7 @@ class Migration(migrations.Migration):
),
),
('value', models.DecimalField(decimal_places=2, max_digits=6)),
+ ('rounding', models.DecimalField(decimal_places=2, default=1, max_digits=4)),
(
'operation',
models.CharField(
@@ -312,6 +313,7 @@ class Migration(migrations.Migration):
),
),
('value', models.DecimalField(decimal_places=2, max_digits=6)),
+ ('rounding', models.DecimalField(decimal_places=2, default=1, max_digits=4)),
(
'operation',
models.CharField(
@@ -365,6 +367,7 @@ class Migration(migrations.Migration):
),
),
('value', models.DecimalField(decimal_places=2, max_digits=6)),
+ ('rounding', models.DecimalField(decimal_places=2, default=1, max_digits=4)),
(
'operation',
models.CharField(
@@ -418,6 +421,7 @@ class Migration(migrations.Migration):
),
),
('value', models.DecimalField(decimal_places=2, max_digits=6)),
+ ('rounding', models.DecimalField(decimal_places=2, default=1, max_digits=4)),
(
'operation',
models.CharField(
@@ -451,4 +455,62 @@ class Migration(migrations.Migration):
'unique_together': {('set_config', 'iteration')},
},
),
+ migrations.CreateModel(
+ name='SetsConfig',
+ fields=[
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name='ID',
+ ),
+ ),
+ ('iteration', models.PositiveIntegerField()),
+ (
+ 'trigger',
+ models.CharField(
+ choices=[('session', 'Session'), ('week', 'Week')],
+ default='session',
+ max_length=10,
+ null=True,
+ ),
+ ),
+ ('value', models.DecimalField(decimal_places=2, max_digits=6)),
+ ('rounding', models.DecimalField(decimal_places=2, default=1, max_digits=4)),
+ (
+ 'operation',
+ models.CharField(
+ choices=[('+', 'Plus'), ('-', 'Minus')],
+ default='+',
+ max_length=1,
+ null=True,
+ ),
+ ),
+ (
+ 'step',
+ models.CharField(
+ choices=[('abs', 'Absolute'), ('percent', 'Percent')],
+ default='abs',
+ max_length=10,
+ null=True,
+ ),
+ ),
+ ('replace', models.BooleanField(default=False)),
+ ('need_log_to_apply', models.BooleanField(default=False)),
+ (
+ 'set_config',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.setconfig',
+ ),
+ ),
+ ],
+ options={
+ 'ordering': ['set_config', 'iteration'],
+ 'abstract': False,
+ 'unique_together': {('set_config', 'iteration')},
+ },
+ ),
]
diff --git a/wger/manager/models/__init__.py b/wger/manager/models/__init__.py
index 63c4c59cf..a0583c073 100644
--- a/wger/manager/models/__init__.py
+++ b/wger/manager/models/__init__.py
@@ -33,6 +33,7 @@ from .set import (
SetNg,
)
from .set_config import SetConfig
+from .sets_config import SetsConfig
from .setting import Setting
from .weight_config import WeightConfig
from .workout import Workout
diff --git a/wger/manager/models/abstract_config.py b/wger/manager/models/abstract_config.py
index 7cd2dda00..3dd5b8704 100644
--- a/wger/manager/models/abstract_config.py
+++ b/wger/manager/models/abstract_config.py
@@ -70,6 +70,13 @@ class AbstractChangeConfig(models.Model):
)
"""The actual increment"""
+ rounding = models.DecimalField(decimal_places=2, max_digits=4, default=1)
+ """
+ The amount by which the value will be rounded
+
+ Note that this will happen in the UI, and not in the backend
+ """
+
operation = models.CharField(
choices=OperationChoices.choices,
max_length=1,
diff --git a/wger/manager/models/reps_config.py b/wger/manager/models/reps_config.py
index 1400d5811..14d453f38 100644
--- a/wger/manager/models/reps_config.py
+++ b/wger/manager/models/reps_config.py
@@ -20,7 +20,7 @@ from wger.manager.models import AbstractChangeConfig
class RepsConfig(AbstractChangeConfig):
"""
- Model for a routine
+ Configuration model for the number of reps for a workout set
"""
pass
diff --git a/wger/manager/models/rest_config.py b/wger/manager/models/rest_config.py
index e483ee902..2fdf79fe5 100644
--- a/wger/manager/models/rest_config.py
+++ b/wger/manager/models/rest_config.py
@@ -20,7 +20,7 @@ from wger.manager.models import AbstractChangeConfig
class RestConfig(AbstractChangeConfig):
"""
- Model for a routine
+ Configuration model for the rest time for a workout set
"""
pass
diff --git a/wger/manager/models/rir_config.py b/wger/manager/models/rir_config.py
index dacfaba97..02bc0ba5f 100644
--- a/wger/manager/models/rir_config.py
+++ b/wger/manager/models/rir_config.py
@@ -20,7 +20,7 @@ from wger.manager.models import AbstractChangeConfig
class RiRConfig(AbstractChangeConfig):
"""
- Model for a routine
+ Configuration model for the number of RiR for a workout set
"""
pass
diff --git a/wger/manager/models/set_config.py b/wger/manager/models/set_config.py
index aaa689b4c..d161a4958 100644
--- a/wger/manager/models/set_config.py
+++ b/wger/manager/models/set_config.py
@@ -108,6 +108,7 @@ class SetConfig(models.Model):
def calculate_config_value(configs: list[AbstractChangeConfig]) -> Decimal:
out = Decimal(0)
for config in configs:
+
if config.replace:
out = config.value
continue
@@ -132,6 +133,7 @@ class SetConfig(models.Model):
raise ImportError(f'Class {self.class_name} not found')
custom_logic = module.SetCalculations(
iteration=iteration,
+ sets_configs=self.setsconfig_set.filter(iteration__lte=iteration),
weight_configs=self.weightconfig_set.filter(iteration__lte=iteration),
reps_configs=self.repsconfig_set.filter(iteration__lte=iteration),
rir_configs=self.rirconfig_set.filter(iteration__lte=iteration),
@@ -178,22 +180,34 @@ class SetConfig(models.Model):
break
return SetConfigData(
+ sets=self.get_sets(iteration),
weight=self.get_weight(max_iter_weight),
+ weight_rounding=self.get_weight_rounding(max_iter_weight),
weight_unit=self.weight_unit.pk,
reps=self.get_reps(max_iter_reps),
+ reps_rounding=self.get_reps_rounding(max_iter_reps),
reps_unit=self.repetition_unit.pk,
rir=self.get_rir(iteration),
rest=self.get_rest(iteration),
)
- def get_weight(self, iteration: int):
+ def get_sets(self, iteration: int) -> Decimal:
+ return self.calculate_config_value(self.setsconfig_set.filter(iteration__lte=iteration))
+
+ def get_weight(self, iteration: int) -> Decimal:
return self.calculate_config_value(self.weightconfig_set.filter(iteration__lte=iteration))
- def get_reps(self, iteration: int):
+ def get_weight_rounding(self, iteration: int) -> Decimal:
+ return self.weightconfig_set.filter(iteration__lte=iteration).last().rounding
+
+ def get_reps(self, iteration: int) -> Decimal:
return self.calculate_config_value(self.repsconfig_set.filter(iteration__lte=iteration))
- def get_rir(self, iteration: int):
+ def get_reps_rounding(self, iteration: int) -> Decimal:
+ return self.repsconfig_set.filter(iteration__lte=iteration).last().rounding
+
+ def get_rir(self, iteration: int) -> Decimal:
return self.calculate_config_value(self.rirconfig_set.filter(iteration__lte=iteration))
- def get_rest(self, iteration: int):
+ def get_rest(self, iteration: int) -> Decimal:
return self.calculate_config_value(self.restconfig_set.filter(iteration__lte=iteration))
diff --git a/wger/manager/models/sets_config.py b/wger/manager/models/sets_config.py
new file mode 100644
index 000000000..13a3978ca
--- /dev/null
+++ b/wger/manager/models/sets_config.py
@@ -0,0 +1,26 @@
+# This file is part of wger Workout Manager <https://github.com/wger-project>.
+# Copyright (C) 2013 - 2021 wger Team
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# wger
+from wger.manager.models import AbstractChangeConfig
+
+
+class SetsConfig(AbstractChangeConfig):
+ """
+ Configuration model for the number of sets for a workout set
+ """
+
+ pass
diff --git a/wger/manager/models/weight_config.py b/wger/manager/models/weight_config.py
index 8205be5c7..a1fe311c1 100644
--- a/wger/manager/models/weight_config.py
+++ b/wger/manager/models/weight_config.py
@@ -20,7 +20,7 @@ from wger.manager.models import AbstractChangeConfig
class WeightConfig(AbstractChangeConfig):
"""
- Model for a routine
+ Configuration model for the weight for a workout set
"""
pass
diff --git a/wger/manager/tests/test_set_config.py b/wger/manager/tests/test_set_config.py
index 8bd483515..fed1c61f0 100644
--- a/wger/manager/tests/test_set_config.py
+++ b/wger/manager/tests/test_set_config.py
@@ -22,6 +22,7 @@ from wger.manager.models import (
RepsConfig,
RestConfig,
RiRConfig,
+ SetsConfig,
WeightConfig,
WorkoutLog,
)
@@ -89,6 +90,7 @@ class SetConfigTestCase(WgerTestCase):
"""
# Initial value
+ SetsConfig(set_config=self.set_config, iteration=1, value=4).save()
WeightConfig(set_config=self.set_config, iteration=1, value=80).save()
RepsConfig(set_config=self.set_config, iteration=1, value=5).save()
RestConfig(set_config=self.set_config, iteration=1, value=120).save()
@@ -139,27 +141,27 @@ class SetConfigTestCase(WgerTestCase):
self.assertEqual(
self.set_config.get_config(1),
- SetConfigData(weight=80, reps=5, rir=2, rest=120),
+ SetConfigData(sets=4, weight=80, reps=5, rir=2, rest=120),
)
self.assertEqual(
self.set_config.get_config(2),
- SetConfigData(weight=80, reps=5, rir=2, rest=120),
+ SetConfigData(sets=4, weight=80, reps=5, rir=2, rest=120),
)
self.assertEqual(
self.set_config.get_config(3),
- SetConfigData(weight=80, reps=5, rir=2, rest=120),
+ SetConfigData(sets=4, weight=80, reps=5, rir=2, rest=120),
)
self.assertEqual(
self.set_config.get_config(4),
- SetConfigData(weight=Decimal(82.5), reps=5, rir=2, rest=120),
+ SetConfigData(sets=4, weight=Decimal(82.5), reps=5, rir=2, rest=120),
)
self.assertEqual(
self.set_config.get_config(5),
- SetConfigData(weight=42, reps=5, rir=2, rest=120),
+ SetConfigData(sets=4, weight=42, reps=5, rir=2, rest=120),
)
self.assertEqual(
self.set_config.get_config(6),
- SetConfigData(weight=42, reps=5, rir=2, rest=120),
+ SetConfigData(sets=4, weight=42, reps=5, rir=2, rest=120),
)
def test_weight_config_custom_python_class(self):
@@ -171,6 +173,7 @@ class SetConfigTestCase(WgerTestCase):
# Initial value with custom python code
self.set_config.class_name = 'dummy'
self.set_config.save()
+ SetsConfig(set_config=self.set_config, iteration=1, value=5).save()
WeightConfig(set_config=self.set_config, iteration=1, value=100, replace=True).save()
RepsConfig(set_config=self.set_config, iteration=1, value=5).save()
RestConfig(set_config=self.set_config, iteration=1, value=120).save()
@@ -178,13 +181,13 @@ class SetConfigTestCase(WgerTestCase):
self.assertEqual(
self.set_config.get_config(1),
- SetConfigData(weight=24, reps=1, rir=2, rest=120),
+ SetConfigData(sets=2, weight=24, reps=1, rir=2, rest=120),
)
self.assertEqual(
self.set_config.get_config(2),
- SetConfigData(weight=42, reps=10, rir=1, rest=90),
+ SetConfigData(sets=4, weight=42, reps=10, rir=1, rest=90),
)
self.assertEqual(
self.set_config.get_config(3),
- SetConfigData(weight=42, reps=10, rir=1, rest=90),
+ SetConfigData(sets=4, weight=42, reps=10, rir=1, rest=90),
)