Merge lp:~cjohnston/summit/participation-changes into lp:summit

[Chris Johnston]

[lp:~cjohnston/summit/participation-changes]

419. By Chris Johnston on 2012-07-31

Sponsorship application and suggestion CSS error (bug # 1030187) fix. Props: ~joseeantonior

420. By Chris Johnston on 2012-07-31

Removes code in summitmodel from lpupdate which deletes meetings that have a spec_url which isn't a launchpad blueprint

421. By Chris Johnston on 2012-07-31

Adds admin info to the meeting page

422. By Chris Johnston on 2012-08-01

Release 1.1.8

423. By Chris Johnston on 2012-08-05

Allows drafters and organizers to modify the attending level of attendees

=== modified file 'summit/schedule/admin/attendeeadmin.py'
--- summit/schedule/admin/attendeeadmin.py	2012-04-27 19:40:23 +0000
+++ summit/schedule/admin/attendeeadmin.py	2012-08-05 16:34:23 +0000
@@ -37,7 +37,7 @@
 
 
 class ParticipantAdmin(admin.ModelAdmin):
-    list_display = ('meeting', 'attendee', 'required')
+    list_display = ('meeting', 'attendee', 'participation')
     list_display_links = ('attendee', )
     search_fields = ('attendee__user__username', 'attendee__user__first_name', 'attendee__user__last_name',
                      'attendee__user__email', 'meeting__name', 'meeting__title')

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2012-05-06 01:16:00 +0000
+++ summit/schedule/forms.py	2012-08-05 16:34:23 +0000
@@ -88,7 +88,7 @@
             instance.participants.clear()
             for participant in self.cleaned_data['participants']:
                 record = Participant(meeting=instance, attendee=participant,
-                                     required=True)
+                                     participation='INTERESTED')
                 record.save()
         self.save_m2m = save_m2m
 
