Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Set the iteration for calculated rest days as well

Roland Geiderde7655caef69
diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.py
index 6df650628..2bd312cc0 100644
--- a/wger/manager/models/routine.py
+++ b/wger/manager/models/routine.py
@@ -183,13 +183,13 @@ class Routine(models.Model):
if skip_til_date:
out.append(
WorkoutDayData(
- iteration=None,
+ iteration=counter[current_day],
date=current_date,
day=None,
label=labels.get(current_date),
)
)
- # current_date += delta
+ current_date += delta
if current_date == skip_til_date:
skip_til_date = None
continue
diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.py
index 5f0854a54..1356970f3 100644
--- a/wger/manager/tests/test_routine.py
+++ b/wger/manager/tests/test_routine.py
@@ -185,25 +185,25 @@ class RoutineTestCase(WgerTestCase):
),
WorkoutDayData(
day=None,
- iteration=None,
+ iteration=1,
date=datetime.date(2024, 1, 4),
label='First label',
),
WorkoutDayData(
day=None,
- iteration=None,
+ iteration=1,
date=datetime.date(2024, 1, 5),
label='Second label',
),
WorkoutDayData(
day=None,
- iteration=None,
+ iteration=1,
date=datetime.date(2024, 1, 6),
label='Second label',
),
WorkoutDayData(
day=None,
- iteration=None,
+ iteration=1,
date=datetime.date(2024, 1, 7),
label=None,
),
@@ -259,7 +259,7 @@ class RoutineTestCase(WgerTestCase):
user_id=1,
date=date,
day=self.day1,
- workout_id=1,
+ routine_id=1,
)
session.save()