Self hosted FLOSS fitness/workout, nutrition and weight tracker
Make the weight and repetitions unit nullable
Roland Geiderafc250aa7830
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.pyindex 056bd533d..780a897fe 100644--- a/wger/manager/migrations/0018_flexible_routines.py+++ b/wger/manager/migrations/0018_flexible_routines.py@@ -196,6 +196,30 @@ class Migration(migrations.Migration):name='rest_target',field=models.PositiveIntegerField(blank=True, null=True),),+ migrations.AlterField(+ model_name='workoutlog',+ name='repetitions_unit',+ field=models.ForeignKey(+ blank=True,+ default=1,+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ to='core.repetitionunit',+ verbose_name='Unit',+ ),+ ),+ migrations.AlterField(+ model_name='workoutlog',+ name='weight_unit',+ field=models.ForeignKey(+ blank=True,+ default=1,+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ to='core.weightunit',+ verbose_name='Unit',+ ),+ ),migrations.AlterModelOptions(name='workoutlog',options={'ordering': ['date', 'repetitions', 'weight']},@@ -287,6 +311,8 @@ class Migration(migrations.Migration):default=1,on_delete=django.db.models.deletion.CASCADE,to='core.repetitionunit',+ blank=True,+ null=True,),),(@@ -313,6 +339,8 @@ class Migration(migrations.Migration):on_delete=django.db.models.deletion.CASCADE,to='core.weightunit',verbose_name='Unit',+ blank=True,+ null=True,),),(diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 13bb8f579..744ebe66f 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -112,6 +112,8 @@ class WorkoutLog(models.Model):verbose_name=_('Unit'),default=REP_UNIT_REPETITIONS,on_delete=models.CASCADE,+ null=True,+ blank=True,)"""The repetition unit of the log. This can be e.g. a repetition, a minute, etc.@@ -145,6 +147,8 @@ class WorkoutLog(models.Model):verbose_name=_('Unit'),default=WEIGHT_UNIT_KG,on_delete=models.CASCADE,+ null=True,+ blank=True,)"""The weight unit of the log. This can be e.g. kg, lb, km/h, etc.@@ -233,6 +237,12 @@ class WorkoutLog(models.Model):if self.repetitions is None and self.weight is None:raise ValidationError('Both repetitions and weight cannot be null at the same time.')+ if self.repetitions is not None and self.repetitions_unit is None:+ raise ValidationError('Repetitions unit must be present if repetitions have a value.')++ if self.weight is not None and self.weight_unit is None:+ raise ValidationError('Weight unit must be present if weight has a value.')+def save(self, *args, **kwargs):"""Plumbingdiff --git a/wger/manager/models/slot_entry.py b/wger/manager/models/slot_entry.pyindex 5c567151c..7939c9ac5 100644--- a/wger/manager/models/slot_entry.py+++ b/wger/manager/models/slot_entry.py@@ -100,6 +100,8 @@ class SlotEntry(models.Model):RepetitionUnit,default=REP_UNIT_REPETITIONS,on_delete=models.CASCADE,+ null=True,+ blank=True,)"""The repetition unit of a set. This can be e.g. a repetition, a minute, etc.@@ -120,6 +122,8 @@ class SlotEntry(models.Model):verbose_name=_('Unit'),default=WEIGHT_UNIT_KG,on_delete=models.CASCADE,+ null=True,+ blank=True,)"""The weight unit of a set. This can be e.g. kg, lb, km/h, etc.