Merged in [11764] from rjsparks@nostrum.com:

    Moved the materials start, cutoff, and revision dates into the Meeting object
Add a bit to meeting to note whether proceedings are final. 
Update proceedings view to reflect the status of that bit. 
Add a function that finalizes a meetings proceedings.
Straighten out a migration numbering collision introduced in an earlier merge.
 - Legacy-Id: 11795
Note: SVN reference [11764] has been migrated to Git commit 57afa06

Author: levkowetz

ietf/doc/tests.py

@@ -928,7 +928,7 @@ def setUp(self):
         self.other_group.role_set.create(name_id='chair',person=self.other_chair,email=self.other_chair.email())
 
         today = datetime.date.today()
-        cut_days = settings.MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS
+        cut_days = settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_CORRECTION_DAYS
         self.past_cutoff = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1+cut_days))
         self.past = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=cut_days/2))
         self.inprog = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1))

ietf/meeting/migrations/0030_add_material_day_offsets.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0029_add_time_to_room_and_floorplan'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='meeting',
+            name='submission_correction_day_offset',
+            field=models.IntegerField(default=50, help_text=b'The number of days after the meeting start date in which updates to existing meeting materials will be accepted.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='meeting',
+            name='submission_cutoff_day_offset',
+            field=models.IntegerField(default=26, help_text=b'The number of days after the meeting start date in which new meeting materials will be accepted.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='meeting',
+            name='submission_start_day_offset',
+            field=models.IntegerField(default=90, help_text=b'The number of days before the meeting start date after which meeting materials will be accepted.', blank=True),
+            preserve_default=True,
+        ),
+    ]

ietf/meeting/migrations/0031_add_proceedings_final.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+def reverse(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0030_add_material_day_offsets'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='meeting',
+            name='proceedings_final',
+            field=models.BooleanField(default=False, help_text='Are the proceedings for this meeting complete?'),
+            preserve_default=True,
+        ),
+    ]

…econstruct_bluesheet_docs_95through96.py …econstruct_bluesheet_docs_95through96.pyietf/meeting/migrations/0029_reconstruct_bluesheet_docs_95through96.py renamed to ietf/meeting/migrations/0032_reconstruct_bluesheet_docs_95through96.py ietf/meeting/migrations/0029_reconstruct_bluesheet_docs_95through96.py renamed to ietf/meeting/migrations/0032_reconstruct_bluesheet_docs_95through96.py

@@ -59,7 +59,7 @@ def reverse(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('meeting', '0028_add_audio_stream_data'),
+        ('meeting', '0031_add_proceedings_final'),
         ('doc', '0012_auto_20160207_0537'),
         ('group','0008_auto_20160505_0523'),
     ]

ietf/meeting/models.py

@@ -72,14 +72,23 @@ class Meeting(models.Model):
     idsubmit_cutoff_warning_days  = timedelta.fields.TimedeltaField(blank=True,
         default=settings.IDSUBMIT_DEFAULT_CUTOFF_WARNING_DAYS,
         help_text = "How long before the 00 cutoff to start showing cutoff warnings.  Use for example 21 days or 3 weeks.")
-    #
+    submission_start_day_offset = models.IntegerField(blank=True,
+        default=settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_START_DAYS,
+        help_text = "The number of days before the meeting start date after which meeting materials will be accepted.")
+    submission_cutoff_day_offset = models.IntegerField(blank=True,
+        default=settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_CUTOFF_DAYS,
+        help_text = "The number of days after the meeting start date in which new meeting materials will be accepted.")
+    submission_correction_day_offset = models.IntegerField(blank=True,
+        default=settings.MEETING_MATERIALS_DEFAULT_SUBMISSION_CORRECTION_DAYS,
+        help_text = "The number of days after the meeting start date in which updates to existing meeting materials will be accepted.")
     venue_name = models.CharField(blank=True, max_length=255)
     venue_addr = models.TextField(blank=True)
     break_area = models.CharField(blank=True, max_length=255)
     reg_area = models.CharField(blank=True, max_length=255)
     agenda_note = models.TextField(blank=True, help_text="Text in this field will be placed at the top of the html agenda page for the meeting.  HTML can be used, but will not be validated.")
     agenda     = models.ForeignKey('Schedule',null=True,blank=True, related_name='+')
     session_request_lock_message = models.CharField(blank=True,max_length=255) # locked if not empty
