Skip to content

feat: optionally hide room-only schedule diffs #9861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 2 commits into from
Nov 3, 2025
Merged

feat: optionally hide room-only schedule diffs #9861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a27f8f
feat: optionally hide room-only schedule diffs
jennifer-richards Nov 1, 2025
35db889
test: update test
jennifer-richards Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 138 additions & 56 deletions ietf/meeting/tests_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@
from ietf.meeting.helpers import send_interim_minutes_reminder, populate_important_dates, update_important_dates
from ietf.meeting.models import Session, TimeSlot, Meeting, SchedTimeSessAssignment, Schedule, SessionPresentation, SlideSubmission, SchedulingEvent, Room, Constraint, ConstraintName
from ietf.meeting.test_data import make_meeting_test_data, make_interim_meeting, make_interim_test_data
from ietf.meeting.utils import condition_slide_order, generate_proceedings_content
from ietf.meeting.utils import (
condition_slide_order,
generate_proceedings_content,
diff_meeting_schedules,
)
from ietf.meeting.utils import add_event_info_to_session_qs, participants_for_meeting
from ietf.meeting.utils import create_recording, delete_recording, get_next_sequence, bluesheet_data
from ietf.meeting.views import session_draft_list, parse_agenda_filter_params, sessions_post_save, agenda_extract_schedule
Expand Down Expand Up @@ -4765,73 +4769,151 @@ def test_list_schedules(self):
self.assertTrue(r.status_code, 200)

def test_diff_schedules(self):
meeting = make_meeting_test_data()

url = urlreverse('ietf.meeting.views.diff_schedules',kwargs={'num':meeting.number})
login_testing_unauthorized(self,"secretary", url)
r = self.client.get(url)
self.assertTrue(r.status_code, 200)

from_schedule = Schedule.objects.get(meeting=meeting, name="test-unofficial-schedule")

session1 = Session.objects.filter(meeting=meeting, group__acronym='mars').first()
session2 = Session.objects.filter(meeting=meeting, group__acronym='ames').first()
session3 = SessionFactory(meeting=meeting, group=Group.objects.get(acronym='mars'),
attendees=10, requested_duration=datetime.timedelta(minutes=70),
add_to_schedule=False)
SchedulingEvent.objects.create(session=session3, status_id='schedw', by=Person.objects.first())

