From 12b665acb8c7bc4b560f5d371d6f4d9877e68b8c 2016-09-13 08:47:51 From: Christopher Neugebauer Date: 2016-09-13 08:47:51 Subject: [PATCH] DRYs QuerysetReport’s headers --- diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py index d533ecf11f3af5f9b032a28ad9354851b3876ca5..9ba63f0648d61255a5d4844b4f4f8e4858eb8792 100644 --- a/registrasion/reporting/reports.py +++ b/registrasion/reporting/reports.py @@ -118,11 +118,20 @@ class ListReport(BasicReport): class QuerysetReport(BasicReport): - def __init__(self, title, headings, attributes, queryset, link_view=None): + def __init__(self, title, attributes, queryset, headings=None, + link_view=None): super(QuerysetReport, self).__init__(title, headings, link_view=link_view) self._attributes = attributes self._queryset = queryset + def headings(self): + if self._headings is not None: + return self._headings + + return [ + " ".join(i.split("_")).capitalize() for i in self._attributes + ] + def rows(self, content_type): def rgetattr(item, attr): diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py index 0149c987b18ae5d8994f906e5265abf021854a06..bb89ae1aa978b45a85114d63df525e0935cb61d0 100644 --- a/registrasion/reporting/views.py +++ b/registrasion/reporting/views.py @@ -290,9 +290,9 @@ def attendee(request, form, user_id=None): ) reports.append(QuerysetReport( "Invoices", - ["Invoice ID", "Status", "Value"], ["id", "get_status_display", "value"], invoices, + headings=["Invoice ID", "Status", "Value"], link_view=views.invoice, )) @@ -302,7 +302,6 @@ def attendee(request, form, user_id=None): ) reports.append(QuerysetReport( "Credit Notes", - ["Note ID", "Status", "Value"], ["id", "status", "value"], credit_notes, link_view=views.credit_note, @@ -314,7 +313,6 @@ def attendee(request, form, user_id=None): ) reports.append(QuerysetReport( "Payments", - ["To Invoice", "Payment ID", "Reference", "Amount"], ["invoice__id", "id", "reference", "amount"], payments, link_view=views.invoice,