+    proceedings_final = models.BooleanField(default=False, help_text=u"Are the proceedings for this meeting complete?")
 
     def __unicode__(self):
         if self.type_id == "ietf":
@@ -149,11 +158,11 @@ def get_materials_path(self):
 
     # the various dates are currently computed
     def get_submission_start_date(self):
-        return self.date + datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_START_DAYS)
+        return self.date - datetime.timedelta(days=self.submission_start_day_offset)
     def get_submission_cut_off_date(self):
-        return self.date + datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_CUTOFF_DAYS)
+        return self.date + datetime.timedelta(days=self.submission_cutoff_day_offset)
     def get_submission_correction_date(self):
-        return self.date + datetime.timedelta(days=settings.MEETING_MATERIALS_SUBMISSION_CORRECTION_DAYS)
+        return self.date + datetime.timedelta(days=self.submission_correction_day_offset)
 
     def get_schedule_by_name(self, name):
         return self.schedule_set.filter(name=name).first()

ietf/meeting/resources.py

@@ -32,6 +32,9 @@ class Meta:
             "idsubmit_cutoff_day_offset_01": ALL,
             "idsubmit_cutoff_time_utc": ALL,
             "idsubmit_cutoff_warning_days": ALL,
+            "submission_start_day_offset": ALL,
+            "submmission_cutoff_day_offset": ALL,
+            "submission_correction_day_offset": ALL,
             "venue_name": ALL,
             "venue_addr": ALL,
             "break_area": ALL,
@@ -40,6 +43,7 @@ class Meta:
             "session_request_lock_message": ALL,
             "type": ALL_WITH_RELATIONS,
             "agenda": ALL_WITH_RELATIONS,
+            "proceedings_final": ALL,
         }
 api.meeting.register(MeetingResource())
 

ietf/meeting/tests_views.py

@@ -1146,7 +1146,7 @@ def test_floor_plan_page(self):
         url = urlreverse('ietf.meeting.views.floor_plan', kwargs={'floor': xslugify(floorplan.name)} )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        
+
 class IphoneAppJsonTests(TestCase):
     def setUp(self):
         pass
@@ -1168,3 +1168,23 @@ def test_iphone_app_json(self):
         url = urlreverse('ietf.meeting.views.json_agenda',kwargs={'num':meeting.number})
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
+
+class FinalizeProceedingsTests(TestCase):
+    def test_finalize_proceedings(self):
+        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)
+
+        url = urlreverse('ietf.meeting.views.finalize_proceedings',kwargs={'num':meeting.number})
+        login_testing_unauthorized(self,"secretary",url)
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+
+        self.assertEqual(meeting.proceedings_final,False)
+        self.assertEqual(meeting.session_set.filter(group__acronym="mars").first().sessionpresentation_set.filter(document__type="draft").first().rev,None)
+        r = self.client.post(url,{'finalize':1})
+        self.assertEqual(r.status_code, 302)
+        meeting = Meeting.objects.get(pk=meeting.pk)
+        self.assertEqual(meeting.proceedings_final,True)
+        self.assertEqual(meeting.session_set.filter(group__acronym="mars").first().sessionpresentation_set.filter(document__type="draft").first().rev,'00')
+ 

ietf/meeting/urls.py

@@ -68,6 +68,7 @@
     url(r'^room-view(?:.html)?/?$', views.room_view),
     url(r'^materials(?:.html)?/?$', views.materials),
     url(r'^proceedings(?:.html)?/?$', views.proceedings),
