Add information about other sessions of the same group to the session

info in the new meeting schedule editor.
 - Legacy-Id: 18018

Author: OleLaursen

ietf/meeting/tests_js.py

@@ -97,6 +97,8 @@ def test_edit_meeting_schedule(self):
         s2.save()
         SchedTimeSessAssignment.objects.filter(session=s1).delete()
 
+        s2_b = Session.objects.create(meeting=meeting, group=s2.group, attendees=10, requested_duration=datetime.timedelta(minutes=60), type_id='regular')
+
         Constraint.objects.create(
             meeting=meeting,
             source=s1.group,
@@ -109,17 +111,18 @@ def test_edit_meeting_schedule(self):
         self.driver.get(url)
 
         q = PyQuery(self.driver.page_source)
-        self.assertEqual(len(q('.session')), 2)
+        self.assertEqual(len(q('.session')), 3)
 
         # select - show session info
         s2_element = self.driver.find_element_by_css_selector('#session{}'.format(s2.pk))
         s2_element.click()
 
-        session_info_element = self.driver.find_element_by_css_selector('.session-info-container .title')
-        self.assertIn(s2.group.acronym, session_info_element.text)
+        session_info_container = self.driver.find_element_by_css_selector('.session-info-container')
+        self.assertIn(s2.group.acronym, session_info_container.find_element_by_css_selector(".title").text)
+        self.assertEqual(session_info_container.find_element_by_css_selector(".other-session .time").text, "not yet scheduled")
 
         # deselect
-        self.driver.find_element_by_css_selector('.session-info-container').click()
+        self.driver.find_element_by_css_selector('.scheduling-panel').click()
 
         self.assertEqual(self.driver.find_elements_by_css_selector('.session-info-container .title'), [])
 
@@ -147,19 +150,19 @@ def test_edit_meeting_schedule(self):
         self.assertEqual(list(SchedTimeSessAssignment.objects.filter(session=s2, schedule=schedule)), [])
 
         # sorting unassigned
-        sorted_pks = [s.pk for s in sorted([s1, s2], key=lambda s: s.group.acronym)]
+        sorted_pks = [s.pk for s in sorted([s1, s2, s2_b], key=lambda s: (s.group.acronym, s.requested_duration, s.pk))]
         self.driver.find_element_by_css_selector('[name=sort_unassigned] option[value=name]').click()
-        self.assertTrue(self.driver.find_element_by_css_selector('.unassigned-sessions .drop-target #session{} + #session{}'.format(*sorted_pks)))
+        self.assertTrue(self.driver.find_element_by_css_selector('.unassigned-sessions .drop-target #session{} + #session{} + #session{}'.format(*sorted_pks)))
 
-        sorted_pks = [s.pk for s in sorted([s1, s2], key=lambda s: (s.group.parent.acronym, s.group.acronym))]
+        sorted_pks = [s.pk for s in sorted([s1, s2, s2_b], key=lambda s: (s.group.parent.acronym, s.group.acronym, s.requested_duration, s.pk))]
         self.driver.find_element_by_css_selector('[name=sort_unassigned] option[value=parent]').click()
         self.assertTrue(self.driver.find_element_by_css_selector('.unassigned-sessions .drop-target #session{} + #session{}'.format(*sorted_pks)))
 
-        sorted_pks = [s.pk for s in sorted([s1, s2], key=lambda s: (s.requested_duration, s.group.parent.acronym, s.group.acronym))]
+        sorted_pks = [s.pk for s in sorted([s1, s2, s2_b], key=lambda s: (s.requested_duration, s.group.parent.acronym, s.group.acronym, s.pk))]
         self.driver.find_element_by_css_selector('[name=sort_unassigned] option[value=duration]').click()
         self.assertTrue(self.driver.find_element_by_css_selector('.unassigned-sessions .drop-target #session{} + #session{}'.format(*sorted_pks)))
 
-        sorted_pks = [s.pk for s in sorted([s1, s2], key=lambda s: (bool(s.comments), s.group.parent.acronym, s.group.acronym))]
+        sorted_pks = [s.pk for s in sorted([s1, s2, s2_b], key=lambda s: (int(bool(s.comments)), s.group.parent.acronym, s.group.acronym, s.requested_duration, s.pk))]
         self.driver.find_element_by_css_selector('[name=sort_unassigned] option[value=comments]').click()
         self.assertTrue(self.driver.find_element_by_css_selector('.unassigned-sessions .drop-target #session{} + #session{}'.format(*sorted_pks)))
 
@@ -204,6 +207,16 @@ def test_edit_meeting_schedule(self):
         self.assertTrue(s1_element.is_displayed())
         self.driver.find_element_by_css_selector(".session-parent-toggles [value=\"{}\"]".format(s1.group.parent.acronym)).click()
         self.assertTrue(not s1_element.is_displayed())
+        self.driver.find_element_by_css_selector(".session-parent-toggles [value=\"{}\"]".format(s1.group.parent.acronym)).click()
+        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.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()
+        self.assertTrue(not self.driver.find_element_by_css_selector("#timeslot-group-toggles-modal").is_displayed())
+
 
 @skipIf(skip_selenium, skip_message)
 @skipIf(django.VERSION[0]==2, "Skipping test with race conditions under Django 2")

ietf/meeting/views.py

@@ -466,7 +466,7 @@ def edit_meeting_schedule(request, num=None, owner=None, name=None):
             meeting=meeting,
             # Restrict graphical scheduling to regular meeting requests (Sessions) for now
             type='regular',
-        ),
+        ).order_by('pk'),
         requested_time=True,
         requested_by=True,
     ).exclude(current_status__in=['notmeet', 'disappr', 'deleted', 'apprw']).prefetch_related(
@@ -603,6 +603,10 @@ def cubehelix(i, total, hue=1.2, start_angle=0.5):
     # constraints
     constraints_for_sessions, formatted_constraints_for_sessions, constraint_names = preprocess_constraints_for_meeting_schedule_editor(meeting, sessions)
 
+    sessions_for_group = defaultdict(list)
+    for s in sessions:
+        sessions_for_group[s.group_id].append(s)
+
     unassigned_sessions = []
     for s in sessions:
         s.requested_by_person = requested_by_lookup.get(s.requested_by)
@@ -640,6 +644,8 @@ def cubehelix(i, total, hue=1.2, start_angle=0.5):
         s.constrained_sessions = list(constrained_sessions_grouped_by_label.items())
         s.formatted_constraints = formatted_constraints_for_sessions.get(s.pk, {})
 
+        s.other_sessions = [s_other for s_other in sessions_for_group.get(s.group_id) if s != s_other]
+
         assigned = False
         for a in assignments_by_session.get(s.pk, []):
             timeslot = timeslots_by_pk.get(a.timeslot_id)

ietf/static/ietf/css/ietf.css

@@ -1122,6 +1122,14 @@ a.fc-event, .fc-event, .fc-content, .fc-title, .fc-event-container {
   font-weight: bold;
 }
 
+.edit-meeting-schedule .session.highlight {
+  background-color: #f3f3f3;
+}
+
+.edit-meeting-schedule .session.highlight .session-label {
+  font-weight: bold;
+}
+
 .edit-meeting-schedule .session.dragging {
   opacity: 0.1;
   transition: opacity 0.4s;
@@ -1277,3 +1285,7 @@ a.fc-event, .fc-event, .fc-content, .fc-title, .fc-event-container {
   font-style: italic;
 }
 
+.edit-meeting-schedule .scheduling-panel .session-info-container .other-session:hover {
+  cursor: default;
+  background-color: #eee;
+}

ietf/static/ietf/js/edit-meeting-schedule.js

@@ -36,19 +36,30 @@ jQuery(document).ready(function () {
 
         return res;
     }
-    
 
     // selecting
     function selectSessionElement(element) {
         if (element) {
             sessions.not(element).removeClass("selected");
             jQuery(element).addClass("selected");
+
             showConstraintHints(element.id.slice("session".length));
+
             let sessionInfoContainer = content.find(".scheduling-panel .session-info-container");
             sessionInfoContainer.html(jQuery(element).find(".session-info").html());
-            sessionInfoContainer.find('[data-original-title]').tooltip();
-            let time = jQuery(element).closest(".timeslot").find(".time-label").text() || "";
-            sessionInfoContainer.find('.time').text(time.replace(new RegExp(" ", "g"), ""));
+
+            sessionInfoContainer.find("[data-original-title]").tooltip();
+
+            sessionInfoContainer.find(".time").text(jQuery(element).closest(".timeslot").data('scheduledatlabel'));
+
+            sessionInfoContainer.find(".other-session").each(function () {
+                let scheduledAt = sessions.filter("#session" + this.dataset.othersessionid).closest(".timeslot").data('scheduledatlabel');
+                let timeElement = jQuery(this).find(".time");
+                if (scheduledAt)
+                    timeElement.text(timeElement.data("scheduled").replace("{time}", ));
+                else
+                    timeElement.text(timeElement.data("notscheduled"));
+            });
         }
         else {
             sessions.removeClass("selected");
@@ -87,6 +98,8 @@ jQuery(document).ready(function () {
     }
 
     content.on("click", function (event) {
+        if (jQuery(event.target).is(".session-info-container") || jQuery(event.target).closest(".session-info-container").length > 0)
+            return;
         selectSessionElement(null);
     });
 
@@ -315,6 +328,10 @@ jQuery(document).ready(function () {
     function sortUnassigned() {
         let sortBy = content.find("select[name=sort_unassigned]").val();
 
+        function extractId(e) {
+            return e.id.slice("session".length);
+        }
+
         function extractName(e) {
             return e.querySelector(".session-label").innerHTML;
         }
@@ -333,13 +350,13 @@ jQuery(document).ready(function () {
 
         let keyFunctions = [];
         if (sortBy == "name")
-            keyFunctions = [extractName, extractDuration];
+            keyFunctions = [extractName, extractDuration, extractId];
         else if (sortBy == "parent")
-            keyFunctions = [extractParent, extractName, extractDuration];
+            keyFunctions = [extractParent, extractName, extractDuration, extractId];
         else if (sortBy == "duration")
-            keyFunctions = [extractDuration, extractParent, extractName];
+            keyFunctions = [extractDuration, extractParent, extractName, extractId];
         else if (sortBy == "comments")
-            keyFunctions = [extractComments, extractParent, extractName, extractDuration];
+            keyFunctions = [extractComments, extractParent, extractName, extractDuration, extractId];
 
         let unassignedSessionsContainer = content.find(".unassigned-sessions .drop-target");
 
@@ -388,5 +405,12 @@ jQuery(document).ready(function () {
 
     timeslotGroupInputs.on("click change", updateTimeslotGroupToggling);
     updateTimeslotGroupToggling();
+
+    // session info
+    content.find(".session-info-container").on("mouseover", ".other-session", function (event) {
+        sessions.filter("#session" + this.dataset.othersessionid).addClass("highlight");
+    }).on("mouseleave", ".other-session", function (event) {
+        sessions.filter("#session" + this.dataset.othersessionid).removeClass("highlight");
+    });
 });
 

ietf/templates/meeting/edit_meeting_schedule.html

@@ -82,7 +82,7 @@
               <div class="timeslots" data-roomcapacity="{{ room.capacity }}">
 
                 {% for t in timeslots %}
-                  <div id="timeslot{{ t.pk }}" class="timeslot {{ t.start_end_group }}" data-start="{{ t.time.isoformat }}" data-end="{{ t.end_time.isoformat }}" data-duration="{{ t.duration.total_seconds }}" style="width: {{ t.layout_width }}rem;">
+                  <div id="timeslot{{ t.pk }}" class="timeslot {{ t.start_end_group }}" data-start="{{ t.time.isoformat }}" data-end="{{ t.end_time.isoformat }}" data-duration="{{ t.duration.total_seconds }}" data-scheduledatlabel="{{ t.time|date:"l G:i" }}-{{ t.end_time|date:"G:i" }}" style="width: {{ t.layout_width }}rem;">
                     <div class="time-label">
                       {{ t.time|date:"G:i" }} - {{ t.end_time|date:"G:i" }}
                     </div>

ietf/templates/meeting/edit_meeting_schedule_session.html

@@ -30,8 +30,12 @@
         <span class="time pull-right"></span>
         {{ session.scheduling_label }}
         &middot; {{ session.requested_duration_in_hours }}h
-        {% if session.group %}&middot; {% if session.group.is_bof %}BoF{% else %}{{ session.group.type.name }}{% endif %}{% endif %}
-        {% if session.attendees != None %}&middot; {{ session.attendees }} <i class="fa fa-user-o"></i>{% endif %}
+        {% if session.group %}
+          &middot; {% if session.group.is_bof %}BoF{% else %}{{ session.group.type.name }}{% endif %}
+        {% endif %}
+        {% if session.attendees != None %}
+          &middot; {{ session.attendees }} <i class="fa fa-user-o"></i>
+        {% endif %}
       </strong>
     </div>
 
@@ -75,5 +79,9 @@
         {% endfor %}
       </div>
     {% endif %}
+
+    {% for s in session.other_sessions %}
+      <div class="other-session" data-othersessionid="{{ s.pk }}"><i class="fa fa-calendar"></i> Other session <span class="time" data-scheduled="scheduled: {time}" data-notscheduled="not yet scheduled"></span></div>
+    {% endfor %}
   </div>
 </div>