Add support in the new meeting schedule editor for making a tombstone

session when rescheduling a session after the schedule is made the
official meeting schedule.

Show both cancelled and rescheduled sessions as tombstones in the new
meeting schedule editor.

Add support for showing rescheduled tombstones in the meeting agenda
views.

Adjust the Secretariat session tool so that it's not possible to
(re)cancel cancelled or rescheduled tombstones.
 - Legacy-Id: 18108

Author: OleLaursen

ietf/meeting/helpers.py

@@ -212,10 +212,15 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
     parents = Group.objects.filter(pk__in=parent_id_set)
     parent_replacements = find_history_replacements_active_at(parents, meeting_time)
 
+    timeslot_by_session_pk = {a.session_id: a.timeslot for a in assignments}
+
     for a in assignments:
         if a.session and a.session.historic_group and a.session.historic_group.parent_id:
             a.session.historic_group.historic_parent = parent_replacements.get(a.session.historic_group.parent_id)
 
+        if a.session.current_status == 'resched':
+            a.session.rescheduled_to = timeslot_by_session_pk.get(a.session.tombstone_for_id)
+
         for d in a.session.prefetched_active_materials:
             # make sure these are precomputed with the meeting instead
             # of having to look it up

ietf/meeting/migrations/0029_session_tombstone_for.py

@@ -0,0 +1,19 @@
+# Copyright The IETF Trust 2020, All Rights Reserved
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0028_auto_20200501_0139'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='session',
+            name='tombstone_for',
+            field=models.ForeignKey(blank=True, help_text='This session is the tombstone for a session that was rescheduled', null=True, on_delete=django.db.models.deletion.CASCADE, to='meeting.Session'),
+        ),
+    ]

ietf/meeting/models.py

@@ -923,6 +923,8 @@ class Session(models.Model):
     modified = models.DateTimeField(auto_now=True)
     remote_instructions = models.CharField(blank=True,max_length=1024)
 
+    tombstone_for = models.ForeignKey('Session', blank=True, null=True, help_text="This session is the tombstone for a session that was rescheduled", on_delete=models.CASCADE)
+
     materials = models.ManyToManyField(Document, through=SessionPresentation, blank=True)
     resources = models.ManyToManyField(ResourceAssociation, blank=True)
 

ietf/meeting/tests_js.py

@@ -16,9 +16,11 @@
 
 from ietf.doc.factories import DocumentFactory
 from ietf.group import colors
+from ietf.person.models import Person
 from ietf.meeting.factories import SessionFactory
 from ietf.meeting.test_data import make_meeting_test_data
 from ietf.meeting.models import Schedule, SchedTimeSessAssignment, Session, Room, TimeSlot, Constraint, ConstraintName
+from ietf.meeting.models import SchedulingEvent, SessionStatusName
 from ietf.utils.test_runner import IetfLiveServerTestCase
 from ietf.utils.pipe import pipe
 from ietf import settings
@@ -107,6 +109,12 @@ def test_edit_meeting_schedule(self):
 
         s2b = Session.objects.create(meeting=meeting, group=s2.group, attendees=10, requested_duration=datetime.timedelta(minutes=60), type_id='regular')
 
