Put status changes on the agenda, moderator, and package pages

 - Legacy-Id: 5331

Author: rjsparks

ietf/iesg/views.py

@@ -159,21 +159,28 @@ def get_doc_sectionREDESIGN(doc):
             s = s + "1"
     elif doc.type_id == 'charter':
         s = get_wg_section(doc.group)
+    elif doc.type_id == 'statchg':
+        protocol_action = False
+        for relation in doc.relateddocument_set.filter(relationship__slug__in=('tops','tois','tohist','toinf','tobcp','toexp')):
+            if relation.relationship.slug in ('tops','tois') or relation.target.document.std_level.slug in ('std','ds','ps'):
+                protocol_action = True
+        if protocol_action:
+            s="23"
+        else:
+            s="33"
+        if doc.get_state_slug() not in ("iesgeval", "defer", "appr-pr", "appr-pend", "appr-sent"):
+            s = s + "3"
+        elif doc.returning_item():
+            s = s + "2"
+        else:
+            s = s + "1"
     elif doc.type_id == 'conflrev':
         if doc.get_state('conflrev').slug not in ('adrev','iesgeval','appr-reqnopub-pend','appr-reqnopub-sent','appr-noprob-pend','appr-noprob-sent','defer'):
-             s = "333"
+             s = "343"
         elif doc.returning_item():
-             s = "332"
+             s = "342"
         else:
-             s = "331"
-    elif doc.type_id == 'statchg':
-       # TODO This is WRONG
-           s="211"
-       #protocol_action = False
-       #for relation in doc.relateddocument_set.filter(relationship__in="('tops','tois','tohist','toinf','tobcp,'toexp')"):
-       #    if relation.relationship.slug in ('tops','tois') or relation.target.document.std_level.slug in ('std','ds','ps'):
-       #        protocol_action = True
-       #if protocol_action:
+             s = "341"
 
     return s
 
@@ -233,6 +240,8 @@ def agenda_docs(date, next_agenda):
     docmatches.sort(key=lambda d: d.balloting_started)
 
     res = dict(("s%s%s%s" % (i, j, k), []) for i in range(2, 5) for j in range (1, 4) for k in range(1, 4))
+    for k in range(1,4):
+        res['s34%d'%k]=[]
     for id in docmatches:
         section_key = "s"+get_doc_section(id)
         if section_key not in res:
@@ -287,16 +296,22 @@ def _agenda_json(request, date=None):
     data['sections']['2.2'] = {'title':"Individual Submissions"}
     data['sections']['2.2.1'] = {'title':"New Items", 'docs':[]}
     data['sections']['2.2.2'] = {'title':"Returning Items", 'docs':[]}
+    data['sections']['2.3'] = {'title':"Individual Submissions"}
+    data['sections']['2.3.1'] = {'title':"New Items", 'docs':[]}
+    data['sections']['2.3.2'] = {'title':"Returning Items", 'docs':[]}
     data['sections']['3'] = {'title':"Document Actions"}
     data['sections']['3.1'] = {'title':"WG Submissions"}
     data['sections']['3.1.1'] = {'title':"New Items", 'docs':[]}
     data['sections']['3.1.2'] = {'title':"Returning Items", 'docs':[]}
     data['sections']['3.2'] = {'title':"Individual Submissions Via AD"}
     data['sections']['3.2.1'] = {'title':"New Items", 'docs':[]}
     data['sections']['3.2.2'] = {'title':"Returning Items", 'docs':[]}
-    data['sections']['3.3'] = {'title':"IRTF and Independent Submission Stream Documents"}
+    data['sections']['3.3'] = {'title':"Status Changes"}
     data['sections']['3.3.1'] = {'title':"New Items", 'docs':[]}
     data['sections']['3.3.2'] = {'title':"Returning Items", 'docs':[]}
+    data['sections']['3.4'] = {'title':"IRTF and Independent Submission Stream Documents"}
+    data['sections']['3.4.1'] = {'title':"New Items", 'docs':[]}
+    data['sections']['3.4.2'] = {'title':"Returning Items", 'docs':[]}
     data['sections']['4'] = {'title':"Working Group Actions"}
     data['sections']['4.1'] = {'title':"WG Creation"}
     data['sections']['4.1.1'] = {'title':"Proposed for IETF Review", 'wgs':[]}

ietf/templates/iesg/agenda_conflict_doc.html

@@ -39,7 +39,7 @@
 {% if title2_first %}{% if title1_first %}<h2>{{ title1 }}</h2>
 {% endif %}
 <h3>{{ title2 }}</h3>
-{% if title2|startswith:"3.3" %}
+{% if title2|startswith:"3.4" %}
     <blockquote>
     The IESG will use RFC 5742 responses: 1) The IESG has concluded
     that there is no conflict between this document and IETF work; 2)

ietf/templates/iesg/agenda_documents.html

