Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add simple weight calculations
Roland Geider9a321b7c8cc0
diff --git a/wger/gym/helpers.py b/wger/gym/helpers.pyindex 895858dfa..38709d2bf 100644--- a/wger/gym/helpers.py+++ b/wger/gym/helpers.py@@ -42,12 +42,12 @@ def get_user_last_activity(user):last_session = last_session.date# Return the last one- if last_session:- if not last_activity:- last_activity = last_session-- if last_activity < last_session:- last_activity = last_session+ # if last_session:+ # if not last_activity:+ # last_activity = last_session+ #+ # if last_activity < last_session:+ # last_activity = last_sessionreturn last_activitydiff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pynew file mode 100644index 000000000..0adb93767--- /dev/null+++ b/wger/manager/dataclasses.py@@ -0,0 +1,11 @@+# Standard Library+from dataclasses import dataclass++# wger+from wger.manager.models import DayNg+++@dataclass+class WorkoutDay:+ day: DayNg+ iteration: intdiff --git a/wger/manager/migrations/0019_alter_repsconfig_options_alter_restconfig_options_and_more.py b/wger/manager/migrations/0019_alter_repsconfig_options_alter_restconfig_options_and_more.pynew file mode 100644index 000000000..b3a26c0e2--- /dev/null+++ b/wger/manager/migrations/0019_alter_repsconfig_options_alter_restconfig_options_and_more.py@@ -0,0 +1,125 @@+# Generated by Django 4.2.6 on 2024-03-07 19:02++import datetime+from django.db import migrations, models+import django.db.models.deletion+++class Migration(migrations.Migration):+ dependencies = [+ ('exercises', '0028_add_uuid_alias_and_comments'),+ ('core', '0016_alter_language_short_name'),+ ('manager', '0018_flexible_routines'),+ ]++ operations = [+ migrations.AlterModelOptions(+ name='repsconfig',+ options={'ordering': ['set_config', 'iteration']},+ ),+ migrations.AlterModelOptions(+ name='restconfig',+ options={'ordering': ['set_config', 'iteration']},+ ),+ migrations.AlterModelOptions(+ name='rirconfig',+ options={'ordering': ['set_config', 'iteration']},+ ),+ migrations.AlterModelOptions(+ name='weightconfig',+ options={'ordering': ['set_config', 'iteration']},+ ),+ migrations.AddField(+ model_name='repsconfig',+ name='need_log_to_apply',+ field=models.BooleanField(default=False),+ ),+ migrations.AddField(+ model_name='restconfig',+ name='need_log_to_apply',+ field=models.BooleanField(default=False),+ ),+ migrations.AddField(+ model_name='rirconfig',+ name='need_log_to_apply',+ field=models.BooleanField(default=False),+ ),+ migrations.AddField(+ model_name='weightconfig',+ name='need_log_to_apply',+ field=models.BooleanField(default=False),+ ),+ migrations.AddField(+ model_name='workoutlog',+ name='session',+ field=models.ForeignKey(+ null=True,+ on_delete=django.db.models.deletion.CASCADE,+ to='manager.workoutsession',+ verbose_name='Session',+ ),+ ),+ migrations.AddField(+ model_name='workoutlog',+ name='set_config',+ field=models.ForeignKey(+ null=True, on_delete=django.db.models.deletion.CASCADE, to='manager.setconfig'+ ),+ ),+ migrations.AlterField(+ model_name='setconfig',+ name='exercise',+ field=models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE, to='exercises.exercisebase'+ ),+ ),+ migrations.AlterField(+ model_name='setconfig',+ name='repetition_unit',+ field=models.ForeignKey(+ default=1, on_delete=django.db.models.deletion.CASCADE, to='core.repetitionunit'+ ),+ ),+ migrations.AlterField(+ model_name='workoutlog',+ name='date',+ field=models.DateTimeField(default=datetime.datetime.now, verbose_name='Date'),+ ),+ migrations.AlterField(+ model_name='workoutsession',+ name='date',+ field=models.DateField(default=datetime.date.today, verbose_name='Date'),+ ),+ migrations.AlterUniqueTogether(+ name='repsconfig',+ unique_together={('set_config', 'iteration')},+ ),+ migrations.AlterUniqueTogether(+ name='restconfig',+ unique_together={('set_config', 'iteration')},+ ),+ migrations.AlterUniqueTogether(+ name='rirconfig',+ unique_together={('set_config', 'iteration')},+ ),+ migrations.AlterUniqueTogether(+ name='weightconfig',+ unique_together={('set_config', 'iteration')},+ ),+ migrations.RemoveField(+ model_name='repsconfig',+ name='creation_date',+ ),+ migrations.RemoveField(+ model_name='restconfig',+ name='creation_date',+ ),+ migrations.RemoveField(+ model_name='rirconfig',+ name='creation_date',+ ),+ migrations.RemoveField(+ model_name='weightconfig',+ name='creation_date',+ ),+ ]diff --git a/wger/manager/models/__init__.py b/wger/manager/models/__init__.pyindex 68c6f164c..63c4c59cf 100644--- a/wger/manager/models/__init__.py+++ b/wger/manager/models/__init__.py@@ -24,6 +24,7 @@ from .log import WorkoutLogfrom .reps_config import RepsConfigfrom .rest_config import RestConfigfrom .rir_config import RiRConfig+from .routine import Routinefrom .schedule import Schedulefrom .schedule_step import ScheduleStepfrom .session import WorkoutSession@@ -31,6 +32,7 @@ from .set import (Set,SetNg,)+from .set_config import SetConfigfrom .setting import Settingfrom .weight_config import WeightConfigfrom .workout import Workoutdiff --git a/wger/manager/models/abstract_config.py b/wger/manager/models/abstract_config.pyindex 7ba62fac2..26b212ed2 100644--- a/wger/manager/models/abstract_config.py+++ b/wger/manager/models/abstract_config.py@@ -16,10 +16,6 @@# Djangofrom django.db import models-from django.utils.translation import gettext_lazy as _--# wger-from wger.manager.models.set_config import SetConfigclass OperationChoices(models.TextChoices):@@ -44,23 +40,35 @@ class AbstractChangeConfig(models.Model):class Meta:abstract = True+ ordering = ['set_config', 'iteration']+ unique_together = ['set_config', 'iteration']++ set_config = models.ForeignKey(+ 'SetConfig',+ on_delete=models.CASCADE,+ )iteration = models.PositiveIntegerField()+ """+ The iteration this takes effect on.- value = models.DecimalField(- decimal_places=2,- max_digits=6,- )+ Note that what exactly an iteration is depends on the trigger type so+ at the moment this can be session (so basically a day) or a week.+ """- set_config = models.ForeignKey(- SetConfig,- on_delete=models.CASCADE,+ trigger = models.CharField(+ choices=TriggerChoices.choices,+ max_length=10,+ default=TriggerChoices.SESSION,+ null=True,)+ """When the changes are calculated"""- creation_date = models.DateTimeField(- _('Creation date'),- auto_now_add=True,+ value = models.DecimalField(+ decimal_places=2,+ max_digits=6,)+ """The actual increment"""operation = models.CharField(choices=OperationChoices.choices,@@ -70,14 +78,6 @@ class AbstractChangeConfig(models.Model):)"""The operation"""- trigger = models.CharField(- choices=TriggerChoices.choices,- max_length=10,- default=TriggerChoices.SESSION,- null=True,- )- """When the changes are calculated"""-step = models.CharField(choices=StepChoices.choices,max_length=10,@@ -94,6 +94,13 @@ class AbstractChangeConfig(models.Model):be replaced with the new one"""+ need_log_to_apply = models.BooleanField(+ default=False,+ )+ """+ Only apply the change if the user logged the last weight+ """+code = models.CharField(max_length=100,)diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 4eebf38a7..fe1d7c057 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -14,6 +14,10 @@# You should have received a copy of the GNU Affero General Public License# along with this program. If not, see <http://www.gnu.org/licenses/>.++# Standard Library+import datetime+# Djangofrom django.contrib.auth.models import Userfrom django.core.validators import MinValueValidator@@ -27,7 +31,6 @@ from wger.core.models import ()from wger.exercises.models import ExerciseBasefrom wger.utils.cache import reset_workout_log-from wger.utils.fields import Html5DateField# Localfrom ..consts import RIR_OPTIONS@@ -47,6 +50,13 @@ class WorkoutLog(models.Model):on_delete=models.CASCADE,)+ session = models.ForeignKey(+ 'WorkoutSession',+ verbose_name=_('Session'),+ on_delete=models.CASCADE,+ null=True,+ )+exercise_base = models.ForeignKey(ExerciseBase,verbose_name=_('Exercise'),@@ -59,6 +69,12 @@ class WorkoutLog(models.Model):on_delete=models.CASCADE,)+ set_config = models.ForeignKey(+ 'SetConfig',+ on_delete=models.CASCADE,+ null=True,+ )+repetition_unit = models.ForeignKey(RepetitionUnit,verbose_name=_('Unit'),@@ -97,7 +113,10 @@ class WorkoutLog(models.Model):The weight unit of the log. This can be e.g. kg, lb, km/h, etc."""- date = Html5DateField(verbose_name=_('Date'))+ date = models.DateTimeField(+ verbose_name=_('Date'),+ default=datetime.datetime.now,+ )rir = models.CharField(verbose_name=_('RiR'),@@ -148,10 +167,10 @@ class WorkoutLog(models.Model):reset_workout_log(self.user_id, self.date.year, self.date.month, self.date.day)# If the user selected "Until Failure", do only 1 "repetition",- # everythin else doesn't make sense.+ # everything else doesn't make sense.if self.repetition_unit == 2:self.reps = 1- super(WorkoutLog, self).save(*args, **kwargs)+ super().save(*args, **kwargs)def delete(self, *args, **kwargs):"""diff --git a/wger/manager/models/reps_config.py b/wger/manager/models/reps_config.pyindex ce136c019..1400d5811 100644--- a/wger/manager/models/reps_config.py+++ b/wger/manager/models/reps_config.py@@ -23,7 +23,4 @@ class RepsConfig(AbstractChangeConfig):Model for a routine"""- class Meta:- ordering = [- '-creation_date',- ]+ passdiff --git a/wger/manager/models/rest_config.py b/wger/manager/models/rest_config.pyindex 2102b8282..e483ee902 100644--- a/wger/manager/models/rest_config.py+++ b/wger/manager/models/rest_config.py@@ -23,7 +23,4 @@ class RestConfig(AbstractChangeConfig):Model for a routine"""- class Meta:- ordering = [- '-creation_date',- ]+ passdiff --git a/wger/manager/models/rir_config.py b/wger/manager/models/rir_config.pyindex f552b3d50..dacfaba97 100644--- a/wger/manager/models/rir_config.py+++ b/wger/manager/models/rir_config.py@@ -23,7 +23,4 @@ class RiRConfig(AbstractChangeConfig):Model for a routine"""- class Meta:- ordering = [- '-creation_date',- ]+ passdiff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex 558e34ce7..d3f2ce6f8 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -16,6 +16,7 @@# Standard Libraryimport datetime+from collections import Counter# Djangofrom django.contrib.auth.models import User@@ -24,6 +25,9 @@ from django.db import modelsfrom django.urls import reversefrom django.utils.translation import gettext_lazy as _+# wger+from wger.manager.dataclasses import WorkoutDay+class Routine(models.Model):"""@@ -130,11 +134,14 @@ class Routine(models.Model):delta = datetime.timedelta(days=1)current_date = self.startcurrent_day = self.first_day+ counter = Counter()out = {}while current_date <= self.end:- out[current_date] = current_day+ counter[current_day] += 1+ out[current_date] = WorkoutDay(day=current_day, iteration=counter[current_day])+ # out[current_date] = current_dayif current_day.can_proceed(current_date):current_day = current_day.next_daydiff --git a/wger/manager/models/session.py b/wger/manager/models/session.pyindex fc0479728..4afcd4c46 100644--- a/wger/manager/models/session.py+++ b/wger/manager/models/session.py@@ -13,6 +13,8 @@## You should have received a copy of the GNU Affero General Public License# along with this program. If not, see <http://www.gnu.org/licenses/>.+# Standard Library+import datetime# Djangofrom django.contrib.auth.models import User@@ -22,7 +24,6 @@ from django.utils.translation import gettext_lazy as _# wgerfrom wger.utils.cache import reset_workout_log-from wger.utils.fields import Html5DateFieldclass WorkoutSession(models.Model):@@ -70,7 +71,10 @@ class WorkoutSession(models.Model):The day the session belongs to"""- date = Html5DateField(verbose_name=_('Date'))+ date = models.DateField(+ verbose_name=_('Date'),+ default=datetime.date.today,+ )"""The date the workout session was performed"""@@ -98,12 +102,20 @@ class WorkoutSession(models.Model):The user's general impression of workout"""- time_start = models.TimeField(verbose_name=_('Start time'), blank=True, null=True)+ time_start = models.TimeField(+ verbose_name=_('Start time'),+ blank=True,+ null=True,+ )"""Time the workout session started"""- time_end = models.TimeField(verbose_name=_('Finish time'), blank=True, null=True)+ time_end = models.TimeField(+ verbose_name=_('Finish time'),+ blank=True,+ null=True,+ )"""Time the workout session ended"""@@ -146,11 +158,11 @@ class WorkoutSession(models.Model):Reset cache"""reset_workout_log(self.user_id, self.date.year, self.date.month)- super(WorkoutSession, self).save(*args, **kwargs)+ super().save(*args, **kwargs)def delete(self, *args, **kwargs):"""Reset cache"""reset_workout_log(self.user_id, self.date.year, self.date.month)- super(WorkoutSession, self).delete(*args, **kwargs)+ super().delete(*args, **kwargs)diff --git a/wger/manager/models/set_config.py b/wger/manager/models/set_config.pyindex 19bee3dde..7d18a7681 100644--- a/wger/manager/models/set_config.py+++ b/wger/manager/models/set_config.py@@ -15,10 +15,6 @@# along with this program. If not, see <http://www.gnu.org/licenses/>.# Django-from django.core.validators import (- MaxValueValidator,- MinValueValidator,-)from django.db import modelsfrom django.utils.translation import gettext_lazy as _@@ -27,15 +23,12 @@ from wger.core.models import (RepetitionUnit,WeightUnit,)-from wger.exercises.models import (- Exercise,- ExerciseBase,+from wger.exercises.models import ExerciseBase+from wger.manager.models.abstract_config import (+ AbstractChangeConfig,+ OperationChoices,+ StepChoices,)-from wger.utils.cache import reset_workout_canonical_form--# Local-from ..consts import RIR_OPTIONS-from .set import Setclass SetConfig(models.Model):@@ -44,20 +37,18 @@ class SetConfig(models.Model):"""set = models.ForeignKey(- Set,+ 'Set',verbose_name=_('Sets'),on_delete=models.CASCADE,)exercise = models.ForeignKey(ExerciseBase,- verbose_name=_('Exercise'),on_delete=models.CASCADE,)repetition_unit = models.ForeignKey(RepetitionUnit,- verbose_name=_('Unit'),default=1,on_delete=models.CASCADE,)@@ -98,3 +89,32 @@ class SetConfig(models.Model):Returns the object that has owner information"""return self.set.exerciseday.training++ def calculate_config_value(self, configs: list[AbstractChangeConfig]):+ out = 0++ for config in configs:+ if config.replace:+ out = config.value+ continue++ step = config.value if config.step == StepChoices.ABSOLUTE else out * config.value / 100++ if config.operation == OperationChoices.PLUS:+ out += step+ else:+ out -= step++ return out++ def get_weight(self, iteration: int):+ return self.calculate_config_value(self.weightconfig_set.filter(iteration__lte=iteration))++ def get_reps(self, iteration: int):+ return self.calculate_config_value(self.repsconfig_set.filter(iteration__lte=iteration))++ def get_rir(self, iteration: int):+ return self.calculate_config_value(self.rirconfig_set.filter(iteration__lte=iteration))++ def get_rest(self, iteration: int):+ return self.calculate_config_value(self.restconfig_set.filter(iteration__lte=iteration))diff --git a/wger/manager/models/weight_config.py b/wger/manager/models/weight_config.pyindex fa951546c..8205be5c7 100644--- a/wger/manager/models/weight_config.py+++ b/wger/manager/models/weight_config.py@@ -23,7 +23,4 @@ class WeightConfig(AbstractChangeConfig):Model for a routine"""- class Meta:- ordering = [- '-creation_date',- ]+ passdiff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.pyindex df07c1286..c2cd996ea 100644--- a/wger/manager/tests/test_routine.py+++ b/wger/manager/tests/test_routine.py@@ -17,6 +17,7 @@ import datetime# wgerfrom wger.core.tests.base_testcase import WgerTestCase+from wger.manager.dataclasses import WorkoutDayfrom wger.manager.models import (DayNg,WorkoutSession,@@ -61,8 +62,10 @@ class RoutineTestCase(WgerTestCase):self.day1.next_day = self.day2self.day1.save()+self.day2.next_day = self.day3self.day2.save()+self.day3.next_day = self.day1self.day3.save()@@ -82,16 +85,16 @@ class RoutineTestCase(WgerTestCase):self.assertEqual(self.routine.date_sequence,{- datetime.date(2024, 1, 1): self.day1,- datetime.date(2024, 1, 2): self.day2,- datetime.date(2024, 1, 3): self.day3,- datetime.date(2024, 1, 4): self.day1,- datetime.date(2024, 1, 5): self.day2,- datetime.date(2024, 1, 6): self.day3,- datetime.date(2024, 1, 7): self.day1,- datetime.date(2024, 1, 8): self.day2,- datetime.date(2024, 1, 9): self.day3,- datetime.date(2024, 1, 10): self.day1,+ datetime.date(2024, 1, 1): WorkoutDay(day=self.day1, iteration=1),+ datetime.date(2024, 1, 2): WorkoutDay(day=self.day2, iteration=1),+ datetime.date(2024, 1, 3): WorkoutDay(day=self.day3, iteration=1),+ datetime.date(2024, 1, 4): WorkoutDay(day=self.day1, iteration=2),+ datetime.date(2024, 1, 5): WorkoutDay(day=self.day2, iteration=2),+ datetime.date(2024, 1, 6): WorkoutDay(day=self.day3, iteration=2),+ datetime.date(2024, 1, 7): WorkoutDay(day=self.day1, iteration=3),+ datetime.date(2024, 1, 8): WorkoutDay(day=self.day2, iteration=3),+ datetime.date(2024, 1, 9): WorkoutDay(day=self.day3, iteration=3),+ datetime.date(2024, 1, 10): WorkoutDay(day=self.day1, iteration=4),},)@@ -124,15 +127,15 @@ class RoutineTestCase(WgerTestCase):self.assertEqual(self.routine.date_sequence,{- datetime.date(2024, 1, 1): self.day1,- datetime.date(2024, 1, 2): self.day1,- datetime.date(2024, 1, 3): self.day1,- datetime.date(2024, 1, 4): self.day1,- datetime.date(2024, 1, 5): self.day2,- datetime.date(2024, 1, 6): self.day3,- datetime.date(2024, 1, 7): self.day1,- datetime.date(2024, 1, 8): self.day2,- datetime.date(2024, 1, 9): self.day3,- datetime.date(2024, 1, 10): self.day1,+ datetime.date(2024, 1, 1): WorkoutDay(day=self.day1, iteration=1),+ datetime.date(2024, 1, 2): WorkoutDay(day=self.day1, iteration=2),+ datetime.date(2024, 1, 3): WorkoutDay(day=self.day1, iteration=3),+ datetime.date(2024, 1, 4): WorkoutDay(day=self.day1, iteration=4),+ datetime.date(2024, 1, 5): WorkoutDay(day=self.day2, iteration=1),+ datetime.date(2024, 1, 6): WorkoutDay(day=self.day3, iteration=1),+ datetime.date(2024, 1, 7): WorkoutDay(day=self.day1, iteration=5),+ datetime.date(2024, 1, 8): WorkoutDay(day=self.day2, iteration=2),+ datetime.date(2024, 1, 9): WorkoutDay(day=self.day3, iteration=2),+ datetime.date(2024, 1, 10): WorkoutDay(day=self.day1, iteration=6),},)diff --git a/wger/manager/tests/test_set_config.py b/wger/manager/tests/test_set_config.pynew file mode 100644index 000000000..d2bc63ddb--- /dev/null+++ b/wger/manager/tests/test_set_config.py@@ -0,0 +1,93 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++# wger+from wger.core.tests.base_testcase import WgerTestCase+from wger.manager.models import WeightConfig+from wger.manager.models.abstract_config import (+ OperationChoices,+ StepChoices,+)+from wger.manager.models.set_config import SetConfig+++class SetConfigTestCase(WgerTestCase):+ """+ Test the set config calculations+ """++ set_config: SetConfig++ def setUp(self):+ super().setUp()++ self.set_config = SetConfig(+ set_id=1,+ exercise_id=1,+ order=1,+ )+ self.set_config.save()++ def test_weight_config(self):+ """+ Test that the weight is correctly calculated for each step / iteration+ """++ # Initial value+ WeightConfig(+ set_config=self.set_config,+ iteration=1,+ value=80,+ ).save()++ # Increase by 2.5+ WeightConfig(+ set_config=self.set_config,+ iteration=3,+ value=2.5,+ ).save()++ # Replace with 42+ WeightConfig(+ set_config=self.set_config,+ iteration=6,+ value=42,+ replace=True,+ ).save()++ # Reduce by 2+ WeightConfig(+ set_config=self.set_config,+ iteration=7,+ value=2,+ operation=OperationChoices.MINUS,+ ).save()++ # Increase by 10%+ WeightConfig(+ set_config=self.set_config,+ iteration=8,+ value=10,+ operation=OperationChoices.PLUS,+ step=StepChoices.PERCENT,+ ).save()++ self.assertEqual(self.set_config.get_weight(1), 80)+ self.assertEqual(self.set_config.get_weight(2), 80)+ self.assertEqual(self.set_config.get_weight(3), 82.5)+ self.assertEqual(self.set_config.get_weight(4), 82.5)+ self.assertEqual(self.set_config.get_weight(5), 82.5)+ self.assertEqual(self.set_config.get_weight(6), 42)+ self.assertEqual(self.set_config.get_weight(7), 40)+ self.assertEqual(self.set_config.get_weight(8), 44)diff --git a/wger/utils/fields.py b/wger/utils/fields.pyindex fc8d4b4d9..b931dec9f 100644--- a/wger/utils/fields.py+++ b/wger/utils/fields.py@@ -53,4 +53,4 @@ class Html5DateField(models.DateField):"""defaults = {'form_class': Html5FormDateField}defaults.update(kwargs)- return super(Html5DateField, self).formfield(**defaults)+ return super().formfield(**defaults)