Self hosted FLOSS fitness/workout, nutrition and weight tracker
Expose the calculated weight config for each workout day
Roland Geider750ace6203c2
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 0d361a0d1..738ca5aa0 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -36,6 +36,7 @@ from wger.manager.models import (ScheduleStep,Set,SetConfig,+ SetNg,Setting,WeightConfig,Workout,@@ -77,6 +78,21 @@ class DayNgSerializer(serializers.ModelSerializer):)+class SetNgSerializer(serializers.ModelSerializer):+ """+ SetNg+ """++ class Meta:+ model = SetNg+ fields = (+ 'day',+ 'order',+ 'comment',+ 'is_dropset',+ )++class SetConfigSerializer(serializers.ModelSerializer):"""Day serializer@@ -171,6 +187,36 @@ class RestConfigSerializer(serializers.ModelSerializer):)+class SetConfigDataSerializer(serializers.Serializer):+ """+ SetData serializer+ """++ weight = serializers.DecimalField(max_digits=5, decimal_places=2)+ reps = serializers.DecimalField(max_digits=5, decimal_places=2)+ rir = serializers.DecimalField(max_digits=5, decimal_places=2)+ rest = serializers.DecimalField(max_digits=5, decimal_places=2)+++class SetExerciseDataSerializer(serializers.Serializer):+ """+ SetData serializer+ """++ # exercise = ExerciseBaseInfoSerializer()+ data = SetConfigDataSerializer()+ config = SetConfigSerializer()+++class SetDataSerializer(serializers.Serializer):+ """+ SetData serializer+ """++ set = SetNgSerializer()+ exercise_data = SetExerciseDataSerializer(many=True)++class WorkoutDayDataSerializer(serializers.Serializer):"""WorkoutDayData serializer@@ -179,6 +225,7 @@ class WorkoutDayDataSerializer(serializers.Serializer):iteration = serializers.IntegerField()date = serializers.DateField()day = DayNgSerializer()+ sets = SetDataSerializer(many=True)class WorkoutSerializer(serializers.ModelSerializer):diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 9a4b8fcfd..eb271557e 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -104,6 +104,13 @@ class RoutineViewSet(viewsets.ModelViewSet):"""return Response(WorkoutDayDataSerializer(self.get_object().date_sequence, many=True).data)+ @action(detail=True, url_path='current-day')+ def current_day(self, request, pk):+ """+ Return current day of the routine+ """+ return Response(WorkoutDayDataSerializer(self.get_object().current_day()).data)+class WorkoutViewSet(viewsets.ModelViewSet):"""diff --git a/wger/manager/config_calculations/calculations.py b/wger/manager/config_calculations/calculations.pyindex 5da4bc8bf..90168f294 100644--- a/wger/manager/config_calculations/calculations.py+++ b/wger/manager/config_calculations/calculations.py@@ -22,7 +22,10 @@ from abc import (from decimal import Decimal# wger-from wger.manager.models import AbstractChangeConfig+from wger.manager.models import (+ AbstractChangeConfig,+ WorkoutLog,+)class AbstractSetCalculations(ABC):@@ -31,13 +34,23 @@ class AbstractSetCalculations(ABC):reps_configs: list[AbstractChangeConfig]rir_configs: list[AbstractChangeConfig]rest_configs: list[AbstractChangeConfig]+ logs: list[WorkoutLog]- def __init__(self, iteration, weight_configs, reps_configs, rir_configs, rest_configs):+ def __init__(+ self,+ iteration: int,+ weight_configs: list[AbstractChangeConfig],+ reps_configs: list[AbstractChangeConfig],+ rir_configs: list[AbstractChangeConfig],+ rest_configs: list[AbstractChangeConfig],+ logs: list[WorkoutLog],+ ):self.iteration = iterationself.weight_configs = weight_configsself.reps_configs = reps_configsself.rir_configs = rir_configsself.rest_configs = rest_configs+ self.logs = logs@abstractmethoddef calculate(self) -> Decimal | int:diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pyindex 2e2fa5362..a0fe8b968 100644--- a/wger/manager/dataclasses.py+++ b/wger/manager/dataclasses.py@@ -1,17 +1,31 @@+# This file is part of wger Workout Manager <https://github.com/wger-project>.+# Copyright (C) wger Team+#+# 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 Affero General Public License for more details.+#+# 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 Libraryimport datetime-from dataclasses import dataclass+from dataclasses import (+ dataclass,+ field,+)from decimal import Decimal+from typing import List# wger-from wger.manager.models import DayNg---@dataclass-class WorkoutDayData:- day: DayNg- date: datetime.date- iteration: int+from wger.exercises.models import ExerciseBase@dataclass@@ -20,3 +34,24 @@ class SetConfigData:reps: Decimal | intrir: Decimal | intrest: Decimal | int+++@dataclass+class SetExerciseData:+ exercise: ExerciseBase+ config: 'SetConfig'+ data: SetConfigData+++@dataclass+class SetData:+ set: 'SetNg'+ exercise_data: List[SetExerciseData] = field(default_factory=list)+++@dataclass+class WorkoutDayData:+ day: 'DayNg'+ date: datetime.date+ iteration: int+ sets: List[SetData] = field(default_factory=list)diff --git a/wger/manager/fixtures/test-routine-data.json b/wger/manager/fixtures/test-routine-data.jsonindex 7feaa6dc5..509965b5e 100644--- a/wger/manager/fixtures/test-routine-data.json+++ b/wger/manager/fixtures/test-routine-data.json@@ -49,5 +49,25 @@"next_day": 1,"is_rest": false}+ },+ {+ "pk": 1,+ "model": "manager.setng",+ "fields": {+ "day": 1,+ "order": 1,+ "comment": "test comment 123",+ "is_dropset": false+ }+ },+ {+ "pk": 2,+ "model": "manager.setng",+ "fields": {+ "day": 1,+ "order": 2,+ "comment": "test comment 456",+ "is_dropset": false+ }}]diff --git a/wger/manager/models/day.py b/wger/manager/models/day.pyindex 9dacc0275..b74874316 100644--- a/wger/manager/models/day.py+++ b/wger/manager/models/day.py@@ -16,6 +16,7 @@# Standard Libraryimport datetime+from typing import List# Djangofrom django.db import models@@ -23,6 +24,7 @@ from django.utils.translation import gettext_lazy as _# wgerfrom wger.core.models import DaysOfWeek+from wger.manager.dataclasses import SetDatafrom wger.utils.cache import reset_workout_canonical_form@@ -85,11 +87,12 @@ class DayNg(models.Model):return False- def get_sets(self, iteration: int):+ def get_sets(self, iteration: int) -> List[SetData]:"""Return the sets for this day"""- ...+ return [SetData(set=s, exercise_data=s.set_data(iteration)) for s in self.setng_set.all()]+ # return [s.set_data(iteration) for s in self.setng_set.all()]class Day(models.Model):diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex 5bd2dc7cb..d44302227 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -17,6 +17,7 @@# Standard Libraryimport datetimefrom collections import Counter+from typing import List# Djangofrom django.contrib.auth.models import User@@ -124,9 +125,9 @@ class Routine(models.Model):return out@property- def date_sequence(self):+ def date_sequence(self) -> List[WorkoutDayData]:"""- Return a dictionary with specific dates and routine days+ Return a list with specific dates and routine daysIf a day needs logs to continue it will be repeated until the user adds one."""@@ -138,10 +139,18 @@ class Routine(models.Model):out = []+ if current_day is None:+ return out+while current_date <= self.end:counter[current_day] += 1out.append(- WorkoutDayData(day=current_day, iteration=counter[current_day], date=current_date)+ WorkoutDayData(+ day=current_day,+ iteration=counter[current_day],+ date=current_date,+ sets=current_day.get_sets(counter[current_day]),+ ))if current_day.can_proceed(current_date):@@ -150,3 +159,17 @@ class Routine(models.Model):current_date += deltareturn out++ def current_day(self, date=None) -> WorkoutDayData | None:+ """+ Return the WorkoutDayData for the specified day. If no date is given, return+ the results for "today"+ """+ if date is None:+ date = datetime.date.today()++ for data in self.date_sequence:+ if data.date == date:+ return data++ return Nonediff --git a/wger/manager/models/set.py b/wger/manager/models/set.pyindex 13cfa3aa2..3e8f174a7 100644--- a/wger/manager/models/set.py+++ b/wger/manager/models/set.py@@ -15,7 +15,7 @@# along with this program. If not, see <http://www.gnu.org/licenses/>.# Standard Library-import typing+from typing import List# Djangofrom django.core.validators import (@@ -27,6 +27,7 @@ from django.utils.translation import gettext_lazy as _# wgerfrom wger.exercises.models import ExerciseBase+from wger.manager.dataclasses import SetExerciseDatafrom wger.utils.cache import reset_workout_canonical_formfrom wger.utils.helpers import normalize_decimal@@ -85,6 +86,14 @@ class SetNg(models.Model):"""return self.day.routine+ def set_data(self, iteration: int) -> List[SetExerciseData]:+ """Calculates the set data for a specific iteration"""++ return [+ SetExerciseData(data=s.get_config(iteration), exercise=s.exercise, config=s)+ for s in self.setconfig_set.all()+ ]+class Set(models.Model):"""@@ -147,7 +156,7 @@ class Set(models.Model):super(Set, self).delete(*args, **kwargs)@property- def exercise_bases(self) -> typing.List[ExerciseBase]:+ def exercise_bases(self) -> List[ExerciseBase]:"""Returns the exercises for this set"""out = list(dict.fromkeys([s.exercise_base for s in self.setting_set.select_related().all()])diff --git a/wger/manager/models/set_config.py b/wger/manager/models/set_config.pyindex 58c0bdbe4..640469d8f 100644--- a/wger/manager/models/set_config.py+++ b/wger/manager/models/set_config.py@@ -13,9 +13,9 @@## 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 Libraryimport importlib-from typing import Optional# Djangofrom django.db import models@@ -121,7 +121,7 @@ class SetConfig(models.Model):return out- def get_config(self, iteration: int):+ def get_config(self, iteration: int) -> SetConfigData:# If there is a custom class set, pass all responsibilities to itif self.class_name:try:@@ -136,6 +136,7 @@ class SetConfig(models.Model):reps_configs=self.repsconfig_set.filter(iteration__lte=iteration),rir_configs=self.rirconfig_set.filter(iteration__lte=iteration),rest_configs=self.restconfig_set.filter(iteration__lte=iteration),+ logs=self.workoutlog_set.filter(iteration__lte=iteration),)return custom_logic.calculate()@@ -154,7 +155,10 @@ class SetConfig(models.Model):weight_config = self.weightconfig_set.filter(iteration__lte=i).last()reps_config = self.repsconfig_set.filter(iteration__lte=i).last()- if not weight_config.need_log_to_apply and not reps_config.need_log_to_apply:+ if weight_config is None or reps_config is None:+ break++ elif not weight_config.need_log_to_apply and not reps_config.need_log_to_apply:max_iter_weight = imax_iter_reps = idiff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.pyindex fad556cf6..443ea4640 100644--- a/wger/manager/tests/test_routine.py+++ b/wger/manager/tests/test_routine.py@@ -99,6 +99,15 @@ class RoutineTestCase(WgerTestCase):],)+ def test_date_sequences_current(self):+ """+ Test that the correct active day is returned+ """+ self.assertEqual(+ self.routine.current_day(datetime.date(2024, 1, 7)),+ WorkoutDayData(day=self.day1, iteration=3, date=datetime.date(2024, 1, 7), sets=[]),+ )+def test_date_sequences_logs(self):"""Test that the days are correctly outputted in a sequencediff --git a/wger/manager/tests/test_set_config.py b/wger/manager/tests/test_set_config.pyindex 9831b3643..8bd483515 100644--- a/wger/manager/tests/test_set_config.py+++ b/wger/manager/tests/test_set_config.py@@ -41,6 +41,7 @@ class SetConfigTestCase(WgerTestCase):def setUp(self):super().setUp()+self.set_config = SetConfig(set_id=1, exercise_id=1, order=1)self.set_config.save()