Adds QuerysetReport, which allows directly adding a queryset to a report rather than having to preprocess it into a list.

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):
+    def __init__(self, title, headings, link_view=None):
-        super(OldReport, self).__init__()
+        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):
+    def cell_text(self, content_type, index, text):
-        ''' Returns the data rows for the table. '''
+        if index > 0 or not self._link_view:
-
+            return text
-        def cell_text(index, text):
+        else:
-            if index > 0 or not self._link_view:
+            address = self.get_link(text)
-                return text
+            return self._linked_text(content_type, address, 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 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):

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(
+    reports.append(QuerysetReport(
-        OldReport("Payments", headings, data, link_view=views.invoice)
+        "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)