[Debconf-video-commits] r413 - package/branches/pycon09/src/pyconvideo/pyconvideo

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-28 21:33:45 +0000 (Sat, 28 Mar 2009)
New Revision: 413

Modified:
   package/branches/pycon09/src/pyconvideo/pyconvideo/views.py
Log:
When listing events for association with a recording, order by room difference (boolean) then by time difference.


Modified: package/branches/pycon09/src/pyconvideo/pyconvideo/views.py
===================================================================
--- package/branches/pycon09/src/pyconvideo/pyconvideo/views.py	2009-03-28 18:10:31 UTC (rev 412)
+++ package/branches/pycon09/src/pyconvideo/pyconvideo/views.py	2009-03-28 21:33:45 UTC (rev 413)
@@ -156,13 +156,14 @@
                                    'form': RecordingReviewForm(data)})
 
     # list events for association
-    events = models.Event.objects
-    events = events.extra(
-        select={'proximity':
-                    "abs(date_part('epoch', age(event.start_time, %s)))"},
-        select_params=[recording.recording_time],
-        order_by=['proximity'])
-    events = events.all()
+    events = models.Event.objects \
+        .extra(select={'room_diff': 'event.conference_room <> %s'},
+               select_params=[recording.conference_room]) \
+        .extra(select={'time_diff':
+                           "abs(date_part('epoch', age(event.start_time, %s)))"},
+               select_params=[recording.recording_time],
+               order_by=['room_diff', 'time_diff']) \
+        .all()
     return render_to_response('pyconvideo/review_list_events.html',
                               {'completed': request.GET.get('completed'),
                                'recording': recording,