Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add fields to configure the maximum number of sets as well

Roland Geider84e41d34f31e
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 20bd3a3fb..9e12de1d1 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -24,6 +24,7 @@ from wger.manager.models import (
Day,
MaxRepsConfig,
MaxRestConfig,
+ MaxSetsConfig,
MaxWeightConfig,
RepsConfig,
RestConfig,
@@ -129,6 +130,16 @@ class SetNrConfigSerializer(serializers.ModelSerializer):
fields = CONFIG_FIELDS
+class MaxSetNrConfigSerializer(serializers.ModelSerializer):
+ """
+ Max Set Nr config serializer
+ """
+
+ class Meta:
+ model = MaxSetsConfig
+ fields = CONFIG_FIELDS
+
+
class RiRConfigSerializer(serializers.ModelSerializer):
"""
RiR Config serializer
@@ -169,6 +180,7 @@ class SlotEntryStructureSerializer(serializers.ModelSerializer):
reps_configs = RepsConfigSerializer(source='repsconfig_set', many=True)
max_reps_configs = RepsConfigSerializer(source='maxrepsconfig_set', many=True)
set_nr_configs = SetNrConfigSerializer(source='setsconfig_set', many=True)
+ max_set_nr_configs = MaxSetNrConfigSerializer(source='maxsetsconfig_set', many=True)
rir_configs = RiRConfigSerializer(source='rirconfig_set', many=True)
rest_configs = RestConfigSerializer(source='restconfig_set', many=True)
max_rest_configs = RestConfigSerializer(source='maxrestconfig_set', many=True)
@@ -193,6 +205,7 @@ class SlotEntryStructureSerializer(serializers.ModelSerializer):
'weight_configs',
'max_weight_configs',
'set_nr_configs',
+ 'max_set_nr_configs',
'rir_configs',
'rest_configs',
'max_rest_configs',
@@ -308,6 +321,7 @@ class SetConfigDataSerializer(serializers.Serializer):
slot_entry_id = serializers.IntegerField()
exercise = serializers.IntegerField()
sets = serializers.IntegerField()
+ max_sets = serializers.IntegerField()
weight = serializers.DecimalField(max_digits=5, decimal_places=2)
max_weight = serializers.DecimalField(max_digits=5, decimal_places=2)
weight_unit = serializers.IntegerField()
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index 99d023d17..320352352 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -38,6 +38,7 @@ from wger.manager.api.serializers import (
LogStatsDataSerializer,
MaxRepsConfigSerializer,
MaxRestConfigSerializer,
+ MaxSetNrConfigSerializer,
MaxWeightConfigSerializer,
RepsConfigSerializer,
RestConfigSerializer,
@@ -61,6 +62,7 @@ from wger.manager.models import (
Day,
MaxRepsConfig,
MaxRestConfig,
+ MaxSetsConfig,
MaxWeightConfig,
RepsConfig,
RestConfig,
@@ -361,6 +363,9 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):
return WorkoutSession.objects.filter(user=self.request.user)
+ # def create(self, request, *args, **kwargs):
+ # super().create(request, *args, **kwargs)
+
def perform_create(self, serializer):
"""
Set the owner
@@ -681,7 +686,6 @@ class SetsConfigViewSet(AbstractConfigViewSet):
def get_queryset(self):
"""
Only allow access to appropriate objects
- Only allow access to appropriate objects
"""
# REST API generation
if getattr(self, 'swagger_fake_view', False):
@@ -690,6 +694,24 @@ class SetsConfigViewSet(AbstractConfigViewSet):
return SetsConfig.objects.filter(slot_entry__slot__day__routine__user=self.request.user)
+class MaxSetsConfigViewSet(AbstractConfigViewSet):
+ """
+ API endpoint for max set config objects
+ """
+
+ serializer_class = MaxSetNrConfigSerializer
+
+ def get_queryset(self):
+ """
+ Only allow access to appropriate objects
+ """
+ # REST API generation
+ if getattr(self, 'swagger_fake_view', False):
+ return MaxSetsConfig.objects.none()
+
+ return MaxSetsConfig.objects.filter(slot_entry__slot__day__routine__user=self.request.user)
+
+
class RestConfigViewSet(AbstractConfigViewSet):
"""
API endpoint for set config objects
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index 36be65f5a..f43b73ad3 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -51,6 +51,7 @@ class SetConfigData:
max_weight: Decimal | int | None = None
max_reps: Decimal | int | None = None
max_rest: int | None = None
+ max_sets: int | None = None
sets: int = 1
weight_unit: int | None = 1
@@ -89,7 +90,10 @@ class SetConfigData:
out = []
if self.sets and self.sets > 1:
- sets = normalize_decimal(Decimal(self.sets))
+ sets = self.sets
+ if self.max_sets:
+ sets = f'{sets}-{self.max_sets}'
+
out.append(f'{sets} {_("Sets")},')
if self.reps:
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 1f5194e88..552c80ef1 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -93,7 +93,7 @@ class Migration(migrations.Migration):
field=models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.CASCADE,
- related_name='logs',
+ related_name='sessions',
to='manager.workoutsession',
verbose_name='Session',
),
@@ -726,6 +726,51 @@ class Migration(migrations.Migration):
'unique_together': {('slot_entry', 'iteration')},
},
),
+ migrations.CreateModel(
+ name='MaxSetsConfig',
+ fields=[
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name='ID',
+ ),
+ ),
+ ('iteration', models.PositiveIntegerField()),
+ (
+ 'operation',
+ models.CharField(
+ choices=[('+', 'Plus'), ('-', 'Minus'), ('r', 'Replace')],
+ default='r',
+ max_length=1,
+ ),
+ ),
+ (
+ 'step',
+ models.CharField(
+ choices=[('abs', 'Absolute'), ('percent', 'Percent')],
+ default='abs',
+ max_length=10,
+ ),
+ ),
+ ('need_log_to_apply', models.BooleanField(default=False, null=True)),
+ ('value', models.PositiveIntegerField()),
+ (
+ 'slot_entry',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.slotentry',
+ ),
+ ),
+ ],
+ options={
+ 'ordering': ['slot_entry', 'iteration'],
+ 'abstract': False,
+ 'unique_together': {('slot_entry', 'iteration')},
+ },
+ ),
migrations.CreateModel(
name='Label',
fields=[
diff --git a/wger/manager/models/__init__.py b/wger/manager/models/__init__.py
index 67edbeb3f..d88dec281 100644
--- a/wger/manager/models/__init__.py
+++ b/wger/manager/models/__init__.py
@@ -32,7 +32,10 @@ from .routine import Routine
from .schedule import Schedule
from .schedule_step import ScheduleStep
from .session import WorkoutSession
-from .sets_config import SetsConfig
+from .sets_config import (
+ MaxSetsConfig,
+ SetsConfig,
+)
from .slot import Slot
from .slot_entry import SlotEntry
from .weight_config import (
diff --git a/wger/manager/models/session.py b/wger/manager/models/session.py
index 4987bb471..9fe2cb162 100644
--- a/wger/manager/models/session.py
+++ b/wger/manager/models/session.py
@@ -32,7 +32,6 @@ class WorkoutSession(models.Model):
Model for a workout session
"""
- # Note: values hardcoded in manager.helpers.WorkoutCalendar
IMPRESSION_BAD = '1'
IMPRESSION_NEUTRAL = '2'
IMPRESSION_GOOD = '3'
diff --git a/wger/manager/models/sets_config.py b/wger/manager/models/sets_config.py
index 9585a5670..11a6ec426 100644
--- a/wger/manager/models/sets_config.py
+++ b/wger/manager/models/sets_config.py
@@ -28,3 +28,12 @@ class SetsConfig(AbstractChangeConfig):
value = models.PositiveIntegerField()
"""Sets are always positive integers"""
+
+
+class MaxSetsConfig(AbstractChangeConfig):
+ """
+ Configuration model for the maximum number of sets for a workout set
+ """
+
+ value = models.PositiveIntegerField()
+ """Sets are always positive integers"""
diff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.py
index 2105d2f5b..b638a7f7c 100644
--- a/wger/manager/models/slot_entry.py
+++ b/wger/manager/models/slot_entry.py
@@ -236,6 +236,7 @@ class SlotEntry(models.Model):
break
sets = self.get_sets(iteration)
+ max_sets = self.get_max_sets(iteration)
weight = self.get_weight(max_iter_weight)
max_weight = self.get_max_weight(max_iter_max_weight)
@@ -250,6 +251,7 @@ class SlotEntry(models.Model):
slot_entry_id=self.id,
exercise=self.exercise.id,
sets=sets if sets is not None else 1,
+ max_sets=max_sets,
weight=weight,
max_weight=max_weight if max_weight and weight and max_weight > weight else None,
weight_rounding=self.weight_rounding if weight is not None else None,
@@ -270,6 +272,9 @@ class SlotEntry(models.Model):
def get_sets(self, iteration: int) -> Decimal | None:
return self.calculate_config_value(self.setsconfig_set.filter(iteration__lte=iteration))
+ def get_max_sets(self, iteration: int) -> Decimal | None:
+ return self.calculate_config_value(self.maxsetsconfig_set.filter(iteration__lte=iteration))
+
def get_weight(self, iteration: int) -> Decimal | None:
return self.calculate_config_value(self.weightconfig_set.filter(iteration__lte=iteration))
diff --git a/wger/manager/tests/test_set_config_data.py b/wger/manager/tests/test_set_config_data.py
index 2bec3d9af..13c32bb4e 100644
--- a/wger/manager/tests/test_set_config_data.py
+++ b/wger/manager/tests/test_set_config_data.py
@@ -62,6 +62,11 @@ class SetConfigDataTestCase(WgerTestCase):
self.config.sets = 3
self.assertEqual(self.config.text_repr, '3 Sets, 4 × 20 kg @ 3 RiR')
+ def test_text_repr_max_sets(self):
+ self.config.sets = 3
+ self.config.max_sets = 6
+ self.assertEqual(self.config.text_repr, '3-6 Sets, 4 × 20 kg @ 3 RiR')
+
def test_text_repr_weight_rounding(self):
self.config.weight = 22.499
self.config.weight_rounding = 5
diff --git a/wger/urls.py b/wger/urls.py
index 6fc8fae7a..0886dd950 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -115,6 +115,11 @@ router.register(
manager_api_views.SetsConfigViewSet,
basename='sets-config',
)
+router.register(
+ r'max-sets-config',
+ manager_api_views.MaxSetsConfigViewSet,
+ basename='max-sets-config',
+)
router.register(
r'rest-config',
manager_api_views.RestConfigViewSet,