@@ -105,6 +105,14 @@ <h1>Documents on Future IESG Telechat Agendas</h1>
     {% if t.docs.s223 %}<tr class="header"><td colspan="6">2.2.3 For Action</td></tr>{% endif %}
     {% for doc in t.docs.s223 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
 
+<tr class="header"><td colspan="6">2.3 Status Changes</td></tr>
+
+    {% for doc in t.docs.s231 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
+    {% if t.docs.s222 %}<tr class="header"><td colspan="6">2.3.2 Returning Item</td></tr>{% endif %}
+    {% for doc in t.docs.s232 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
+    {% if t.docs.s223 %}<tr class="header"><td colspan="6">2.3.3 For Action</td></tr>{% endif %}
+    {% for doc in t.docs.s233 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
+
 <tr class="header"><td colspan="6">3. Document Actions</td></tr>
 
 <tr class="header"><td colspan="6">3.1 WG Submissions</td></tr>
@@ -123,14 +131,22 @@ <h1>Documents on Future IESG Telechat Agendas</h1>
     {% if t.docs.s323 %}<tr class="header"><td colspan="6">3.2.3 For Action</td></tr>{% endif %}
     {% for doc in t.docs.s323 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
 
-<tr class="header"><td colspan="6">3.3 IRTF and Independent Submission Stream Documents</td></tr>
+<tr class="header"><td colspan="6">3.3 Status Changes</td></tr>
 
     {% for doc in t.docs.s331 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
     {% if t.docs.s332 %}<tr class="header"><td colspan="6">3.3.2 Returning Item</td></tr>{% endif %}
     {% for doc in t.docs.s332 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
     {% if t.docs.s333 %}<tr class="header"><td colspan="6">3.3.3 For Action</td></tr>{% endif %}
     {% for doc in t.docs.s333 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
 
+<tr class="header"><td colspan="6">3.4 IRTF and Independent Submission Stream Documents</td></tr>
+
+    {% for doc in t.docs.s341 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
+    {% if t.docs.s342 %}<tr class="header"><td colspan="6">3.4.2 Returning Item</td></tr>{% endif %}
+    {% for doc in t.docs.s342 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
+    {% if t.docs.s343 %}<tr class="header"><td colspan="6">3.4.3 For Action</td></tr>{% endif %}
+    {% for doc in t.docs.s343 %}{% include "iesg/agenda_documents_row_redesign.html" %}{%endfor%}
+
 <tr class="header"><td colspan="6">4. Working Group Actions</td></tr>
 
     {% if t.docs.s411 or t.docs.s412%}<tr class="header"><td colspan="6">4.1 WG Creation</td></tr>{% endif %}

ietf/templates/iesg/agenda_documents_redesign.html

@@ -73,8 +73,29 @@
 
 {% endwith %}{# title2 #}
 
+{% with "2.3 Status Changes" as title2 %}
+{% with 1 as title2_first %}
+
+{% with "2.3.1 New Items" as title3 %}
+{% with docs.s231 as section_docs %}{% include doc_template %}{% endwith %}
+{% endwith %}
+{% endwith %}{# title2_first #}
+
+{% with "2.3.2 Returning Items" as title3 %}
+{% with docs.s232 as section_docs %}{% include doc_template %}{% endwith %}
+{% endwith %}
+
+{% if docs.s233 %}
+{% with "2.3.3 For Action" as title3 %}
+{% with docs.s233 as section_docs %}{% include doc_template %}{% endwith %}
+{% endwith %}
+{% endif %}
+
+{% endwith %}{# title2 #}
+
 {% endwith %}{# title1 #}
 
+
 {% with "3. Document Actions" as title1 %}{% with 1 as title1_first %}
 
 {% with "3.1 WG Submissions" as title2 %}
@@ -119,21 +140,41 @@
 
 {% endwith %}{# title2 #}
 
-{% with "3.3 IRTF and Independent Submission Stream Documents" as title2 %}
+{% with "3.3 Status Changes" as title2 %}
 {% with 1 as title2_first %}
 
 {% with "3.3.1 New Items" as title3 %}
-{% with docs.s331 as section_docs %}{% include doc_conflict_template %}{% endwith %}
+{% with docs.s331 as section_docs %}{% include doc_template %}{% endwith %}
 {% endwith %}
 {% endwith %}{# title2_first #}
 
 {% with "3.3.2 Returning Items" as title3 %}
-{% with docs.s332 as section_docs %}{% include doc_conflict_template %}{% endwith %}
+{% with docs.s332 as section_docs %}{% include doc_template %}{% endwith %}
 {% endwith %}
 
 {% if docs.s333 %}
 {% with "3.3.3 For Action" as title3 %}
-{% with docs.s333 as section_docs %}{% include doc_conflict_template %}{% endwith %}
+{% with docs.s333 as section_docs %}{% include doc_template %}{% endwith %}
+{% endwith %}
+{% endif %}
+
+{% endwith %} {# title2 #}
+
+{% with "3.4 IRTF and Independent Submission Stream Documents" as title2 %}
+{% with 1 as title2_first %}
+
+{% with "3.4.1 New Items" as title3 %}
+{% with docs.s341 as section_docs %}{% include doc_conflict_template %}{% endwith %}
+{% endwith %}
+{% endwith %}{# title2_first #}
+
+{% with "3.4.2 Returning Items" as title3 %}
+{% with docs.s342 as section_docs %}{% include doc_conflict_template %}{% endwith %}
+{% endwith %}
+
+{% if docs.s343 %}
+{% with "3.4.3 For Action" as title3 %}
+{% with docs.s343 as section_docs %}{% include doc_conflict_template %}{% endwith %}
 {% endwith %}
 {% endif %}