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

Added functionality which allows the secretariat to manage more meeting types, including leadership meetings.
Backfilled those types of meetings from IETF91 and IETF92.
Addressed several facelift issues in the meeting application.
 - Legacy-Id: 9606
Note: SVN reference [9603] has been migrated to Git commit a85424a

Author: levkowetz

ietf/bin/create-break-sessions

@@ -22,8 +22,8 @@ scheduled = SessionStatusName.objects.get(slug='sched')
 
 for meeting in Meeting.objects.filter(type="ietf").order_by("date"):
     print "Checking %s schedules ..." % meeting
-    brk, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Break', )
-    reg, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Registration', )
+    brk, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Break', type_id='break',)
+    reg, __ = Session.objects.get_or_create(meeting=meeting, group=secretariat, requested_by=system, status=scheduled, name='Registration', type_id='reg',)
 
     for schedule in meeting.schedule_set.all():
         print "  Checking for missing Break and Reg sessions in %s" % schedule

ietf/doc/tests.py

@@ -527,6 +527,7 @@ def test_document_material(self):
             status = SessionStatusName.objects.create(slug='scheduled', name='Scheduled'),
             modified = datetime.datetime.now(),
             requested_by = Person.objects.get(user__username="marschairman"),
+            type_id = "session",
             )
         SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
 

ietf/doc/tests_material.py

@@ -148,6 +148,7 @@ def test_revise(self):
             status = SessionStatusName.objects.create(slug='scheduled', name='Scheduled'),
             modified = datetime.datetime.now(),
             requested_by = Person.objects.get(user__username="marschairman"),
+            type_id="session",
             )
         SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
 

ietf/group/migrations/0005_auto_20150504_0726.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def create_iab_roles(apps, schema_editor):
+    Role = apps.get_model('group','Role')
+    Group = apps.get_model('group','Group')
+    Person = apps.get_model('person','Person')
+
+    iab = Group.objects.get(acronym='iab')
+
+    iab_names = [
+                  'Jari Arkko',
+                  'Mary Barnes',
+                  'Marc Blanchet',
+                  'Ralph Droms',
+                  'Ted Hardie',
+                  'Joe Hildebrand',
+                  'Russ Housley',
+                  'Erik Nordmark',
+                  'Robert Sparks',
+                  'Andrew Sullivan',
+                  'Dave Thaler',
+                  'Brian Trammell',
+                  'Suzanne Woolf',
+                ]
+   
+    for name in iab_names:
+        person = Person.objects.get(name=name)
+        person.role_set.add(Role(name_id='member',group=iab,person=person,email_id=person.email_set.filter(active=True).order_by('-time').first().address))
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0004_auto_20150430_0847'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_iab_roles),
+    ]

ietf/ietfauth/utils.py

@@ -46,6 +46,7 @@ def has_role(user, role_names, *args, **kwargs):
         role_qs = {
 	    "Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"),
 	    "Secretariat": Q(person=person, name="secr", group__acronym="secretariat"),
+            "IAB" : Q(person=person, name="member", group__acronym="iab"),
 	    "IANA": Q(person=person, name="auth", group__acronym="iana"),
             "RFC Editor": Q(person=person, name="auth", group__acronym="rfceditor"),
             "ISE" : Q(person=person, name="chair", group__acronym="ise"),

ietf/meeting/ajax.py

@@ -158,6 +158,8 @@ def timeslot_roomurl(request, num=None, roomid=None):
 # no authorization required to list.
 def timeslot_slotlist(request, mtg):
     slots = mtg.timeslot_set.all()
+    # Restrict graphical editing to slots of type 'session' for now
+    slots = slots.filter(type__slug='session')
     json_array=[]
     for slot in slots:
         json_array.append(slot.json_dict(request.build_absolute_uri('/')))

ietf/meeting/helpers.py

@@ -66,7 +66,7 @@ def build_all_agenda_slices(meeting):
     time_slices = []
     date_slices = {}
 
