From f3e419d66d07b3ca6e718248a912944362d833c0 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 15:32:55 +1000
Subject: [PATCH 01/10] Refactors reports so that rendering of links is done
 within Python code, not templates.

---
 registrasion/reporting/reports.py | 87 +++++++++++++++++++++++++++----
 registrasion/reporting/views.py   | 22 ++++----
 2 files changed, 87 insertions(+), 22 deletions(-)

diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py
index e756622e..2dc35d1d 100644
--- a/registrasion/reporting/reports.py
+++ b/registrasion/reporting/reports.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.decorators import user_passes_test
 from django.shortcuts import render
+from django.core.urlresolvers import reverse
 from functools import wraps
 
 from registrasion import views
@@ -12,35 +13,94 @@ _all_report_views = []
 
 class Report(object):
 
+    def __init__(self):
+        pass
+
+    def title():
+        raise NotImplementedError
+
+    def headings():
+        ''' Returns the headings for the report. '''
+        raise NotImplementedError
+
+    def rows(content_type):
+        '''
+
+        Arguments:
+            content_type (str): The content-type for the output format of this
+            report.
+
+        Returns:
+            An iterator, which yields each row of the data. Each row should
+            be an iterable containing the cells, rendered appropriately for
+            content_type.
+        '''
+        raise NotImplementedError
+
+    def _linked_text(self, content_type, address, text):
+        '''
+
+        Returns:
+            an HTML linked version of text, if the content_type for this report
+            is HTMLish, otherwise, the text.
+        '''
+
+        if content_type == "text/html":
+            return Report._html_link(address, text)
+
+    @staticmethod
+    def _html_link(address, text):
+        return '<a href="%s">%s</a>' % (address, text)
+
+
+class ReportTemplateWrapper(object):
+
+    def __init__(self, content_type, report):
+        self.content_type = content_type
+        self.report = report
+
+    def title(self):
+        return self.report.title()
+
+    def headings(self):
+        return self.report.headings()
+
+    def rows(self):
+        return self.report.rows(self.content_type)
+
+
+class OldReport(Report):
+
     def __init__(self, title, headings, data, link_view=None):
+        super(OldReport, self).__init__()
         self._title = title
         self._headings = headings
         self._data = data
         self._link_view = link_view
 
-    @property
     def title(self):
         ''' Returns the title for this report. '''
         return self._title
 
-    @property
     def headings(self):
         ''' Returns the headings for the table. '''
         return self._headings
 
-    @property
-    def data(self):
+    def rows(self, content_type):
         ''' Returns the data rows for the table. '''
-        return self._data
 
-    @property
-    def link_view(self):
-        ''' Returns the URL name or the view callable that can be used to
-        view the row's detail. The left-most value is passed into `reverse`
-        as an argument. '''
+        def cell_text(index, text):
+            if index > 0 or not self._link_view:
+                return text
+            else:
+                address = reverse(self._link_view, args=[text])
+                return self._linked_text(content_type, address, text)
 
-        return self._link_view
+        for row in self._data:
+            yield [cell_text(i, cell) for i, cell in enumerate(row)]
 
+    def _get_link(self, argument):
+        return reverse(self._link_view, argument)
 
 def report_view(title, form_type=None):
     ''' Decorator that converts a report view function into something that
@@ -72,6 +132,11 @@ def report_view(title, form_type=None):
             if isinstance(reports, Report):
                 reports = [reports]
 
+            reports = [
+                ReportTemplateWrapper("text/html", report)
+                for report in reports
+            ]
+
             ctx = {
                 "title": title,
                 "form": form,
diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index 962b7071..6a5522a5 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -14,7 +14,7 @@ from registrasion.models import people
 from registrasion import views
 
 from reports import get_all_reports
-from reports import Report
+from reports import OldReport
 from reports import report_view
 
 
@@ -90,7 +90,7 @@ def items_sold(request, form):
         "(TOTAL)", "--", "--", total_income,
     ])
 
-    return Report("Paid items", headings, data)
+    return OldReport("Paid items", headings, data)
 
 
 @report_view("Reconcilitation")
@@ -128,7 +128,7 @@ def reconciliation(request, form):
         sales["total"] - payments["total"] - ucn["total"],
     ])
 
-    return Report("Sales and Payments", headings, data)
+    return OldReport("Sales and Payments", headings, data)
 
 
 @report_view("Product status", form_type=forms.ProductAndCategoryForm)
@@ -211,7 +211,7 @@ def product_status(request, form):
             item["total_refunded"],
         ])
 
-    return Report("Inventory", headings, data)
+    return OldReport("Inventory", headings, data)
 
 
 @report_view("Credit notes")
@@ -238,7 +238,7 @@ def credit_notes(request, form):
             note.value,
         ])
 
-    return Report("Credit Notes", headings, data, link_view="credit_note")
+    return OldReport("Credit Notes", headings, data, link_view="credit_note")
 
 
 @report_view("Attendee", form_type=forms.UserIdForm)
@@ -269,7 +269,7 @@ def attendee(request, form, user_id=None):
             pq.quantity,
         ])
 
-    reports.append(Report("Paid Products", headings, data))
+    reports.append(OldReport("Paid Products", headings, data))
 
     # Unpaid products
     headings = ["Product", "Quantity"]
@@ -281,7 +281,7 @@ def attendee(request, form, user_id=None):
             pq.quantity,
         ])
 
-    reports.append( Report("Unpaid Products", headings, data))
+    reports.append( OldReport("Unpaid Products", headings, data))
 
     # Invoices
     headings = ["Invoice ID", "Status", "Value"]
@@ -295,7 +295,7 @@ def attendee(request, form, user_id=None):
             invoice.id, invoice.get_status_display(), invoice.value,
         ])
 
-    reports.append(Report("Invoices", headings, data, link_view="invoice"))
+    reports.append(OldReport("Invoices", headings, data, link_view="invoice"))
 
     # Credit Notes
     headings = ["Note ID", "Status", "Value"]
@@ -310,7 +310,7 @@ def attendee(request, form, user_id=None):
         ])
 
     reports.append(
-        Report("Credit Notes", headings, data, link_view="credit_note")
+        OldReport("Credit Notes", headings, data, link_view="credit_note")
     )
 
     # All payments
@@ -326,7 +326,7 @@ def attendee(request, form, user_id=None):
         ])
 
     reports.append(
-        Report("Payments", headings, data, link_view="invoice")
+        OldReport("Payments", headings, data, link_view="invoice")
     )
 
 
@@ -364,4 +364,4 @@ def attendee_list(request):
     # Sort by whether they've registered, then ID.
     data.sort(key=lambda attendee: (-attendee[3], attendee[0]))
 
-    return Report("Attendees", headings, data, link_view="attendee")
+    return OldReport("Attendees", headings, data, link_view="attendee")

From e8cfd024d3acfc5a3dcfa38cb49103a7212e0cc5 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 15:39:25 +1000
Subject: [PATCH 02/10] Makes the reports use actual objects rather than
 strings

---
 registrasion/reporting/views.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index 6a5522a5..574df7d1 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -238,7 +238,12 @@ def credit_notes(request, form):
             note.value,
         ])
 
-    return OldReport("Credit Notes", headings, data, link_view="credit_note")
+    return OldReport(
+        "Credit Notes",
+        headings,
+        data,
+        link_view=views.credit_note,
+    )
 
 
 @report_view("Attendee", form_type=forms.UserIdForm)
@@ -295,7 +300,9 @@ def attendee(request, form, user_id=None):
             invoice.id, invoice.get_status_display(), invoice.value,
         ])
 
-    reports.append(OldReport("Invoices", headings, data, link_view="invoice"))
+    reports.append(
+        OldReport("Invoices", headings, data, link_view=views.invoice)
+    )
 
     # Credit Notes
     headings = ["Note ID", "Status", "Value"]
@@ -310,7 +317,7 @@ def attendee(request, form, user_id=None):
         ])
 
     reports.append(
-        OldReport("Credit Notes", headings, data, link_view="credit_note")
+        OldReport("Credit Notes", headings, data, link_view=views.credit_note)
     )
 
     # All payments
@@ -326,7 +333,7 @@ def attendee(request, form, user_id=None):
         ])
 
     reports.append(
-        OldReport("Payments", headings, data, link_view="invoice")
+        OldReport("Payments", headings, data, link_view=views.invoice)
     )
 
 
@@ -353,15 +360,15 @@ def attendee_list(request):
 
     data = []
 
-    for attendee in attendees:
+    for a in attendees:
         data.append([
-            attendee.user.id,
-            attendee.attendeeprofilebase.attendee_name(),
-            attendee.user.email,
-            attendee.has_registered > 0,
+            a.user.id,
+            a.attendeeprofilebase.attendee_name(),
+            a.user.email,
+            a.has_registered > 0,
         ])
 
     # Sort by whether they've registered, then ID.
-    data.sort(key=lambda attendee: (-attendee[3], attendee[0]))
+    data.sort(key=lambda a: (-a[3], a[0]))
 
-    return OldReport("Attendees", headings, data, link_view="attendee")
+    return OldReport("Attendees", headings, data, link_view=attendee)

From 53e6278116da6d32edfc70e2dc33ac2a4d195e68 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 16:02:18 +1000
Subject: [PATCH 03/10] Adds a Links report type, which can be used to generate
 a list of links to display with a report.

---
 registrasion/reporting/reports.py | 40 +++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py
index 2dc35d1d..ae079104 100644
--- a/registrasion/reporting/reports.py
+++ b/registrasion/reporting/reports.py
@@ -47,13 +47,17 @@ class Report(object):
 
         if content_type == "text/html":
             return Report._html_link(address, text)
+        else:
+            return text
 
     @staticmethod
     def _html_link(address, text):
         return '<a href="%s">%s</a>' % (address, text)
 
 
-class ReportTemplateWrapper(object):
+class _ReportTemplateWrapper(object):
+    ''' Used internally to pass `Report` objects to templates. They effectively
+    are used to specify the content_type for a report. '''
 
     def __init__(self, content_type, report):
         self.content_type = content_type
@@ -93,14 +97,40 @@ class OldReport(Report):
             if index > 0 or not self._link_view:
                 return text
             else:
-                address = reverse(self._link_view, args=[text])
+                address = self.get_link(text)
                 return self._linked_text(content_type, address, text)
 
         for row in self._data:
             yield [cell_text(i, cell) for i, cell in enumerate(row)]
 
-    def _get_link(self, argument):
-        return reverse(self._link_view, argument)
+    def get_link(self, argument):
+        return reverse(self._link_view, args=[argument])
+
+
+class Links(Report):
+
+    def __init__(self, title, links):
+        '''
+        Arguments:
+            links ([tuple, ...]): a list of 2-tuples:
+                (url, link_text)
+
+        '''
+        self._title = title
+        self._links = links
+
+    def title(self):
+        return self._title
+
+    def headings(self):
+        return []
+
+    def rows(self, content_type):
+        print self._links
+        for url, link_text in self._links:
+            yield [
+                self._linked_text(content_type, url, link_text)
+            ]
 
 def report_view(title, form_type=None):
     ''' Decorator that converts a report view function into something that
@@ -133,7 +163,7 @@ def report_view(title, form_type=None):
                 reports = [reports]
 
             reports = [
-                ReportTemplateWrapper("text/html", report)
+                _ReportTemplateWrapper("text/html", report)
                 for report in reports
             ]
 

From fa717dee65c4d1a09665f8ff39eae56623e4e34a Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 16:19:18 +1000
Subject: [PATCH 04/10] Adds QuerysetReport, which allows directly adding a
 queryset to a report rather than having to preprocess it into a list.

---
 registrasion/reporting/reports.py | 62 +++++++++++++++++++++++--------
 registrasion/reporting/views.py   | 49 +++++++++++++++---------
 2 files changed, 77 insertions(+), 34 deletions(-)

diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py
index ae079104..1061a903 100644
--- a/registrasion/reporting/reports.py
+++ b/registrasion/reporting/reports.py
@@ -73,13 +73,12 @@ class _ReportTemplateWrapper(object):
         return self.report.rows(self.content_type)
 
 
-class OldReport(Report):
+class BasicReport(Report):
 
-    def __init__(self, title, headings, data, link_view=None):
-        super(OldReport, self).__init__()
+    def __init__(self, title, headings, link_view=None):
+        super(BasicReport, self).__init__()
         self._title = title
         self._headings = headings
