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

    Moves Important Dates into the datatracker. Fixes ietf-tools#2338.
 - Legacy-Id: 13962
Note: SVN reference [13957] has been migrated to Git commit 2e6f26a

Author: levkowetz

ietf/meeting/admin.py

@@ -2,7 +2,7 @@
 
 from ietf.meeting.models import (Meeting, Room, Session, TimeSlot, Constraint, Schedule,
     SchedTimeSessAssignment, ResourceAssociation, FloorPlan, UrlResource,
-    SessionPresentation)
+    SessionPresentation, ImportantDate, )
 
 
 class UrlResourceAdmin(admin.ModelAdmin):
@@ -125,3 +125,10 @@ class SessionPresentationAdmin(admin.ModelAdmin):
     list_filter = ['session__meeting', 'document__group__acronym', ]
     raw_id_fields = ['document', 'session', ]
 admin.site.register(SessionPresentation, SessionPresentationAdmin)
+
+class ImportantDateAdmin(admin.ModelAdmin):
+    model = ImportantDate
+    list_display = ['meeting', 'name', 'date']
+    ordering = ['-meeting__number','date',]
+
+admin.site.register(ImportantDate,ImportantDateAdmin)

ietf/meeting/helpers.py

@@ -22,7 +22,8 @@
 from ietf.liaisons.utils import get_person_for_user
 from ietf.mailtrigger.utils import gather_address_lists
 from ietf.person.models  import Person
-from ietf.meeting.models import Meeting, Schedule, TimeSlot, SchedTimeSessAssignment
+from ietf.meeting.models import Meeting, Schedule, TimeSlot, SchedTimeSessAssignment, ImportantDate
+from ietf.name.models import ImportantDateName
 from ietf.utils.history import find_history_active_at, find_history_replacements_active_at
 from ietf.utils.mail import send_mail
 from ietf.utils.pipe import pipe
@@ -128,6 +129,13 @@ def get_meeting(num=None,type_in=['ietf',]):
     else:
         raise Http404("No such meeting found: %s" % num)
 
+def get_ietf_meeting(num=None):
+    if num:
+        meetings = Meeting.objects.filter(number=num)
+    else:
+        meetings = Meeting.objects.filter(type='ietf',date__gte=datetime.datetime.today()-datetime.timedelta(days=31)).order_by('date')
+    return meetings.first()
+
 def get_schedule(meeting, name=None):
     if name is None:
         schedule = meeting.agenda
@@ -608,3 +616,9 @@ def update_interim_session_assignment(form):
             timeslot=slot,
             session=session,
             schedule=session.meeting.agenda)
+
+def populate_important_dates(meeting):
+    assert ImportantDate.objects.filter(meeting=meeting).exists() is False
+    assert meeting.type_id=='ietf'
+    for datename in ImportantDateName.objects.filter(used=True):
+        ImportantDate.objects.create(meeting=meeting,name=datename,date=meeting.date+datetime.timedelta(days=datename.default_offset_days))

ietf/meeting/migrations/0053_important_date.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-07-20 06:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0025_add-important-dates'),
+        ('meeting', '0052_floorplan_short'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ImportantDate',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateField()),
+                ('meeting', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='meeting.Meeting')),
+                ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.ImportantDateName')),
+            ],
+            options={'ordering': ['-meeting','date']},
+        ),
+    ]

ietf/meeting/migrations/0054_earlier_important_dates.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-07-20 06:14
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+import datetime
+
+def forward(apps,schema_editor):
+    Meeting = apps.get_model('meeting','Meeting')
+    ImportantDate = apps.get_model('meeting', 'ImportantDate')
+    ImportantDateName = apps.get_model('name', 'ImportantDateName')
+
+    for num in [98,99]:
+        meeting = Meeting.objects.get(number=num)
+        for datename in ImportantDateName.objects.filter(used=True):
+            ImportantDate.objects.create(meeting=meeting,name=datename,date=meeting.date+datetime.timedelta(days=datename.default_offset_days-1))
+
+    ImportantDate.objects.filter(meeting__number=99,name__slug='openreg').update(date='2017-03-27')
+
+    ImportantDate.objects.filter(meeting__number=98,name__slug='openreg').update(date='2016-11-28')
+    ImportantDate.objects.filter(meeting__number=98,name__slug='opensched').update(date='2016-12-19')
+
+def reverse(apps,schema_editor):
+    ImportantDate = apps.get_model('meeting', 'ImportantDate')
+    ImportantDate.objects.filter(meeting__number__in=[99,98]).delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0053_important_date'),
+        ('name', '0026_popuulate-important-date-names'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward,reverse),
+    ]

