Merge lp:~alanbell/summit/roomlists into lp:summit

[Alan Bell]

fix for lp:860683 which adds new roomlist functionality to display schedule for a list of rooms, this will allow a day of schedule to be displayed across two monitors.

[Alan Bell (alanbell)]

this bit may also fix it for django in Oneiric, and may break it for prior versions:

+ (r'^admin/', include(admin.site.urls) ),

- (r'^admin/(.*)$', admin.site.root),
+ #(r'^admin/(.*)$', admin.site.urls),

[Michael Hall (mhall119)]

replaced by https://code.launchpad.net/~mhall119/summit/schedule-specific-rooms/+merge/79681

review: Disapprove

Unmerged revisions

194. By Alan Bell on 2011-10-17

allow display of schedule for an arbitary room list

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2011-09-30 21:43:02 +0000
+++ summit/schedule/render.py	2011-10-17 19:25:26 +0000
@@ -65,7 +65,7 @@
     @classmethod
     def from_request(cls, request, summit,
                      attendee=None, date=None, room=None, track=None,
-                     show_private=False):
+                     show_private=False, rooms=None):
         edit = False
         if summit.state != 'public' \
                 and 'edit' in request.GET:
@@ -91,6 +91,11 @@
         if room is not None:
             room = room
             rooms = [room]
+            print "doing one room"
+            print rooms
+        if rooms is not None:
+            print "doing multiple rooms"
+            print rooms
         else:
             room = None
             rooms = summit.open_rooms()
@@ -1125,7 +1130,7 @@
 
 
 def schedule_factory(
-        request, summit, attendee=None, date=None, room=None, track=None):
+        request, summit, attendee=None, date=None, room=None, track=None, rooms=None):
     """Create and return a Schedule instance with the given arguments.
 
     If settings.LINARO_ONLY is True, create a LinaroSchedule instance instead.
@@ -1134,4 +1139,4 @@
     if settings.LINARO_ONLY:
         schedule_class = LinaroSchedule
     return schedule_class.from_request(
-        request, summit, attendee, room=room, date=date, track=track)
+        request, summit, attendee, room=room, date=date, track=track, rooms=rooms)

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2011-09-21 12:08:21 +0000
+++ summit/schedule/views.py	2011-10-17 19:25:26 +0000
@@ -136,6 +136,40 @@
                               context_instance=RequestContext(request))
 
 @summit_required
+def by_date_roomlist(request, summit, attendee, date):
+    roomnames=request.META['QUERY_STRING'].split(',')
+    rooms=[]
+    for roomname in roomnames:
+        try:
+            rooms.append(summit.room_set.get(tracks__title__iexact=roomname))
+        except (ObjectDoesNotExist, MultipleObjectsReturned):
+            try:
+               rooms.append(get_object_or_404(summit.room_set, name__exact=roomname))
+            except:
+               print "room name not found, but other rooms might be OK"
+
+    schedule = schedule_factory(request, summit, attendee, rooms=rooms, date=date)
+    if request.method == 'POST':
+        return schedule.save_change()
+    else:
+        viewdate = datetime.datetime.strptime(date, "%Y-%m-%d")
+        day = datetime.timedelta(days=1)
+        print viewdate
+        schedule.calculate()
+
+    context = {
+        'summit': summit,
+        'attendee': attendee,
+        'schedule': schedule,
+        'autoreload': 'reload' in request.GET,
+        'nextday': viewdate + day,
+        'previousday': viewdate - day,
+    }
+
+    return render_to_response("schedule/schedule.html", context,
+                              context_instance=RequestContext(request))
+
+@summit_required
 def next_session(request, summit, attendee):
     schedule = Schedule.from_request(request, summit, attendee)
     schedule.nextonly = True
@@ -198,6 +232,37 @@
                               context_instance=RequestContext(request))
 
 @summit_required
+
+def by_roomlist(request, summit, attendee):
+    roomnames=request.META['QUERY_STRING'].split(',')
+    rooms=[]
+    for roomname in roomnames:
+        try:
+            rooms.append(summit.room_set.get(tracks__title__iexact=roomname))
+        except (ObjectDoesNotExist, MultipleObjectsReturned):
+            try:
+               rooms.append(get_object_or_404(summit.room_set, name__exact=roomname))
+            except:
+               print "room name not found, but other rooms might be OK"
+
+    schedule = schedule_factory(request, summit, attendee, rooms=rooms)
+    if request.method == 'POST':
+        return schedule.save_change()
+    else:
+        schedule.calculate()
+
+    context = {
+        'summit': summit,
+        'attendee': attendee,
+        'schedule': schedule,
+        'autoreload': 'reload' in request.GET,
+    }
+
+    return render_to_response("schedule/schedule.html", context,
+                              context_instance=RequestContext(request))
+
+
+@summit_required
 def meeting(request, summit, attendee, meeting_id, meeting_slug):
     meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
     agendaitems=meeting.agenda_set.all()

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-09-19 17:04:05 +0000
+++ summit/urls.py	2011-10-17 19:25:26 +0000
@@ -25,8 +25,9 @@
 urlpatterns = patterns('',
     (r'^$', 'summit.schedule.views.index'),
     (r'^openid/', include('django_openid_auth.urls')),
+    (r'^admin/', include(admin.site.urls) ),
 
-    (r'^admin/(.*)$', admin.site.root),
+    #(r'^admin/(.*)$', admin.site.urls),
     
     (r'^api/', include('services.urls')),
 )
@@ -65,6 +66,8 @@
     (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),
     (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/$', 'by_date'),
     (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[%+\.\w-]+)/$', 'by_room'),
+    (r'^(?P<summit_name>[\w-]+)/roomlist$', 'by_roomlist'),
+    (r'^(?P<summit_name>[\w-]+)/roomlist/(?P<date>[\d-]+)/$', 'by_date_roomlist'),
     (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%+\.\w-]+)/$', 'by_track'),
     (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'meeting'),
     (r'^(?P<summit_name>[\w-]+)\.csv$', 'csv'),