-        self._data = data
         self._link_view = link_view
 
     def title(self):
@@ -90,23 +89,54 @@ class OldReport(Report):
         ''' Returns the headings for the table. '''
         return self._headings
 
-    def rows(self, content_type):
-        ''' Returns the data rows for the table. '''
-
-        def cell_text(index, text):
-            if index > 0 or not self._link_view:
-                return text
-            else:
-                address = self.get_link(text)
-                return self._linked_text(content_type, address, text)
-
-        for row in self._data:
-            yield [cell_text(i, cell) for i, cell in enumerate(row)]
+    def cell_text(self, content_type, index, text):
+        if index > 0 or not self._link_view:
+            return text
+        else:
+            address = self.get_link(text)
+            return self._linked_text(content_type, address, text)
 
     def get_link(self, argument):
         return reverse(self._link_view, args=[argument])
 
 
+class ListReport(BasicReport):
+
+    def __init__(self, title, headings, data, link_view=None):
+        super(ListReport, self).__init__(title, headings, link_view=link_view)
+        self._data = data
+
+    def rows(self, content_type):
+        ''' Returns the data rows for the table. '''
+
+        for row in self._data:
+            yield [
+                self.cell_text(content_type, i, cell)
+                for i, cell in enumerate(row)
+            ]
+
+
+class QuerysetReport(BasicReport):
+
+    def __init__(self, title, headings, attributes, queryset, link_view=None):
+        super(QuerysetReport, self).__init__(title, headings, link_view=link_view)
+        self._attributes = attributes
+        self._queryset = queryset
+
+    def rows(self, content_type):
+
+        def rgetattr(item, attr):
+            for i in attr.split("__"):
+                item = getattr(item, i)
+            return item
+
+        for row in self._queryset:
+            yield [
+                self.cell_text(content_type, i, rgetattr(row, attribute))
+                for i, attribute in enumerate(self._attributes)
+            ]
+
+
 class Links(Report):
 
     def __init__(self, title, links):
diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index 574df7d1..0ea7a1f6 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -14,7 +14,9 @@ from registrasion.models import people
 from registrasion import views
 
 from reports import get_all_reports
-from reports import OldReport
+from reports import Links
+from reports import ListReport
+from reports import QuerysetReport
 from reports import report_view
 
 
@@ -90,7 +92,7 @@ def items_sold(request, form):
         "(TOTAL)", "--", "--", total_income,
     ])
 
-    return OldReport("Paid items", headings, data)
+    return ListReport("Paid items", headings, data)
 
 
 @report_view("Reconcilitation")
@@ -128,7 +130,7 @@ def reconciliation(request, form):
         sales["total"] - payments["total"] - ucn["total"],
     ])
 
-    return OldReport("Sales and Payments", headings, data)
+    return ListReport("Sales and Payments", headings, data)
 
 
 @report_view("Product status", form_type=forms.ProductAndCategoryForm)
@@ -211,7 +213,7 @@ def product_status(request, form):
             item["total_refunded"],
         ])
 