ietf/meeting/migrations/0055_old_id_cutoffs.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-07-21 01:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+import datetime
+
+def forward(apps, schema_editor):
+    ImportantDate = apps.get_model('meeting','ImportantDate')
+    Meeting = apps.get_model('meeting','Meeting')
+    for m in Meeting.objects.filter(type='ietf').exclude(importantdate__isnull=False):
+        if m.idsubmit_cutoff_day_offset_00 == m.idsubmit_cutoff_day_offset_01 :
+            ImportantDate.objects.create(
+                name_id='idcutoff',
+                meeting=m,
+                date=m.date-datetime.timedelta(days=m.idsubmit_cutoff_day_offset_00) 
+            )
+        else:
+            ImportantDate.objects.create(
+                name_id='00cutoff',
+                meeting=m,
+                date=m.date-datetime.timedelta(days=m.idsubmit_cutoff_day_offset_00) 
+            )
+            ImportantDate.objects.create(
+                name_id='01cutoff',
+                meeting=m,
+                date=m.date-datetime.timedelta(days=m.idsubmit_cutoff_day_offset_01) 
+            )
+        
+ 
+def reverse(apps, schema_editor):
+    Meeting = apps.get_model('meeting','Meeting')
+    # This is a simple reverse implementation. If a reverse is needed a significant
+    # time after the forward is run (as in multiple meeting cycles), a more considered
+    # implemenation should be created reflecting any assumptions that have changed in
+    # that time.
+    for m in Meeting.objects.filter(type='ietf'):
+        if m.importantdate_set.count()==2:
+            m.importantdate_set.all().delete()
+        
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0054_earlier_important_dates'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward,reverse)
+    ]

ietf/meeting/models.py

@@ -21,7 +21,7 @@
 from ietf.doc.models import Document
 from ietf.group.models import Group
 from ietf.group.utils import can_manage_materials
-from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName, RoomResourceName
+from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName, RoomResourceName, ImportantDateName
 from ietf.person.models import Person
 from ietf.utils.storage import NoLocationMigrationFileSystemStorage
 from ietf.utils.text import xslugify
@@ -109,13 +109,25 @@ def end_date(self):
 
     def get_00_cutoff(self):
         start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day, tzinfo=pytz.utc)
-        cutoff_date = start_date - datetime.timedelta(days=self.idsubmit_cutoff_day_offset_00)
+        importantdate = self.importantdate_set.filter(name_id='idcutoff').first()
+        if not importantdate:
+            importantdate = self.importantdate_set.filter(name_id='00cutoff').first()
+        if importantdate:
+            cutoff_date = importantdate.date
+        else:
+            cutoff_date = start_date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
         cutoff_time = cutoff_date + self.idsubmit_cutoff_time_utc
         return cutoff_time
 
     def get_01_cutoff(self):
         start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day, tzinfo=pytz.utc)
-        cutoff_date = start_date - datetime.timedelta(days=self.idsubmit_cutoff_day_offset_01)
+        importantdate = self.importantdate_set.filter(name_id='idcutoff').first()
+        if not importantdate:
+            importantdate = self.importantdate_set.filter(name_id='01cutoff').first()
+        if importantdate:
+            cutoff_date = importantdate.date
+        else:
+            cutoff_date = start_date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
         cutoff_time = cutoff_date + self.idsubmit_cutoff_time_utc
         return cutoff_time
 
@@ -1100,3 +1112,10 @@ def agenda_file(self):
             self._agenda_file = "%s/agenda/%s" % (self.meeting.number, filename)
 
         return self._agenda_file
+
+class ImportantDate(models.Model):
+    meeting = models.ForeignKey(Meeting)
+    date = models.DateField()
+    name = models.ForeignKey(ImportantDateName)
+    class Meta:
+        ordering = ["-meeting","date", ]

ietf/meeting/resources.py

@@ -9,7 +9,7 @@
 
 from ietf.meeting.models import ( Meeting, ResourceAssociation, Constraint, Room, Schedule, Session,
                                 TimeSlot, SchedTimeSessAssignment, SessionPresentation, FloorPlan,
-                                UrlResource)
+                                UrlResource, ImportantDate )
 
 from ietf.name.resources import MeetingTypeNameResource
 class MeetingResource(ModelResource):
