Merge lp:~mhall119/summit/fix-multislot-scheduling into lp:summit

[Michael Hall]

Fix scheduling conflicts when multi-slot meetings span a break slot

Count the number of breaks a multi-slot meeting is crossing and subtract that from the actual distance of slots when checking availability after a multi-slot meeting

=== modified file 'summit/schedule/fields.py'
--- summit/schedule/fields.py	2012-01-23 01:18:55 +0000
+++ summit/schedule/fields.py	2012-05-03 19:39:18 +0000
@@ -36,7 +36,7 @@
     def formfield(self, **kwargs):
         defaults = {
             'form_class': forms.RegexField,
-            'regex': r'^[a-z][a-z0-9-]*$',
+            'regex': r'^[a-z][a-z0-9-\.]*$',
             'max_length': self.max_length,
             'error_messages': {
                 'invalid': _(

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2012-04-18 13:00:52 +0000
+++ summit/schedule/models/meetingmodel.py	2012-05-03 19:39:18 +0000
@@ -409,15 +409,17 @@
 
             # Check that the room is not in use by a double session
             slot_num = all_slots.index(this_slot)
+            breaks = 0
             for i in range(slot_num, 0, -1):
                 distance = 2 + slot_num - i
                 prev_slot = all_slots[i - 1]
                 if prev_slot.type != this_slot.type:
-                    break
+                    breaks += 1
+                    continue
 
                 for agenda in prev_slot.agenda_set.filter(room=room):
                     if agenda.meeting != self \
-                            and agenda.meeting.slots >= distance:
+                            and agenda.meeting.slots >= (distance - breaks):
                         raise Meeting.SchedulingError("Room is in use by %s"
                                                       % agenda.meeting)