diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 5cffe9459..6e96fa82a 100644 --- 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 index d4040ec8e..eb6fe0f04 100644 --- a/ietf/templates/meeting/proceedings.html +++ b/ietf/templates/meeting/proceedings.html @@ -148,7 +148,7 @@ {% endif %} - {% if irtf %} + {% if irtf.meeting_groups %}

IRTF Internet Research Task Force

@@ -173,11 +173,39 @@ - {% 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 %} + {% if irtf.not_meeting_groups %} +

+ IRTF groups not meeting: + {% for entry in irtf.not_meeting_groups %} + {% if entry.name == "" %}{# do not show named sessions in this list #} + + {{ entry.group.acronym }} + {% if not forloop.last %},{% endif %} + {% endif %} + {% endfor %} +

+ + + + + + + + + + + + {% 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 %} + +
+ {% endif %} {% endif %} {% endcache %} {% endblock %}