From 55550ce9e656335b1aede2126721144e07e09bfc Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 16 Jul 2020 21:24:05 +0000 Subject: [PATCH] Only show sessions from the traditional week in the "week view" used for customized calendars. Partially addresses #3022 until a more general solution can be constructed. - Legacy-Id: 18185 --- ietf/meeting/views.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 8c63dcd58..c40efac6f 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -1198,6 +1198,12 @@ def week_view(request, num=None, name=None, owner=None): raise Http404 filtered_assignments = schedule.assignments.exclude(timeslot__type__in=['lead','offagenda']) + # Only show assignments from the traditional meeting "week" (Sat-Fri). + # We'll determine this using the saturday before the first scheduled regular session. + first_regular_session_time = meeting.schedule.qs_assignments_with_sessions.filter(session__type_id='regular').order_by('timeslot__time').first().timeslot.time + saturday_before = first_regular_session_time - datetime.timedelta(days=(first_regular_session_time.weekday() - 5)%7) + saturday_after = saturday_before + datetime.timedelta(days=7) + filtered_assignments = filtered_assignments.filter(timeslot__time__gte=saturday_before,timeslot__time__lt=saturday_after) filtered_assignments = preprocess_assignments_for_agenda(filtered_assignments, meeting) items = []