-    return OldReport("Inventory", headings, data)
+    return ListReport("Inventory", headings, data)
 
 
 @report_view("Credit notes")
@@ -238,7 +240,7 @@ def credit_notes(request, form):
             note.value,
         ])
 
-    return OldReport(
+    return ListReport(
         "Credit Notes",
         headings,
         data,
@@ -258,10 +260,16 @@ def attendee(request, form, user_id=None):
         user_id = form.cleaned_data["user"]
 
     attendee = people.Attendee.objects.get(user__id=user_id)
+    name = attendee.attendeeprofilebase.attendee_name()
 
     reports = []
 
-    # TODO: METADATA.
+    links = []
+    links.append((
+        reverse(views.amend_registration, args=[user_id]),
+        "Amend current cart",
+    ))
+    reports.append(Links("Actions for " + name, links))
 
     ic = ItemController(attendee.user)
     # Paid products
@@ -274,7 +282,7 @@ def attendee(request, form, user_id=None):
             pq.quantity,
         ])
 
-    reports.append(OldReport("Paid Products", headings, data))
+    reports.append(ListReport("Paid Products", headings, data))
 
     # Unpaid products
     headings = ["Product", "Quantity"]
@@ -286,7 +294,7 @@ def attendee(request, form, user_id=None):
             pq.quantity,
         ])
 
-    reports.append( OldReport("Unpaid Products", headings, data))
+    reports.append(ListReport("Unpaid Products", headings, data))
 
     # Invoices
     headings = ["Invoice ID", "Status", "Value"]
@@ -301,7 +309,7 @@ def attendee(request, form, user_id=None):
         ])
 
     reports.append(
-        OldReport("Invoices", headings, data, link_view=views.invoice)
+        ListReport("Invoices", headings, data, link_view=views.invoice)
     )
 
     # Credit Notes
@@ -317,7 +325,7 @@ def attendee(request, form, user_id=None):
         ])
 
     reports.append(
-        OldReport("Credit Notes", headings, data, link_view=views.credit_note)
+        ListReport("Credit Notes", headings, data, link_view=views.credit_note)
     )
 
     # All payments
@@ -327,14 +335,14 @@ def attendee(request, form, user_id=None):
     payments = commerce.PaymentBase.objects.filter(
         invoice__user=attendee.user,
     )
-    for payment in payments:
-        data.append([
-            payment.invoice.id, payment.id, payment.reference, payment.amount,
-        ])
 
-    reports.append(
-        OldReport("Payments", headings, data, link_view=views.invoice)
-    )
+    reports.append(QuerysetReport(
+        "Payments",
+        headings,
+        ["invoice__id", "id", "reference", "amount"],
+        payments,
+        link_view=views.invoice,
+    ))
 
 
     return reports
@@ -371,4 +379,9 @@ def attendee_list(request):
     # Sort by whether they've registered, then ID.
     data.sort(key=lambda a: (-a[3], a[0]))
 
-    return OldReport("Attendees", headings, data, link_view=attendee)
+    class Report(ListReport):
+
+        def get_link(self, argument):
+            return reverse(self._link_view) + "?user=%d" % int(argument)
+
+    return Report("Attendees", headings, data, link_view=attendee)

From f7326eedf7c1a0e1eae6df71a71573e7069bfa60 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 16:24:50 +1000
Subject: [PATCH 05/10] Makes as many reports under attendee() as possible a
 QuerysetReport

---
 registrasion/reporting/views.py | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index 0ea7a1f6..8e648505 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -303,6 +303,7 @@ def attendee(request, form, user_id=None):
     invoices = commerce.Invoice.objects.filter(
         user=attendee.user,
     )
