fix: Use session.order_in_meeting() in the agenda (#5222)

This commit is contained in:
Jennifer Richards 2023-02-27 14:18:12 -04:00 committed by GitHub
parent 5c9a3642bd
commit a2bdd3109c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -124,7 +124,7 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
# check before blindly assigning to meeting just in case.
if a.session.meeting.pk == meeting.pk:
a.session.meeting = meeting
a.session.order_number = None
a.session.order_number = a.session.order_in_meeting() if a.session.group else None
if a.session.group and a.session.group not in groups:
groups.append(a.session.group)
@ -134,12 +134,6 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
if a.session and a.session.group:
sessions_for_groups[(a.session.group, a.session.type_id)].append(a)
for a in assignments:
if a.session and a.session.group:
l = sessions_for_groups.get((a.session.group, a.session.type_id), [])
a.session.order_number = l.index(a) + 1 if a in l else 0
timeslot_by_session_pk = {a.session_id: a.timeslot for a in assignments}
for a in assignments: