Merged in ^/personal/jennifer/7.17.1.dev0 from jennifer@painless-security.com:

This adds support for the simpler show/hide filtering to the ical agenda
views. It also significantly rearranges (and, I hope, improves the
organization of) the tests. In particular, it specifically tests that
the ical and HTML views include equivalent sets of events. Finally, the
agenda_filter.html template is reworked to be more modular.
 - Legacy-Id: 18631

Author: levkowetz

ietf/meeting/helpers.py

@@ -240,6 +240,30 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
 
     return assignments
 
+def tag_assignments_with_filter_keywords(assignments):
+    """Add keywords for agenda filtering
+    
+    Keywords are all lower case.
+    """
+    for a in assignments:
+        a.filter_keywords = {a.timeslot.type.slug.lower()}
+        a.filter_keywords.update(filter_keywords_for_session(a.session))
+
+def filter_keywords_for_session(session):
+    keywords = {session.type.slug.lower()}
+    group = getattr(session, 'historic_group', session.group)
+    if group is not None:
+        if group.state_id == 'bof':
+            keywords.add('bof')
+        keywords.add(group.acronym.lower())
+        area = getattr(group, 'historic_parent', group.parent)
+        if area is not None:
+            keywords.add(area.acronym.lower())
+    office_hours_match = re.match(r'^ *\w+(?: +\w+)* +office hours *$', session.name, re.IGNORECASE)
+    if office_hours_match is not None:
+        keywords.update(['officehours', session.name.lower().replace(' ', '')])
+    return keywords
+
 def read_session_file(type, num, doc):
     # XXXX FIXME: the path fragment in the code below should be moved to
     # settings.py.  The *_PATH settings should be generalized to format()

ietf/meeting/templatetags/agenda_filter_tags.py

@@ -0,0 +1,20 @@
+# Copyright The IETF Trust 2020, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+"""Custom tags for the agenda filter template"""
+
+from django import template
+
+register = template.Library()
+
+@register.filter
+def agenda_width_scale(filter_categories, spacer_scale):
+    """Compute the width scale for the agenda filter button table
+    
+    Button columns are spacer_scale times as wide as the spacer columns between
+    categories. There is one fewer spacer column than categories.
+    """
+    category_count = len(filter_categories)
+    column_count = sum([len(cat) for cat in filter_categories])
+    # Refuse to return less than 1 to avoid width calculation problems.
+    return max(spacer_scale * column_count + category_count - 1, 1) 

ietf/meeting/tests_helpers.py

@@ -0,0 +1,97 @@
+# Copyright The IETF Trust 2020, All Rights Reserved
+# -*- coding: utf-8 -*-
+from ietf.group.factories import GroupFactory
+from ietf.meeting.factories import SessionFactory, MeetingFactory
+from ietf.meeting.helpers import tag_assignments_with_filter_keywords
+from ietf.utils.test_utils import TestCase
+
+
+class HelpersTests(TestCase):
+    def do_test_tag_assignments_with_filter_keywords(self, bof=False, historic=None):
+        """Assignments should be tagged properly
+        
+        The historic param can be None, group, or parent, to specify whether to test
+        with no historic_group, a historic_group but no historic_parent, or both.
+        """
+        meeting_types = ['regular', 'plenary']
+        group_state_id = 'bof' if bof else 'active'
+        group = GroupFactory(state_id=group_state_id)
+        historic_group = GroupFactory(state_id=group_state_id)
+        historic_parent = GroupFactory(type_id='area')
+
+        if historic == 'parent':
+            historic_group.historic_parent = historic_parent
+
+        # Create meeting and sessions
+        meeting = MeetingFactory()
+        for meeting_type in meeting_types:
+            sess = SessionFactory(group=group, meeting=meeting, type_id=meeting_type)
+            ts = sess.timeslotassignments.first().timeslot
+            ts.type = sess.type
+            ts.save()
+
+        # Create an office hours session in the group's area (i.e., parent). This is not
+        # currently really needed, but will protect against areas and groups diverging
+        # in a way that breaks keywording.
+        office_hours = SessionFactory(
+            name='some office hours',
+            group=group.parent,
+            meeting=meeting,
+            type_id='other'
+        )
+        ts = office_hours.timeslotassignments.first().timeslot
+        ts.type = office_hours.type
+        ts.save()
+
+        assignments = meeting.schedule.assignments.all()
+        orig_num_assignments = len(assignments)
+
+        # Set up historic groups if needed
+        if historic:
+            for a in assignments:
+                if a.session != office_hours:
+                    a.session.historic_group = historic_group
+
+        # Execute the method under test
+        tag_assignments_with_filter_keywords(assignments)
+
+        # Assert expected results
+        self.assertEqual(len(assignments), orig_num_assignments, 'Should not change number of assignments')
+
+        if historic:
+            expected_group = historic_group
+            expected_area = historic_parent if historic == 'parent' else historic_group.parent
+        else:
+            expected_group = group
+            expected_area = group.parent
+
+        for assignment in assignments:
+            expected_filter_keywords = {assignment.timeslot.type.slug, assignment.session.type.slug}
+
+            if assignment.session == office_hours:
+                expected_filter_keywords.update([
+                    group.parent.acronym,
+                    'officehours',
+                    'someofficehours',
+                ])
+            else:
+                expected_filter_keywords.update([
+                    expected_group.acronym,
+                    expected_area.acronym
+                ])
+                if bof:
+                    expected_filter_keywords.add('bof')
+
+            self.assertCountEqual(
+                assignment.filter_keywords,
+                expected_filter_keywords,
+                'Assignment has incorrect filter keywords'
+            )
+
+    def test_tag_assignments_with_filter_keywords(self):
+        self.do_test_tag_assignments_with_filter_keywords()
+        self.do_test_tag_assignments_with_filter_keywords(historic='group')
+        self.do_test_tag_assignments_with_filter_keywords(historic='parent')
+        self.do_test_tag_assignments_with_filter_keywords(bof=True)
+        self.do_test_tag_assignments_with_filter_keywords(bof=True, historic='group')
+        self.do_test_tag_assignments_with_filter_keywords(bof=True, historic='parent')