X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tickets%2Fviews.py;h=1764301de977e2ba7824748cb7a1ddc3cee9aa0f;hb=8f82b787420a65cb08b42b59dea1929c76b77be4;hp=db988fe448a280ea34d99839741b3c3ff509b133;hpb=02d8f6dc92f570d1016c139b0ec0fb742fe66d7b;p=matthijs%2Fprojects%2Fdorestad-bookings.git diff --git a/tickets/views.py b/tickets/views.py index db988fe..1764301 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), - } + 'payed' : sum([b.tickets for b in bookings if b.payment is not None]), + })) c = { 'shows' : shows } return render_to_response('tickets/bookings.html', c, context_instance=RequestContext(request))