Add support for displaying constraint hints when scheduling a task and

for displaying violated constraints in the new schedule editor, with
the old of a new field, ConstraintName.editor_label.

Add support for displaying room capacity violations.

Add support for selecting a session and displaying information about
it similar to the existing scheduling editor.

Add support for sorting unassigned sessions.

Clean up markup and styles a bit, and fix some bugs.

Expand HTML-based test and add JS test that exercises the
Javascript-based functionality.

Switch to using Chrome driver instead of PhantomJS since the HTML
engine in PhantomJS is apparently too old to support the constructs in
the new schema editor.

Add a workaround for LiveServerTestCase clashing with IetfTestRunner
fixture loading.
 - Legacy-Id: 17519

Author: OleLaursen

docker/Dockerfile

@@ -54,6 +54,7 @@ RUN apt-get install -qy \
 	build-essential \
 	bzip2 \
 	ca-certificates \
+	chromium-driver \
 	colordiff \
 	gawk \
 	gcc \
@@ -139,15 +140,6 @@ RUN wget -q https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm get-
 RUN pip install certifi
 RUN pip install virtualenv
 
-# Phantomjs
-WORKDIR /usr/local
-
-RUN wget -qN https://tools.ietf.org/tar/phantomjs-1.9.8-linux-x86_64.tar.bz2
-RUN tar xjf phantomjs-1.9.8-linux-x86_64.tar.bz2
-
-WORKDIR /usr/local/bin
-RUN ln -s /usr/local/phantomjs-1.9.8-linux-x86_64/bin/phantomjs .
-
 # idnits and dependencies
 ADD https://tools.ietf.org/tools/idnits/idnits /usr/local/bin/
 RUN chmod +rx /usr/local/bin/idnits

ietf/meeting/test_data.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
+# Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -101,11 +101,11 @@ def make_meeting_test_data(meeting=None):
     # slots
     session_date = meeting.date + datetime.timedelta(days=1)
     slot1 = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
-                                    duration=datetime.timedelta(minutes=30),
+                                    duration=datetime.timedelta(minutes=60),
                                     time=datetime.datetime.combine(session_date, datetime.time(9, 30)))
     slot2 = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
-                                    duration=datetime.timedelta(minutes=30),
-                                    time=datetime.datetime.combine(session_date, datetime.time(10, 30)))
+                                    duration=datetime.timedelta(minutes=60),
+                                    time=datetime.datetime.combine(session_date, datetime.time(10, 50)))
     breakfast_slot = TimeSlot.objects.create(meeting=meeting, type_id="lead", location=breakfast_room,
                                     duration=datetime.timedelta(minutes=90),
                                     time=datetime.datetime.combine(session_date, datetime.time(7,0)))
@@ -118,7 +118,7 @@ def make_meeting_test_data(meeting=None):
     # mars WG
     mars = Group.objects.get(acronym='mars')
     mars_session = Session.objects.create(meeting=meeting, group=mars,
-                                          attendees=10, requested_duration=datetime.timedelta(minutes=20),
+                                          attendees=10, requested_duration=datetime.timedelta(minutes=50),
                                           type_id='regular')
     SchedulingEvent.objects.create(session=mars_session, status_id='schedw', by=system_person)
     SchedTimeSessAssignment.objects.create(timeslot=slot1, session=mars_session, schedule=schedule)
@@ -127,7 +127,7 @@ def make_meeting_test_data(meeting=None):
     # ames WG
     ames_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="ames"),
                                           attendees=10,
-                                          requested_duration=datetime.timedelta(minutes=20),
+                                          requested_duration=datetime.timedelta(minutes=60),
                                           type_id='regular')
     SchedulingEvent.objects.create(session=ames_session, status_id='schedw', by=system_person)
     SchedTimeSessAssignment.objects.create(timeslot=slot2, session=ames_session, schedule=schedule)
@@ -136,7 +136,7 @@ def make_meeting_test_data(meeting=None):
     # IESG breakfast
     iesg_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="iesg"),
                                           name="IESG Breakfast", attendees=25,
-                                          requested_duration=datetime.timedelta(minutes=20),
+                                          requested_duration=datetime.timedelta(minutes=60),
                                           type_id="lead")
     SchedulingEvent.objects.create(session=iesg_session, status_id='schedw', by=system_person)
     SchedTimeSessAssignment.objects.create(timeslot=breakfast_slot, session=iesg_session, schedule=schedule)

ietf/meeting/tests_js.py

@@ -34,7 +34,7 @@
 from ietf.meeting.helpers import send_interim_approval_request
 from ietf.meeting.helpers import send_interim_cancellation_notice
 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
+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
 from ietf.meeting.utils import finalize, condition_slide_order
 from ietf.meeting.utils import add_event_info_to_session_qs
@@ -921,29 +921,86 @@ def test_edit_meeting_schedule(self):
 
         self.client.login(username="secretary", password="secretary+password")
 
