From 0ae9c399dd8c6aeb646fcd8d5d279e99ea46872a Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Thu, 14 Nov 2024 23:40:52 +0100 Subject: [PATCH] =?UTF-8?q?Par=20d=C3=A9faut,=20un=20=C3=A9v=C3=A9nemnt=20?= =?UTF-8?q?dure=202=20heures=20quand=20on=20calcule=20les=20intersections?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/models.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index 0f498e9..279258f 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -1385,11 +1385,13 @@ class Event(models.Model): self.current_date = date def get_start_end_datetimes(self, day): + start_h = time().min if self.start_day == day: if self.start_time is None: dtstart = datetime.combine(self.start_day, time().min) else: dtstart = datetime.combine(self.start_day, self.start_time) + start_h = self.start_time else: dtstart = datetime.combine(day, time().min) @@ -1397,7 +1399,10 @@ class Event(models.Model): if end_day == day: if self.end_time is None: - dtend = datetime.combine(end_day, time().max) + if end_day == self.start_day: + dtend = dtstart + timedelta(hours=2) + else: + dtend = datetime.combine(end_day, time().max) else: dtend = datetime.combine(end_day, self.end_time) else: