From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Mon, 25 Oct 2010 09:24:52 +0000 (+0200)
Subject: tickets: Don't use a dict of shows in the overview.
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fdorestad-bookings.git;a=commitdiff_plain;h=8e3cb97473e051c840069cbeb399153b4c62834c

tickets: Don't use a dict of shows in the overview.

Instead, we now use a list of tuples. This ensures that the output
remains properly sorted.
---

diff --git a/tickets/templates/tickets/bookings.html b/tickets/templates/tickets/bookings.html
index 26d0018..0c0348d 100644
--- a/tickets/templates/tickets/bookings.html
+++ b/tickets/templates/tickets/bookings.html
@@ -7,13 +7,13 @@
 	<tr><th>Voorstelling</th><th>Reserveringen</th><th>Gereserveerde kaarten</th><th>Betaalde kaarten</th></tr>
     </thead>
     <tbody>
-{% for show, info in shows.items %}
+{% for show, info in shows %}
 <tr><td>{{ show }}</td><td>{{ info.bookings|length }}</td><td>{{ info.tickets }}</td><td>{{ info.payed|length }}</td></tr>
 {% endfor %}
     </tbody>
 </table>
 
-{% for show, info in shows.items %}
+{% for show, info in shows %}
 <h2>{{ show }}</h2>
 <table>
     <thead>
diff --git a/tickets/views.py b/tickets/views.py
index db988fe..5b7ab75 100644
--- a/tickets/views.py
+++ b/tickets/views.py
@@ -130,14 +130,15 @@ def payments(request):
 
 @permission_required('tickets.change_booking')
 def bookings(request):
-    shows = {}
+    shows = []
     for (show, show_desc) in SHOW_CHOICES:
         bookings = Booking.objects.filter(show=show)
-        shows[show_desc] = {
+        # shows is a list of (show_desc, infodict) tuples
+        shows.append((show_desc, {
             'bookings' : bookings,
             'tickets'  : sum([b.tickets for b in bookings]),
             'payed'    : Booking.objects.filter(show=show, payment__isnull=False),
-        }
+        }))
 
     c = { 'shows' : shows }
     return render_to_response('tickets/bookings.html', c, context_instance=RequestContext(request))