-        # check we have the grid and everything set up
+        s1 = Session.objects.filter(meeting=meeting, type='regular').first()
+        s2 = Session.objects.filter(meeting=meeting, type='regular').exclude(group=s1.group).first()
+        s1.comments = "Hello world!"
+        s1.attendees = 1234
+        s1.save()
+
+        Constraint.objects.create(
+            meeting=meeting,
+            source=s1.group,
+            target=s2.group,
+            name=ConstraintName.objects.get(slug="conflict"),
+        )
+
+        p = Person.objects.all().first()
+
+        Constraint.objects.create(
+            meeting=meeting,
+            source=s1.group,
+            person=p,
+            name=ConstraintName.objects.get(slug="bethere"),
+        )
+        
+        Constraint.objects.create(
+            meeting=meeting,
+            source=s2.group,
+            person=p,
+            name=ConstraintName.objects.get(slug="bethere"),
+        )
+        
+        # check we have the grid and everything set up as a baseline -
+        # the Javascript tests check that the Javascript can work with
+        # it
         url = urlreverse("ietf.meeting.views.edit_meeting_schedule", kwargs=dict(num=meeting.number))
         r = self.client.get(url)
         q = PyQuery(r.content)
 
         room = Room.objects.get(meeting=meeting, session_types='regular')
-        self.assertTrue(q("h5:contains(\"{}\")".format(room.name)))
-        self.assertTrue(q("h5:contains(\"{}\")".format(room.capacity)))
+        self.assertTrue(q(".room-name:contains(\"{}\")".format(room.name)))
+        self.assertTrue(q(".room-name:contains(\"{}\")".format(room.capacity)))
 
         timeslots = TimeSlot.objects.filter(meeting=meeting, type='regular')
-        self.assertTrue(q("div.timeslot[data-timeslot=\"{}\"]".format(timeslots[0].pk)))
+        self.assertTrue(q("#timeslot{}".format(timeslots[0].pk)))
 
-        sessions = Session.objects.filter(meeting=meeting, type='regular')
-        for s in sessions:
-            self.assertIn(s.group.acronym, q("#session{}".format(s.pk)).text())
+        for s in [s1, s2]:
+            e = q("#session{}".format(s.pk))
 
-        self.assertIn("You can't edit this schedule", r.content)
+            # info in the movable entity
+            self.assertIn(s.group.acronym, e.find(".session-label").text())
+            if s.comments:
+                self.assertTrue(e.find(".comments"))
+            if s.attendees is not None:
+                self.assertIn(str(s.attendees), e.find(".attendees").text())
+            self.assertTrue(e.hasClass("parent-{}".format(s.group.parent.acronym)))
+
+            # session info for the panel
+            self.assertIn(str(s.requested_duration.total_seconds() / 60.0 / 60), e.find(".session-info label").text())
+
+            event = SchedulingEvent.objects.filter(session=s).order_by("id").first()
+            if event:
+                self.assertTrue(e.find("div:contains(\"{}\")".format(event.by.plain_name())))
+
+            if s.comments:
+                self.assertIn(s.comments, e.find(".comments").text())
+
+            # constraints
+            constraints = e.find(".constraints > span")
+            s_other = s2 if s == s1 else s1
+            self.assertEqual(len(constraints), 2)
+            self.assertEqual(constraints.eq(0).attr("data-sessions"), str(s_other.pk))
+            self.assertEqual(constraints.eq(1).attr("data-sessions"), str(s_other.pk))
+            self.assertEqual(constraints.find(".encircled").text(), "1")
+            self.assertEqual(constraints.find(".fa-user-o").parent().text(), "1") # 1 person in the constraint
+
+        self.assertTrue(q("em:contains(\"You can't edit this schedule\")"))
 
         # can't change anything
         r = self.client.post(url, {
             'action': 'assign',
             'timeslot': timeslots[0].pk,
-            'session': sessions[0].pk,
+            'session': s1.pk,
         })
         self.assertEqual(r.status_code, 403)
 
@@ -953,35 +1010,36 @@ def test_edit_meeting_schedule(self):
 
         url = urlreverse("ietf.meeting.views.edit_meeting_schedule", kwargs=dict(num=meeting.number, owner=meeting.schedule.owner_email(), name=meeting.schedule.name))
         r = self.client.get(url)
-        self.assertNotIn("You can't edit this schedule", r.content)
+        q = PyQuery(r.content)
+        self.assertTrue(not q("em:contains(\"You can't edit this schedule\")"))
 
-        SchedTimeSessAssignment.objects.filter(session=sessions[0]).delete()
+        SchedTimeSessAssignment.objects.filter(session=s1).delete()
 
         # assign
         r = self.client.post(url, {
             'action': 'assign',
             'timeslot': timeslots[0].pk,
-            'session': sessions[0].pk,
+            'session': s1.pk,
         })
         self.assertEqual(r.content, "OK")
-        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=meeting.schedule, session=sessions[0]).timeslot, timeslots[0])
+        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=meeting.schedule, session=s1).timeslot, timeslots[0])
 
         # move assignment
         r = self.client.post(url, {
             'action': 'assign',
             'timeslot': timeslots[1].pk,
-            'session': sessions[0].pk,
+            'session': s1.pk,
         })
         self.assertEqual(r.content, "OK")
-        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=meeting.schedule, session=sessions[0]).timeslot, timeslots[1])
+        self.assertEqual(SchedTimeSessAssignment.objects.get(schedule=meeting.schedule, session=s1).timeslot, timeslots[1])
 
         # unassign
         r = self.client.post(url, {
             'action': 'unassign',
-            'session': sessions[0].pk,
+            'session': s1.pk,
         })
         self.assertEqual(r.content, "OK")
-        self.assertEqual(list(SchedTimeSessAssignment.objects.filter(schedule=meeting.schedule, session=sessions[0])), [])
+        self.assertEqual(list(SchedTimeSessAssignment.objects.filter(schedule=meeting.schedule, session=s1)), [])
 
 
     def test_copy_meeting_schedule(self):