+    # TODO make this a querysetreport
     for invoice in invoices:
         data.append([
             invoice.id, invoice.get_status_display(), invoice.value,
@@ -313,32 +314,24 @@ def attendee(request, form, user_id=None):
     )
 
     # Credit Notes
-    headings = ["Note ID", "Status", "Value"]
-    data = []
-
     credit_notes = commerce.CreditNote.objects.filter(
         invoice__user=attendee.user,
     )
-    for credit_note in credit_notes:
-        data.append([
-            credit_note.id, credit_note.status, credit_note.value,
-        ])
-
-    reports.append(
-        ListReport("Credit Notes", headings, data, link_view=views.credit_note)
-    )
+    reports.append(QuerysetReport(
+        "Credit Notes",
+        ["Note ID", "Status", "Value"],
+        ["id", "status", "value"],
+        credit_notes,
+        link_view=views.credit_note,
+    ))
 
     # All payments
-    headings = ["To Invoice", "Payment ID", "Reference", "Amount"]
-    data = []
-
     payments = commerce.PaymentBase.objects.filter(
         invoice__user=attendee.user,
     )
-
     reports.append(QuerysetReport(
         "Payments",
-        headings,
+        ["To Invoice", "Payment ID", "Reference", "Amount"],
         ["invoice__id", "id", "reference", "amount"],
         payments,
         link_view=views.invoice,

From 4c9f426a472cd55e10c58ea5879c9f80eb65a921 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 16:26:40 +1000
Subject: [PATCH 06/10] Simplifies a bunch of older reports.

---
 registrasion/reporting/views.py | 36 +++++++++++----------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index 8e648505..934705ce 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -271,39 +271,27 @@ def attendee(request, form, user_id=None):
     ))
     reports.append(Links("Actions for " + name, links))
 
+    # Paid and pending  products
     ic = ItemController(attendee.user)
-    # Paid products
-    headings = ["Product", "Quantity"]
-    data = []
-
-    for pq in ic.items_purchased():
-        data.append([
-            pq.product,
-            pq.quantity,
-        ])
-
-    reports.append(ListReport("Paid Products", headings, data))
-
-    # Unpaid products
-    headings = ["Product", "Quantity"]
-    data = []
-
-    for pq in ic.items_pending():
-        data.append([
-            pq.product,
-            pq.quantity,
-        ])
-
-    reports.append(ListReport("Unpaid Products", headings, data))
+    reports.append(ListReport(
+        "Paid Products",
+        ["Product", "Quantity"],
+        [(pq.product, pq.quantity) for pq in ic.items_purchased()],
+    ))
+    reports.append(ListReport(
+        "Unpaid Products",
+        ["Product", "Quantity"],
+        [(pq.product, pq.quantity) for pq in ic.items_pending()],
+    ))
 
     # Invoices
+    # TODO make this a querysetreport
     headings = ["Invoice ID", "Status", "Value"]
     data = []
 
     invoices = commerce.Invoice.objects.filter(
         user=attendee.user,
     )
-    # TODO make this a querysetreport
     for invoice in invoices:
         data.append([
             invoice.id, invoice.get_status_display(), invoice.value,

From bbce369a38f25facf19e35fca826bb8b629b31de Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 18:44:13 +1000
Subject: [PATCH 07/10] Allows for callable attributes to be specified in
 QuerysetReports.

---
 registrasion/reporting/reports.py |  7 +++++++
 registrasion/reporting/views.py   | 20 +++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py
index 1061a903..d533ecf1 100644
--- a/registrasion/reporting/reports.py
+++ b/registrasion/reporting/reports.py
@@ -128,6 +128,13 @@ class QuerysetReport(BasicReport):
         def rgetattr(item, attr):
             for i in attr.split("__"):
                 item = getattr(item, i)
+
+            if callable(item):
+                try:
+                    return item()
+                except TypeError:
+                    pass
+
             return item
 
         for row in self._queryset:
diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index 934705ce..0149c987 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -285,21 +285,16 @@ def attendee(request, form, user_id=None):
     ))
 
     # Invoices
-    # TODO make this a querysetreport
-    headings = ["Invoice ID", "Status", "Value"]
-    data = []
-
     invoices = commerce.Invoice.objects.filter(
         user=attendee.user,
     )
-    for invoice in invoices:
-        data.append([
-            invoice.id, invoice.get_status_display(), invoice.value,
-        ])
-
-    reports.append(
-        ListReport("Invoices", headings, data, link_view=views.invoice)
-    )
+    reports.append(QuerysetReport(
+        "Invoices",
+        ["Invoice ID", "Status", "Value"],
+        ["id", "get_status_display", "value"],
+        invoices,
+        link_view=views.invoice,
+    ))
 
     # Credit Notes
     credit_notes = commerce.CreditNote.objects.filter(
@@ -325,7 +320,6 @@ def attendee(request, form, user_id=None):
         link_view=views.invoice,
     ))
 
