Added date formatting methods to ensure reports are consistent.

The dates should be picked up correctly by Excel now.

oscar/apps/analytics/reports.py

@@ -1,6 +1,7 @@
 import csv
 
 from django.db.models import get_model
+from django.template.defaultfilters import date
 
 from oscar.core.loading import get_class
 
@@ -43,8 +44,7 @@ class UserReportGenerator(ReportGenerator):
     
     def generate(self, response):
         writer = csv.writer(response)
-        header_row = ['Username',
-                      'Name',
+        header_row = ['Name',
                       'Date registered',
                       'Product views',
                       'Basket additions',
@@ -58,9 +58,15 @@ class UserReportGenerator(ReportGenerator):
         
         records = UserRecord._default_manager.select_related().all()
         for record in records:
-            row = [record.user.username, record.user.get_full_name(), record.user.date_joined, 
-                   record.num_product_views, record.num_basket_additions, record.num_orders,
-                   record.num_order_lines, record.num_order_items, record.total_spent, record.date_last_order]
+            row = [record.user.get_full_name(), 
+                   self.format_date(record.user.date_joined),
+                   record.num_product_views, 
+                   record.num_basket_additions, 
+                   record.num_orders,
+                   record.num_order_lines,
+                   record.num_order_items,
+                   record.total_spent,
+                   self.format_datetime(record.date_last_order)]
             writer.writerow(row)
             
     def is_available_to(self, user):

oscar/apps/basket/reports.py

@@ -19,7 +19,6 @@ class OpenBasketReportGenerator(ReportGenerator):
     def generate(self, response):
         writer = csv.writer(response)
         header_row = ['User ID',
-                      'Username',
                       'Name',
                       'Email',
                       'Basket status',
@@ -34,14 +33,15 @@ class OpenBasketReportGenerator(ReportGenerator):
         baskets = Basket._default_manager.filter(status=OPEN)
         for basket in baskets:
             if basket.owner:
-                row = [basket.owner_id, basket.owner.username, basket.owner.get_full_name(), basket.owner.email,
+                row = [basket.owner_id, basket.owner.get_full_name(), basket.owner.email,
                        basket.status, basket.num_lines,
                        basket.num_items, basket.total_incl_tax, 
-                       basket.date_created, basket.time_since_creation]
+                       self.format_datetime(basket.date_created), 
+                       basket.time_since_creation]
             else:
-                row = [basket.owner_id, None, None, None, basket.status, basket.num_lines,
+                row = [basket.owner_id, None, None, basket.status, basket.num_lines,
                        basket.num_items, basket.total_incl_tax, 
-                       basket.date_created, basket.time_since_creation]
+                       self.format_datetime(basket.date_created), basket.time_since_creation]
             writer.writerow(row)
 
 
@@ -61,13 +61,19 @@ class SubmittedBasketReportGenerator(ReportGenerator):
                       'Num lines',
                       'Num items',
                       'Value',
+                      'Date created',
                       'Time between creation and submission',
                      ]
         writer.writerow(header_row)
         
         baskets = Basket._default_manager.filter(status=SUBMITTED)
         for basket in baskets:
-            row = [basket.owner_id, basket.owner, basket.status, basket.num_lines,
-                   basket.num_items, basket.total_incl_tax, 
-                   basket.date_created, basket.time_before_submit]
+            row = [basket.owner_id,
+                   basket.owner,
+                   basket.status,
+                   basket.num_lines,
+                   basket.num_items,
+                   basket.total_incl_tax,
+                   self.format_datetime(basket.date_created),
+                   basket.time_before_submit]
             writer.writerow(row)

oscar/apps/dashboard/reports/reports.py

@@ -1,3 +1,6 @@
+from django.template.defaultfilters import date
+
+
 class ReportGenerator(object):
     """
     Top-level class that needs to be subclassed to provide a 
@@ -17,13 +20,19 @@ class ReportGenerator(object):
         pass
  
     def filename(self):
-        u"""
+        """
         Returns the filename for this report
         """
         return self.filename_template % (self.start_date, self.end_date)
     
     def is_available_to(self, user):
-        u"""
+        """
         Checks whether this report is available to this user
         """
-        return user.is_staff
+        return user.is_staff
+
+    def format_datetime(self, dt):
+        return date(dt, 'DATETIME_FORMAT')
+
+    def format_date(self, d):
+        return date(d, 'DATE_FORMAT')

oscar/apps/dashboard/reports/utils.py

@@ -2,7 +2,7 @@ from oscar.core.loading import get_class, get_classes
 OrderReportGenerator = get_class('order.reports', 'OrderReportGenerator')
 ProductReportGenerator, UserReportGenerator = get_classes('analytics.reports', ['ProductReportGenerator', 'UserReportGenerator'])
 OpenBasketReportGenerator, SubmittedBasketReportGenerator = get_classes(
-    'basket.reports', ['OpenBasketReportGenerator', 'SubmittedBasketReportGenerator'])     
+    'basket.reports', ['OpenBasketReportGenerator', 'SubmittedBasketReportGenerator'])
 OfferReportGenerator = get_class('offer.reports', 'OfferReportGenerator')
 VoucherReportGenerator = get_class('voucher.reports', 'VoucherReportGenerator')
 
@@ -14,7 +14,7 @@ class GeneratorRepository(object):
                   UserReportGenerator,
                   OpenBasketReportGenerator,
                   SubmittedBasketReportGenerator,
-                  VoucherReportGenerator, 
+                  VoucherReportGenerator,
                   OfferReportGenerator]
 
     def get_report_generators(self):

oscar/apps/order/reports.py

@@ -1,8 +1,10 @@
 import csv
 
-from oscar.core.loading import import_module
-import_module('dashboard.reports.reports', ['ReportGenerator'], locals())
-import_module('order.models', ['Order'], locals())
+from django.db.models import get_model
+
+from oscar.core.loading import get_class
+ReportGenerator = get_class('dashboard.reports.reports', 'ReportGenerator')
+Order = get_model('order', 'Order')
 
 
 class OrderReportGenerator(ReportGenerator):
@@ -23,7 +25,10 @@ class OrderReportGenerator(ReportGenerator):
                       'Date placed',]
         writer.writerow(header_row)
         for order in orders:
-            row = [order.number, order.user, order.total_incl_tax, order.date_placed]
+            row = [order.number,
+                   order.user,
+                   order.total_incl_tax,
+                   self.format_datetime(order.date_placed)]
             writer.writerow(row)
             
     def is_available_to(self, user):