Use reworked filtering for ical agendas; refactor filter UI with office hours buttons and nicer formatting

 - Legacy-Id: 18619

Author: jennifer-richards

ietf/meeting/helpers.py

@@ -245,21 +245,22 @@ def tag_assignments_with_filter_keywords(assignments):
     Keywords are all lower case.
     """
     for a in assignments:
-        a.filter_keywords = [a.timeslot.type.slug.lower()]
-        a.filter_keywords.extend(filter_keywords_for_session(a.session))
+        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 = []
+    keywords = {session.type.slug.lower()}
     group = getattr(session, 'historic_group', session.group)
     if group is not None:
         if group.state_id == 'bof':
-            keywords.append('bof')
-        keywords.append(group.acronym.lower())
+            keywords.add('bof')
+        keywords.add(group.acronym.lower())
         area = getattr(group, 'historic_parent', group.parent)
         if area is not None:
-            keywords.append(area.acronym.lower())
-    if session.name.lower().endswith('office hours'):
-        keywords.append('adofficehours')
+            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):

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

@@ -66,20 +66,21 @@ def do_test_tag_assignments_with_filter_keywords(self, bof=False, historic=None)
             expected_area = group.parent
 
         for assignment in assignments:
-            expected_filter_keywords = [assignment.timeslot.type.slug]
+            expected_filter_keywords = {assignment.timeslot.type.slug, assignment.session.type.slug}
 
             if assignment.session == office_hours:
-                expected_filter_keywords.extend([
+                expected_filter_keywords.update([
                     group.parent.acronym,
-                    'adofficehours',
+                    'officehours',
+                    'someofficehours',
                 ])
             else:
-                expected_filter_keywords.extend([
+                expected_filter_keywords.update([
                     expected_group.acronym,
                     expected_area.acronym
                 ])
                 if bof:
-                    expected_filter_keywords.append('bof')
+                    expected_filter_keywords.add('bof')
 
             self.assertCountEqual(
                 assignment.filter_keywords,