From 2052faa8d1c71c7a59d7662e00e048fa72e96dc2 Mon Sep 17 00:00:00 2001 From: Ildar Iskhakov Date: Wed, 23 Nov 2022 20:19:52 +0800 Subject: [PATCH] Fix web oncall calendars not loading (#891) * Fix oncall schedules bug * Update custom_on_call_shift.py --- engine/apps/schedules/models/custom_on_call_shift.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engine/apps/schedules/models/custom_on_call_shift.py b/engine/apps/schedules/models/custom_on_call_shift.py index 96cc2db2..27d26ceb 100644 --- a/engine/apps/schedules/models/custom_on_call_shift.py +++ b/engine/apps/schedules/models/custom_on_call_shift.py @@ -373,6 +373,8 @@ class CustomOnCallShift(models.Model): expected_start_day = min(CustomOnCallShift.ICAL_WEEKDAY_REVERSE_MAP[d] for d in self.by_day) delta = (expected_start_day - start.weekday()) % 7 start = start + timezone.timedelta(days=delta) + if self.until is not None: + self.until = self.until + timezone.timedelta(days=delta) if self.frequency == CustomOnCallShift.FREQUENCY_DAILY and self.by_day: result = self._daily_by_day_to_ical(time_zone, start, users_queue)