Paginate html report results

oscar/apps/analytics/reports.py

@@ -32,7 +32,7 @@ class ProductReportCSVFormatter(ReportCSVFormatter):
 
 
 class ProductReportHTMLFormatter(ReportHTMLFormatter):
-    template = 'dashboard/reports/partials/product_report.html'
+    filename_template = 'dashboard/reports/partials/product_report.html'
 
 
 class ProductReportGenerator(ReportGenerator):
@@ -84,7 +84,7 @@ class UserReportCSVFormatter(ReportCSVFormatter):
 
 
 class UserReportHTMLFormatter(ReportHTMLFormatter):
-    template = 'dashboard/reports/partials/user_report.html'
+    filename_template = 'dashboard/reports/partials/user_report.html'
 
 
 class UserReportGenerator(ReportGenerator):

oscar/apps/basket/reports.py

@@ -45,7 +45,7 @@ class OpenBasketReportCSVFormatter(ReportCSVFormatter):
 
 
 class OpenBasketReportHTMLFormatter(ReportHTMLFormatter):
-    template = 'dashboard/reports/partials/open_basket_report.html'
+    filename_template = 'dashboard/reports/partials/open_basket_report.html'
 
 
 class OpenBasketReportGenerator(ReportGenerator):
@@ -101,7 +101,7 @@ class SubmittedBasketReportCSVFormatter(ReportCSVFormatter):
 
 
 class SubmittedBasketReportHTMLFormatter(ReportHTMLFormatter):
-    template = 'dashboard/reports/partials/submitted_basket_report.html'
+    filename_template = 'dashboard/reports/partials/submitted_basket_report.html'
 
 
 class SubmittedBasketReportGenerator(ReportGenerator):
@@ -123,4 +123,3 @@ class SubmittedBasketReportGenerator(ReportGenerator):
         }
         baskets = Basket._default_manager.filter(status=SUBMITTED)
         return self.formatter.generate_response(baskets, **additional_data)
-

oscar/apps/dashboard/reports/reports.py

@@ -27,7 +27,7 @@ class ReportGenerator(object):
         """
         Returns the filename for this report
         """
