Self hosted FLOSS fitness/workout, nutrition and weight tracker
Handle last_day_in_week flag
Roland Geider1506f8b48dc3
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex c4fa2f10d..ae3dea16d 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -72,11 +72,12 @@ class DayNgSerializer(serializers.ModelSerializer):model = DayNgfields = ('id',+ 'next_day','name','description','is_rest',+ 'last_day_in_week','need_logs_to_advance',- 'next_day',)diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.pyindex dac6114d9..9b40b5d23 100644--- a/wger/manager/dataclasses.py+++ b/wger/manager/dataclasses.py@@ -59,8 +59,11 @@ class SlotData:class WorkoutDayData:day: 'DayNg'date: datetime.date- iteration: int+ iteration: int | None@propertydef slots(self) -> List[SlotData]:+ if not self.day:+ return []+return self.day.get_slots(self.iteration)diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.pyindex e1429561b..dd7212073 100644--- a/wger/manager/migrations/0018_flexible_routines.py+++ b/wger/manager/migrations/0018_flexible_routines.py@@ -27,6 +27,7 @@ class Migration(migrations.Migration):('name', models.CharField(max_length=20, verbose_name='Description')),('description', models.CharField(max_length=250, verbose_name='Description')),('is_rest', models.BooleanField(default=False)),+ ('last_day_in_week', models.BooleanField(default=False)),('need_logs_to_advance', models.BooleanField(default=False)),('next_day',diff --git a/wger/manager/models/day.py b/wger/manager/models/day.pyindex 625168d7d..913e0ff6a 100644--- a/wger/manager/models/day.py+++ b/wger/manager/models/day.py@@ -71,6 +71,13 @@ class DayNg(models.Model):Needs logs to advance to the next day"""+ last_day_in_week = models.BooleanField(+ default=False,+ )+ """+ Flag indicating that this is the last workout day in the week+ """+def __str__(self):"""Return a more human-readable representationdiff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex f979547a6..e1347cf70 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -158,6 +158,7 @@ class Routine(models.Model):current_date = self.startcurrent_day = self.first_daycounter = Counter()+ skip_til_date = Noneout = []@@ -165,7 +166,21 @@ class Routine(models.Model):return outwhile current_date <= self.end:++ # Fill all days till the end of the week with empty workout days+ if skip_til_date:+ out.append(WorkoutDayData(iteration=None, date=current_date, day=None))+ current_date += delta+ if current_date == skip_til_date:+ skip_til_date = None+ continue+counter[current_day] += 1++ if current_day.last_day_in_week:+ days_til_monday = 7 - current_date.weekday()+ skip_til_date = current_date + datetime.timedelta(days=days_til_monday)+out.append(WorkoutDayData(iteration=counter[current_day], date=current_date, day=current_day))diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.pyindex 8e74ece2f..d240e4ee8 100644--- a/wger/manager/tests/test_routine.py+++ b/wger/manager/tests/test_routine.py@@ -99,6 +99,33 @@ class RoutineTestCase(WgerTestCase):],)+ def test_date_sequence_week_skip(self):+ """+ Test that the last_day_in_week flag works+ """++ self.day3.last_day_in_week = True+ self.day3.save()++ self.assertListEqual(+ self.routine.date_sequence,+ [+ # Monday+ WorkoutDayData(day=self.day1, iteration=1, date=datetime.date(2024, 1, 1)),+ WorkoutDayData(day=self.day2, iteration=1, date=datetime.date(2024, 1, 2)),+ WorkoutDayData(day=self.day3, iteration=1, date=datetime.date(2024, 1, 3)),+ WorkoutDayData(day=None, iteration=None, date=datetime.date(2024, 1, 4)),+ WorkoutDayData(day=None, iteration=None, date=datetime.date(2024, 1, 5)),+ WorkoutDayData(day=None, iteration=None, date=datetime.date(2024, 1, 6)),+ WorkoutDayData(day=None, iteration=None, date=datetime.date(2024, 1, 7)),++ # Monday+ WorkoutDayData(day=self.day1, iteration=2, date=datetime.date(2024, 1, 8)),+ WorkoutDayData(day=self.day2, iteration=2, date=datetime.date(2024, 1, 9)),+ WorkoutDayData(day=self.day3, iteration=2, date=datetime.date(2024, 1, 10)),+ ],+ )+def test_date_sequences_current(self):"""Test that the correct active day is returned