-    for ts in meeting.timeslot_set.exclude(type__in=['reg','break']).order_by('time','name'):
+    for ts in meeting.timeslot_set.filter(type__in=['session',]).order_by('time','name'):
             ymd = ts.time.date()
 
             if ymd not in date_slices and ts.location != None:
@@ -80,13 +80,10 @@ def build_all_agenda_slices(meeting):
     time_slices.sort()
     return time_slices,date_slices
 
-def get_scheduledsessions_from_schedule(schedule):
-   ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False).exclude(session__isnull = True).order_by('timeslot__time','timeslot__name','session__group__group')
-
-   return ss
-
 def get_all_scheduledsessions_from_schedule(schedule):
-   ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False).order_by('timeslot__time','timeslot__name')
+   ss = schedule.scheduledsession_set.filter(timeslot__location__isnull = False)
+   ss = ss.filter(session__type__slug='session')
+   ss = ss.order_by('timeslot__time','timeslot__name')
 
    return ss
 

ietf/meeting/migrations/0006_auto_20150318_1116.py

@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations
+
+
+def backfill_91_other_meetings(apps, schema_editor):
+
+        Meeting          = apps.get_model('meeting', 'Meeting')
+        Schedule         = apps.get_model('meeting', 'Schedule')
+        ScheduledSession = apps.get_model('meeting', 'ScheduledSession')
+        Room             = apps.get_model('meeting', 'Room')
+        Group            = apps.get_model('group',   'Group')
+        Person           = apps.get_model('person',  'Person')
+
+        ietf91 = Meeting.objects.filter(number=91).first()
+
+        if not ietf91:
+            print "IETF91 not found, no data changed"
+        else:
+            agenda91 = Schedule.objects.get(meeting=ietf91,pk=ietf91.agenda.pk)
+    
+            south_pacific_1 = Room.objects.get(meeting=ietf91,name="South Pacific 1")
+            south_pacific_2 = Room.objects.get(meeting=ietf91,name="South Pacific 2")
+            rainbow_12      = Room.objects.get(meeting=ietf91,name="Rainbow Suite 1/2")        
+            lehua_suite     = Room.objects.get(meeting=ietf91,name="Lehua Suite")        
+            kahili          = Room.objects.get(meeting=ietf91,name="Kahili")        
+            coral_2         = Room.objects.get(meeting=ietf91,name="Coral 2")        
+    
+            south_pacific_3  = Room.objects.create(meeting=ietf91,name="South Pacific 3",capacity=20)
+            rainbow_suite_3  = Room.objects.create(meeting=ietf91,name="Rainbow Suite 3",capacity=20)
+            rainbow_23       = Room.objects.create(meeting=ietf91,name="Rainbow Suite 2/3",capacity=210)
+            south_pacific_34 = Room.objects.create(meeting=ietf91,name="South Pacific 3/4",capacity=210)
+            iolani_67        = Room.objects.create(meeting=ietf91,name="Iolani 6/7",capacity=40)
+            sea_pearl_12     = Room.objects.create(meeting=ietf91,name="Sea Pearl 1/2",capacity=40)
+            sea_pearl_2      = Room.objects.create(meeting=ietf91,name="Sea Pearl 2",capacity=20)
+            coral_lounge     = Room.objects.create(meeting=ietf91,name="Coral Lounge", capacity=1200)
+            hibiscus         = Room.objects.create(meeting=ietf91,name="Hibiscus", capacity=20)
+            tiare            = Room.objects.create(meeting=ietf91,name="Tiare Suite", capacity=20)
+    
+            iesg = Group.objects.get(acronym='iesg')
+            iab = Group.objects.get(acronym='iab')
+            rsoc = Group.objects.get(acronym='rsoc')
+            iaoc = Group.objects.get(acronym='iaoc')
+            nomcom = Group.objects.get(acronym='nomcom2014')
+            isoc = Group.objects.get(acronym='isoc')
+            secr = Group.objects.get(acronym='secretariat')
+            isocbot = Group.objects.create(acronym='isocbot',name="Internet Society Board of Trustees",state_id='active',type_id='isoc',parent=isoc)
+            isocfell = Group.objects.create(acronym='isocfell',name="Internet Society Fellows",state_id='active',type_id='isoc',parent=isoc)
+    
+            system = Person.objects.get(name='(System)')
+    
+            for d, h, m, duration, type_id,  groups, room, slotname, label in [
+                    (  9,  8,  0,  120, 'offagenda', [secr],     rainbow_suite_3, 'WEIRDS Interop', 'WEIRDS Interop'),
+                    (  9,  8, 30,   90, 'lead',      [iesg],     south_pacific_2, 'Breakfast', None),
+                    (  9,  9,  0,  240, 'offagenda', [secr],     lehua_suite,     'RMCAT Interim', 'RMCAT Interim Meeting'),
+                    (  9,  9,  0,   60, 'lead',      [nomcom],   iolani_67,       'Breakfast', 'Nomcom Breakfast'),
+                    (  9,  9,  0,  150, 'lead',      [iesg],     south_pacific_2, 'Meeting', None), 
+                    (  9,  9,  0,  360, 'offagenda', [secr],     hibiscus,        'Meeting', 'RootOPS'),
+                    (  9,  9, 30,  360, 'offagenda', [secr],     kahili,          'TLS Interim', 'TLS WG Interim'),
+                    (  9, 11,  0,  480, 'offagenda', [secr],     coral_lounge,    'T-Shirt Distribution', 'T-shirt Distribution'),
+                    (  9, 11, 30,  150, 'lead',      [iesg],     south_pacific_2, 'Lunch', 'IESG Lunch with the IAB'),
+                    (  9, 11, 30,  150, 'lead',      [iab],      south_pacific_2, 'Lunch', 'IAB Lunch with the IESG'),
+                    (  9, 12,  0,  360, 'offagenda', [secr],     south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'),
+                    (  9, 14,  0,  180, 'lead',      [iab],      south_pacific_2, 'Meeting', None),
+                    (  9, 16,  0,  120, 'offagenda', [secr],     coral_2,         'Meeting', 'Web Object Encryption'),
+                    (  9, 17,  0,  120, 'offagenda', [secr],     sea_pearl_12,    'Reception', "Companion's Reception"), # Should this appear on agenda?
+                    (  9, 19,  0,  180, 'offagenda', [isocfell], rainbow_23,      'Dinner', 'ISOC Fellows Reception/Dinner'),
+                    (  9, 19,  0,  180, 'offagenda', [secr],     lehua_suite,     'Meeting', 'Huawei'),
+                    (  9, 21,  0,  180, 'lead',      [secr],     sea_pearl_12,    'Gathering', 'AMS/IESG/IAB/IAOC Gathering'),
+                    ( 10,  0,  0, 1440, 'offagenda', [secr],     south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'),
+                    ( 10,  7,  0,  120, 'lead',      [iesg],     south_pacific_2, 'Breakfast', 'IESG Breakfast with the IAB'),
+                    ( 10,  7,  0,  120, 'lead',      [iab],      south_pacific_2, 'Breakfast', 'IAB Breakfast with the IESG'),
+                    ( 10,  7,  0,  120, 'lead',      [nomcom],   iolani_67,       'Breakfast', 'Nomcom Breakfast'),
+                    ( 10,  8,  0,  600, 'offagenda', [secr],     coral_lounge,    'T-shirt Distribution', 'T-shirt Distribution'),
+                    ( 10, 11, 30,   90, 'offagenda', [secr],     south_pacific_2, 'Meeting', 'OPS Directorate Meeting'),
+                    ( 10, 11, 30,   90, 'offagenda', [secr],     rainbow_suite_3, 'Meeting', 'IETF/3GPP Meeting'),
+                    ( 10, 11, 30,   90, 'offagenda', [secr],     lehua_suite,     'Meeting', 'RTG Area Meeting'),
+                    ( 10, 19,  0,  240, 'offagenda', [secr],     south_pacific_2, 'Meeting', 'Huawei'),
+                    ( 11,  0,  0, 1440, 'offagenda', [secr],     south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'),
+                    ( 11,  7,  0,  120, 'lead',      [iesg],     south_pacific_2, 'Breakfast', None),
+                    ( 11,  7,  0,  120, 'lead',      [nomcom],   iolani_67,       'Breakfast', 'Nomcom Breakfast'),
+                    ( 11,  7,  0,  120, 'lead',      [iab],      rainbow_suite_3, 'Breakfast', None),
+                    ( 11,  7,  0,   60, 'lead',      [iab],      tiare,           'Meeting', 'Vendor Selection Committee Meeting'),
+                    ( 11,  8,  0,  600, 'offagenda', [secr],     coral_lounge,    'T-shirt Distribution', 'T-shirt Distribution'),
+                    ( 11,  9,  0,   90, 'offagenda', [secr],     south_pacific_2, 'Meeting', 'DHCPv6bis Team Meeting'),
+                    ( 11, 11, 30,   90, 'offagenda', [secr],     south_pacific_2, 'Meeting', 'SECdir Meeting'),
+                    ( 11, 11, 30,   90, 'offagenda', [secr],     rainbow_suite_3, 'Lunch', 'RSAG/ISEB Lunch'),
+                    ( 11, 16,  0,  240, 'offagenda', [secr],     south_pacific_2, 'Meeting', 'Verisign Corporate Meeting'),
+                    ( 12,  0,  0, 1440, 'offagenda', [secr],     south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'),
+                    ( 12,  7, 30,   90, 'lead',      [iaoc],     south_pacific_3, 'Breakfast', None),
+                    ( 12,  7,  0,  120, 'lead',      [nomcom],   iolani_67,       'Breakfast', 'Nomcom Breakfast'),
+                    ( 12,  8,  0,  540, 'offagenda', [secr],     coral_lounge,    'T-shirt Distribution', 'T-shirt Distribution'),
+                    ( 12,  8,  0,  240, 'offagenda', [secr],     south_pacific_2, 'Meeting', 'DIME WG'),
+                    ( 12, 11, 30,   90, 'offagenda', [secr],     rainbow_suite_3, 'Lunch', 'RFC Editor Lunch'),
+                    ( 12, 15,  0,  120, 'offagenda', [secr],     south_pacific_2, 'Meeting', 'YANG Advice'),
+                    ( 12, 17,  0,  240, 'offagenda', [secr],     rainbow_suite_3, 'Meeting', 'Huawei (POC Wil Liu)'),
+                    ( 12, 20,  0,  150, 'offagenda', [secr],     south_pacific_2, 'Meeting', 'ICANN SSAC'),
+                    ( 13,  0,  0, 1440, 'offagenda', [secr],     south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'),
+                    ( 13,  7,  0,  120, 'lead',      [iab],      rainbow_suite_3, 'Breakfast', None),
+                    ( 13,  7,  0,  120, 'lead',      [nomcom],   iolani_67,       'Breakfast', 'Nomcom Breakfast'),
+                    ( 13, 11, 30,   90, 'lead',      [iab],      sea_pearl_2,     'Meeting', 'IAB Liaison Oversight'),
+                    ( 13, 11, 30,   90, 'lead',      [rsoc],     rainbow_suite_3, 'Lunch', None),
+                    ( 14,  0,  0,  900, 'offagenda', [secr],     south_pacific_1, 'Terminal Room', 'Terminal Room Open to Attendees'),
+                    ( 14,  7,  0,  120, 'lead',      [nomcom],   iolani_67,       'Breakfast', 'Nomcom Breakfast'),
+                    ( 14, 11,  0,  360, 'offagenda', [isoc],     south_pacific_34,'Meeeting', 'ISOC AC Meeting'),
+                    ( 14, 13, 30,   90, 'lead',      [iesg],     south_pacific_2, 'Lunch', 'IESG Lunch with the IAB'),
+                    ( 14, 13, 30,   90, 'lead',      [iab],      south_pacific_2, 'Lunch', 'IAB Lunch with the IESG'),
+                    ( 14, 18,  0,   60, 'offagenda', [isocbot],  rainbow_23,      'Reception', 'ISOC Board Reception for IETF Leadership'),
+                    ( 14, 19,  0,  180, 'offagenda', [isocbot],  rainbow_23,      'Dinner', 'ISOC Board Dinner for IETF Leadership'),
+                    ( 15,  8,  0,   60, 'offagenda', [isocbot],  rainbow_12,      'Breakfast', 'ISOC Board of Trustees Breakfast'),
+                    ( 15,  8,  0,  540, 'offagenda', [isocbot],  south_pacific_34,'Meeting', 'ISOC Board of Trustees Meeting'),
+                    ( 15, 12,  0,   60, 'offagenda', [isocbot],  rainbow_12,      'Lunch', 'ISOC Board of Trustees Lunch'),
+                    ( 16,  8,  0,   60, 'offagenda', [isocbot],  rainbow_12,      'Breakfast', 'ISOC Board of Trustees Breakfast'), 
+                    ( 16,  8,  0,  540, 'offagenda', [isocbot],  south_pacific_34,'Meeting', 'ISOC Board of Trustees Meeting'),
+                    ( 16, 12,  0,   60, 'offagenda', [isocbot],  rainbow_12,      'Lunch', 'ISOC Board of Trustees Lunch'),
+                    ]:
+                ts = ietf91.timeslot_set.create(type_id=type_id, name=slotname, 
+                                                time=datetime.datetime(2014,11,d,h,m,0),
+                                                duration=datetime.timedelta(minutes=duration), 
+                                                location=room,show_location=(type_id not in ['lead','offagenda']))
+                for group in groups:
+                    session = ietf91.session_set.create(name= label or "%s %s"%(group.acronym.upper(),slotname),
+                                                        group=group, attendees=25,
+                                                        requested=datetime.datetime(2014,11,1,0,0,0),
+                                                        requested_by=system, status_id='sched')
+                    ScheduledSession.objects.create(schedule=agenda91, timeslot=ts, session=session)
+
+
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0005_auto_20150430_0847'),
+        ('name',    '0004_auto_20150318_1140'),
+        ('group',   '0004_auto_20150430_0847'),
+        ('person',  '0004_auto_20150308_0440'),
+    ]
+
+    operations = [
+        migrations.RunPython(backfill_91_other_meetings)
+    ]

ietf/meeting/migrations/0007_auto_20150429_1224.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+def extract_session_type_values(apps, schema_editor):
+
+    Session  = apps.get_model('meeting', 'Session')
+
+    for s in Session.objects.all():
+        t = s.scheduledsession_set.filter(schedule=models.F('schedule__meeting__agenda')).first()
+        if t and t.timeslot.type.slug != 'session':
+            s.type = t.timeslot.type
+            s.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0004_auto_20150318_1140'),
+        ('meeting', '0006_auto_20150318_1116'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='session',
+            name='type',
+            field=models.ForeignKey(default='session', to='name.TimeSlotTypeName'),
+            preserve_default=False,
+        ),
+        migrations.RunPython(extract_session_type_values),
+    ]

ietf/meeting/migrations/0008_auto_20150429_1346.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+def extract_room_session_type_values(apps, schema_editor):
+
+    Room  = apps.get_model('meeting', 'Room')
+
+    for r in Room.objects.all():
+        for ts in r.timeslot_set.all():
+            if ts.scheduledsession_set.filter(schedule=models.F('schedule__meeting__agenda')):
+                r.session_types.add(ts.type)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0004_auto_20150318_1140'),
+        ('meeting', '0007_auto_20150429_1224'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='room',
+            name='session_types',
+            field=models.ManyToManyField(to='name.TimeSlotTypeName', blank=True),
+            preserve_default=True,
+        ),
+        migrations.RunPython(extract_room_session_type_values),
+    ]