fix: restore IRTF non-meeting groups to agenda (#5077)

* fix: restore IRTF non-meeting groups to agenda Fixes #5010 * fix: account for changes to entry from #5065
ietf-tools · Feb 2, 2023 · fac5a8c · fac5a8c
1 parent 0fd8df4
commit fac5a8c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
@@ -3688,9 +3688,13 @@ def proceedings(request, num=None):
         sessions.filter(name__icontains='plenary')
         .exclude(current_status='notmeet')
     )
-    irtf, _ = organize_proceedings_sessions(
+    irtf_meeting, irtf_not_meeting = organize_proceedings_sessions(
         sessions.filter(group__parent__acronym = 'irtf').order_by('group__acronym')
     )
+    # per Colin (datatracker #5010) - don't report not meeting rags
+    irtf_not_meeting = [item for item in irtf_not_meeting if item["group"].type_id != "rag"]
+    irtf = {"meeting_groups":irtf_meeting, "not_meeting_groups":irtf_not_meeting}
+
     training, _ = organize_proceedings_sessions(
         sessions.filter(group__acronym__in=['edu','iaoc'], type_id__in=['regular', 'other',])
         .exclude(current_status='notmeet')

diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html
@@ -148,7 +148,7 @@ <h2 class="mt-5" id="iab">
         </table>
     {% endif %}
     <!-- IRTF Sessions -->
-    {% if irtf %}
+    {% if irtf.meeting_groups  %}
         <h2 class="mt-5" id="irtf">
             IRTF <small class="text-muted">Internet Research Task Force</small>
         </h2>
@@ -173,11 +173,39 @@ <h2 class="mt-5" id="irtf">
                 </tr>
             </thead>
             <tbody>
-                {% for entry in irtf %}
+                {% for entry in irtf.meeting_groups %}
                     {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
                 {% endfor %}
             </tbody>
         </table>
+        {% if irtf.not_meeting_groups %}
+        <p>
+            IRTF groups not meeting:
+            {% for entry in irtf.not_meeting_groups %}
+                {% if entry.name == "" %}{# do not show named sessions in this list #}
+                    <a href="{% url 'ietf.group.views.group_home' acronym=entry.group.acronym %}">
+                        {{ entry.group.acronym }}
+                    </a>{% if not forloop.last %},{% endif %}
+                {% endif %}
+            {% endfor %}
+        </p>
+        <table class="table table-sm table-striped">
+            <thead>
+                <tr>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                    <th scope="col"></th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for entry in irtf.not_meeting %}{% if entry.has_materials %}
+                    {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
+                {% endif %}{% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
     {% endif %}
 {% endcache %}
 {% endblock %}