+        SchedulingEvent.objects.create(
+            session=s2b,
+            status=SessionStatusName.objects.get(slug='appr'),
+            by=Person.objects.get(name='(System)'),
+        )
+
         Constraint.objects.create(
             meeting=meeting,
             source=s1.group,
@@ -226,7 +234,7 @@ def test_edit_meeting_schedule(self):
         self.assertTrue(s1_element.is_displayed())
 
         # hide timeslots
-        self.driver.find_element_by_css_selector(".timeslot-group-toggles button".format(s1.group.parent.acronym)).click()
+        self.driver.find_element_by_css_selector(".timeslot-group-toggles button").click()
         self.assertTrue(self.driver.find_element_by_css_selector("#timeslot-group-toggles-modal").is_displayed())
         self.driver.find_element_by_css_selector("#timeslot-group-toggles-modal [value=\"{}\"]".format("ts-group-{}-{}".format(slot2.time.strftime("%Y%m%d-%H%M"), int(slot2.duration.total_seconds() / 60)))).click()
         self.driver.find_element_by_css_selector("#timeslot-group-toggles-modal [data-dismiss=\"modal\"]").click()

ietf/meeting/tests_views.py

@@ -1049,10 +1049,14 @@ def test_edit_meeting_schedule(self):
         self.assertEqual(r.status_code, 403)
 
         # turn us into owner
-        meeting.schedule.owner = Person.objects.get(user__username="secretary")
-        meeting.schedule.save()
+        schedule = meeting.schedule
+        schedule.owner = Person.objects.get(user__username="secretary")
+        schedule.save()
+
+        meeting.schedule = None
+        meeting.save()
 
-        url = urlreverse("ietf.meeting.views.edit_meeting_schedule", kwargs=dict(num=meeting.number, owner=meeting.schedule.owner_email(), name=meeting.schedule.name))
+        url = urlreverse("ietf.meeting.views.edit_meeting_schedule", kwargs=dict(num=meeting.number, owner=schedule.owner_email(), name=schedule.name))
         r = self.client.get(url)
         q = PyQuery(r.content)
         self.assertTrue(not q("em:contains(\"You can't edit this schedule\")"))
@@ -1065,25 +1069,52 @@ def test_edit_meeting_schedule(self):
             'timeslot': timeslots[0].pk,
             'session': s1.pk,
         })
-        self.assertEqual(r.content, b"OK")
-        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=meeting.schedule, session=s1).timeslot, timeslots[0])
+        self.assertEqual(json.loads(r.content)['success'], True)
+        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=schedule, session=s1).timeslot, timeslots[0])
 
-        # move assignment
+        # move assignment on unofficial schedule
         r = self.client.post(url, {
             'action': 'assign',
             'timeslot': timeslots[1].pk,
             'session': s1.pk,
         })
-        self.assertEqual(r.content, b"OK")
-        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=meeting.schedule, session=s1).timeslot, timeslots[1])
+        self.assertEqual(json.loads(r.content)['success'], True)
+        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=schedule, session=s1).timeslot, timeslots[1])
+
+        # move assignment on official schedule, leaving tombstone
+        meeting.schedule = schedule
+        meeting.save()
+        SchedulingEvent.objects.create(
+            session=s1,
+            status=SessionStatusName.objects.get(slug='sched'),
+            by=Person.objects.get(name='(System)')
+        )
+        r = self.client.post(url, {
+            'action': 'assign',
+            'timeslot': timeslots[0].pk,
+            'session': s1.pk,
+        })
+        json_content = json.loads(r.content)
+        self.assertEqual(json_content['success'], True)
+        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=schedule, session=s1).timeslot, timeslots[0])
+
+        sessions_for_group = Session.objects.filter(group=s1.group, meeting=meeting)
+        self.assertEqual(len(sessions_for_group), 2)
+        s_tombstone = [s for s in sessions_for_group if s != s1][0]
+        self.assertEqual(s_tombstone.tombstone_for, s1)
+        tombstone_event = SchedulingEvent.objects.get(session=s_tombstone)
+        self.assertEqual(tombstone_event.status_id, 'resched')
+
+        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=schedule, session=s_tombstone).timeslot, timeslots[1])
+        self.assertTrue(PyQuery(json_content['tombstone'])("#session{}.tombstone".format(s_tombstone.pk)).html())
 
         # unassign
         r = self.client.post(url, {
             'action': 'unassign',
             'session': s1.pk,
         })
-        self.assertEqual(r.content, b"OK")
-        self.assertEqual(list(SchedTimeSessAssignment.objects.filter(schedule=meeting.schedule, session=s1)), [])
+        self.assertEqual(json.loads(r.content)['success'], True)
+        self.assertEqual(list(SchedTimeSessAssignment.objects.filter(schedule=schedule, session=s1)), [])
 
 
     def test_copy_meeting_schedule(self):