From 2b48a210aef938f4f7759d38ae3589774db9ef18 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sat, 11 Nov 2023 21:38:33 +0100 Subject: [PATCH] =?UTF-8?q?si=20un=20=C3=A9v=C3=A9nement=20fini=20le=20mat?= =?UTF-8?q?in=20t=C3=B4t,=20il=20n'est=20pas=20indiqu=C3=A9=20dans=20le=20?= =?UTF-8?q?jour=20concern=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/views.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index 89c39fc..a1eb26b 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -64,16 +64,24 @@ class CalendarDay: def is_today(self): return self.today + def is_event_finishing_early_in_this_day(self, event): + if event.end_day is None or event.end_time is None: + return False + if event.start_day == event.end_day: + return False + return event.end_day == self.date and event.end_time < time(4) + def add_event(self, event): - self.events.append(event) - if event.category is None: - if not "" in self.events_by_category: - self.events_by_category[""] = [] - self.events_by_category[""].append(event) - else: - if not event.category.name in self.events_by_category: - self.events_by_category[event.category.name] = [] - self.events_by_category[event.category.name].append(event) + if not self.is_event_finishing_early_in_this_day(event): + self.events.append(event) + if event.category is None: + if not "" in self.events_by_category: + self.events_by_category[""] = [] + self.events_by_category[""].append(event) + else: + if not event.category.name in self.events_by_category: + self.events_by_category[event.category.name] = [] + self.events_by_category[event.category.name].append(event) def filter_events(self): self.events.sort(key=lambda e: CalendarDay.midnight if e.start_time is None else e.start_time)