Merge lp:~mhall119/summit/new_schedule_improvements into lp:summit

[Michael Hall]

Display time headers in 24-hour time, add end time

Display time headers in 24-hour time, add end time

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-01-20 23:51:48 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-01-22 03:27:23 +0000
@@ -96,7 +96,7 @@
 
 {% for slot, meetings in schedule.items %}
 <table  class="basic">
-<thead><tr><th colspan="2">{{slot.start.time|strftime:"%I:%M %p"}}</th></tr></thead>
+<thead><tr><th colspan="2">{{slot.start.time|strftime:"%H:%M"}} - {{slot.end.time|strftime:"%H:%M"}}</th></tr></thead>
 <tbody>
 {% for room, agenda in meetings.items %}
 <tr style="background-color: {{ agenda.meeting.track_color }};">

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-01-21 14:30:30 +0000
+++ summit/schedule/views.py	2012-01-22 03:27:23 +0000
@@ -91,7 +91,7 @@
             continue
         if not slot in schedule:
             schedule[slot] = SortedDict()
-        for agenda in slot.agenda_set.order_by('room__name'):
+        for agenda in slot.agenda_set.select_related().order_by('room__name'):
             if not agenda.meeting.private or attendee in agenda.meeting.attendees:
                 schedule[slot][agenda.room] = agenda