From: Ross Jones <rossdjones@gmail.com>
Date: Thu, 25 Oct 2012 15:33:34 +0000
Subject: Trimming long float numbers
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=e4af116592f89b92445813df6ae64412ec548201
---
Trimming long float numbers
---


--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -59,7 +59,15 @@
             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)
+                e.key = '%s *' % e.key
+            c.global_totals.append((e.key, val))
+
 
         keys = {
             'Browser versions': 'browsers',
@@ -101,10 +109,13 @@
             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;
         """
+        # 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:

--- a/ckanext/ga_report/templates/ga_report/publisher/index.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/index.html
@@ -8,6 +8,7 @@
   <py:match path="primarysidebar">
     <li class="widget-container boxed widget_text">
       <h4>Publishers</h4>
+      <p>The table shows the top 20 publishers as recorded by page views of datasets owned by that publisher, and the number of visits to each publisher's home page.</p>
     </li>
   </py:match>
 

--- a/ckanext/ga_report/templates/ga_report/site/index.html
+++ b/ckanext/ga_report/templates/ga_report/site/index.html
@@ -50,6 +50,8 @@
                     </tr>
                 </py:for>
                </table>
+
+              <p>* Values are rounded up to 2 decimal places.</p>
         </div>
         <div class="tab-pane" id="browsers">
              <table class="table table-condensed table-bordered table-striped">