+    url(r'^proceedings(?:.html)?/finalize/?$', views.finalize_proceedings),
 ]
 
 urlpatterns = [

ietf/meeting/utils.py

@@ -71,3 +71,19 @@ def time_sort_key(session):
     meeting_sorted = sorted(acronym_sorted,key=lambda x: x.meeting.number)
 
     return meeting_sorted
+
+def finalize(meeting):
+    end_date = meeting.end_date()
+    end_time = datetime.datetime.combine(end_date, datetime.datetime.min.time())+datetime.timedelta(days=1)
+    for session in meeting.session_set.all():
+        for sp in session.sessionpresentation_set.filter(document__type='draft',rev=None):
+            rev_before_end = [e for e in sp.document.docevent_set.filter(newrevisiondocevent__isnull=False).order_by('-time') if e.time <= end_time ]
+            if rev_before_end:
+                sp.rev = rev_before_end[-1].newrevisiondocevent.rev
+            else:
+                sp.rev = '00' 
+            sp.save()
+    meeting.proceedings_final = True
+    meeting.save()
+    return
+

ietf/meeting/views.py

@@ -50,6 +50,7 @@
 from ietf.meeting.helpers import send_interim_cancellation_notice
 from ietf.meeting.helpers import send_interim_approval_request
 from ietf.meeting.helpers import send_interim_announcement_request
+from ietf.meeting.utils import finalize
 from ietf.utils.mail import send_mail_message
 from ietf.utils.pipe import pipe
 from ietf.utils.pdf import pdf_pages
@@ -913,7 +914,7 @@ def json_agenda(request, num=None ):
             sessdict['name'] = asgn.session.short
         else:
             sessdict['name'] = asgn.session.group.name
-        sessdict['start'] = str(asgn.timeslot.time)
+        sessdict['start'] = asgn.timeslot.utc_start_time().strftime("%Y-%m-%dT%H:%M:%SZ")
         sessdict['duration'] = str(asgn.timeslot.duration)
         sessdict['location'] = asgn.room_name
         room_names.add(asgn.room_name) 
@@ -962,8 +963,10 @@ def json_agenda(request, num=None ):
     meetinfo.extend(parents)
     meetinfo.sort(key=lambda x: x['modified'],reverse=True)
     last_modified = meetinfo[0]['modified']
+
+    tz = pytz.timezone(meeting.time_zone)
     for obj in meetinfo:
-        obj['modified'] = obj['modified'].strftime('%Y-%m-%dT%H:%M:%S')
+        obj['modified'] = tz.localize(obj['modified']).astimezone(pytz.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
 
     data = {"%s"%num: meetinfo}
 
@@ -1544,10 +1547,26 @@ def proceedings(request, num=None):
 
     cache_version = Document.objects.filter(session__meeting__number=meeting.number).aggregate(Max('time'))["time__max"]
     return render(request, "meeting/proceedings.html", {
-        'meeting_num': meeting.number,
+        'meeting': meeting,
         'plenaries': plenaries, 'ietf': ietf, 'training': training, 'irtf': irtf, 'iab': iab,
         'cut_off_date': cut_off_date,
         'cor_cut_off_date': cor_cut_off_date,
         'submission_started': now > begin_date,
         'cache_version': cache_version,
     })
+
+
+@role_required('Secretariat')
+def finalize_proceedings(request, num=None):
+
+    meeting = get_meeting(num)
+
+    if meeting.number <= 64 or not meeting.agenda.assignments.exists() or meeting.proceedings_final:
+        raise Http404
+
+    if request.method=='POST':
+        finalize(meeting)
+        return HttpResponseRedirect(reverse('ietf.meeting.views.proceedings',kwargs={'num':meeting.number}))
+    
+    return render(request, "meeting/finalize.html", {'meeting':meeting,})
+