-        return self.filename_template % (self.start_date, self.end_date)
+        return self.formatter.filename()
 
     def is_available_to(self, user):
         """
@@ -59,6 +59,4 @@ class ReportCSVFormatter(ReportFormatter):
 class ReportHTMLFormatter(ReportFormatter):
 
     def generate_response(self, objects, **kwargs):
-        template = loader.get_template(self.template)
-        ctx = Context({'objects': objects})
-        return template.render(ctx)
+        return objects

oscar/apps/dashboard/reports/views.py

@@ -1,14 +1,16 @@
 from django.http import HttpResponse, HttpResponseForbidden, Http404
 from django.template.response import TemplateResponse
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, ListView
 
 from oscar.core.loading import get_class
 ReportForm = get_class('dashboard.reports.forms', 'ReportForm')
 GeneratorRepository = get_class('dashboard.reports.utils', 'GeneratorRepository')
 
 
-class IndexView(TemplateView):
+class IndexView(ListView):
     template_name = 'dashboard/reports/index.html'
+    paginate_by = 25
+    context_object_name = 'objects'
 
     def get(self, request, *args, **kwargs):
         if 'report_type' in request.GET:
@@ -16,19 +18,25 @@ class IndexView(TemplateView):
             if form.is_valid():
                 generator = _get_generator(form)
                 if not generator.is_available_to(request.user):
-                    return HttpResponseForbidden("You do not have access to this report")
+                    return HttpResponseForbidden("You do not have access"
+                                                 " to this report")
 
                 report = generator.generate()
 
                 if form.cleaned_data['download']:
                     return report
                 else:
-                    return TemplateResponse(request, self.template_name,
-                        {'form': form, 'report': report})
+                    self.set_list_view_attrs(generator, report)
+                    context = self.get_context_data(object_list=self.queryset)
+                    context['form'] = form
+                    return self.render_to_response(context)
         else:
             form = ReportForm()
         return TemplateResponse(request, self.template_name, {'form': form})
 
+    def set_list_view_attrs(self, generator, report):
+        self.template_name = generator.filename()
+        self.object_list = self.queryset = report
 
 def _get_generator(form):
     code = form.cleaned_data['report_type']

oscar/apps/offer/reports.py

@@ -25,7 +25,7 @@ class OfferReportCSVFormatter(ReportCSVFormatter):
 
 
 class OfferReportHTMLFormatter(ReportHTMLFormatter):
-    template = 'dashboard/reports/partials/offer_report.html'
+    filename_template = 'dashboard/reports/partials/offer_report.html'
 
 
 class OfferReportGenerator(ReportGenerator):
@@ -41,6 +41,3 @@ class OfferReportGenerator(ReportGenerator):
     def generate(self):
         offers = ConditionalOffer._default_manager.all()
         return self.formatter.generate_response(offers)
-
-    def filename(self):
-        return self.filename_template

oscar/apps/order/reports.py

@@ -32,7 +32,7 @@ class OrderReportCSVFormatter(ReportCSVFormatter):
 
 
 class OrderReportHTMLFormatter(ReportHTMLFormatter):
-    template = 'dashboard/reports/partials/order_report.html'
+    filename_template = 'dashboard/reports/partials/order_report.html'
 
 
 class OrderReportGenerator(ReportGenerator):

oscar/apps/voucher/reports.py

@@ -31,7 +31,7 @@ class VoucherReportCSVFormatter(ReportCSVFormatter):
 
 
 class VoucherReportHTMLFormatter(ReportHTMLFormatter):
-    template = 'dashboard/reports/partials/voucher_report.html'
+    filename_template = 'dashboard/reports/partials/voucher_report.html'
 
 
 class VoucherReportGenerator(ReportGenerator):

oscar/templates/dashboard/reports/index.html

@@ -35,5 +35,8 @@ Reports | {{ block.super }}
     {{ report }}
 {% endif %}
 
+{% block report %}
+{% endblock %}
+
 {% endblock dashboard_content %}
 

oscar/templates/dashboard/reports/partials/offer_report.html

@@ -1,5 +1,7 @@
+{% extends 'dashboard/reports/index.html' %}
 {% load currency_filters %}
 
+{% block report %}
 <table class="table table-striped table-bordered">
     <tr>
         <th>Offer</th>
@@ -11,4 +13,8 @@
         <td>{{ offer.total_discount }}</td>
     </tr>
     {% endfor %}
-</table>
+</table>
+    {% if page_obj %}
+        {% include "catalogue/partials/pagination.html" %}
+    {% endif %}
+{% endblock %}

oscar/templates/dashboard/reports/partials/open_basket_report.html

@@ -1,5 +1,7 @@
+{% extends 'dashboard/reports/index.html' %}
 {% load currency_filters %}
 
+{% block report %}
 <table class="table table-striped table-bordered">
     <tr>
         <th>User ID</th>
@@ -25,4 +27,8 @@
         <td>{{ basket.time_since_creation }}</td>
     </tr>
     {% endfor %}
-</table>
+</table>
+    {% if page_obj %}
+        {% include "catalogue/partials/pagination.html" %}
+    {% endif %}
+{% endblock %}

oscar/templates/dashboard/reports/partials/order_report.html

@@ -1,8 +1,9 @@
+{% extends 'dashboard/reports/index.html' %}
 {% load currency_filters %}
 
+{% block report %}
 <table class="table table-striped table-bordered">
     <tr>
-        <th></th>
         <th>Order number</th>
         <th>User</th>
         <th>Total incl. tax</th>
@@ -11,7 +12,6 @@
     </tr>
     {% for order in objects %}
     <tr>
-        <td><input type="checkbox" name="selected_order" class="selected_order" value="{{ order.id }}"/>
         <td>{{ order.number }}</td>
         <td>{{ order.user }}</td>
         <td>{{ order.total_incl_tax|currency }}</td>
@@ -21,4 +21,8 @@
         </td>
     </tr>
     {% endfor %}
-</table>
+</table>
+    {% if page_obj %}
+        {% include "catalogue/partials/pagination.html" %}
+    {% endif %}
+{% endblock %}

oscar/templates/dashboard/reports/partials/product_report.html

@@ -1,5 +1,7 @@
+{% extends 'dashboard/reports/index.html' %}
 {% load currency_filters %}
 
+{% block report %}
 <table class="table table-striped table-bordered">
     <tr>
         <th>Product</th>
@@ -15,4 +17,8 @@
         <td>{{ product.num_purchases }}</td>
     </tr>
     {% endfor %}
-</table>
+</table>
+    {% if page_obj %}
+        {% include "catalogue/partials/pagination.html" %}
+    {% endif %}
+{% endblock %}

oscar/templates/dashboard/reports/partials/submitted_basket_report.html

@@ -1,5 +1,7 @@
+{% extends 'dashboard/reports/index.html' %}
 {% load currency_filters %}
 
+{% block report %}
 <table class="table table-striped table-bordered">
     <tr>
         <th>User ID</th>
@@ -23,4 +25,8 @@
         <td>{{ basket.time_before_submit }}</td>
     </tr>
     {% endfor %}
-</table>
+</table>
+    {% if page_obj %}
+        {% include "catalogue/partials/pagination.html" %}
+    {% endif %}
+{% endblock %}

oscar/templates/dashboard/reports/partials/user_report.html

@@ -1,5 +1,7 @@
+{% extends 'dashboard/reports/index.html' %}
 {% load currency_filters %}
 
+{% block report %}
 <table class="table table-striped table-bordered">
     <tr>
         <th>Name</th>
@@ -25,4 +27,8 @@
         <td>{% if user.date_last_order %}{{ user.date_last_order }}{% endif %}</td>
     </tr>
     {% endfor %}
-</table>
+</table>
+    {% if page_obj %}
+        {% include "catalogue/partials/pagination.html" %}
+    {% endif %}
+{% endblock %}

oscar/templates/dashboard/reports/partials/voucher_report.html

@@ -1,5 +1,7 @@
+{% extends 'dashboard/reports/index.html' %}
 {% load currency_filters %}
 
+{% block report %}
 <table class="table table-striped table-bordered">
     <tr>
         <th>Voucher code</th>
@@ -15,4 +17,8 @@
         <td>{{ voucher.total_discount }}</td>
     </tr>
     {% endfor %}
-</table>
+</table>
+    {% if page_obj %}
+        {% include "catalogue/partials/pagination.html" %}
+    {% endif %}
+{% endblock %}