-
     return reports
 
 

From 12b665acb8c7bc4b560f5d371d6f4d9877e68b8c Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 18:47:51 +1000
Subject: [PATCH 08/10] =?UTF-8?q?DRYs=20QuerysetReport=E2=80=99s=20headers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 registrasion/reporting/reports.py | 11 ++++++++++-
 registrasion/reporting/views.py   |  4 +---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py
index d533ecf1..9ba63f06 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 0149c987..bb89ae1a 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,

From cb50f2a3bea93a873d844945918debf30b1f6f5f Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 18:53:01 +1000
Subject: [PATCH 09/10] Replaces a bunch of reports with QuerysetReports

---
 registrasion/reporting/views.py | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py
index bb89ae1a..88f4eada 100644
--- a/registrasion/reporting/views.py
+++ b/registrasion/reporting/views.py
@@ -227,23 +227,11 @@ def credit_notes(request, form):
         "invoice__user__attendee__attendeeprofilebase",
     )
 
-    headings = [
-        "id", "Owner", "Status", "Value",
-    ]
-
-    data = []
-    for note in notes:
-        data.append([
-            note.id,
-            note.invoice.user.attendee.attendeeprofilebase.invoice_recipient(),
-            note.status,
-            note.value,
-        ])
-
-    return ListReport(
+    return QuerysetReport(
         "Credit Notes",
-        headings,
-        data,
+        ["id", "invoice__user__attendee__attendeeprofilebase__invoice_recipient", "status", "value"],  # NOQA
+        notes,
+        headings=["id", "Owner", "Status", "Value"],
         link_view=views.credit_note,
     )
 

From f0730b4de9fa32fc43d2cec9f2fd1548036d77cf Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Tue, 13 Sep 2016 18:54:28 +1000
Subject: [PATCH 10/10] Flake8 fixes for reports

---
 registrasion/reporting/forms.py   | 1 +
 registrasion/reporting/reports.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/registrasion/reporting/forms.py b/registrasion/reporting/forms.py
index f4902660..94e99491 100644
--- a/registrasion/reporting/forms.py
+++ b/registrasion/reporting/forms.py
@@ -4,6 +4,7 @@ from django import forms
 
 # Staff-facing forms.
 
+
 class ProductAndCategoryForm(forms.Form):
     product = forms.ModelMultipleChoiceField(
         queryset=inventory.Product.objects.all(),
diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py
index 9ba63f06..ab8e924d 100644
--- a/registrasion/reporting/reports.py
+++ b/registrasion/reporting/reports.py
@@ -120,7 +120,9 @@ class QuerysetReport(BasicReport):
 
     def __init__(self, title, attributes, queryset, headings=None,
                  link_view=None):
-        super(QuerysetReport, self).__init__(title, headings, link_view=link_view)
+        super(QuerysetReport, self).__init__(
+            title, headings, link_view=link_view
+        )
         self._attributes = attributes
         self._queryset = queryset
 
@@ -178,6 +180,7 @@ class Links(Report):
                 self._linked_text(content_type, url, link_text)
             ]
 
+
 def report_view(title, form_type=None):
     ''' Decorator that converts a report view function into something that
     displays a Report.