Merge lp:~salgado/summit/drop-unused-rooms into lp:summit

[Guilherme Salgado]

This branch drops unused rooms on the linaro-only view and changes the icon used for linaro sessions.

[Dave Walker (davewalker)]

lgtm

review: Approve

=== modified file 'summit/media/img/blueprint-linaro.png'
 Binary files summit/media/img/blueprint-linaro.png	2010-09-22 14:38:26 +0000 and summit/media/img/blueprint-linaro.png	2010-10-22 20:18:47 +0000 differ
=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2010-10-21 11:14:25 +0000
+++ summit/schedule/render.py	2010-10-22 20:18:47 +0000
@@ -119,7 +119,7 @@
             _now = datetime.datetime.utcnow()
             if self.fakenow is not None:
                 _now = self.fakenow
-	    _local_now = self.summit.localize(_now)
+                _local_now = self.summit.localize(_now)
             try:
                 _slots = self.summit.slot_set.filter(
                     start_utc__lte=_now, end_utc__gte=_now)[0]
@@ -140,7 +140,7 @@
                     if _guess.start.date() != _local_now.date():
                         self.endofday = True
                         return
-		    else:
+                    else:
                         _slots = [_guess]
                 except IndexError:
                     _slots = []
@@ -265,37 +265,37 @@
             html += '<p><strong>No more sessions for today.</strong></p>'
             return mark_safe(html)
 
-	headings = u''
-	meetings = u''
+        headings = u''
+        meetings = u''
 
         for date_num, date in enumerate(self.dates):
             for slot_num, slot in enumerate(self.slots[date]):
                 for room_num, info in enumerate(self.meetings[slot]):
                     (room, meeting) = info
-		    if room is None: 
-			continue
+                    if room is None: 
+                        continue
                     if meeting is None:
                         meeting_title = ''
                     else:
                         meeting_title = meeting.title
                     try:
-                    	track = meeting.tracks.all()[0].title.lower()
+                        track = meeting.tracks.all()[0].title.lower()
                     except (IndexError, AttributeError):
                         track = "unknown"
-		    headings += '<th>%s</th>\n' % escape(room.name)
+                    headings += '<th>%s</th>\n' % escape(room.name)
                     meetings += '<td class="%s">%s</td>\n' % (track, escape(meeting_title))
 
-	html += '<table>\n'
-
-	html += '<tr>\n'
-	html += headings
-	html += '</tr>\n'
-
-	html += '<tr>\n'
-	html += meetings
-	html += '</tr>\n'
-
-	html += '</table>\n'
+        html += '<table>\n'
+
+        html += '<tr>\n'
+        html += headings
+        html += '</tr>\n'
+
+        html += '<tr>\n'
+        html += meetings
+        html += '</tr>\n'
+
+        html += '</table>\n'
 
         return mark_safe(html)
 
@@ -1012,9 +1012,36 @@
     
 class LinaroSchedule(Schedule):
 
-    def meeting_div(self, meeting, room=None, slot=None, pos=None):
-        if meeting.is_linaro or meeting.type in ('talk', 'plenary'):
-            return super(LinaroSchedule, self).meeting_div(
-                meeting, room=room, slot=slot, pos=pos)
-        else:
-            return u''
+    def calculate(self):
+        super(LinaroSchedule, self).calculate()
+
+        # Find all the meetings that are linaro-related and all the rooms that
+        # are used by at least one linaro-related meeting.
+        used_rooms = set()
+        linaro_meetings = []
+        for slot, meetings in self.meetings.items():
+            for room, meeting in meetings:
+                if meeting is None:
+                    continue
+                if meeting.is_linaro or meeting.type in ('talk', 'plenary'):
+                    used_rooms.add(room)
+                    linaro_meetings.append(meeting)
+
+        # Now remove all unused rooms from self.rooms.
+        unused_rooms = set(self.rooms) - used_rooms
+        for room in unused_rooms:
+            self.rooms.remove(room)
+
+        # Finally, remove the (room, meeting) tuples from self.meetings
+        # for all rooms that are unused.  Also drop all non-linaro meetings
+        # from self.meetings.
+        for slot, meetings in self.meetings.items():
+            if slot.type == 'lunch':
+                continue
+            tmp_meetings = meetings[:]
+            for room, meeting in tmp_meetings:
+                if room in unused_rooms:
+                    meetings.remove((room, meeting))
+                elif meeting not in linaro_meetings:
+                    idx = meetings.index((room, meeting))
+                    meetings[idx] = (room, None)