Added roll call to moderator package; added agenda package email

 - Legacy-Id: 1891

Author: pasieronen

ietf/iesg/testurl.list

@@ -7,11 +7,15 @@
 200		/iesg/agenda/
 200		/iesg/agenda/agenda.txt
 200		/iesg/agenda/scribe_template.html
-302		/iesg/agenda/moderator_package.html
 200		/iesg/agenda/documents.txt
 200		/iesg/agenda/documents/
 200		/iesg/discusses/
 
+302		/iesg/agenda/moderator_package.html
+302		/iesg/agenda/agenda_package.txt
+200		/iesg/_test/moderator_package.html
+200		/iesg/_test/agenda_package.txt
+
 200		/iesg/ann/ind/
 200 		/iesg/ann/new/
 # This takes ~ 300s:

ietf/iesg/urls.py

@@ -54,12 +54,15 @@
         (r'^agenda/agenda.txt$', views.agenda_txt),                        
         (r'^agenda/scribe_template.html$', views.agenda_scribe_template),
         (r'^agenda/moderator_package.html$', views.agenda_moderator_package),
+        (r'^agenda/agenda_package.txt$', views.agenda_package),
         (r'^agenda/documents.txt$', views.agenda_documents_txt),
         (r'^agenda/documents/$', views.agenda_documents),
         (r'^discusses/$', views.discusses),
 )
 
 if settings.SERVER_MODE != 'production':
     urlpatterns += patterns('',
-        (r'^agenda/(?P<date>\d{4}-\d\d-\d\d)/$', views.agenda),                        
+        (r'^agenda/(?P<date>\d{4}-\d\d-\d\d)/$', views.agenda),
+        (r'^_test/moderator_package.html$', views.agenda_moderator_package_test),
+        (r'^_test/agenda_package.txt', views.agenda_package_test),
     )

ietf/iesg/views.py

@@ -36,7 +36,7 @@
 from ietf.idtracker.models import IDInternal, InternetDraft,AreaGroup, Position, IESGLogin
 from django.views.generic.list_detail import object_list
 from django.views.generic.simple import direct_to_template
-from django.http import Http404, HttpResponse
+from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.template import RequestContext, Context, loader
 from django.shortcuts import render_to_response
 from django.conf import settings
@@ -157,13 +157,18 @@ def _agenda_data(request, date=None):
     docs = agenda_docs(date, next_agenda)
     mgmt = agenda_management_issues(date)
     wgs = agenda_wg_actions(date)
-    try:
-        f = codecs.open(settings.IESG_TASK_FILE, 'r', 'utf-8', 'replace')
-        action_items = f.read().strip()
-        f.close()
-    except IOError:
-        action_items = "(Error reading task.txt)"
-    return {'date':str(date), 'docs':docs,'mgmt':mgmt,'wgs':wgs, 'action_items':action_items}
+    data = {'date':str(date), 'docs':docs,'mgmt':mgmt,'wgs':wgs}
+    for key, filename in {'action_items':settings.IESG_TASK_FILE,
+                          'roll_call':settings.IESG_ROLL_CALL_FILE,
+                          'minutes':settings.IESG_MINUTES_FILE}.items():
+        try:
+            f = codecs.open(filename, 'r', 'utf-8', 'replace')
+            text = f.read().strip()
+            f.close()
+            data[key] = text
+        except IOError:
+            data[key] = "(Error reading "+key+")"
+    return data
 
 def agenda(request, date=None):
     data = _agenda_data(request, date)
@@ -179,12 +184,35 @@ def agenda_scribe_template(request):
     docs = agenda_docs(date, True)
     return render_to_response('iesg/scribe_template.html', {'date':str(date), 'docs':docs}, context_instance=RequestContext(request) )
 
-@group_required('Area_Director','Secretariat')
-def agenda_moderator_package(request):
+def _agenda_moderator_package(request):
     data = _agenda_data(request)
     data['ad_names'] = [str(x) for x in IESGLogin.active_iesg()]
     return render_to_response("iesg/moderator_package.html", data, context_instance=RequestContext(request))
 
+@group_required('Area_Director','Secretariat')
+def agenda_moderator_package(request):
+    return _agenda_moderator_package(request)
+
+def agenda_moderator_package_test(request):
+    if request.META['REMOTE_ADDR'] == "127.0.0.1":
+        return _agenda_moderator_package(request)
+    else:
+        return HttpResponseForbidden()
+
+def _agenda_package(request):
+    data = _agenda_data(request)
+    return render_to_response("iesg/agenda_package.txt", data, context_instance=RequestContext(request), mimetype='text/plain')
+
+@group_required('Area_Director','Secretariat')
+def agenda_package(request):
+    return _agenda_package(request)
+
+def agenda_package_test(request):
+    if request.META['REMOTE_ADDR'] == "127.0.0.1":
+        return _agenda_package(request)
+    else:
+        return HttpResponseForbidden()
+
 def agenda_documents_txt(request):
     dates = TelechatDates.objects.all()[0].dates()
     docs = []

ietf/settings.py

@@ -166,6 +166,8 @@
 # Path to Work Group Description Text Files
 IETFWG_DESCRIPTIONS_PATH = '/a/www/www6s/wg-descriptions/'
 IESG_TASK_FILE = '/a/www/www6/iesg/internal/task.txt'
+IESG_ROLL_CALL_FILE = '/a/www/www6/iesg/internal/rollcall.txt'
+IESG_MINUTES_FILE = '/a/www/www6/iesg/internal/minutes.txt'
 
 # External page top and bottom, which gives a html page the current menubar
 # and footer used in the current web-page design

ietf/templates/iesg/agenda_package.txt

@@ -0,0 +1,40 @@
+{% load ietf_filters %}{% autoescape off %}AGENDA PACKAGE FOR {{ date }} IESG TELECHAT
+
+Contents:
+
+1. Roll Call and Dial-In Instructions
+   https://www.ietf.org/iesg/internal/rollcall.txt
+2. Agenda
+   http://datatracker.ietf.org/iesg/agenda/?private
+3. Management Item Details
+   https://datatracker.ietf.org/cgi-bin/display_news.cgi?template_type=3
+4. Previous minutes
+   https://www.ietf.org/iesg/internal/minutes.txt
+
+------------------------------------------------------------------------
+1. ROLL CALL AND DIAL-IN INSTRUCTIONS
+------------------------------------------------------------------------
+
+{{ roll_call }}
+
+------------------------------------------------------------------------
+2. AGENDA
+------------------------------------------------------------------------
+{% include "iesg/agenda.txt" %}
+------------------------------------------------------------------------
+3. MANAGEMENT ITEM DETAILS
+------------------------------------------------------------------------
+{% for m in mgmt %}
+6.{{forloop.counter}} {{m.title}}
+
+    {{m.text|wordwrap:"68"|indent|indent}}
+{% endfor %}
+
+------------------------------------------------------------------------
+4. PREVIOUS MINUTES
+------------------------------------------------------------------------
+
+{{ minutes }}
+
+------------------------------------------------------------------------
+{% endautoescape %}

ietf/templates/iesg/moderator_package.html

@@ -61,6 +61,10 @@ <h1>Moderator Package for {{date}} IESG Telechat</h1>
 
 <h3>1. Administrivia<br>1.1 Roll Call</h3>
 
+{% filter linebreaks_crlf %}<pre>
+{{ roll_call }}
+</pre>{% endfilter %}
+
 <h3>1. Administrivia<br>1.2 Bash the Agenda</h3>
 
 <p>Does anyone want to add anything NEW to the agenda?</p>