X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tickets%2Fviews.py;h=1764301de977e2ba7824748cb7a1ddc3cee9aa0f;hb=HEAD;hp=4eca48d94739342c8a0e87e5cc33931aa936152d;hpb=97514165a01d41917c6eae9c0d43f6766296712e;p=matthijs%2Fprojects%2Fdorestad-bookings.git diff --git a/tickets/views.py b/tickets/views.py index 4eca48d..1764301 100644 --- a/tickets/views.py +++ b/tickets/views.py @@ -130,12 +130,15 @@ def payments(request): @permission_required('tickets.change_booking') def bookings(request): - shows = {} + shows = [] for (show, show_desc) in SHOW_CHOICES: - shows[show_desc] = { - 'bookings' : Booking.objects.filter(show=show), - 'payed' : Booking.objects.filter(show=show, payment__isnull=False), - } + bookings = Booking.objects.filter(show=show) + # shows is a list of (show_desc, infodict) tuples + shows.append((show_desc, { + 'bookings' : bookings, + 'tickets' : sum([b.tickets for b in bookings]), + '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))