Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add endpoint that returns the day data for a complete iteration

Roland Geider7795c6e74733
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index fcf793ec7..3dc060634 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -115,14 +115,34 @@ class RoutineViewSet(viewsets.ModelViewSet):
"""
Return current day of the routine
"""
- return Response(WorkoutDayDataDisplayModeSerializer(self.get_object().current_day()).data)
+ return Response(WorkoutDayDataDisplayModeSerializer(self.get_object().data_for_day()).data)
@action(detail=True, url_path='current-day-gym-mode')
def current_day_gym_mode(self, request, pk):
"""
Return current day of the routine
"""
- return Response(WorkoutDayDataGymModeSerializer(self.get_object().current_day()).data)
+ return Response(WorkoutDayDataGymModeSerializer(self.get_object().data_for_day()).data)
+
+ @action(detail=True, url_path='current-iteration-display-mode')
+ def current_iteration_display_mode(self, request, pk):
+ """
+ Return current day of the routine
+ """
+ return Response(
+ WorkoutDayDataDisplayModeSerializer(
+ self.get_object().data_for_iteration(),
+ many=True).data
+ )
+
+ @action(detail=True, url_path='current-iteration-gym-mode')
+ def current_iteration_gym_mode(self, request, pk):
+ """
+ Return current day of the routine
+ """
+ return Response(
+ WorkoutDayDataGymModeSerializer(self.get_object().data_for_iteration(), many=True).data
+ )
@action(detail=True)
def structure(self, request, pk):
diff --git a/wger/manager/models/abstract_config.py b/wger/manager/models/abstract_config.py
index fca7c4811..3924058dc 100644
--- a/wger/manager/models/abstract_config.py
+++ b/wger/manager/models/abstract_config.py
@@ -85,3 +85,13 @@ class AbstractChangeConfig(models.Model):
Only apply the change if the user logged the last weight, otherwise
apply the rules anyway
"""
+
+ def save(self, **kwargs):
+ # Override values for the first iteration. While these would be ignored
+ # in the calculations anyway, this is cleaner
+ if self.iteration == 1:
+ self.replace = True
+ self.need_log_to_apply = False
+ self.step = None
+ self.operation = None
+ super().save(**kwargs)
diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.py
index f95ea06ef..b078a25dc 100644
--- a/wger/manager/models/routine.py
+++ b/wger/manager/models/routine.py
@@ -216,7 +216,7 @@ class Routine(models.Model):
return out
- def current_day(self, date=None) -> WorkoutDayData | None:
+ def data_for_day(self, date=None) -> WorkoutDayData | None:
"""
Return the WorkoutDayData for the specified day. If no date is given, return
the results for "today"
@@ -229,3 +229,27 @@ class Routine(models.Model):
return data
return None
+
+ def data_for_iteration(self, iteration: int | None = None) -> List[WorkoutDayData]:
+ """
+ Return the WorkoutDayData entries for the specified iteration. If no iteration
+ is given, return the results for the one for "today". If none could be found,
+ return the data for the first one
+ """
+
+ if iteration is None:
+ for data in self.date_sequence:
+ if data.date == datetime.date.today():
+ iteration = data.iteration
+ break
+
+ if iteration is None:
+ iteration = 1
+
+ out = []
+
+ for data in self.date_sequence:
+ if data.iteration == iteration:
+ out.append(data)
+
+ return out
diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.py
index ff8967cad..5f0854a54 100644
--- a/wger/manager/tests/test_routine.py
+++ b/wger/manager/tests/test_routine.py
@@ -234,7 +234,7 @@ class RoutineTestCase(WgerTestCase):
Test that the correct active day is returned
"""
self.assertEqual(
- self.routine.current_day(datetime.date(2024, 1, 7)),
+ self.routine.data_for_day(datetime.date(2024, 1, 7)),
WorkoutDayData(day=self.day1, iteration=3, date=datetime.date(2024, 1, 7)),
)