Merge lp:~james-w/summit/dial-in into lp:summit

[James Westby]

Add fields on rooms and meetings for dial-in.

A meeting that requires dial-in can only be scheduled in to a room
that has it.

Hi,

This is a surprisingly small branch that adds dial-in knowledge
to meetings and rooms.

A meeting can specify that it requires dial-in, and such meetings
can only be scheduled in to rooms that have dial-in.

It will be up to admins to manage these fields, you can't put
something in the LP blueprint for instance.

My next branch will update the admin interface to show these
fields.

Thanks,

James

[James Westby (james-w)]

Well, the admin site was easier than I thought, so I've pushed
that now too.

[lp:~james-w/summit/dial-in]

171. By James Westby on 2011-09-15

Add the dial-in fields to the admin site.

[James Westby (james-w)]

Hi,

Michael asked if we should be showing dial-in information on the schedule.

I talked to Joey about it, and he's not sure.

I propose that we land this so that the scheduling can be done, and we can
land something to store and display that information if it is needed, once
we know how it should work.

At worst the session lead could put the information in the etherpad for the
session.

Thanks,

James

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py	2011-05-31 10:43:35 +0000
+++ summit/schedule/admin/meetingadmin.py	2011-09-15 20:51:24 +0000
@@ -154,7 +154,7 @@
     fieldsets = (
         (None, {
             'fields': ('summit', 'name', 'title', 'description',
-                       'type', 'tracks', 'topics'),
+                       'type', 'tracks', 'topics', 'requires_dial_in'),
         }),
         ("References", {
             'fields': ('spec_url', 'wiki_url', 'pad_url'),

=== modified file 'summit/schedule/admin/roomadmin.py'
--- summit/schedule/admin/roomadmin.py	2010-03-05 10:33:36 +0000
+++ summit/schedule/admin/roomadmin.py	2011-09-15 20:51:24 +0000
@@ -36,7 +36,7 @@
     fieldsets = (
         (None, {
             'fields': ('summit', 'name', 'title', 'type', 'size', 'tracks',
-                       'icecast_url'),
+                       'icecast_url', 'has_dial_in'),
         }),
         ("Availability", {
             'fields': ('start_utc', 'end_utc'),

=== added file 'summit/schedule/migrations/0004_add_dial_in_fields.py'
--- summit/schedule/migrations/0004_add_dial_in_fields.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0004_add_dial_in_fields.py	2011-09-15 20:51:24 +0000
@@ -0,0 +1,193 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Meeting.requires_dial_in'
+        db.add_column('schedule_meeting', 'requires_dial_in', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Room.has_dial_in'
+        db.add_column('schedule_room', 'has_dial_in', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Meeting.requires_dial_in'
+        db.delete_column('schedule_meeting', 'requires_dial_in')
+
+        # Deleting field 'Room.has_dial_in'
+        db.delete_column('schedule_room', 'has_dial_in')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.agenda': {
+            'Meta': {'ordering': "('slot', 'room')", 'unique_together': "(('slot', 'room'),)", 'object_name': 'Agenda'},
+            'auto': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'room': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Room']"}),
+            'slot': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Slot']"})
+        },
+        'schedule.attendee': {
+            'Meta': {'ordering': "('summit', 'user')", 'object_name': 'Attendee'},
+            'crew': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_column': "'crew'"}),
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'schedule.attendeebusy': {
+            'Meta': {'ordering': "('attendee', 'start_utc', 'end_utc')", 'object_name': 'AttendeeBusy'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Attendee']"}),
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
+        },
+        'schedule.crew': {
+            'Meta': {'ordering': "('date_utc', 'attendee')", 'object_name': 'Crew'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'crew_schedule'", 'to': "orm['schedule.Attendee']"}),
+            'date_utc': ('django.db.models.fields.DateField', [], {'db_column': "'date'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'schedule.meeting': {
+            'Meta': {'object_name': 'Meeting'},
+            'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approver_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'assignee': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'assignee_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'drafter': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'drafter_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50', 'blank': 'True'}),
+            'pad_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'participants': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Attendee']", 'symmetrical': 'False', 'through': "'Participant'", 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'requires_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'scribe': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scribe_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'slots': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'spec_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Topic']", 'symmetrical': 'False', 'blank': 'True'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'blueprint'", 'max_length': '15'}),
+            'videographer1': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'videographer1_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'videographer2': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'videographer2_set'", 'null': 'True', 'to': "orm['schedule.Attendee']"}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'schedule.participant': {
+            'Meta': {'object_name': 'Participant'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Meeting']"}),
+            'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'schedule.room': {
+            'Meta': {'ordering': "('summit', 'name')", 'object_name': 'Room'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'end'", 'blank': 'True'}),
+            'has_dial_in': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icecast_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'db_column': "'start'", 'blank': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.roombusy': {
+            'Meta': {'ordering': "('room', 'start_utc', 'end_utc')", 'object_name': 'RoomBusy'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'busy_set'", 'to': "orm['schedule.Room']"}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"})
+        },
+        'schedule.slot': {
+            'Meta': {'ordering': "('summit', 'start_utc', 'end_utc')", 'object_name': 'Slot'},
+            'end_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'end'"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'open'", 'max_length': '7'})
+        },
+        'schedule.summit': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Summit'},
+            'date_end': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'date_start': ('django.db.models.fields.DateField', [], {'null': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '2047', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'state': ('django.db.models.fields.CharField', [], {'default': "u'sponsor'", 'max_length': '10'}),
+            'timezone': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.summitsprint': {
+            'Meta': {'ordering': "('summit', 'import_url')", 'object_name': 'SummitSprint'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'import_url': ('django.db.models.fields.URLField', [], {'max_length': '200'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sprint_set'", 'to': "orm['schedule.Summit']"})
+        },
+        'schedule.topic': {
+            'Meta': {'ordering': "('summit', 'title')", 'object_name': 'Topic'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'schedule.track': {
+            'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
+            'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True'}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['schedule']

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2011-09-14 01:00:37 +0000
+++ summit/schedule/models/meetingmodel.py	2011-09-15 20:51:24 +0000
@@ -90,6 +90,7 @@
                                verbose_name="Pad URL", null=True, blank=True)
     slots = models.IntegerField(default=1)
     private = models.BooleanField(default=False)
+    requires_dial_in = models.BooleanField(default=False)
     # FIXME attendees must be for the same summit
     # (will require js magic in admin to refresh the boxes)
     drafter = models.ForeignKey(Attendee, null=True, blank=True,
@@ -343,6 +344,10 @@
             if not room.available(this_slot):
                 raise Meeting.SchedulingError("Room is not available")
 
+            if self.requires_dial_in:
+                if not room.has_dial_in:
+                    raise Meeting.SchedulingError("Room has no dial-in capability")
+
             # Work out who is busy in this slot
             busy = set()
             for agenda in this_slot.agenda_set.all():

=== modified file 'summit/schedule/models/roommodel.py'
--- summit/schedule/models/roommodel.py	2011-05-15 01:11:24 +0000
+++ summit/schedule/models/roommodel.py	2011-09-15 20:51:24 +0000
@@ -51,6 +51,10 @@
                                    verbose_name="End (UTC)")
     icecast_url = models.URLField(blank=True, verify_exists=False,
                                   verbose_name="Icecast URL")
+
+    # Whether the room has dial-in capability
+    has_dial_in = models.BooleanField(default=False)
+
     # people who cannot be scheduled here
     # voip, listen-only and icecast urls
     class Meta:

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-09-15 17:22:40 +0000
+++ summit/schedule/tests.py	2011-09-15 20:51:24 +0000
@@ -66,6 +66,44 @@
             Meeting.SchedulingError,
             meeting.check_schedule, agenda.slot, agenda.room)
 
+    def make_open_slot(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        slot = factory.make_one(
+            Slot,
+            start_utc=now+one_hour,
+            end_utc=now+one_hour+one_hour,
+            type='open')
+        return slot
+
+    def test_check_schedule_errors_on_no_dial_in(self):
+        slot = self.make_open_slot()
+        room = factory.make_one(Room, has_dial_in=False, summit=slot.summit, name="testroom")
+        meeting = factory.make_one(Meeting, requires_dial_in=True, summit=slot.summit, name="testmeeting")
+        try:
+            meeting.check_schedule(slot, room)
+        except meeting.SchedulingError, e:
+            print e
+            self.assertEqual("Room has no dial-in capability", e.message)
+            return
+        self.fail("SchedulingError not thrown")
+
+    def test_try_schedule_into_refuses_room_without_dial_in(self):
+        slot = self.make_open_slot()
+        room = factory.make_one(Room, has_dial_in=False, summit=slot.summit, name="testroom")
+        meeting = factory.make_one(Meeting, requires_dial_in=True, summit=slot.summit, name="testmeeting")
+
+        self.assertEqual(False, meeting.try_schedule_into([room]))
+        self.assertEqual(0, meeting.agenda_set.all().count())
+
+    def test_try_schedule_into_allows_room_with_dial_in(self):
+        slot = self.make_open_slot()
+        room = factory.make_one(Room, has_dial_in=True, summit=slot.summit, name="testroom")
+        meeting = factory.make_one(Meeting, requires_dial_in=True, summit=slot.summit, name="testmeeting")
+
+        self.assertEqual(True, meeting.try_schedule_into([room]))
+        self.assertEqual(1, meeting.agenda_set.all().count())
+
 
 class ICalTestCase(djangotest.TestCase):