diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py index 9e34165..851ed5f 100644 --- a/src/agenda_culturel/calendar.py +++ b/src/agenda_culturel/calendar.py @@ -408,7 +408,7 @@ class CalendarList: def nb_days(self): return (self.c_lastdate - self.c_firstdate).days + 1 - def time_intervals_list(self, onlyfirst=False): + def time_intervals_list(self): ds = self.calendar_days_list() result = [] for d in ds: @@ -416,12 +416,11 @@ class CalendarList: for t in tis: if len(t.events) > 0: result.append(t) - if onlyfirst: - break - return result - def time_intervals_list_first(self): - return self.time_intervals_list(True) + for i, ti in enumerate(result)[:-1]: + result[i].set_not_last() + + return result def export_to_ics(self, request): from .models import Event diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html index 2a74365..ae88c52 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-week.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html @@ -214,17 +214,19 @@ {% endfor %} - {% if day.is_today_after_events %} -