slot2 = TimeSlot.objects.filter(meeting=meeting, type='regular').order_by('-time').first()
slot3 = TimeSlot.objects.create(
meeting=meeting, type_id='regular', location=slot2.location,
duration=datetime.timedelta(minutes=60),
time=slot2.time + datetime.timedelta(minutes=60),
# Create meeting and some time slots
meeting = MeetingFactory(type_id="ietf", populate_schedule=False)
rooms = RoomFactory.create_batch(2, meeting=meeting)
# first index is room, second is time
timeslots = [
[
TimeSlotFactory(
location=room,
meeting=meeting,
time=datetime.datetime.combine(
meeting.date, datetime.time(9, 0, tzinfo=datetime.UTC)
)
),
TimeSlotFactory(
location=room,
meeting=meeting,
time=datetime.datetime.combine(
meeting.date, datetime.time(10, 0, tzinfo=datetime.UTC)
)
),
TimeSlotFactory(
location=room,
meeting=meeting,
time=datetime.datetime.combine(
meeting.date, datetime.time(11, 0, tzinfo=datetime.UTC)
)
),
]
for room in rooms
]
sessions = SessionFactory.create_batch(
5, meeting=meeting, add_to_schedule=False
)

# copy
new_url = urlreverse("ietf.meeting.views.new_meeting_schedule", kwargs=dict(num=meeting.number, owner=from_schedule.owner_email(), name=from_schedule.name))
r = self.client.post(new_url, {
'name': "newtest",
'public': "on",
})
self.assertNoFormPostErrors(r)
from_schedule = ScheduleFactory(meeting=meeting)
to_schedule = ScheduleFactory(meeting=meeting)

to_schedule = Schedule.objects.get(meeting=meeting, name='newtest')
# sessions[0]: not scheduled in from_schedule, scheduled in to_schedule
SchedTimeSessAssignment.objects.create(
schedule=to_schedule,
session=sessions[0],
timeslot=timeslots[0][0],
)
# sessions[1]: scheduled in from_schedule, not scheduled in to_schedule
SchedTimeSessAssignment.objects.create(
schedule=from_schedule,
session=sessions[1],
timeslot=timeslots[0][0],
)
# sessions[2]: moves rooms, not time
SchedTimeSessAssignment.objects.create(
schedule=from_schedule,
session=sessions[2],
timeslot=timeslots[0][1],
)
SchedTimeSessAssignment.objects.create(
schedule=to_schedule,
session=sessions[2],
timeslot=timeslots[1][1],
)
# sessions[3]: moves time, not room
SchedTimeSessAssignment.objects.create(
schedule=from_schedule,
session=sessions[3],
timeslot=timeslots[1][1],
)
SchedTimeSessAssignment.objects.create(
schedule=to_schedule,
session=sessions[3],
timeslot=timeslots[1][2],
)
# sessions[4]: moves room and time
SchedTimeSessAssignment.objects.create(
schedule=from_schedule,
session=sessions[4],
timeslot=timeslots[1][0],
)
SchedTimeSessAssignment.objects.create(
schedule=to_schedule,
session=sessions[4],
timeslot=timeslots[0][2],
)

# make some changes
# Check the raw diffs
raw_diffs = diff_meeting_schedules(from_schedule, to_schedule)
self.assertCountEqual(
raw_diffs,
[
{
"change": "schedule",
"session": sessions[0].pk,
"to": timeslots[0][0].pk,
},
{
"change": "unschedule",
"session": sessions[1].pk,
"from": timeslots[0][0].pk,
},
{
"change": "move",
"session": sessions[2].pk,
"from": timeslots[0][1].pk,
"to": timeslots[1][1].pk,
},
{
"change": "move",
"session": sessions[3].pk,
"from": timeslots[1][1].pk,
"to": timeslots[1][2].pk,
},
{
"change": "move",
"session": sessions[4].pk,
"from": timeslots[1][0].pk,
"to": timeslots[0][2].pk,
},
]
)

edit_url = urlreverse("ietf.meeting.views.edit_meeting_schedule", kwargs=dict(num=meeting.number, owner=to_schedule.owner_email(), name=to_schedule.name))
# Check the view
url = urlreverse("ietf.meeting.views.diff_schedules",
kwargs={"num": meeting.number})
login_testing_unauthorized(self, "secretary", url)
r = self.client.get(url)
self.assertTrue(r.status_code, 200)

# schedule session
r = self.client.post(edit_url, {
'action': 'assign',
'timeslot': slot3.pk,
'session': session3.pk,
})
self.assertEqual(json.loads(r.content)['success'], True)
# unschedule session
r = self.client.post(edit_url, {
'action': 'unassign',
'session': session1.pk,
})
self.assertEqual(json.loads(r.content)['success'], True)
# move session
r = self.client.post(edit_url, {
'action': 'assign',
'timeslot': slot2.pk,
'session': session2.pk,
# with show room changes disabled - does not show sessions[2] because it did
# not change time
r = self.client.get(url, {
"from_schedule": from_schedule.name,
"to_schedule": to_schedule.name,
})
self.assertEqual(json.loads(r.content)['success'], True)
self.assertTrue(r.status_code, 200)
q = PyQuery(r.content)
self.assertEqual(len(q(".schedule-diffs tr")), 4 + 1)

# now get differences
# with show room changes enabled - shows all changes
r = self.client.get(url, {
'from_schedule': from_schedule.name,
'to_schedule': to_schedule.name,
"from_schedule": from_schedule.name,
"to_schedule": to_schedule.name,
"show_room_changes": "on",
})
self.assertTrue(r.status_code, 200)

q = PyQuery(r.content)
self.assertEqual(len(q(".schedule-diffs tr")), 3+1)
self.assertEqual(len(q(".schedule-diffs tr")), 5 + 1)

def test_delete_schedule(self):
url = urlreverse('ietf.meeting.views.delete_schedule',
Expand Down
13 changes: 13 additions & 0 deletions ietf/meeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,6 +1675,11 @@ def list_schedules(request, num):
class DiffSchedulesForm(forms.Form):
from_schedule = forms.ChoiceField()
to_schedule = forms.ChoiceField()
show_room_changes = forms.BooleanField(
initial=False,
required=False,
help_text="Include changes to room without a date or time change",
)

def __init__(self, meeting, user, *args, **kwargs):
super().__init__(*args, **kwargs)
Expand Down Expand Up @@ -1707,6 +1712,14 @@ def diff_schedules(request, num):
raw_diffs = diff_meeting_schedules(from_schedule, to_schedule)

diffs = prefetch_schedule_diff_objects(raw_diffs)
if not form.cleaned_data["show_room_changes"]:
# filter out room-only changes
diffs = [
d
for d in diffs
if (d["change"] != "move") or (d["from"].time != d["to"].time)
]

for d in diffs:
s = d['session']
s.session_label = s.short_name
Expand Down
Loading