Skip to content

Commit 5b8442e

Browse files
committed
Merged in [18185] from rjsparks@nostrum.com:
Only show sessions from the traditional week in the 'week view' used for customized calendars. Partially addresses ietf-tools#3022 until a more general solution can be constructed. - Legacy-Id: 18208 Note: SVN reference [18185] has been migrated to Git commit 55550ce
2 parents cd8d638 + 55550ce commit 5b8442e

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

ietf/meeting/views.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,12 @@ def week_view(request, num=None, name=None, owner=None):
11981198
raise Http404
11991199

12001200
filtered_assignments = schedule.assignments.exclude(timeslot__type__in=['lead','offagenda'])
1201+
# Only show assignments from the traditional meeting "week" (Sat-Fri).
1202+
# We'll determine this using the saturday before the first scheduled regular session.
1203+
first_regular_session_time = meeting.schedule.qs_assignments_with_sessions.filter(session__type_id='regular').order_by('timeslot__time').first().timeslot.time
1204+
saturday_before = first_regular_session_time - datetime.timedelta(days=(first_regular_session_time.weekday() - 5)%7)
1205+
saturday_after = saturday_before + datetime.timedelta(days=7)
1206+
filtered_assignments = filtered_assignments.filter(timeslot__time__gte=saturday_before,timeslot__time__lt=saturday_after)
12011207
filtered_assignments = preprocess_assignments_for_agenda(filtered_assignments, meeting)
12021208

12031209
items = []

0 commit comments

Comments
 (0)