diff --git a/home/models.py b/home/models.py index 0be80d654a2a85b6e7b0d54a97becd9b86e631b2..7d8cf079e05cdfb6720d17e7d6c8fd47c7763c0a 100644 --- a/home/models.py +++ b/home/models.py @@ -191,7 +191,7 @@ class InterludesSlot(models.Model): settings = SiteSettings.load() if settings.date_start: return timezone.datetime.combine( - settings.date_start, + settings.date_start + datetime.timedelta(days=InterludesSlot.relative_day(date)), date.time(), timezone.get_current_timezone() ) @@ -213,7 +213,10 @@ class InterludesSlot(models.Model): @property def planning_end(self) -> int: - return self.fake_date(self.end) + end = self.fake_date(self.end) + if end and end <= self.planning_start: + end += datetime.timedelta(days = 1) + return end def __str__(self) -> str: return self.title.replace(self.TITLE_SPECIFIER, self.activity.title)