Debugging
[ckanext-ga-report.git] / ckanext / ga_report / controller.py
blob:a/ckanext/ga_report/controller.py -> blob:b/ckanext/ga_report/controller.py
--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -34,7 +34,6 @@
             filter(GA_Stat.period_name==month).\
             order_by('GA_Stat.stat_name, GA_Stat.key').all()
 
-        response.headers['Content-disposition'] = 'attachment; filename=dgu_analytics_%s.csv' % (month)
         response.headers['Content-Type'] = "text/csv; charset=utf-8"
 
         writer = csv.writer(response)
@@ -60,7 +59,19 @@
             filter(GA_Stat.stat_name=='Totals').\
             filter(GA_Stat.period_name==c.month).\
             order_by('ga_stat.key').all()
-        c.global_totals = [(s.key, s.value) for s in entries ]
+
+        c.global_totals = []
+        for e in entries:
+            val = e.value
+            if e.key in ['Average time on site', 'Pages per visit', 'Percent new visits']:
+                val =  "%.2f" % round(float(e.value), 2)
+                if e.key == 'Average time on site':
+                    mins, secs = divmod(float(val), 60)
+                    hours, mins = divmod(mins, 60)
+                    val = '%02d:%02d:%02d (%s seconds) ' % (hours, mins, secs, val)
+                e.key = '%s *' % e.key
+            c.global_totals.append((e.key, val))
+
 
         keys = {
             'Browser versions': 'browsers',
@@ -88,30 +99,32 @@
     """
 
     def index(self):
-        try:
-            # Get the month details by fetching distinct values and determining the
-            # month names from the values.
-            c.months = _month_details(GA_Url)
 
-            # Work out which month to show, based on query params of the first item
-            c.month = request.params.get('month', c.months[0][0] if c.months else '')
-            c.month_desc = ''.join([m[1] for m in c.months if m[0]==c.month])
+        # Get the month details by fetching distinct values and determining the
+        # month names from the values.
+        c.months = _month_details(GA_Url)
 
-            connection = model.Session.connection()
-            q = """
-                select department_id, sum(pageviews::int) views, sum(visitors::int) visits
-                from ga_url
-                where department_id <> ''
-                    and not url like '/publisher/%%'
-                    and period_name=%s
-                group by department_id order by views desc limit 20;
-            """
-            c.top_publishers = []
-            res = connection.execute(q, c.month)
-            for row in res:
-                c.top_publishers.append((model.Group.get(row[0]), row[1], row[2]))
-        except Exception as e:
-            raise e
+        # Work out which month to show, based on query params of the first item
+        c.month = request.params.get('month', c.months[0][0] if c.months else '')
+        c.month_desc = ''.join([m[1] for m in c.months if m[0]==c.month])
+
+        connection = model.Session.connection()
+        q = """
+            select department_id, sum(pageviews::int) views, sum(visitors::int) visits
+            from ga_url
+            where department_id <> ''
+                and period_name=%s
+            group by department_id order by views desc limit 20;
+        """
+        # Add this back (before and period_name =%s) if you want to ignore publisher
+        # homepage views
+        # and not url like '/publisher/%%'
+
+        c.top_publishers = []
+        res = connection.execute(q, c.month)
+        for row in res:
+            c.top_publishers.append((model.Group.get(row[0]), row[1], row[2]))
+
         return render('ga_report/publisher/index.html')