Self hosted FLOSS fitness/workout, nutrition and weight tracker
Rename workout log field for more consistency
Roland Geider1e2e75ba7cf0
diff --git a/wger/manager/api/filtersets.py b/wger/manager/api/filtersets.pyindex bdd150df6..fe02b0ae7 100644--- a/wger/manager/api/filtersets.py+++ b/wger/manager/api/filtersets.py@@ -39,9 +39,9 @@ class WorkoutLogFilterSet(filters.FilterSet):'date': ['exact', 'date', 'gt', 'lt'],'exercise': ['exact', 'in'],'iteration': ['exact', 'in'],- 'repetition_unit': ['exact', 'in'],- 'reps': ['exact', 'gt', 'lt'],- 'reps_target': ['exact', 'gt', 'lt'],+ 'repetitions_unit': ['exact', 'in'],+ 'repetitions': ['exact', 'gt', 'lt'],+ 'repetitions_target': ['exact', 'gt', 'lt'],'weight_unit': ['exact', 'in'],'weight': ['exact', 'gt', 'lt'],'weight_target': ['exact', 'gt', 'lt'],diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 25d417d80..cf750ce95 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -434,9 +434,9 @@ class WorkoutLogSerializer(serializers.ModelSerializer):'slot_entry','next_log','exercise',- 'repetition_unit',- 'reps',- 'reps_target',+ 'repetitions_unit',+ 'repetitions',+ 'repetitions_target','weight_unit','weight','weight_target',diff --git a/wger/manager/fixtures/test-workout-log-data.json b/wger/manager/fixtures/test-workout-log-data.jsonindex a0cca9263..82401d776 100644--- a/wger/manager/fixtures/test-workout-log-data.json+++ b/wger/manager/fixtures/test-workout-log-data.json@@ -6,7 +6,7 @@"routine": 1,"session": 1,"weight": 30,- "reps": 8,+ "repetitions": 8,"user": 1,"date": "2025-10-01T00:00:00+01:00","exercise": 1@@ -19,7 +19,7 @@"routine": 1,"session": 2,"weight": 32,- "reps": 8,+ "repetitions": 8,"user": 1,"date": "2025-10-20T00:00:00+01:00","exercise": 1@@ -32,7 +32,7 @@"routine": 1,"session": 3,"weight": 38,- "reps": 8,+ "repetitions": 8,"user": 1,"date": "2025-10-30T00:00:00+01:00","exercise": 1@@ -45,7 +45,7 @@"routine": 1,"session": 4,"weight": 30,- "reps": 8,+ "repetitions": 8,"user": 1,"date": "2025-11-01T00:00:00+01:00","exercise": 1@@ -58,7 +58,7 @@"weight": 30,"session": 5,"routine": 5,- "reps": 8,+ "repetitions": 8,"user": 2,"date": "2025-11-01T00:00:00+01:00","exercise": 2diff --git a/wger/manager/management/commands/dummy-generator-workout-diary.py b/wger/manager/management/commands/dummy-generator-workout-diary.pyindex 0f499a649..cdf8ccc6e 100644--- a/wger/manager/management/commands/dummy-generator-workout-diary.py+++ b/wger/manager/management/commands/dummy-generator-workout-diary.py@@ -27,7 +27,6 @@ from wger.manager.models import (WorkoutLog,)-logger = logging.getLogger(__name__)@@ -96,9 +95,9 @@ class Command(BaseCommand):user=user,exercise_id=exercise_id,routine=routine,- reps=reps,- reps_target=set_data.reps,- repetition_unit_id=set_data.reps_unit,+ repetitions=reps,+ repetitions_target=set_data.reps,+ repetitions_unit_id=set_data.reps_unit,weight=weight,weight_target=set_data.weight,weight_unit_id=set_data.weight_unit,diff --git a/wger/manager/managers.py b/wger/manager/managers.pyindex cce286c48..500491363 100644--- a/wger/manager/managers.py+++ b/wger/manager/managers.py@@ -36,7 +36,7 @@ class WorkoutLogQuerySet(models.QuerySet):def reps(self):"""Return all entries with reps as unit"""- return self.filter(repetition_unit_id=ID_UNIT_REPS)+ return self.filter(repetitions_unit_id=ID_UNIT_REPS)class WorkoutLogManager(models.Manager):diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.pyindex 4e496813e..538ec5746 100644--- a/wger/manager/migrations/0018_flexible_routines.py+++ b/wger/manager/migrations/0018_flexible_routines.py@@ -84,6 +84,10 @@ class Migration(migrations.Migration):'ordering': ['order'],},),++ #+ # Workout log changes+ #migrations.AddField(model_name='workoutlog',name='iteration',@@ -107,13 +111,23 @@ class Migration(migrations.Migration):),migrations.AddField(model_name='workoutlog',- name='reps_target',+ name='repetitions_target',field=models.IntegerField(null=True,validators=[wger.manager.validators.NullMinValueValidator(0)],verbose_name='Repetitions',),),+ migrations.RenameField(+ model_name='workoutlog',+ old_name='reps',+ new_name='repetitions',+ ),+ migrations.RenameField(+ model_name="workoutlog",+ old_name="repetition_unit",+ new_name="repetitions_unit",+ ),migrations.AddField(model_name='workoutlog',name='rir_target',@@ -157,6 +171,11 @@ class Migration(migrations.Migration):name='rest_target',field=models.PositiveIntegerField(blank=True, null=True),),+ migrations.AlterModelOptions(+ name="workoutlog",+ options={"ordering": ["date", "repetitions", "weight"]},+ ),+migrations.AlterField(model_name='workoutsession',name='date',diff --git a/wger/manager/migrations/0019_flexible_routines_migration.py b/wger/manager/migrations/0019_flexible_routines_migration.pyindex 4e936d263..7dbc40310 100644--- a/wger/manager/migrations/0019_flexible_routines_migration.py+++ b/wger/manager/migrations/0019_flexible_routines_migration.py@@ -157,6 +157,7 @@ def migrate_logs(apps, workout_to_routine: dict[int, Any]) -> None:Session = apps.get_model('manager', 'WorkoutSession')for log in Log.objects.all():+ passif not log.workout:continue@@ -168,7 +169,6 @@ def migrate_logs(apps, workout_to_routine: dict[int, Any]) -> None:'workout': log.workout,},)-log.routine = workout_to_routine[log.workout.id]log.session = sessionlog.save()diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex c24a1247c..e2c784b6d 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -103,7 +103,7 @@ class WorkoutLog(models.Model):null=True,)- repetition_unit = models.ForeignKey(+ repetitions_unit = models.ForeignKey(RepetitionUnit,verbose_name=_('Unit'),default=1,@@ -113,7 +113,7 @@ class WorkoutLog(models.Model):The repetition unit of the log. This can be e.g. a repetition, a minute, etc."""- reps = models.IntegerField(+ repetitions = models.IntegerField(verbose_name=_('Repetitions'),validators=[MinValueValidator(0)],)@@ -121,7 +121,7 @@ class WorkoutLog(models.Model):Logged amount of repetitions"""- reps_target = models.IntegerField(+ repetitions_target = models.IntegerField(verbose_name=_('Repetitions'),validators=[NullMinValueValidator(0)],null=True,@@ -202,7 +202,7 @@ class WorkoutLog(models.Model):# Metaclass to set some other propertiesclass Meta:- ordering = ['date', 'reps']+ ordering = ['date', 'repetitions', 'weight']def __str__(self):"""@@ -246,7 +246,7 @@ class WorkoutLog(models.Model):# If the user selected "Until Failure", do only 1 "repetition",# anything else doesn't make sense.- if self.repetition_unit == 2:+ if self.repetitions_unit == 2:self.reps = 1# Save to dbdiff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex 04d98fd74..d5428211c 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -305,12 +305,12 @@ class Routine(models.Model):intensity_counter = GroupedLogData()def update_grouped_log_data(- entry: GroupedLogData,- date: datetime.date,- week_nr: int,- iter: int,- exercise: Exercise,- value: Decimal | int,+ entry: GroupedLogData,+ date: datetime.date,+ week_nr: int,+ iter: int,+ exercise: Exercise,+ value: Decimal | int,):"""Updates grouped log data@@ -433,7 +433,7 @@ class Routine(models.Model):for log in session.logs.kg().reps():exercise = log.exerciseweight = log.weight- reps = log.reps+ reps = log.repetitionsiteration = log.iterationexercise_volume = weight * repsdiff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.pyindex 41fb30c5d..22d4e17e8 100644--- a/wger/manager/models/slot_entry.py+++ b/wger/manager/models/slot_entry.py@@ -265,7 +265,7 @@ class SlotEntry(models.Model):# If any of the entries in last log is greater than the last config data,# proceed. Otherwise, the weight won't changefor log in log_data:- if log.weight >= weight and log.reps >= reps:+ if log.weight >= weight and log.repetitions >= reps:max_iter_weight = imax_iter_max_weight = imax_iter_reps = idiff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.pyindex ae3c4d4c0..20a36dbec 100644--- a/wger/manager/tests/test_day.py+++ b/wger/manager/tests/test_day.py@@ -228,9 +228,9 @@ class DayModelTestCase(WgerTestCase):WorkoutLog.objects.create(date=datetime.datetime.now(),weight_unit_id=1,- repetition_unit_id=1,+ repetitions_unit_id=1,user=day.routine.user,- reps=1,+ repetitions=1,weight=1,exercise_id=1,)diff --git a/wger/manager/tests/test_log_model.py b/wger/manager/tests/test_log_model.pyindex 1d050ed6d..2b20ede68 100644--- a/wger/manager/tests/test_log_model.py+++ b/wger/manager/tests/test_log_model.py@@ -22,7 +22,6 @@ from wger.manager.models import (WorkoutSession,)-logger = logging.getLogger(__name__)@@ -45,7 +44,7 @@ class LogModelTestCase(WgerTestCase):user_id=1,exercise_id=1,weight=10,- reps=10,+ repetitions=10,).save()self.assertEqual(WorkoutSession.objects.count(), 1)diff --git a/wger/manager/tests/test_routine_statistics.py b/wger/manager/tests/test_routine_statistics.pyindex cfa7385c5..ba2293ed8 100644--- a/wger/manager/tests/test_routine_statistics.py+++ b/wger/manager/tests/test_routine_statistics.py@@ -51,9 +51,9 @@ class RoutineStatisticsTestCase(WgerTestCase):user_id=1,routine=self.routine,date=datetime.date(2024, 2, 1),- repetition_unit_id=ID_UNIT_REPS,+ repetitions_unit_id=ID_UNIT_REPS,+ repetitions=5,weight_unit_id=ID_UNIT_KG,- reps=5,weight=10,exercise_id=1,iteration=1,@@ -64,9 +64,9 @@ class RoutineStatisticsTestCase(WgerTestCase):user_id=1,routine=self.routine,date=datetime.date(2024, 2, 2),- repetition_unit_id=ID_UNIT_REPS,+ repetitions_unit_id=ID_UNIT_REPS,+ repetitions=1,weight_unit_id=ID_UNIT_KG,- reps=1,weight=10,exercise_id=1,iteration=2,@@ -77,9 +77,9 @@ class RoutineStatisticsTestCase(WgerTestCase):user_id=1,routine=self.routine,date=datetime.date(2024, 2, 10),- repetition_unit_id=ID_UNIT_REPS,+ repetitions_unit_id=ID_UNIT_REPS,+ repetitions=1,weight_unit_id=ID_UNIT_KG,- reps=1,weight=10,exercise_id=3,iteration=3,@@ -90,9 +90,9 @@ class RoutineStatisticsTestCase(WgerTestCase):user_id=1,routine=self.routine,date=datetime.date(2024, 2, 10),- repetition_unit_id=ID_UNIT_REPS,+ repetitions_unit_id=ID_UNIT_REPS,+ repetitions=1,weight_unit_id=ID_UNIT_LB,- reps=1,weight=10,exercise_id=3,iteration=3,diff --git a/wger/manager/tests/test_slot_entry.py b/wger/manager/tests/test_slot_entry.pyindex fcdca8045..0c1821fb2 100644--- a/wger/manager/tests/test_slot_entry.py+++ b/wger/manager/tests/test_slot_entry.py@@ -159,7 +159,7 @@ class SlotEntryTestCase(WgerTestCase):slot_entry=self.slot_entry,iteration=2,weight=82.5,- reps=4,+ repetitions=4,).save()# Did 5x82.5 at iteration 3@@ -170,7 +170,7 @@ class SlotEntryTestCase(WgerTestCase):slot_entry=self.slot_entry,iteration=3,weight=82.5,- reps=5,+ repetitions=5,).save()self.assertEqual(@@ -296,7 +296,7 @@ class SlotEntryTestCase(WgerTestCase):slot_entry=self.slot_entry,iteration=2,weight=82.5,- reps=4,+ repetitions=4,).save()# 5x80 at iteration 3@@ -307,7 +307,7 @@ class SlotEntryTestCase(WgerTestCase):slot_entry=self.slot_entry,iteration=3,weight=80,- reps=5,+ repetitions=5,).save()self.assertEqual(diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex ca4dbb550..f64ba4421 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -20,7 +20,6 @@ import loggingfrom wger.core.tests import api_base_testfrom wger.manager.models import WorkoutLog-logger = logging.getLogger(__name__)@@ -35,8 +34,8 @@ class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):data = {'exercise': 1,'routine': 3,- 'reps': 3,- 'repetition_unit': 1,+ 'repetitions': 3,+ 'repetitions_unit': 1,'weight_unit': 2,'weight': 2,'date': datetime.date.today(),