merged speed optimization branch

2 files changed, 9 insertions, 5 deletions

diff --git a/TODO.md b/TODO.md
index 76dc0b7..5921850 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,9 @@
-- [ ] list notes of predecessor, if available, on show detail page
-- [ ] list notes of successor, if available to show detail page
+- [*] list notes of predecessor, if available, on show detail page
+- [ ] list notes of successor, if available, on show detail page
+- [*] optimize the export for the day schedule
+- [ ] handle exceptions better
+- [ ] optimize the selection of a predecessor for a show
+- [ ] optimize the selection of a timeslot for a note
 - [ ] add management command to automatically renew program slots
 - [ ] add jingle field (File) to Show model
 - [ ] customize the admin interface for program slot
diff --git a/program/views.py b/program/views.py
index 5dc82dd..23aab75 100644
--- a/program/views.py
+++ b/program/views.py
@@ -27,7 +27,7 @@ class HostDetailView(DetailView):
 
 class ShowListView(ListView):
     context_object_name = 'show_list'
-    queryset = Show.objects.filter(is_active=True).exclude(id=1).distinct()
+    queryset = Show.objects.filter(is_active=True).exclude(id=1)
     template_name = 'show_list.html'
 
     def get_queryset(self):
@@ -50,7 +50,7 @@ class ShowListView(ListView):
 
 
 class ShowDetailView(DetailView):
-    queryset = Show.objects.all().exclude(id=1)
+    queryset = Show.objects.exclude(id=1)
     template_name = 'show_detail.html'
 
 
@@ -195,7 +195,7 @@ def json_day_schedule(request, year=None, month=None, day=None):
     else:
         today = datetime.strptime('%s__%s__%s__00__00' % (year, month, day), '%Y__%m__%d__%H__%M')
 
-    timeslots = TimeSlot.objects.get_24h_timeslots(today)
+    timeslots = TimeSlot.objects.get_24h_timeslots(today).select_related('programslot')
     schedule = []
     for ts in timeslots:
         entry = {