Merged in ^/branch/proceedings/6.33.1.dev0@12141 from rcross@amsl.com:

Added meeting proceedings introduction pages: Progress Report and Attendees.  Added a data migration to provide proceedings introduction information for IETF 95 and 96.
 - Legacy-Id: 12150

Author: levkowetz

hold-for-merge

@@ -1,6 +1,6 @@
 # -*- conf-mode -*-
 
-/branch/proceedings/6.33.1.dev0@12111	# Missing data migration to add dbtemplates ?
+
 /branch/proceedings/6.29.1.dev0@11850	# Merged into /branch/proceedings/6.30.1.dev0, will be merged from there
 /branch/proceedings/6.29.1.dev0@11856	# Merged into /branch/proceedings/6.30.1.dev0, will be merged from there
 /personal/rcross/6.29.1.dev0@11765	# Merged into ^/personal/rjs/6.29.1.dev0@11770, will be merged from there

ietf/meeting/migrations/0038_auto_20161013_1459.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+from ietf.meeting.utils import create_proceedings_templates
+
+def create_attendee_templates(apps, schema_editor):
+    """Create attendee templates for supported meetings"""
+    Meeting = apps.get_model("meeting", "Meeting")
+    create_proceedings_templates(Meeting.objects.get(number=95))
+    create_proceedings_templates(Meeting.objects.get(number=96))
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0037_change_meta_options_on_sessionpresentation'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_attendee_templates),
+    ]

ietf/meeting/tests_views.py

@@ -11,6 +11,7 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 
+from mock import patch
 from pyquery import PyQuery
 from StringIO import StringIO
 
@@ -22,6 +23,7 @@
 from ietf.meeting.helpers import send_interim_minutes_reminder
 from ietf.meeting.models import Session, TimeSlot, Meeting
 from ietf.meeting.test_data import make_meeting_test_data, make_interim_meeting
+from ietf.meeting.utils import finalize
 from ietf.name.models import SessionStatusName
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
 from ietf.utils.mail import outbox
@@ -33,6 +35,7 @@
     MeetingFactory, FloorPlanFactory )
 from ietf.doc.factories import DocumentFactory
 
+
 class MeetingTests(TestCase):
     def setUp(self):
         self.materials_dir = os.path.abspath(settings.TEST_MATERIALS_DIR)
@@ -272,41 +275,50 @@ def test_proceedings(self):
         self.assertEqual(r.status_code, 200)
 
     def test_proceedings_acknowledgements(self):
-        meeting = make_meeting_test_data()
+        make_meeting_test_data()
+        meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
+        meeting.acknowledgements = 'test acknowledgements'
+        meeting.save()
         url = urlreverse('ietf.meeting.views.proceedings_acknowledgements',kwargs={'num':meeting.number})
