Remove the responsible AD at the top of the session info in the new

meeting editor as the information is now redundant - the AD appears as
an AD constraint.
 - Legacy-Id: 18048

Author: OleLaursen

ietf/meeting/utils.py

@@ -319,7 +319,7 @@ def reverse_editor_label(label):
     else:
         return reverse_sign + label
 
-def preprocess_constraints_for_meeting_schedule_editor(meeting, sessions, responsible_ad_for_group):
+def preprocess_constraints_for_meeting_schedule_editor(meeting, sessions):
     # process constraint names - we synthesize extra names to be able
     # to treat the concepts in the same manner as the modelled ones
     constraint_names = {n.pk: n for n in ConstraintName.objects.all()}
@@ -356,9 +356,18 @@ def preprocess_constraints_for_meeting_schedule_editor(meeting, sessions, respon
     constraints = list(Constraint.objects.filter(meeting=meeting).prefetch_related('target', 'person', 'timeranges'))
 
     # synthesize AD constraints - we can treat them as a special kind of 'bethere'
+    responsible_ad_for_group = {}
+    session_groups = set(s.group for s in sessions if s.group and s.group.parent and s.group.parent.type_id == 'area')
+    meeting_time = datetime.datetime.combine(meeting.date, datetime.time(0, 0, 0))
+
+    # dig up historic AD names
+    for group_id, history_time, pk in Person.objects.filter(rolehistory__name='ad', rolehistory__group__group__in=session_groups, rolehistory__group__time__lte=meeting_time).values_list('rolehistory__group__group', 'rolehistory__group__time', 'pk').order_by('rolehistory__group__time'):
+        responsible_ad_for_group[group_id] = pk
+    for group_id, pk in Person.objects.filter(role__name='ad', role__group__in=session_groups, role__group__time__lte=meeting_time).values_list('role__group', 'pk'):
+        responsible_ad_for_group[group_id] = pk
+
     ad_person_lookup = {p.pk: p for p in Person.objects.filter(pk__in=set(responsible_ad_for_group.values()))}
-    groups_at_meeting = {s.group for s in sessions}
-    for group in groups_at_meeting:
+    for group in session_groups:
         ad = ad_person_lookup.get(responsible_ad_for_group.get(group.pk))
         if ad is not None:
             constraints.append(Constraint(meeting=meeting, source=group, person=ad, name=ad_constraint_name))

ietf/meeting/views.py

@@ -586,25 +586,11 @@ def cubehelix(i, total, hue=1.2, start_angle=0.5):
         p.scheduling_color = "rgb({}, {}, {})".format(*tuple(int(round(x * 255)) for x in rgb_color))
         p.light_scheduling_color = "rgb({}, {}, {})".format(*tuple(int(round((0.9 + 0.1 * x) * 255)) for x in rgb_color))
 
-    # dig out historic AD names
-    ad_names = {}
-    ad_pks = {}
-    session_groups = set(s.group for s in sessions if s.group and s.group.parent and s.group.parent.type_id == 'area')
-    meeting_time = datetime.datetime.combine(meeting.date, datetime.time(0, 0, 0))
-
-    for group_id, history_time, name, pk in Person.objects.filter(rolehistory__name='ad', rolehistory__group__group__in=session_groups, rolehistory__group__time__lte=meeting_time).values_list('rolehistory__group__group', 'rolehistory__group__time', 'name', 'pk').order_by('rolehistory__group__time'):
-        ad_names[group_id] = plain_name(name)
-        ad_pks[group_id] = pk
-
-    for group_id, name, pk in Person.objects.filter(role__name='ad', role__group__in=session_groups, role__group__time__lte=meeting_time).values_list('role__group', 'name', 'pk'):
-        ad_names[group_id] = plain_name(name)
-        ad_pks[group_id] = pk
-
     # requesters
     requested_by_lookup = {p.pk: p for p in Person.objects.filter(pk__in=set(s.requested_by for s in sessions if s.requested_by))}
 
     # constraints
-    constraints_for_sessions, formatted_constraints_for_sessions, constraint_names = preprocess_constraints_for_meeting_schedule_editor(meeting, sessions, ad_pks)
+    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:
@@ -625,7 +611,6 @@ def cubehelix(i, total, hue=1.2, start_angle=0.5):
         session_layout_margin = 0.2
         s.layout_width = timedelta_to_css_ems(s.requested_duration) - 2 * session_layout_margin
         s.parent_acronym = s.group.parent.acronym if s.group and s.group.parent else ""
-        s.historic_group_ad_name = ad_names.get(s.group_id)
 
         # compress the constraints, so similar constraint labels are
         # shared between the conflicting sessions they cover - the JS

ietf/templates/meeting/edit_meeting_schedule_session.html

@@ -44,7 +44,6 @@
         {{ session.group.name }}
         {% if session.group.parent %}
           &middot; <span class="session-parent">{{ session.group.parent.acronym }}</span>
-          {% if session.historic_group_ad_name %} ({{ session.historic_group_ad_name }}){% endif %}
         {% endif %}
       </div>
     {% endif %}