Document page: show IESG telechat date; show state for RFCs (if applicable)

 - Legacy-Id: 1949

Author: pasieronen

ietf/idrfc/idrfc_wrapper.py

@@ -388,7 +388,11 @@ def to_json_helper(self):
                   'has_iesg_ballot':self.has_iesg_ballot(),
                   'has_active_iesg_ballot':self.has_active_iesg_ballot(),
                   'ad_name':self.ad_name(),
-                  'intended_maturity_level':self.intended_maturity_level()}
+                  'intended_maturity_level':self.intended_maturity_level(),
+                  'telechat_date':self.telechat_date()}
+        if result['telechat_date']:
+            result['telechat_date'] = str(result['telechat_date'])
+            result['telechat_returning_item'] = self.telechat_returning_item()
         if self.iesg_note():
             result['iesg_note'] = self.iesg_note()
         if self.has_iesg_ballot():
@@ -413,8 +417,17 @@ def intended_maturity_level(self):
                 s = None
         return s
 
-    # intended_maturity_level(self):
-    # telechat_date, on_telechat_agenda, returning_telechat_item
+    def telechat_date(self):
+        # return date only if it's on upcoming agenda
+        if self._idinternal.agenda:
+            return self._idinternal.telechat_date
+        else:
+            return None
+        
+    def telechat_returning_item(self):
+        # should be called only if telechat_date() returns non-None
+        return bool(self._idinternal.returning_item)
+    
     # state_change_notice_to?
     # comment_log?
 
@@ -603,7 +616,7 @@ def get_texts(self):
         return [p for p in self.position_list() if ('has_text' in p) and p['has_text']]
 
     def to_json_helper(self):
-        return {}
+        return {"not_implemented_yet:":True}
 
 def position_to_string(position):
     positions = {"yes":"Yes",

ietf/templates/idrfc/doc_main_id.html

@@ -39,11 +39,13 @@
 
 {% block doc_meta %}
 <table id="metatable">
-<tr><td style="width:18ex;">Document type:</td><td>{{ info.type|escape }}</td></tr>
+<tr><td style="width:18ex;">Document type:</td><td>{{ info.type|escape }}
+{% with doc.replaces as r %}{% if r %}<br />Replaces {% for rep in r %}<a href="/doc/{{rep}}/">{{rep}}</a> {% endfor %}{% endif %}{% endwith %}
+</td></tr>
 <tr><td>State:</td><td> 
 {{ doc.friendly_state|safe }}
 {% if doc.rfc_editor_state %}<br />RFC Editor State: <a href="http://www.rfc-editor.org/queue2.html#{{doc.draft_name}}">{{ doc.rfc_editor_state|escape }}</a>{% endif %}
-{% with doc.replaces as r %}{% if r %}<br />Replaces {% for rep in r %}<a href="/doc/{{rep}}/">{{rep}}</a> {% endfor %}{% endif %}{% endwith %}
+{% if doc.in_ietf_process %}{% if doc.ietf_process.telechat_date %}<br/>On agenda of {{ doc.ietf_process.telechat_date }} IESG telechat {% if doc.ietf_process.telechat_returning_item %} (returning item){%endif%}{%endif%}{%endif%}
 </td></tr>
 
 <tr><td>Intended status:</td><td>{% if doc.in_ietf_process %}{{ doc.ietf_process.intended_maturity_level|default:"-"  }}{% else %}-{%endif%}</td></tr>

ietf/templates/idrfc/doc_main_rfc.html

@@ -45,7 +45,13 @@
 {% if doc.obsoletes %}<br />Obsoletes {{ doc.obsoletes }}{%endif %}
 {% if doc.updates %}<br />Updates {{ doc.updates }}{%endif %}
 </td></tr>
+{% if doc.in_ietf_process %}
+<tr><td>State:</td><td> 
+{{ doc.friendly_state|safe }}
+{% if doc.ietf_process.telechat_date %}<br/>On agenda of {{ doc.ietf_process.telechat_date }} IESG telechat {% if doc.ietf_process.telechat_returning_item %} (returning item){%endif%}{%endif%}
+</td></tr>{% endif %}
 <tr><td>Published:</td><td> {{ doc.publication_date|default:"(data missing)" }}</td></tr>
+
 </table><!-- metatable -->
 {% endblock %}{# doc_meta #}