Final corrections and coord with Ole. Fixed agenda package, template cleanup, more tests and a couple of bugs.

 - Legacy-Id: 3360

Author: Martin Qvist

ietf/iesg/views.py

@@ -208,6 +208,19 @@ def get_doc_sectionREDESIGN(id):
         s = s + "1"
     return s
 
+def get_wg_section(wg):
+    if wg.state_id == "proposed":
+        if wg.charter.charter_state_id == "intrev":
+            s = '411'
+        elif wg.charter.charter_state_id == "iesgrev":
+            s = '412'
+    elif wg.state_id == "active":
+        if wg.charter.charter_state_id == "intrev":
+            s = '421'
+        elif wg.charter.charter_state_id == "iesgrev":
+            s = '422'
+    return s
+
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
     get_doc_section = get_doc_sectionREDESIGN
 
@@ -253,15 +266,17 @@ def agenda_docs(date, next_agenda):
     return res
 
 def agenda_wg_actions(date):
-    mapping = {12:'411', 13:'412',22:'421',23:'422'}
-    matches = WGAction.objects.filter(agenda=1,telechat_date=date,category__in=mapping.keys()).order_by('category')
-    res = {}
-    for o in matches:
-        section_key = "s"+mapping[o.category]
+    from doc.models import TelechatDocEvent
+    from group.models import Group
+    
+    matches = Group.objects.filter(charter__docevent__telechatdocevent__telechat_date=date)
+
+    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 wg in list(matches):
+        section_key = "s"+get_wg_section(wg)
         if section_key not in res:
             res[section_key] = []
-        area = AreaGroup.objects.get(group=o.group_acronym)
-        res[section_key].append({'obj':o, 'area':str(area.area)})
+        res[section_key].append({'obj':wg})
     return res
 
 def agenda_management_issues(date):

ietf/templates/iesg/agenda_wg.html

@@ -43,20 +43,14 @@ <h3>{{ title2 }}</h3>
 {% endif %}
 
 <tr>
-<td>{{wg.area|upper}}</td>
-<td>{{ wg.obj.status_date|date:"M d"}}</td>
+<td>{{wg.obj.parent.name|upper}}</td>
+<td>{{ wg.obj.time|date:"M d"}}</td>
 <td>
-<a href="http://www.ietf.org/iesg/evaluation/{{wg.obj.group_acronym}}-charter.txt">
-{{ wg.obj.group_acronym.name|escape }} ({{wg.obj.group_acronym}})
+<a href="http://www.ietf.org/iesg/evaluation/charter-ietf-{{wg.obj.acronym}}-{{wg.obj.charter.rev}}.txt">
+{{ wg.obj.name|escape }} ({{wg.obj.acronym}})
 </a>
 </td>
 </tr>
-{% if wg.obj.token_name %}
-<tr><td></td><td>Token:</td><td>{{ wg.obj.token_name|escape }}</td></tr>
-{% endif %}
-{% if wg.obj.note %}
-<tr><td></td><td></td><td>Note: {{wg.obj.note|escape}}</td></tr>
-{% endif %}
 
 {% if forloop.last %}
 </table>

ietf/templates/iesg/agenda_wg.txt

@@ -35,11 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {{ title2 }}
 {% endif %}{{ title3 }}
 {% for wg in section_wgs %}
-  o {{ wg.obj.group_acronym.name }} ({{wg.obj.group_acronym}})
-{% if wg.obj.token_name %}    Token: {{ wg.obj.token_name }}
-{% endif %}
-{% if wg.obj.note %}    {% filter wordwrap:"68"|indent|indent %}Note: {{wg.obj.note|striptags}}{% endfilter %}
-{% endif %}
+  o {{ wg.obj.name }} ({{wg.obj.acronym}})
 {% empty %}
   NONE
 {% endfor %}

ietf/templates/iesg/moderator_wg.html

@@ -36,14 +36,7 @@ <h3>{{ title1 }}<br>
 {{ title2 }}<br>
 {{ title3 }} ({{ forloop.counter }} of {{ section_wgs|length }})</h3>
 
-<p><b>{{ wg.obj.group_acronym.name }} ({{wg.obj.group_acronym}})<br>
-{% if wg.obj.token_name %}    
-Token: {{ wg.obj.token_name }}
-{% endif %}</b></p>
-
-{% if wg.obj.note %}
-<p>Note: {{wg.obj.note|striptags}}</p>
-{% endif %}
+<p><b>{{ wg.obj.name }} ({{wg.obj.acronym}})<br>
 
 {% if title3|startswith:"4.1.1" %}
   <p>Does anyone have an objection to the charter being sent for

ietf/templates/wgrecord/announcement_text.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}WG {{ announcement }} announcement writeup for {{ doc.group.acronym }}{% endblock %}
+{% block title %}WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}{% endblock %}
 
 {% block morecss %}
 form #id_announcement_text {
@@ -10,7 +10,7 @@
 {% endblock %}
 
 {% block content %}
-<h1>WG {{ announcement }} announcement writeup for {{ doc.group.acronym }}</h1>
+<h1>WG {{ announcement }} announcement writeup for {{ charter.chartered_group.acronym }}</h1>
 
 <form action="" method="POST">
 
@@ -22,12 +22,4 @@ <h1>WG {{ announcement }} announcement writeup for {{ doc.group.acronym }}</h1>
   </div>
 </form>
 
-{% load ietf_filters %}
-{% if user|in_group:"Secretariat" %}
-<p>
-{% if can_announce %}
-<a href="{% url doc_approve_ballot name=doc.name %}">Approve ballot</a>
-{% endif %}
-</p>
-{% endif %}
 {% endblock%}

ietf/templates/wgrecord/ballot_comment_mail.txt

@@ -1,5 +1,5 @@
 {% autoescape off %}{{ ad }} has entered the following ballot position for
-{{ doc.filename }}-{{ doc.revision_display }}: {{ pos.name }}
+{{ charter.name }}-{{ charter.rev }}: {{ pos.name }}
 
 When responding, please keep the subject line intact and reply to all
 email addresses included in the To and CC lines. (Feel free to cut this

ietf/templates/wgrecord/ballot_issued.html

@@ -3,10 +3,6 @@
 {% block title %}Change position for {{ ad.name }} on {{ wg.acronym }}{% endblock %}
 
 {% block morecss %}
-div.ballot-deferred {
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
 form.position-form .position ul {
   padding: 0;
   margin: 0;

ietf/templates/wgrecord/ballot_writeupnotes.html

@@ -40,7 +40,7 @@ <h2 style="margin-top:12px;">Comments</h2>
 
 {% for pos in info.positions %}
 {% if pos.comment or pos.block_comment %}
-<h2 class="ballot_ad"><a name="{{pos.ad|slugify}}">{% if pos.is_old_ad %}[{%endif%}{{pos.ad|escape}}{% if pos.is_old_ad %}]{%endif%}</a></h2>
+<h2 class="ballot_ad"><a name="{{pos.ad|slugify}}">{{pos.ad|escape}}</a></h2>
 
 {% if pos.block_comment %}
 <p><b>Blocking ({{pos.block_comment_time}})</b> <img src="/images/comment.png" width="14" height="12" alt=""/></p>