Self hosted FLOSS fitness/workout, nutrition and weight tracker
Consistently use "repetitions config" instead of "reps config"
Roland Geiderdc333f0b3160
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex cf750ce95..de38f92ef 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -22,12 +22,12 @@ from wger.manager.api.consts import BASE_CONFIG_FIELDSfrom wger.manager.api.validators import validate_requirementsfrom wger.manager.models import (Day,- MaxRepsConfig,+ MaxRepetitionsConfig,MaxRestConfig,MaxRiRConfig,MaxSetsConfig,MaxWeightConfig,- RepsConfig,+ RepetitionsConfig,RestConfig,RiRConfig,Routine,@@ -112,23 +112,23 @@ class MaxWeightConfigSerializer(BaseConfigSerializer):fields = BASE_CONFIG_FIELDS-class RepsConfigSerializer(BaseConfigSerializer):+class RepetitionsConfigSerializer(BaseConfigSerializer):"""Repetition Config serializer"""class Meta:- model = RepsConfig+ model = RepetitionsConfigfields = BASE_CONFIG_FIELDS-class MaxRepsConfigSerializer(BaseConfigSerializer):+class MaxRepetitionsConfigSerializer(BaseConfigSerializer):"""Max Repetition Config serializer"""class Meta:- model = MaxRepsConfig+ model = MaxRepetitionsConfigfields = BASE_CONFIG_FIELDS@@ -199,8 +199,11 @@ class SlotEntryStructureSerializer(serializers.ModelSerializer):weight_configs = WeightConfigSerializer(source='weightconfig_set', many=True)max_weight_configs = WeightConfigSerializer(source='maxweightconfig_set', many=True)- reps_configs = RepsConfigSerializer(source='repsconfig_set', many=True)- max_reps_configs = RepsConfigSerializer(source='maxrepsconfig_set', many=True)+ repetitions_configs = RepetitionsConfigSerializer(source='repetitionsconfig_set', many=True)+ max_repetitions_configs = RepetitionsConfigSerializer(+ source='maxrepetitionssconfig_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)diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 74c74a9f2..29108577e 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -42,12 +42,12 @@ from wger.manager.api.serializers import (DaySerializer,LogDisplaySerializer,LogStatsDataSerializer,- MaxRepsConfigSerializer,+ MaxRepetitionsConfigSerializer,MaxRestConfigSerializer,MaxRiRConfigSerializer,MaxSetNrConfigSerializer,MaxWeightConfigSerializer,- RepsConfigSerializer,+ RepetitionsConfigSerializer,RestConfigSerializer,RiRConfigSerializer,RoutineSerializer,@@ -63,12 +63,12 @@ from wger.manager.api.serializers import ()from wger.manager.models import (Day,- MaxRepsConfig,+ MaxRepetitionsConfig,MaxRestConfig,MaxRiRConfig,MaxSetsConfig,MaxWeightConfig,- RepsConfig,+ RepetitionsConfig,RestConfig,RiRConfig,Routine,@@ -507,12 +507,12 @@ class MaxWeightConfigViewSet(AbstractConfigViewSet):)-class RepsConfigViewSet(AbstractConfigViewSet):+class RepetitionsConfigViewSet(AbstractConfigViewSet):"""API endpoint for reps config objects"""- serializer_class = RepsConfigSerializer+ serializer_class = RepetitionsConfigSerializerfilterset_class = BaseConfigFilterSetdef get_queryset(self):@@ -521,17 +521,17 @@ class RepsConfigViewSet(AbstractConfigViewSet):"""# REST API generationif getattr(self, 'swagger_fake_view', False):- return RepsConfig.objects.none()+ return RepetitionsConfig.objects.none()- return RepsConfig.objects.all()+ return RepetitionsConfig.objects.all()-class MaxRepsConfigViewSet(AbstractConfigViewSet):+class MaxRepetitionsConfigViewSet(AbstractConfigViewSet):"""API endpoint for max reps config objects"""- serializer_class = MaxRepsConfigSerializer+ serializer_class = MaxRepetitionsConfigSerializerfilterset_class = BaseConfigFilterSetdef get_queryset(self):@@ -540,9 +540,9 @@ class MaxRepsConfigViewSet(AbstractConfigViewSet):"""# REST API generationif getattr(self, 'swagger_fake_view', False):- return MaxRepsConfig.objects.none()+ return MaxRepetitionsConfig.objects.none()- return MaxRepsConfig.objects.all()+ return MaxRepetitionsConfig.objects.all()class SetsConfigViewSet(AbstractConfigViewSet):diff --git a/wger/manager/fixtures/test-routine-data.json b/wger/manager/fixtures/test-routine-data.jsonindex a63fce556..6e117e79b 100644--- a/wger/manager/fixtures/test-routine-data.json+++ b/wger/manager/fixtures/test-routine-data.json@@ -298,7 +298,7 @@},{"pk": 1,- "model": "manager.repsconfig",+ "model": "manager.repetitionsconfig","fields": {"slot_entry_id": 1,"iteration": 1,@@ -311,7 +311,7 @@},{"pk": 2,- "model": "manager.repsconfig",+ "model": "manager.repetitionsconfig","fields": {"slot_entry_id": 2,"iteration": 1,@@ -324,7 +324,7 @@},{"pk": 3,- "model": "manager.repsconfig",+ "model": "manager.repetitionsconfig","fields": {"slot_entry_id": 3,"iteration": 1,@@ -337,7 +337,7 @@},{"pk": 4,- "model": "manager.repsconfig",+ "model": "manager.repetitionsconfig","fields": {"slot_entry_id": 4,"iteration": 1,diff --git a/wger/manager/management/commands/dummy-generator-routines.py b/wger/manager/management/commands/dummy-generator-routines.pyindex e76d38412..0388ddcb6 100644--- a/wger/manager/management/commands/dummy-generator-routines.py+++ b/wger/manager/management/commands/dummy-generator-routines.py@@ -26,7 +26,7 @@ from django.core.management.base import BaseCommandfrom wger.exercises.models import Exercisefrom wger.manager.models import (Day,- RepsConfig,+ RepetitionsConfig,Routine,SetsConfig,Slot,@@ -35,7 +35,6 @@ from wger.manager.models import ()from wger.manager.models.abstract_config import OperationChoices-logger = logging.getLogger(__name__)@@ -121,7 +120,7 @@ class Command(BaseCommand):operation=OperationChoices.REPLACE,).save()- RepsConfig(+ RepetitionsConfig(slot_entry=slot_entry,value=reps,iteration=1,diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.pyindex 794f6d984..bef59a6fc 100644--- a/wger/manager/migrations/0018_flexible_routines.py+++ b/wger/manager/migrations/0018_flexible_routines.py@@ -808,7 +808,7 @@ class Migration(migrations.Migration):},),migrations.CreateModel(- name='RepsConfig',+ name='RepetitionsConfig',fields=[('id',@@ -863,7 +863,7 @@ class Migration(migrations.Migration):},),migrations.CreateModel(- name='MaxRepsConfig',+ name='MaxRepetitionsConfig',fields=[('id',diff --git a/wger/manager/migrations/0019_flexible_routines_migration.py b/wger/manager/migrations/0019_flexible_routines_migration.pyindex 0bcd735cb..e411d8d0d 100644--- a/wger/manager/migrations/0019_flexible_routines_migration.py+++ b/wger/manager/migrations/0019_flexible_routines_migration.py@@ -24,7 +24,7 @@ def migrate_routines(apps) -> dict[int, Any]:SlotEntry = apps.get_model('manager', 'SlotEntry')SetsConfig = apps.get_model('manager', 'SetsConfig')WeightConfig = apps.get_model('manager', 'WeightConfig')- RepsConfig = apps.get_model('manager', 'RepsConfig')+ RepetitionsConfig = apps.get_model('manager', 'RepetitionsConfig')RiRConfig = apps.get_model('manager', 'RiRConfig')RestConfig = apps.get_model('manager', 'RestConfig')@@ -102,7 +102,7 @@ def migrate_routines(apps) -> dict[int, Any]:).save()if setting.reps:- RepsConfig(+ RepetitionsConfig(slot_entry=slot_entry,value=setting.reps,iteration=1,diff --git a/wger/manager/models/__init__.py b/wger/manager/models/__init__.pyindex a5fb60b5a..79ab3fdb6 100644--- a/wger/manager/models/__init__.py+++ b/wger/manager/models/__init__.py@@ -19,9 +19,9 @@ from .abstract_config import AbstractChangeConfigfrom .day import Dayfrom .label import Labelfrom .log import WorkoutLog-from .reps_config import (- MaxRepsConfig,- RepsConfig,+from .repetitions_config import (+ MaxRepetitionsConfig,+ RepetitionsConfig,)from .rest_config import (MaxRestConfig,diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 4f75430cd..392f496f1 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -221,7 +221,7 @@ class WorkoutLog(models.Model):"""Return a more human-readable representation"""- return f'Log entry: {self.reps} - {self.weight} kg on {self.date}'+ return f'Log entry: {self.repetitions} - {self.weight} kg on {self.date}'def get_owner_object(self):"""diff --git a/wger/manager/models/reps_config.py b/wger/manager/models/repetitions_config.pysimilarity index 91%rename from wger/manager/models/reps_config.pyrename to wger/manager/models/repetitions_config.pyindex 4575958c9..bba367cf6 100644--- a/wger/manager/models/reps_config.py+++ b/wger/manager/models/repetitions_config.py@@ -18,7 +18,7 @@from wger.manager.models import AbstractChangeConfig-class RepsConfig(AbstractChangeConfig):+class RepetitionsConfig(AbstractChangeConfig):"""Configuration model for the number of reps for a workout set"""@@ -26,7 +26,7 @@ class RepsConfig(AbstractChangeConfig):pass-class MaxRepsConfig(AbstractChangeConfig):+class MaxRepetitionsConfig(AbstractChangeConfig):"""Configuration model for the upper limit of the reps for a workout set"""diff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.pyindex 784defbd6..4a136257c 100644--- a/wger/manager/models/slot_entry.py+++ b/wger/manager/models/slot_entry.py@@ -224,8 +224,8 @@ class SlotEntry(models.Model):max_sets_configs=self.maxsetsconfig_set.filter(iteration__lte=iteration),weight_configs=self.weightconfig_set.filter(iteration__lte=iteration),max_weight_configs=self.maxweightconfig_set.filter(iteration__lte=iteration),- reps_configs=self.repsconfig_set.filter(iteration__lte=iteration),- max_reps_configs=self.maxrepsconfig_set.filter(iteration__lte=iteration),+ reps_configs=self.repetitionsconfig_set.filter(iteration__lte=iteration),+ max_reps_configs=self.maxrepetitionsconfig_set.filter(iteration__lte=iteration),rir_configs=self.rirconfig_set.filter(iteration__lte=iteration),max_rir_configs=self.maxrirconfig_set.filter(iteration__lte=iteration),rest_configs=self.restconfig_set.filter(iteration__lte=iteration),@@ -249,7 +249,7 @@ class SlotEntry(models.Model):# up to the current iteration if the weights and reps can be increased.for i in range(1, iteration + 1):weight_config = self.weightconfig_set.filter(iteration__lte=i).last()- reps_config = self.repsconfig_set.filter(iteration__lte=i).last()+ reps_config = self.repetitionsconfig_set.filter(iteration__lte=i).last()# No configs, return Noneif not weight_config or not reps_config:@@ -355,7 +355,7 @@ class SlotEntry(models.Model):return self.calculate_config_value(self.duplicate_configs(iteration,- list(self.repsconfig_set.filter(iteration__lte=iteration)),+ list(self.repetitionsconfig_set.filter(iteration__lte=iteration)),))@@ -363,7 +363,7 @@ class SlotEntry(models.Model):return self.calculate_config_value(self.duplicate_configs(iteration,- list(self.maxrepsconfig_set.filter(iteration__lte=iteration)),+ list(self.maxrepetitionsconfig_set.filter(iteration__lte=iteration)),))diff --git a/wger/manager/signals.py b/wger/manager/signals.pyindex b304a3e05..8ac78fae1 100644--- a/wger/manager/signals.py+++ b/wger/manager/signals.py@@ -26,10 +26,10 @@ from wger.gym.helpers import get_user_last_activityfrom wger.manager.helpers import reset_routine_cachefrom wger.manager.models import (Day,- MaxRepsConfig,+ MaxRepetitionsConfig,MaxRestConfig,MaxWeightConfig,- RepsConfig,+ RepetitionsConfig,RestConfig,RiRConfig,Routine,@@ -76,11 +76,11 @@ def update_cache_max_weight_config(sender, instance: MaxWeightConfig, **kwargs):reset_routine_cache(instance.slot_entry.slot.day.routine)-def update_cache_reps_config(sender, instance: RepsConfig, **kwargs):+def update_cache_repetitions_config(sender, instance: RepetitionsConfig, **kwargs):reset_routine_cache(instance.slot_entry.slot.day.routine)-def update_cache_max_reps_config(sender, instance: MaxRepsConfig, **kwargs):+def update_cache_max_repetitions_config(sender, instance: MaxRepetitionsConfig, **kwargs):reset_routine_cache(instance.slot_entry.slot.day.routine)@@ -114,8 +114,8 @@ pre_save.connect(update_cache_slot, sender=Slot)pre_save.connect(update_cache_slot_entry, sender=SlotEntry)pre_save.connect(update_cache_weight_config, sender=WeightConfig)pre_save.connect(update_cache_max_weight_config, sender=MaxWeightConfig)-pre_save.connect(update_cache_reps_config, sender=RepsConfig)-pre_save.connect(update_cache_max_reps_config, sender=MaxRepsConfig)+pre_save.connect(update_cache_repetitions_config, sender=RepetitionsConfig)+pre_save.connect(update_cache_max_repetitions_config, sender=MaxRepetitionsConfig)pre_save.connect(update_cache_sets_config, sender=SetsConfig)pre_save.connect(update_cache_rest_config, sender=RestConfig)pre_save.connect(update_cache_max_rest_config, sender=MaxRestConfig)@@ -128,8 +128,8 @@ pre_delete.connect(update_cache_slot, sender=Slot)pre_delete.connect(update_cache_slot_entry, sender=SlotEntry)pre_delete.connect(update_cache_weight_config, sender=WeightConfig)pre_delete.connect(update_cache_max_weight_config, sender=MaxWeightConfig)-pre_delete.connect(update_cache_reps_config, sender=RepsConfig)-pre_delete.connect(update_cache_max_reps_config, sender=MaxRepsConfig)+pre_delete.connect(update_cache_repetitions_config, sender=RepetitionsConfig)+pre_delete.connect(update_cache_max_repetitions_config, sender=MaxRepetitionsConfig)pre_delete.connect(update_cache_sets_config, sender=SetsConfig)pre_delete.connect(update_cache_rest_config, sender=RestConfig)pre_delete.connect(update_cache_max_rest_config, sender=MaxRestConfig)diff --git a/wger/manager/tests/test_slot_entry.py b/wger/manager/tests/test_slot_entry.pyindex 4d1beaf60..a38ddd5fd 100644--- a/wger/manager/tests/test_slot_entry.py+++ b/wger/manager/tests/test_slot_entry.py@@ -22,9 +22,9 @@ from django.test import SimpleTestCasefrom wger.core.tests.base_testcase import WgerTestCasefrom wger.manager.dataclasses import SetConfigDatafrom wger.manager.models import (- MaxRepsConfig,+ MaxRepetitionsConfig,MaxWeightConfig,- RepsConfig,+ RepetitionsConfig,RestConfig,RiRConfig,SetsConfig,@@ -122,7 +122,7 @@ class SlotEntryTestCase(WgerTestCase):# Initial valueSetsConfig(slot_entry=self.slot_entry, iteration=1, value=4).save()- RepsConfig(slot_entry=self.slot_entry, iteration=1, value=5).save()+ RepetitionsConfig(slot_entry=self.slot_entry, iteration=1, value=5).save()RestConfig(slot_entry=self.slot_entry, iteration=1, value=120).save()RiRConfig(slot_entry=self.slot_entry, iteration=1, value=2).save()WeightConfig(@@ -274,8 +274,8 @@ class SlotEntryTestCase(WgerTestCase):self.slot_entry.save()# Initial value: 5-6 reps x 80-100 kg- RepsConfig(slot_entry=self.slot_entry, iteration=1, value=5).save()- MaxRepsConfig(slot_entry=self.slot_entry, iteration=1, value=6).save()+ RepetitionsConfig(slot_entry=self.slot_entry, iteration=1, value=5).save()+ MaxRepetitionsConfig(slot_entry=self.slot_entry, iteration=1, value=6).save()WeightConfig(slot_entry=self.slot_entry,iteration=1,@@ -360,7 +360,7 @@ class SlotEntryTestCase(WgerTestCase):value=100,operation=OperationChoices.REPLACE,).save()- RepsConfig(slot_entry=self.slot_entry, iteration=1, value=5).save()+ RepetitionsConfig(slot_entry=self.slot_entry, iteration=1, value=5).save()RestConfig(slot_entry=self.slot_entry, iteration=1, value=120).save()RiRConfig(slot_entry=self.slot_entry, iteration=1, value=2).save()diff --git a/wger/manager/views/routine.py b/wger/manager/views/routine.pyindex 78b38cdda..4ddc4ff51 100644--- a/wger/manager/views/routine.py+++ b/wger/manager/views/routine.py@@ -34,7 +34,6 @@ from wger.manager.models import (SlotEntry,)-logger = logging.getLogger(__name__)@@ -87,8 +86,9 @@ def copy_routine(request, pk):copy_config(current_entry.weightconfig_set.all(), slot_entry_copy)copy_config(current_entry.maxweightconfig_set.all(), slot_entry_copy)- copy_config(current_entry.repsconfig_set.all(), slot_entry_copy)- copy_config(current_entry.maxrepsconfig_set.all(), slot_entry_copy)+ copy_config(current_entry.repetitionsconfig_set.all(), slot_entry_copy)+ copy_config(current_entry.maxrepetitionsconfig_set.all(), slot_entry_copy)+ copy_config(current_entry.maxrepetitionsconfig_set.all(), slot_entry_copy)copy_config(current_entry.rirconfig_set.all(), slot_entry_copy)copy_config(current_entry.restconfig_set.all(), slot_entry_copy)copy_config(current_entry.maxrestconfig_set.all(), slot_entry_copy)diff --git a/wger/urls.py b/wger/urls.pyindex e7644a1a6..054258d22 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -99,14 +99,14 @@ router.register(basename='max-weight-config',)router.register(- r'reps-config',- manager_api_views.RepsConfigViewSet,- basename='reps-config',+ r'repetitions-config',+ manager_api_views.RepetitionsConfigViewSet,+ basename='repetitions-config',)router.register(- r'max-reps-config',- manager_api_views.MaxRepsConfigViewSet,- basename='max-reps-config',+ r'max-repetitions-config',+ manager_api_views.MaxRepetitionsConfigViewSet,+ basename='max-repetitions-config',)router.register(r'sets-config',