@@ -131,4 +131,15 @@
 class AttendMeeting(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Participant
-        fields = ('required',)
+        fields = ('participation',)
+    def __init__(self, *args, **kwargs):
+        super(AttendMeeting, self).__init__(*args, **kwargs)
+        self.fields['participation'].choices = ((u'ATTENDING', u'Attending'), (u'INTERESTED', u'Very interested in attending'))
+
+class OrganizerChangeAttend(forms.ModelForm, RenderableMixin):
+    class Meta:
+        model = Participant
+        fields = ('participation',)
+    def __init__(self, *args, **kwargs):
+        super(OrganizerChangeAttend, self).__init__(*args, **kwargs)
+        self.fields['participation'].choices = ((u'INTERESTED', u'Should Attend'), (u'REQUIRED', u'Required to Attend'))

=== added file 'summit/schedule/migrations/0024_change_required_to_participation.py'
--- summit/schedule/migrations/0024_change_required_to_participation.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/migrations/0024_change_required_to_participation.py	2012-08-05 16:34:23 +0000
@@ -0,0 +1,212 @@
+# 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):
+        
+        # Deleting field 'Participant.required'
+        db.delete_column('schedule_participant', 'required')
+
+        # Adding field 'Participant.participation'
+        db.add_column('schedule_participant', 'participation', self.gf('django.db.models.fields.CharField')(default='ATTENDING', max_length=32, null=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Adding field 'Participant.required'
+        db.add_column('schedule_participant', 'required', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Deleting field 'Participant.participation'
+        db.delete_column('schedule_participant', 'participation')
+
+
+    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', 'content_type__model', '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': {'ordering': "['username']", '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': "('user__username', 'summit')", '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'}),
+            'secret_key_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'start_utc': ('django.db.models.fields.DateTimeField', [], {'db_column': "'start'"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            '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.lead': {
+            'Meta': {'ordering': "('summit', 'track')", 'object_name': 'Lead'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lead': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'lead'", 'to': "orm['schedule.Attendee']"}),
+            'summit': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Summit']"}),
+            'track': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Track']"})
+        },
+        'schedule.meeting': {
+            'Meta': {'object_name': 'Meeting'},
+            'approved': ('django.db.models.fields.CharField', [], {'default': "'PENDING'", 'max_length': '10', 'null': 'True'}),
+            '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': '100'}),
+            'override_break': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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': "orm['schedule.Participant']", 'blank': 'True'}),
+            'priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'private': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'private_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            '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'}),
+            'tracks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['schedule.Track']", 'symmetrical': 'False', 'blank': 'True'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "u'discussion'", 'max_length': '15'}),
+            'video': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'schedule.participant': {
+            'Meta': {'ordering': "('meeting', 'attendee', 'participation')", 'object_name': 'Participant'},
+            'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['schedule.Attendee']"}),
+            'from_launchpad': ('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']"}),
+            'participation': ('django.db.models.fields.CharField', [], {'default': "'ATTENDING'", 'max_length': '32', 'null': 'True'})
+        },
+        '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'}),
+            'irc_channel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': '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'}),
+            'etherpad': ('django.db.models.fields.URLField', [], {'default': "'http://pad.ubuntu.com/'", 'max_length': '75'}),
+            'hashtag': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'help_text': ('django.db.models.fields.TextField', [], {'null': 'True', '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'}),
+            'managers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'managers'", 'blank': 'True', 'to': "orm['auth.User']"}),
+            'name': ('summit.schedule.fields.NameField', [], {'max_length': '50'}),
+            'qr': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '100', 'blank': 'True'}),
+            'schedulers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'schedulers'", 'blank': 'True', 'to': "orm['auth.User']"}),
+            'sites': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['sites.Site']", 'symmetrical': 'False'}),
+            '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.track': {
+            'Meta': {'ordering': "('summit', 'title', 'slug')", 'object_name': 'Track'},
+            'allow_adjacent_sessions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'color': ('django.db.models.fields.CharField', [], {'default': "'FFFFFF'", 'max_length': '6'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '1000', 'null': 'True'}),
+            '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'})
+        },
+        'sites.site': {
+            'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"},
+            'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['schedule']

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2012-05-18 00:31:38 +0000
+++ summit/schedule/models/meetingmodel.py	2012-08-05 16:34:23 +0000
@@ -279,11 +279,18 @@
         #    attendees.add(self.approver)
 
         for participant in self.participant_set.all():
-            if participant.required:
+            if participant.participation == 'REQUIRED':
                 attendees.add(participant.attendee)
 
         return attendees
 
+    def get_participants_by_level(self, level):
+        attendees = set()
+        for participant in self.participant_set.all():
+            if participant.participation == level:
+                attendees.add(participant.attendee)        
+        return attendees
+
     def update_from_launchpad(self, elem):
         """Update from Launchpad data."""
 
@@ -382,7 +389,10 @@
 
 
                 participant.from_launchpad = True
-                participant.required = required
+                if required:
+                    participant.participation = 'INTERESTED'
+                else:
+                    participant.participation = 'ATTENDING'
                 participant.save()
             except ObjectDoesNotExist:
                 pass
@@ -391,7 +401,7 @@
 
         self.save()
 
-    def check_schedule(self, slot, room):
+    def check_schedule(self, slot, room, with_interested = False):
         """Check whether we can schedule this meeting in the given slot
         and room."""
         missing = set()
@@ -455,7 +465,8 @@
             for agenda in this_slot.agenda_set.all():
                 if agenda.meeting != self:
                     busy.update([a.pk for a in agenda.meeting.required_attendees])
-
+                    if with_interested:
+                        busy.update([a.pk for a in agenda.meeting.get_participants_by_level('INTERESTED')])
             slot_num = all_slots.index(this_slot)
             for i in range(slot_num, 0, -1):
                 distance = 2 + slot_num - i
@@ -467,13 +478,20 @@
                     if agenda.meeting != self \
                             and agenda.meeting.slots >= distance:
                         busy.update([a.pk for a in agenda.meeting.required_attendees])
-
+                        if with_interested:
+                            busy.update([a.pk for a in agenda.meeting.get_participants_by_level('INTERESTED')])
             # Check that all required attendees are free in this slot
             for attendee in self.required_attendees:
                 if not attendee.available(this_slot):
                     missing.add(attendee)
                 if attendee.pk in busy:
                     missing.add(attendee)
+            if with_interested:
+                for attendee in self.get_participants_by_level('INTERESTED'):
+                    if not attendee.available(this_slot):
+                        missing.add(attendee)
+                    if attendee.pk in busy:
+                        missing.add(attendee)
 
             # Check that next/previous slots are not from the same track
             def check_not_same_track(other_slot, relative_position):
@@ -494,7 +512,7 @@
 
         return missing
 
-    def try_schedule(self):
+    def try_schedule(self, with_interested = False):
         """Try to schedule this meeting in a suitable room."""
         if self.private:
             print "Not scheduling private meeting: %s" % self
@@ -507,23 +525,23 @@
         tracks = self.tracks.all()
         if tracks:
             rooms = open_rooms.filter(tracks__in=tracks)
-            if self.try_schedule_into(rooms):
+            if self.try_schedule_into(rooms, with_interested):
                 return
 
         rooms = open_rooms.filter(tracks__isnull=True)
         if not self.try_schedule_into(rooms):
             print "Gave up scheduling %s" % self
 
-    def try_schedule_into(self, rooms):
+    def try_schedule_into(self, rooms, with_interested = False):
         """Try to schedule this meeting in one of the given rooms."""
         today = datetime.now()
         for room in rooms:
             for slot in self.summit.slot_set.filter(type__exact='open',start_utc__gt=today):
                 try:
                     room.agenda_set.get(slot=slot)
-                except ObjectDoesNotExist:
+                except room.agenda_set.model.DoesNotExist:
                     try:
-                        missing = self.check_schedule(slot, room)
+                        missing = self.check_schedule(slot, room, with_interested)
                         if len(missing):
                             raise Meeting.SchedulingError("Required people not available: %s"
                                                           % ', '.join(m.user.username for m in missing))

=== modified file 'summit/schedule/models/participantmodel.py'
--- summit/schedule/models/participantmodel.py	2012-01-23 01:18:55 +0000
+++ summit/schedule/models/participantmodel.py	2012-08-05 16:34:23 +0000
@@ -42,17 +42,24 @@
 
 
 class Participant(models.Model):
+    
+    PARTICIPATION_CHOICES = (
+        (u'ATTENDING', u'Attending'),
+        (u'INTERESTED', u'Very interested in attending'),
+        (u'REQUIRED', u'Required'),
+    )
+
     meeting = models.ForeignKey(Meeting)
     attendee = models.ForeignKey(Attendee,
             help_text=HELP_TEXT["attendee"])
-    required = models.BooleanField(default=False,
-            help_text=HELP_TEXT["required"])
+    participation = models.CharField(max_length=32, choices=PARTICIPATION_CHOICES,
+            null=True, blank=False, default='ATTENDING')
     from_launchpad = models.BooleanField(default=False,
             help_text=HELP_TEXT["from_launchpad"])
 
     class Meta:
         app_label = 'schedule'
-        ordering = ('meeting', 'attendee', 'required')
+        ordering = ('meeting', 'attendee', 'participation')
 
     def __unicode__(self):
         return self.attendee.user.username

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2012-06-11 15:00:59 +0000
+++ summit/schedule/models/summitmodel.py	2012-08-05 16:34:23 +0000
@@ -326,9 +326,13 @@
         This is a pretty simple best-fit/first-come-first-served scheduler,
         but it suffices.
         """
-        for meeting in self.meeting_set.filter(approved='APPROVED', agenda__isnull=True):
+        for meeting in self.meeting_set.filter(approved='APPROVED', agenda__isnull=True).order_by('id'):
+            meeting.try_schedule(with_interested = True)
+
+        for meeting in self.meeting_set.filter(approved='APPROVED', agenda__isnull=True).order_by('id'):
             meeting.try_schedule()
 
+
     def check_schedule(self):
         """Check the schedule for existant errors."""
         for meeting in self.meeting_set.all():

=== modified file 'summit/schedule/templates/schedule/attend.html'
--- summit/schedule/templates/schedule/attend.html	2012-05-06 00:02:48 +0000
+++ summit/schedule/templates/schedule/attend.html	2012-08-05 16:34:23 +0000
@@ -28,9 +28,9 @@
 
         <form action="{{ request.path_info }}" method="POST">
             <fieldset>
-                <h3>Attend "{{ meeting }}"</h3>
+                <h3>Attend "{{ meeting.title }}"</h3>
                 {{ form.as_template }}
-                <p id="twitter_update_list" style="color: black;">Check 'Required' if your participation in this topic is essential. This will cause the meeting scheduler to try to ensure that you are able to attend this meeting. If your participation is not required, just click Save.</p>
+                <p id="twitter_update_list" style="color: black;">If you feel that your participation is required for this topic, please contact {{ meeting.drafter.name }} or {{ meeting.approver.name }}, otherwise, please select one of the options above.</p>
             </fieldset>
                 {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}       
                 <input type="submit" name="submit" value="Save" class="submit-button" /> 

=== added file 'summit/schedule/templates/schedule/attendees.html'
--- summit/schedule/templates/schedule/attendees.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/attendees.html	2012-08-05 16:34:23 +0000
@@ -0,0 +1,96 @@
+{% extends "base.html" %}
+
+{% block page_name %}
+Review Attendees - {{ summit.title }}
+{% endblock %}
+
+{% block extrahead %}
+{{ block.super }}
+<style>
+TABLE img.icon {
+    vertical-align: bottom;
+    width: 16px;
+    height: 16px;
+}
+
+table.basic span.main-agenda-item-tracks {
+    font-size: 0.8em;
+}
+
+div.agenda-details {
+    display: none;
+    padding: 5px;
+    position: absolute;
+    margin-left: 20px;
+    font-size: 0.9em;
+    color: #FFFFFF;
+    background-color: #101010;
+    border: #000000 1px solid;
+    border-radius: 5px;
+    min-width: 200px;
+    max-width: 500px;
+    z-index: 100;
+}
+
+div.meeting-description {
+    white-space: pre-wrap;
+}
+
+div.agenda-details LI {
+    font-size: 1.0em;
+}
+
+div.schedule-head {
+    position: relative;
+    overflow: visible;
+    z-index: 10;
+}
+
+div.schedule-head .schedule-qrcode {
+    height: 63px;
+    vertical-align: top;
+    margin-left: -3px;
+    margin-top: -3px;
+}
+
+div.schedule-head .schedule-date {
+    font-weight: normal;
+    font-size: 36px;
+    margin-left: 5px;
+}
+
+div.schedule-head .schedule-crew, .last-updated {
+    font-size: 0.7pc;
+}
+
+</style>
+{% endblock %}
+
+{% block sub_nav_links %}
+<li><a class="sub-nav-item" href="{% url summit.schedule.views.meeting summit.name, meeting.id, meeting.name|default:'-' %}">Meeting</a></li>
+{% endblock %}
+
+{% block content %}
+<div class="row">
+<article class="span-12">
+
+<div class="schedule-head">
+    <h2>{{ meeting.title }} Attendees</h2>
+</div>
+<table class="basic">
+{% for participant in participants %}
+<tr>
+<td width="66%">
+    <a href="http://launchpad.net/~{{ participant.attendee.user.username }}">
+        {{ participant.attendee.name }}
+    </a>
+</td>
+<td width="34%">
+<a href="{% url summit.schedule.views.organizer_edit_attendees meeting.summit.name meeting.id participant.attendee.user.username %}">Status: {{ participant.get_participation_display }}</a>
+</td>
+</tr>
+{% endfor %}
+</table>
+</article>
+</div>
+{% endblock %}

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2012-06-10 20:34:50 +0000
+++ summit/schedule/templates/schedule/meeting.html	2012-08-05 16:34:23 +0000
@@ -37,10 +37,18 @@
         {% else %}
             {% if drafter %}
                 <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit meeting</a></li>
+                <li><a class="sub-nav-item" href="{% url summit.schedule.views.attendee_review summit.name, meeting.id, meeting.name|default:'-' %}">Review attendees</a></li>
             {% endif %}
         {% endif %}
     {% endif %}
-    
+    {% if summit_organizer %}
+        <li><a class="sub-nav-item" href="{% url summit.schedule.views.attendee_review summit.name, meeting.id, meeting.name|default:'-' %}">Review attendees</a></li>
+    {% else %}
+        {% if drafter %}
+            <li><a class="sub-nav-item" href="{% url summit.schedule.views.attendee_review summit.name, meeting.id, meeting.name|default:'-' %}">Review attendees</a></li>
+        {% endif %}
+    {% endif %}
+
     {% if user_is_attending %}
         {% if user_is_participating %}
             <li><a class="sub-nav-item" href="{% url summit.schedule.views.unregister meeting.summit.name, meeting.id, meeting.name|default:'-' %}">Skip this meeting</a></li>
@@ -110,7 +118,7 @@
     <div id="Attendees" class="span-5">
         <h3>Attendees</h3>
         {% for attendee in attendees %}
-            <a href="http://launchpad.net/~{{ attendee.user.username }}">{% if attendee.required %}<strong>{% endif %}{{ attendee.name }}{% if attendee.required %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
+            <a href="http://launchpad.net/~{{ attendee.user.username }}">{% if attendee.participation = 'REQUIRED' %}<strong>{% endif %}{{ attendee.name }}{% if attendee.required %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
         {% endfor %}
     </div>
         {% endifnotequal %}

=== added file 'summit/schedule/templates/schedule/org_attend.html'
--- summit/schedule/templates/schedule/org_attend.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/org_attend.html	2012-08-05 16:34:23 +0000
@@ -0,0 +1,39 @@
+{% extends "base.html" %}
+
+{% block page_name %}Change {{ attendee.name }}'s attendance to {{ meeting }} - {{ summit.title }}{%endblock %}
+{% block sub_nav %}{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+    <script type="text/javascript" src="{{MEDIA_URL}}js/colortip-1.0-jquery.js"></script>
+    <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/colortip-1.0-jquery.css"/>
+{% endblock %}
+
+{% block closure %}
+<script type="text/javascript"><!--
+$(document).ready(function(){
+    $('span[rel*=help]').colorTip({color:'orange'});
+});
+--></script>
+{% endblock %}
+
+
+{% block content %}
+<div class="row">
+    <article id="form" class="span-8">
+        {% if form.errors %}
+            <p style="color: red;">
+                Please correct the error{{ form.errors|pluralize }} below.
+            </p>
+        {% endif %}
+
+        <form action="{{ request.path_info }}" method="POST">
+            <fieldset>
+                <h3>Change {{ attendee.name }}'s attendance to "{{ meeting.title }}"</h3>
+                {{ form.as_template }}
+            </fieldset>
+                {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}       
+                <input type="submit" name="submit" value="Save" class="submit-button" /> 
+        </form>
+    </article>
+</div>
+{% endblock %}

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-07-31 23:30:11 +0000
+++ summit/schedule/tests.py	2012-08-05 16:34:23 +0000
@@ -136,8 +136,8 @@
         meeting2 = factory.make_one(Meeting, summit=slot.summit, requires_dial_in=False, private=False)
 
         attendee = factory.make_one(Attendee)
-        factory.make_one(Participant, meeting=meeting1, attendee=attendee, required=True)
-        factory.make_one(Participant, meeting=meeting2, attendee=attendee, required=True)
+        factory.make_one(Participant, meeting=meeting1, attendee=attendee, participation = 'REQUIRED')
+        factory.make_one(Participant, meeting=meeting2, attendee=attendee, participation = 'REQUIRED')
 
         factory.make_one(Agenda, meeting=meeting1, slot=slot, room=room1)
         agenda = factory.make_one(Agenda, meeting=meeting2, slot=slot, room=room2)
@@ -387,7 +387,7 @@
         meeting.update_from_launchpad(elem)
         participant = meeting.participant_set.get()
         self.assertEqual(attendee, participant.attendee)
-        self.assertEqual(False, participant.required)
+        self.assertEqual('ATTENDING', participant.participation)
 
     def test_update_from_launchpad_sets_participant_essential(self):
         summit, attendee = self.make_summit_and_attendee()
@@ -395,7 +395,7 @@
         elem = self.get_person_node(attendee.user.username, required=True)
         meeting.update_from_launchpad(elem)
         participant = meeting.participant_set.get()
-        self.assertEqual(True, participant.required)
+        self.assertEqual('INTERESTED', participant.participation)
 
     def test_update_from_launchpad_sets_from_launchpad(self):
         summit, attendee = self.make_summit_and_attendee()
@@ -605,7 +605,7 @@
         self.assertContains(response, 'Skip this meeting', 0)
 
     def test_skip_link(self):
-        self.meeting.participant_set.create(attendee=self.attendee, required=False, from_launchpad=False)
+        self.meeting.participant_set.create(attendee=self.attendee, participation = 'ATTENDING', from_launchpad=False)
         self.assertEquals(1, Participant.objects.filter(attendee=self.attendee).count())
         self.login()
         response = self.client.get(reverse('summit.schedule.views.meeting', args=('uds-test', self.meeting.id, 'meeting1')))
@@ -620,7 +620,7 @@
         self.assertEquals(1, Participant.objects.filter(attendee=self.attendee).count())
 
     def test_delete_participation(self):
-        self.meeting.participant_set.create(attendee=self.attendee, required=False, from_launchpad=False)
+        self.meeting.participant_set.create(attendee=self.attendee, participation = 'ATTENDING', from_launchpad=False)
         self.assertEquals(1, Participant.objects.filter(attendee=self.attendee).count())
         self.login()
         response = self.client.get(reverse('summit.schedule.views.unregister', args=('uds-test', self.meeting.id, 'meeting1')))
@@ -856,7 +856,7 @@
         participant1 = Participant.objects.create(
             meeting=self.meeting1,
             attendee=self.attendee,
-            required=True
+            participation = 'REQUIRED'
         )
         missing = self.meeting1.check_schedule(self.slot, self.room1)
         self.assertEquals(len(missing), 0)
@@ -864,11 +864,127 @@
         participant1 = Participant.objects.create(
             meeting=self.meeting2,
             attendee=self.attendee,
-            required=True
+            participation = 'REQUIRED'
         )
         missing = self.meeting2.check_schedule(self.slot, self.room2)
         self.assertEquals(len(missing), 1)
 
+class AutoSchedulerTestCase(djangotest.TestCase):
+    def setUp(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        week = datetime.timedelta(days=5)
+        self.summit = factory.make_one(Summit, name='uds-test')
+        self.slot = factory.make_one(
+            Slot,
+            start_utc=now+week,
+            end_utc=now+week+one_hour,
+            type='open',
+            summit=self.summit)
+        
+        self.room1 = factory.make_one(Room, summit=self.summit, type='open')
+        self.meeting1 = factory.make_one(Meeting, summit=self.summit, name='meeting1', requires_dial_in=False, approved='APPROVED', private=False)
+        self.agenda1 = factory.make_one(Agenda, slot=self.slot, meeting=self.meeting1, room=self.room1)
+
+        self.room2 = factory.make_one(Room, summit=self.summit, type='open')
+        self.meeting2 = factory.make_one(Meeting, summit=self.summit, name='meeting2', requires_dial_in=False, approved='APPROVED', private=False)
+        
+        self.user = factory.make_one(User, username='testuser', first_name='Test', last_name='User')
+        self.attendee = factory.make_one(Attendee, summit=self.summit, user=self.user, start_utc=now, end_utc=now+week)
+        
+    def tearDown(self):
+        pass
+
+    def run_autoschedule(self):
+        from django.core.management import execute_from_command_line
+        execute_from_command_line(argv=['manage.py', 'autoschedule', 'uds-test', '-v', '2'])
+
+    def run_reschedule(self):
+        from django.core.management import execute_from_command_line
+        execute_from_command_line(argv=['manage.py', 'reschedule', 'uds-test', '-v', '2'])
+
+    def test_required_conflict(self):
+        participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee,
+            participation = 'REQUIRED'
+        )
+
+        participant2 = Participant.objects.create(
+            meeting=self.meeting2,
+            attendee=self.attendee,
+            participation = 'REQUIRED'
+        )
+
+        self.run_autoschedule()
+
+        self.assertEquals(1, self.meeting1.agenda_set.all().count())
+        self.assertEquals(0, self.meeting2.agenda_set.all().count())
+
+    def test_required_and_interested(self):
+        participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee,
+            participation = 'REQUIRED'
+        )
+
+        participant2 = Participant.objects.create(
+            meeting=self.meeting2,
+            attendee=self.attendee,
+            participation = 'INTERESTED'
+        )
+
+        self.run_autoschedule()
+
+        self.assertEquals(1, self.meeting1.agenda_set.all().count())
+        self.assertEquals(1, self.meeting2.agenda_set.all().count())
+
+    def test_interested_and_required(self):
+        participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee,
+            participation = 'REQUIRED'
+        )
+
+        participant2 = Participant.objects.create(
+            meeting=self.meeting2,
+            attendee=self.attendee,
+            participation = 'INTERESTED'
+        )
+
+        self.run_autoschedule()
+
+        self.assertEquals(1, self.meeting1.agenda_set.all().count())
+        self.assertEquals(1, self.meeting2.agenda_set.all().count())
+
+        participant2.participation = 'REQUIRED'
+        participant2.save()
+        
+        self.run_reschedule()
+
+        self.assertEquals(1, self.meeting1.agenda_set.all().count())
+        self.assertEquals(0, self.meeting2.agenda_set.all().count())        
+
+    def test_get_participants_by_level(self):
+        participant1 = Participant.objects.create(
+            meeting=self.meeting1,
+            attendee=self.attendee,
+            participation = 'REQUIRED'
+        )
+
+        participant2 = Participant.objects.create(
+            meeting=self.meeting2,
+            attendee=self.attendee,
+            participation = 'INTERESTED'
+        )
+
+        self.assertEquals(1, len(self.meeting1.get_participants_by_level('REQUIRED')))
+        self.assertEquals(0, len(self.meeting1.get_participants_by_level('INTERESTED')))
+        self.assertEquals(0, len(self.meeting1.get_participants_by_level('ATTENDING')))
+
+        self.assertEquals(0, len(self.meeting2.get_participants_by_level('REQUIRED')))
+        self.assertEquals(1, len(self.meeting2.get_participants_by_level('INTERESTED')))
+        self.assertEquals(0, len(self.meeting2.get_participants_by_level('ATTENDING')))
 
 class PrivateSchedulingTestCase(djangotest.TestCase):
 
@@ -953,8 +1069,8 @@
     def test_required_participant_in_private_meeting(self):
         '''Make sure meetings aren't scheduled when someone is in a private meeting.'''
         # Make the same person required for both meetings
-        self.public_meeting.participant_set.create(attendee=self.attendee, required=True)
-        self.private_meeting.participant_set.create(attendee=self.attendee, required=True)
+        self.public_meeting.participant_set.create(attendee=self.attendee, participation = 'REQUIRED')
+        self.private_meeting.participant_set.create(attendee=self.attendee, participation = 'REQUIRED')
         # Schedule the private meeting in the one available slot
         self.private_room.agenda_set.create(slot=self.slot, meeting=self.private_meeting)
 
@@ -1668,8 +1784,8 @@
         slot = self.make_one_future_slot(summit=summit)
         attendee = factory.make_one(Attendee, summit=summit,
                 start_utc=slot.start_utc, end_utc=slot.end_utc)
-        meeting1.participant_set.create(attendee=attendee, required=True)
-        meeting2.participant_set.create(attendee=attendee, required=True)
+        meeting1.participant_set.create(attendee=attendee, participation = 'REQUIRED')
+        meeting2.participant_set.create(attendee=attendee, participation = 'REQUIRED')
         factory.make_one(Agenda, meeting=meeting1, room=room1, slot=slot,
                 auto=True)
         factory.make_one(Agenda, meeting=meeting2, room=room2, slot=slot,
@@ -1686,7 +1802,7 @@
         attendee = factory.make_one(Attendee, summit=summit,
                 start_utc=slot.end_utc,
                 end_utc=slot.end_utc+datetime.timedelta(hours=1))
-        meeting.participant_set.create(attendee=attendee, required=True)
+        meeting.participant_set.create(attendee=attendee, participation = 'REQUIRED')
         factory.make_one(Agenda, meeting=meeting, room=room, slot=slot,
                 auto=True)
         summit.reschedule()

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-05-18 00:31:53 +0000
+++ summit/schedule/views.py	2012-08-05 16:34:23 +0000
@@ -375,7 +375,7 @@
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
     user_is_attending = attendee is not None and attendee in meeting.attendees
     if not user_is_attending:
-        meeting.participant_set.create(attendee=attendee, required=False, from_launchpad=False)
+        meeting.participant_set.create(attendee=attendee, participation = 'ATTENDING', from_launchpad=False)
 
     return HttpResponseRedirect(reverse('summit.schedule.views.meeting', args=(summit.name, meeting.id, meeting_slug)))
 
@@ -677,7 +677,59 @@
     context = {
         'summit': summit,
         'form': form,
-        'meeting': meeting.title,
+        'meeting.title': meeting.title,
+        'meeting': meeting,
     }
     return render_to_response('schedule/attend.html',
                           context, RequestContext(request))
+
+@summit_required
+def attendee_review(request, summit, attendee, meeting_slug, meeting_id):
+    meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
+
+    if not summit.is_organizer(attendee) and attendee != meeting.drafter:
+        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+    else:
+        participants=meeting.participant_set.all()
+
+    context = {
+        'summit': summit,
+        'meeting':meeting,
+        'participants':participants,
+        'summit_organizer': summit.is_organizer(attendee),
+
+    }
+    return render_to_response("schedule/attendees.html", context,
+                              context_instance=RequestContext(request))
+
+@summit_attendee_required
+def organizer_edit_attendees(request, summit, logged_in_user, username, meeting_id):
+    meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
+    attendee = get_object_or_404(Attendee, summit=summit, user__username=username)
+    meeting_slug = get_object_or_404(Meeting, summit=summit, id=meeting_id)
+
+    if not summit.is_organizer(logged_in_user) and logged_in_user != meeting.drafter:
+        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+    else:
+        try:
+            participant = Participant.objects.get(attendee=attendee, meeting=meeting)
+        except Participant.DoesNotExist:
+            participant = Participant(attendee=attendee, meeting=meeting)
+        
+        if request.method == 'POST':
+            form = OrganizerChangeAttend(data=request.POST, instance=participant)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(reverse('summit.schedule.views.attendee_review', args=(summit.name, meeting.id, meeting.name)))
+        else:
+            form = OrganizerChangeAttend(instance=participant)
+
+    context = {
+        'summit': summit,
+        'form': form,
+        'meeting.title': meeting.title,
+        'meeting': meeting,
+        'attendee': attendee,
+    }
+    return render_to_response('schedule/org_attend.html',
+                          context, RequestContext(request))

=== modified file 'summit/urls.py'
--- summit/urls.py	2012-05-06 00:02:48 +0000
+++ summit/urls.py	2012-08-05 16:34:23 +0000
@@ -72,8 +72,10 @@
     (r'^(?P<summit_name>[\w-]+)/review/$', 'review_pending'),
     (r'^(?P<summit_name>[\w-]+)/review_meeting/(?P<meeting_id>\d+)/$', 'meeting_review'),
     (r'^(?P<summit_name>[\w-]+)/attend_meeting/(?P<meeting_id>\d+)/$', 'attend_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/edit_attendee/(?P<meeting_id>\d+)/(?P<username>[%+\.\w-]+)/$', 'organizer_edit_attendees'),
     (r'^(?P<summit_name>[\w-]+)/create_meeting/$', 'create_meeting'),
     (r'^(?P<summit_name>[\w-]+)/edit_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'organizer_edit_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/attendee_review/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'attendee_review'),
     (r'^(?P<summit_name>[\w-]+)/tracks$', 'tracks'),
     (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),
     (r'^(?P<summit_name>[\w-]+)/(?P<username>[%+\.\w-]+)/meetings$', 'created_meetings'),