@@ -281,3 +281,21 @@ class Meta:
         }
 api.meeting.register(UrlResourceResource())
 
+
+
+from ietf.name.resources import ImportantDateNameResource
+class ImportantDateResource(ModelResource):
+    meeting          = ToOneField(MeetingResource, 'meeting')
+    name             = ToOneField(ImportantDateNameResource, 'name')
+    class Meta:
+        queryset = ImportantDate.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'importantdate'
+        filtering = { 
+            "id": ALL,
+            "date": ALL,
+            "meeting": ALL_WITH_RELATIONS,
+            "name": ALL_WITH_RELATIONS,
+        }
+api.meeting.register(ImportantDateResource())

ietf/meeting/tests_views.py

@@ -22,7 +22,7 @@
 from ietf.meeting.helpers import can_approve_interim_request, can_view_interim_request
 from ietf.meeting.helpers import send_interim_approval_request
 from ietf.meeting.helpers import send_interim_cancellation_notice
-from ietf.meeting.helpers import send_interim_minutes_reminder
+from ietf.meeting.helpers import send_interim_minutes_reminder, populate_important_dates
 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
@@ -408,6 +408,14 @@ def test_feed(self):
         self.assertTrue("agenda" in unicontent(r))
         self.assertTrue(session.group.acronym in unicontent(r))
 
+    def test_important_dates(self):
+        meeting=MeetingFactory(type_id='ietf')
+        populate_important_dates(meeting)
+        url = urlreverse('ietf.meeting.views.important_dates',kwargs={'num':meeting.number})
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(str(meeting.importantdate_set.first().date) in unicontent(r))
+
 class EditTests(TestCase):
     def setUp(self):
         # make sure we have the colors of the area

ietf/meeting/urls.py

@@ -90,6 +90,8 @@
     url(r'^proceedings/attendees/$', views.proceedings_attendees),
     url(r'^proceedings/overview/$', views.proceedings_overview),
     url(r'^proceedings/progress-report/$', views.proceedings_progress_report),
+    url(r'^important-dates/$', views.important_dates),
+
 ]
 
 urlpatterns = [

ietf/meeting/views.py

@@ -46,7 +46,7 @@
 from ietf.meeting.helpers import get_all_assignments_from_schedule
 from ietf.meeting.helpers import get_modified_from_assignments
 from ietf.meeting.helpers import get_wg_list, find_ads_for_meeting
-from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, get_meetings
+from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, get_meetings, get_ietf_meeting
 from ietf.meeting.helpers import preprocess_assignments_for_agenda, read_agenda_file, read_session_file
 from ietf.meeting.helpers import convert_draft_to_pdf, get_earliest_session_date
 from ietf.meeting.helpers import can_view_interim_request, can_approve_interim_request
@@ -416,13 +416,13 @@ def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc=""
         ".csv": "text/csv; charset=%s"%settings.DEFAULT_CHARSET,
     }
 
-    meetings = get_meetings(num)
-
     # We do not have the appropriate data in the datatracker for IETF 64 and earlier.
     # So that we're not producing misleading pages...
 
-    meeting = meetings.first()
-    if not meetings.exists() or (meeting.number.isdigit() and int(meeting.number) <= 64 and not meeting.agenda.assignments.exists()):
+    assert num is None or num.isdigit()
+
+    meeting = get_ietf_meeting(num)
+    if not meeting or (meeting.number.isdigit() and int(meeting.number) <= 64 and not meeting.agenda.assignments.exists()):
         if ext == '.html':
             return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num )
         else:
@@ -2202,4 +2202,19 @@ def api_import_recordings(request, number):
     else:
         return HttpResponse(status=405)
 
+def important_dates(request, num=None):
+    assert num is None or num.isdigit()
+
+    meeting = get_ietf_meeting(num)
+    if not meeting:
+        raise Http404
+    base_num = int(meeting.number)
+
+    meetings=[meeting]
+    for i in range(1,3):
+        future_meeting = get_ietf_meeting(base_num+i)
+        if future_meeting:
+            meetings.append(future_meeting)
 
+    context={'meetings':meetings}
+    return render(request, 'meeting/important-dates.html', context)