-        login_testing_unauthorized(self,"secretary",url)
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('test acknowledgements' in response.content)
+
+    @patch('urllib2.urlopen')
+    def test_proceedings_attendees(self, mock_urlopen):
+        mock_urlopen.return_value = StringIO('[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
+        make_meeting_test_data()
+        meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
+        finalize(meeting)
+        url = urlreverse('ietf.meeting.views.proceedings_attendees',kwargs={'num':96})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('Attendee List' in response.content)
+        q = PyQuery(response.content)
+        self.assertEqual(1,len(q("#id_attendees tbody tr")))
 
     def test_proceedings_overview(self):
         '''Test proceedings IETF Overview page.
         Note: old meetings aren't supported so need to add a new meeting then test.
         '''
         make_meeting_test_data()
-        # add meeting requires a previous meeting to work
-        date = datetime.date(2016,7,14)
-        Meeting.objects.create(type_id='ietf',date=date,number=96)
-        url = urlreverse('ietf.secr.meetings.views.add')
-        post_data = dict(number='97',city='Seoul',date='2016-11-13',country='KR',
-                         time_zone='Asia/Seoul',venue_name='Conrad Seoul',
-                         venue_addr='10 Gukjegeumyung-ro',
-                         idsubmit_cutoff_day_offset_00=13,
-                         idsubmit_cutoff_day_offset_01=20,
-                         idsubmit_cutoff_time_utc     =datetime.timedelta(hours=23, minutes=59, seconds=59),
-                         idsubmit_cutoff_warning_days =datetime.timedelta(days=21),
-                         submission_start_day_offset=90,
-                         submission_cutoff_day_offset=26,
-                         submission_correction_day_offset=50,
-                     )
-        self.client.login(username='secretary', password='secretary+password')
-        
-        response = self.client.post(url, post_data)
-        self.assertRedirects(response,urlreverse('ietf.secr.meetings.views.main'))
-        url = urlreverse('ietf.meeting.views.proceedings_overview',kwargs={'num':97})
+        meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
+        finalize(meeting)
+        url = urlreverse('ietf.meeting.views.proceedings_overview',kwargs={'num':96})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertTrue('The Internet Engineering Task Force' in response.content)
 
+    def test_proceedings_progress_report(self):
+        make_meeting_test_data()
+        MeetingFactory(type_id='ietf', date=datetime.date(2016,4,3), number="95")
+        MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
+
+        url = urlreverse('ietf.meeting.views.proceedings_progress_report',kwargs={'num':96})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('Progress Report' in response.content)
+
     def test_feed(self):
         meeting = make_meeting_test_data()
         session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
@@ -1279,7 +1291,9 @@ def test_iphone_app_json(self):
         self.assertEqual(r.status_code,200)
 
 class FinalizeProceedingsTests(TestCase):
-    def test_finalize_proceedings(self):
+    @patch('urllib2.urlopen')
+    def test_finalize_proceedings(self, mock_urlopen):
+        mock_urlopen.return_value = StringIO('[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
         meeting = Meeting.objects.filter(type_id='ietf').order_by('id').last()
         meeting.session_set.filter(group__acronym='mars').first().sessionpresentation_set.create(document=Document.objects.filter(type='draft').first(),rev=None)

ietf/meeting/urls.py

@@ -78,7 +78,9 @@
     url(r'^proceedings(?:.html)?/?$', views.proceedings),
     url(r'^proceedings(?:.html)?/finalize/?$', views.finalize_proceedings),
     url(r'^proceedings/acknowledgements/$', views.proceedings_acknowledgements),
+    url(r'^proceedings/attendees/$', views.proceedings_attendees),
     url(r'^proceedings/overview/$', views.proceedings_overview),
+    url(r'^proceedings/progress-report/$', views.proceedings_progress_report),
 ]
 
 urlpatterns = [

ietf/meeting/utils.py

@@ -1,5 +1,12 @@
 import datetime
+import json
+import urllib2
+import urlparse
 
+from django.conf import settings
+from django.template.loader import render_to_string
+
+from ietf.dbtemplate.models import DBTemplate
 from ietf.meeting.models import Session
 from ietf.group.utils import can_manage_materials
 
@@ -72,6 +79,35 @@ def time_sort_key(session):
 
     return meeting_sorted
 
+def create_proceedings_templates(meeting):
+    '''Create DBTemplates for meeting proceedings'''
+    # Get meeting attendees from registration system
+    url = urlparse.urljoin(settings.REGISTRATION_ATTENDEES_BASE_URL,meeting.number)
+    try:
+        attendees = json.load(urllib2.urlopen(url))
+    except (ValueError, urllib2.HTTPError):
+        attendees = []
+
+    if attendees:
+        attendees = sorted(attendees, key = lambda a: a['LastName'])
+        content = render_to_string('meeting/proceedings_attendees_table.html', {
+            'attendees':attendees})
+        DBTemplate.objects.create(
+            path='/meeting/proceedings/%s/attendees.html' % meeting.number,
+            title='IETF %s Attendee List' % meeting.number,
+            type_id='django',
+            content=content)
+    
+    # Make copy of default IETF Overview template
+    if not meeting.overview:
+        template = DBTemplate.objects.get(path='/meeting/proceedings/defaults/overview.rst')
+        template.id = None
+        template.path = '/meeting/proceedings/%s/overview.rst' % (meeting.number)
+        template.title = 'IETF %s Proceedings Overview' % (meeting.number)
+        template.save()
+        meeting.overview = template
+        meeting.save()
+
 def finalize(meeting):
     end_date = meeting.end_date()
     end_time = datetime.datetime.combine(end_date, datetime.datetime.min.time())+datetime.timedelta(days=1)
@@ -81,8 +117,10 @@ def finalize(meeting):
             if rev_before_end:
                 sp.rev = rev_before_end[-1].newrevisiondocevent.rev
             else:
-                sp.rev = '00' 
+                sp.rev = '00'
             sp.save()
+    
+    create_proceedings_templates(meeting)
     meeting.proceedings_final = True
     meeting.save()
     return

ietf/meeting/views.py

@@ -25,6 +25,7 @@
 from django.conf import settings
 from django.forms.models import modelform_factory, inlineformset_factory
 from django.forms import ModelForm
+from django.template import TemplateDoesNotExist
 from django.template.loader import render_to_string
 from django.utils.functional import curry
 from django.views.decorators.cache import cache_page
@@ -56,6 +57,7 @@
 from ietf.meeting.helpers import send_interim_announcement_request
 from ietf.meeting.utils import finalize
 from ietf.secr.proceedings.utils import handle_upload_file
+from ietf.secr.proceedings.proc_utils import get_progress_stats
 from ietf.utils.mail import send_mail_message
 from ietf.utils.pipe import pipe
 from ietf.utils.pdf import pdf_pages
@@ -2009,30 +2011,65 @@ def finalize_proceedings(request, num=None):
 
     return render(request, "meeting/finalize.html", {'meeting':meeting,})
 
-@role_required('Secretariat')
 def proceedings_acknowledgements(request, num=None):
-
+    '''Display Acknowledgements for meeting'''
     meeting = get_meeting(num)
-    if meeting.number < 95:
+    if not num.isdigit():
+        raise Http404
+    if int(meeting.number) < settings.NEW_PROCEEDINGS_START:
         return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s/acknowledgement.html' % num )
     return render(request, "meeting/proceedings_acknowledgements.html", {
         'meeting': meeting,
     })
 
-@role_required('Secretariat')
+def proceedings_attendees(request, num=None):
+    '''Display list of meeting attendees'''
+    meeting = get_meeting(num)
+    if not num.isdigit():
+        raise Http404
+    if int(meeting.number) < settings.NEW_PROCEEDINGS_START:
+        return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s/attendees.html' % num )
+    overview_template = '/meeting/proceedings/%s/attendees.html' % meeting.number
+    try:
+        template = render_to_string(overview_template, {})
+    except TemplateDoesNotExist:
+        raise Http404
+    return render(request, "meeting/proceedings_attendees.html", {
+        'meeting': meeting,
+        'template': template,
+    })
+
 def proceedings_overview(request, num=None):
     '''Display Overview for given meeting'''
     meeting = get_meeting(num)
-    if meeting.number < 95:
+    if not num.isdigit():
+        raise Http404
+    if int(meeting.number) < settings.NEW_PROCEEDINGS_START:
         return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s/overview.html' % num )
     overview_template = '/meeting/proceedings/%s/overview.rst' % meeting.number
-    template = render_to_string(overview_template, {})
-
+    try:
+        template = render_to_string(overview_template, {})
+    except TemplateDoesNotExist:
+        raise Http404
     return render(request, "meeting/proceedings_overview.html", {
         'meeting': meeting,
         'template': template,
     })
 
+@cache_page( 60 * 60 )
+def proceedings_progress_report(request, num=None):
+    '''Display Progress Report (stats since last meeting)'''
+    meeting = get_meeting(num)
+    if not num.isdigit():
+        raise Http404
+    if int(meeting.number) < settings.NEW_PROCEEDINGS_START:
+        return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s/progress-report.html' % num )
+    sdate = meeting.previous_meeting().date
+    edate = meeting.date
+    context = get_progress_stats(sdate,edate)
+    context['meeting'] = meeting
+    return render(request, "meeting/proceedings_progress_report.html", context)
+    
 class OldUploadRedirect(RedirectView):
     def get_redirect_url(self, **kwargs):
         return reverse_lazy('ietf.meeting.views.session_details',kwargs=self.kwargs)

ietf/secr/meetings/tests.py

@@ -85,8 +85,6 @@ def test_add_meeting(self):
         response = self.client.post(url, post_data, follow=True)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(Meeting.objects.count(),count + 1)
-        meeting = Meeting.objects.order_by('id').last()
-        self.assertEqual(meeting.overview.path,'/meeting/proceedings/%s/overview.rst' % meeting.number)
 
     def test_edit_meeting(self):
         "Edit Meeting"

ietf/secr/meetings/views.py

@@ -14,7 +14,6 @@
 from django.template import RequestContext
 from django.utils.functional import curry
 
-from ietf.dbtemplate.models import DBTemplate
 from ietf.ietfauth.utils import role_required
 from ietf.utils.mail import send_mail
 from ietf.meeting.helpers import get_meeting, make_materials_directories
@@ -317,16 +316,7 @@ def add(request):
 
             # Create Physical new meeting directory and subdirectories
             make_materials_directories(meeting)
-            
-            # Make copy of IETF Overview template
-            template = DBTemplate.objects.get(path='/meeting/proceedings/defaults/overview.rst')
-            template.id = None
-            template.path = '/meeting/proceedings/%s/overview.rst' % (meeting.number)
-            template.title = 'IETF %s Proceedings Overview' % (meeting.number)
-            template.save()
-            meeting.overview = template
-            meeting.save()
-            
+
             messages.success(request, 'The Meeting was created successfully!')
             return redirect('meetings')
     else: