Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Change field type for log values to decimal field

Roland Geider5f2803edc102
diff --git a/wger/core/demo.py b/wger/core/demo.py
index e26df8cfa..d03991cfd 100644
--- a/wger/core/demo.py
+++ b/wger/core/demo.py
@@ -24,6 +24,7 @@ from django.contrib.auth.models import User
from django.core.management import call_command
from django.http import HttpRequest
+
logger = logging.getLogger(__name__)
diff --git a/wger/manager/management/commands/dummy-generator-workout-diary.py b/wger/manager/management/commands/dummy-generator-workout-diary.py
index cdf8ccc6e..723c5b4bc 100644
--- a/wger/manager/management/commands/dummy-generator-workout-diary.py
+++ b/wger/manager/management/commands/dummy-generator-workout-diary.py
@@ -27,6 +27,7 @@ from wger.manager.models import (
WorkoutLog,
)
+
logger = logging.getLogger(__name__)
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 538ec5746..f51114220 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -84,7 +84,6 @@ class Migration(migrations.Migration):
'ordering': ['order'],
},
),
-
#
# Workout log changes
#
@@ -112,7 +111,10 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='workoutlog',
name='repetitions_target',
- field=models.IntegerField(
+ field=models.DecimalField(
+ blank=True,
+ decimal_places=2,
+ max_digits=5,
null=True,
validators=[wger.manager.validators.NullMinValueValidator(0)],
verbose_name='Repetitions',
@@ -123,10 +125,32 @@ class Migration(migrations.Migration):
old_name='reps',
new_name='repetitions',
),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='repetitions',
+ field=models.DecimalField(
+ blank=True,
+ decimal_places=2,
+ max_digits=5,
+ null=True,
+ validators=[wger.manager.validators.NullMinValueValidator(0)],
+ ),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='weight',
+ field=models.DecimalField(
+ blank=True,
+ decimal_places=2,
+ max_digits=5,
+ null=True,
+ validators=[wger.manager.validators.NullMinValueValidator(0)],
+ ),
+ ),
migrations.RenameField(
- model_name="workoutlog",
- old_name="repetition_unit",
- new_name="repetitions_unit",
+ model_name='workoutlog',
+ old_name='repetition_unit',
+ new_name='repetitions_unit',
),
migrations.AddField(
model_name='workoutlog',
@@ -154,6 +178,7 @@ class Migration(migrations.Migration):
model_name='workoutlog',
name='weight_target',
field=models.DecimalField(
+ blank=True,
decimal_places=2,
max_digits=5,
null=True,
@@ -172,10 +197,9 @@ class Migration(migrations.Migration):
field=models.PositiveIntegerField(blank=True, null=True),
),
migrations.AlterModelOptions(
- name="workoutlog",
- options={"ordering": ["date", "repetitions", "weight"]},
+ name='workoutlog',
+ options={'ordering': ['date', 'repetitions', 'weight']},
),
-
migrations.AlterField(
model_name='workoutsession',
name='date',
diff --git a/wger/manager/models/log.py b/wger/manager/models/log.py
index e2c784b6d..4f75430cd 100644
--- a/wger/manager/models/log.py
+++ b/wger/manager/models/log.py
@@ -19,6 +19,7 @@ import datetime
# Django
from django.contrib.auth.models import User
+from django.core.exceptions import ValidationError
from django.core.validators import MinValueValidator
from django.db import models
from django.utils.translation import gettext_lazy as _
@@ -29,7 +30,11 @@ from wger.core.models import (
WeightUnit,
)
from wger.exercises.models import Exercise
-from wger.manager.consts import RIR_OPTIONS
+from wger.manager.consts import (
+ ID_UNIT_KG,
+ ID_UNIT_REPS,
+ RIR_OPTIONS,
+)
from wger.manager.managers import WorkoutLogManager
from wger.manager.models.session import WorkoutSession
from wger.manager.validators import NullMinValueValidator
@@ -106,25 +111,31 @@ class WorkoutLog(models.Model):
repetitions_unit = models.ForeignKey(
RepetitionUnit,
verbose_name=_('Unit'),
- default=1,
+ default=ID_UNIT_REPS,
on_delete=models.CASCADE,
)
"""
The repetition unit of the log. This can be e.g. a repetition, a minute, etc.
"""
- repetitions = models.IntegerField(
- verbose_name=_('Repetitions'),
- validators=[MinValueValidator(0)],
+ repetitions = models.DecimalField(
+ max_digits=5,
+ decimal_places=2,
+ validators=[NullMinValueValidator(0)],
+ blank=True,
+ null=True,
)
"""
Logged amount of repetitions
"""
- repetitions_target = models.IntegerField(
+ repetitions_target = models.DecimalField(
+ max_digits=5,
+ decimal_places=2,
verbose_name=_('Repetitions'),
validators=[NullMinValueValidator(0)],
null=True,
+ blank=True,
)
"""
Target amount of repetitions
@@ -133,7 +144,7 @@ class WorkoutLog(models.Model):
weight_unit = models.ForeignKey(
WeightUnit,
verbose_name=_('Unit'),
- default=1,
+ default=ID_UNIT_KG,
on_delete=models.CASCADE,
)
"""
@@ -141,21 +152,23 @@ class WorkoutLog(models.Model):
"""
weight = models.DecimalField(
- decimal_places=2,
max_digits=5,
- verbose_name=_('Weight'),
- validators=[MinValueValidator(0)],
+ decimal_places=2,
+ validators=[NullMinValueValidator(0)],
+ blank=True,
+ null=True,
)
"""
Logged amount of weight
"""
weight_target = models.DecimalField(
- decimal_places=2,
max_digits=5,
+ decimal_places=2,
verbose_name=_('Weight'),
validators=[NullMinValueValidator(0)],
null=True,
+ blank=True,
)
"""
Target amount of weight
@@ -216,10 +229,16 @@ class WorkoutLog(models.Model):
"""
return self
+ def clean(self):
+ super().clean()
+ if self.repetitions is None and self.weight is None:
+ raise ValidationError('Both repetitions and weight cannot be null at the same time.')
+
def save(self, *args, **kwargs):
"""
Plumbing
"""
+ self.clean()
# If the routine does not belong to this user, do not save
if self.routine and self.routine.user != self.user:
diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.py
index d5428211c..3ef8cf737 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
diff --git a/wger/manager/tests/test_log_model.py b/wger/manager/tests/test_log_model.py
index 2b20ede68..4f6be5f4e 100644
--- a/wger/manager/tests/test_log_model.py
+++ b/wger/manager/tests/test_log_model.py
@@ -22,6 +22,7 @@ from wger.manager.models import (
WorkoutSession,
)
+
logger = logging.getLogger(__name__)
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index f64ba4421..2e6cacc73 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -20,6 +20,7 @@ import logging
from wger.core.tests import api_base_test
from wger.manager.models import WorkoutLog
+
logger = logging.getLogger(__name__)