Changes related to presentation, and new tabs.
- Changed nearly all values to percentages of the total
- Added non-version info for OS and browsers
- Made tabs into dropdowns for Browser/OS
--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -1,4 +1,6 @@
import re
+import csv
+import sys
import logging
import operator
import collections
@@ -38,6 +40,7 @@
entries = q.order_by('GA_Stat.period_name, GA_Stat.stat_name, GA_Stat.key').all()
response.headers['Content-Type'] = "text/csv; charset=utf-8"
+ response.headers['Content-Disposition'] = str('attachment; filename=stats_%s.csv' % (month,))
writer = csv.writer(response)
writer.writerow(["Period", "Statistic", "Key", "Value"])
@@ -73,9 +76,14 @@
mins, secs = divmod(float(val), 60)
hours, mins = divmod(mins, 60)
val = '%02d:%02d:%02d (%s seconds) ' % (hours, mins, secs, val)
- key = '%s *' % key
+ if key == 'Percent new visits':
+ key = 'New visits'
+ val = "%s%%" % val
if key in ['Bounces', 'Total pageviews']:
val = int(val)
+ if key == 'Total pageviews':
+ key = 'Total page views'
+
return key, val
c.global_totals = []
@@ -97,8 +105,10 @@
c.global_totals = sorted(c.global_totals, key=operator.itemgetter(0))
keys = {
- 'Browser versions': 'browsers',
- 'Operating Systems versions': 'os',
+ 'Browser versions': 'browser_versions',
+ 'Browsers': 'browsers',
+ 'Operating Systems versions': 'os_versions',
+ 'Operating Systems': 'os',
'Social sources': 'social_networks',
'Languages': 'languages',
'Country': 'country'
@@ -141,9 +151,14 @@
entries.append((key,val,))
entries = sorted(entries, key=operator.itemgetter(1), reverse=True)
- setattr(c, v, [(k,v) for k,v in entries ])
-
-
+ def percent(num, total):
+ p = 100 * float(num)/float(total)
+ return "%.2f%%" % round(p, 2)
+
+ # Get the total for each set of values and then set the value as
+ # a percentage of the total
+ total = sum([num for _,num in entries])
+ setattr(c, v, [(k,percent(v,total)) for k,v in entries ])
return render('ga_report/site/index.html')
@@ -153,6 +168,45 @@
Displays the pageview and visit count for specific publishers based on
the datasets associated with the publisher.
"""
+ def csv(self, month):
+
+ c.month = month if not month =='all' else ''
+ response.headers['Content-Type'] = "text/csv; charset=utf-8"
+ response.headers['Content-Disposition'] = str('attachment; filename=publishers_%s.csv' % (month,))
+
+ writer = csv.writer(response)
+ writer.writerow(["Publisher", "Views", "Visits", "Period Name"])
+
+ for publisher,view,visit in self._get_publishers(None):
+ writer.writerow([publisher.title.encode('utf-8'),
+ view,
+ visit,
+ month])
+
+
+
+ def publisher_csv(self, id, month):
+
+ c.month = month if not month =='all' else ''
+ c.publisher = model.Group.get(id)
+ if not c.publisher:
+ abort(404, 'A publisher with that name could not be found')
+
+ packages = self._get_packages(c.publisher)
+ response.headers['Content-Type'] = "text/csv; charset=utf-8"
+ response.headers['Content-Disposition'] = \
+ str('attachment; filename=%s_%s.csv' % (c.publisher.name, month,))
+
+ writer = csv.writer(response)
+ writer.writerow(["Publisher", "Views", "Visits", "Period Name"])
+
+ for package,view,visit in packages:
+ writer.writerow([package.title.encode('utf-8'),
+ view,
+ visit,
+ month])
+
+
def index(self):
@@ -166,6 +220,11 @@
if c.month:
c.month_desc = ''.join([m[1] for m in c.months if m[0]==c.month])
+ c.top_publishers = self._get_publishers()
+
+ return render('ga_report/publisher/index.html')
+
+ def _get_publishers(self, limit=20):
connection = model.Session.connection()
q = """
select department_id, sum(pageviews::int) views, sum(visitors::int) visits
@@ -176,54 +235,31 @@
and period_name=%s
"""
q = q + """
- group by department_id order by views desc limit 20;
+ group by department_id order by views desc
"""
+ if limit:
+ q = q + " limit %s;" % (limit)
# Add this back (before and period_name =%s) if you want to ignore publisher
# homepage views
# and not url like '/publisher/%%'
- c.top_publishers = []
+ 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')
-
-
- def read(self, id):
- count = 20
-
- c.publisher = model.Group.get(id)
- if not c.publisher:
- abort(404, 'A publisher with that name could not be found')
- c.top_packages = [] # package, dataset_views in c.top_packages
-
- # 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', '')
- if not c.month:
- c.month_desc = 'all time'
- else:
- c.month_desc = ''.join([m[1] for m in c.months if m[0]==c.month])
-
- c.publisher_page_views = 0
- q = model.Session.query(GA_Url).\
- filter(GA_Url.url=='/publisher/%s' % c.publisher.name)
- if c.month:
- entry = q.filter(GA_Url.period_name==c.month).first()
- c.publisher_page_views = entry.pageviews if entry else 0
- else:
- for e in q.all():
- c.publisher_page_views = c.publisher_page_views + int(e.pageviews)
-
-
+ g = model.Group.get(row[0])
+ if g:
+ top_publishers.append((g, row[1], row[2]))
+ return top_publishers
+
+ def _get_packages(self, publisher, count=-1):
+ if count == -1:
+ count = sys.maxint
+
+ top_packages = []
q = model.Session.query(GA_Url).\
- filter(GA_Url.department_id==c.publisher.name).\
+ filter(GA_Url.department_id==publisher.name).\
filter(GA_Url.url.like('/dataset/%'))
if c.month:
q = q.filter(GA_Url.period_name==c.month)
@@ -232,7 +268,7 @@
if c.month:
for entry in q[:count]:
p = model.Package.get(entry.url[len('/dataset/'):])
- c.top_packages.append((p,entry.pageviews,entry.visitors))
+ top_packages.append((p,entry.pageviews,entry.visitors))
else:
ds = {}
for entry in q.all():
@@ -248,7 +284,40 @@
for k, v in ds.iteritems():
results.append((k,v['views'],v['visits']))
- c.top_packages = sorted(results, key=operator.itemgetter(1), reverse=True)
+ top_packages = sorted(results, key=operator.itemgetter(1), reverse=True)
+ return top_packages
+
+
+ def read(self, id):
+ count = 20
+
+ c.publisher = model.Group.get(id)
+ if not c.publisher:
+ abort(404, 'A publisher with that name could not be found')
+ c.top_packages = [] # package, dataset_views in c.top_packages
+
+ # 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', '')
+ if not c.month:
+ c.month_desc = 'all time'
+ else:
+ c.month_desc = ''.join([m[1] for m in c.months if m[0]==c.month])
+
+ c.publisher_page_views = 0
+ q = model.Session.query(GA_Url).\
+ filter(GA_Url.url=='/publisher/%s' % c.publisher.name)
+ if c.month:
+ entry = q.filter(GA_Url.period_name==c.month).first()
+ c.publisher_page_views = entry.pageviews if entry else 0
+ else:
+ for e in q.all():
+ c.publisher_page_views = c.publisher_page_views + int(e.pageviews)
+
+ c.top_packages = self._get_packages(c.publisher, 20)
return render('ga_report/publisher/read.html')
--- a/ckanext/ga_report/plugin.py
+++ b/ckanext/ga_report/plugin.py
@@ -27,22 +27,32 @@
def after_map(self, map):
map.connect(
- '/data/analytics/publisher',
+ '/data/site-usage/publisher',
controller='ckanext.ga_report.controller:GaPublisherReport',
action='index'
)
map.connect(
- '/data/analytics/publisher/{id}',
+ '/data/site-usage/publisher_{month}.csv',
+ controller='ckanext.ga_report.controller:GaPublisherReport',
+ action='csv'
+ )
+ map.connect(
+ '/data/site-usage/publisher/{id}_{month}.csv',
+ controller='ckanext.ga_report.controller:GaPublisherReport',
+ action='publisher_csv'
+ )
+ map.connect(
+ '/data/site-usage/publisher/{id}',
controller='ckanext.ga_report.controller:GaPublisherReport',
action='read'
)
map.connect(
- '/data/analytics',
+ '/data/site-usage',
controller='ckanext.ga_report.controller:GaReport',
action='index'
)
map.connect(
- '/data/analytics/data_{month}.csv',
+ '/data/site-usage/data_{month}.csv',
controller='ckanext.ga_report.controller:GaReport',
action='csv'
)
--- a/ckanext/ga_report/templates/ga_report/ga_util.html
+++ b/ckanext/ga_report/templates/ga_report/ga_util.html
@@ -12,6 +12,20 @@
<td><a href="/publisher/${group.name}">${title}</a></td>
</tr>
</py:for>
+ </table>
+
+
+<table py:def="stat_table(items)" class="table table-condensed table-bordered table-striped">
+ <tr>
+ <th>Name</th>
+ <th>% Views</th>
+ </tr>
+ <py:for each="name, value in items">
+ <tr>
+ <td>${name}</td>
+ <td>${value}</td>
+ </tr>
+ </py:for>
</table>
--- a/ckanext/ga_report/templates/ga_report/publisher/index.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/index.html
@@ -20,7 +20,7 @@
<li class="widget-container boxed widget_text">
<h4>Download</h4>
<p><center>
- <a class="btn button" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month or 'all')}">Download as CSV</a></center>
+ <a class="btn button" href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport',action='csv',month=c.month or 'all')}">Download as CSV</a></center>
</p>
</li>
</py:match>
--- a/ckanext/ga_report/templates/ga_report/publisher/read.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/read.html
@@ -21,7 +21,7 @@
<li class="widget-container boxed widget_text">
<h4>Download</h4>
<p><center>
- <a class="btn button" href="${h.url_for(controller='ckanext.ga_report.controller:GaReport',action='csv',month=c.month or 'all')}">Download as CSV</a></center>
+ <a class="btn button" href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport',action='publisher_csv',id=c.publisher.name,month=c.month or 'all')}">Download as CSV</a></center>
</p>
</li>
</py:match>
--- a/ckanext/ga_report/templates/ga_report/site/index.html
+++ b/ckanext/ga_report/templates/ga_report/site/index.html
@@ -44,8 +44,22 @@
<div class="tabbable">
<ul class="nav nav-tabs">
<li class="active"><a href="#totals" data-toggle="tab">Totals</a></li>
- <li><a href="#browsers" data-toggle="tab">Browsers</a></li>
- <li><a href="#os" data-toggle="tab">Operating Systems</a></li>
+ <li class="dropdown">
+ <a href="#browsers" class="dropdown-toggle" data-toggle="dropdown">Browsers
+ <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#browsers_names" data-toggle="tab">Browsers</a></li>
+ <li><a href="#browsers_versions" data-toggle="tab">Versions</a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a href="#browsers" class="dropdown-toggle" data-toggle="dropdown">Operating<br/>Systems
+ <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="#os" data-toggle="tab">Operating Systems</a></li>
+ <li><a href="#os_versions" data-toggle="tab">Versions</a></li>
+ </ul>
+ </li>
<li><a href="#social_networks" data-toggle="tab">Social Networks</a></li>
<li><a href="#languages" data-toggle="tab">Languages</a></li>
<li><a href="#country" data-toggle="tab">Country</a></li>
@@ -65,75 +79,26 @@
</py:for>
</table>
</div>
- <div class="tab-pane" id="browsers">
- <table class="table table-condensed table-bordered table-striped">
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- <py:for each="name, value in c.browsers">
- <tr>
- <td>${name}</td>
- <td>${value}</td>
- </tr>
- </py:for>
- </table>
- </div>
- <div class="tab-pane" id="os">
- <table class="table table-condensed table-bordered table-striped">
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- <py:for each="name, value in c.os">
- <tr>
- <td>${name}</td>
- <td>${value}</td>
- </tr>
- </py:for>
- </table>
- </div>
+ <div class="tab-pane" id="browsers_versions">
+ ${stat_table(c.browser_versions)}
+ </div>
+ <div class="tab-pane" id="browsers_names">
+ ${stat_table(c.browsers)}
+ </div>
+ <div class="tab-pane" id="os">
+ ${stat_table(c.os)}
+ </div>
+ <div class="tab-pane" id="os_versions">
+ ${stat_table(c.os_versions)}
+ </div>
<div class="tab-pane" id="social_networks">
- <table class="table table-condensed table-bordered table-striped">
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- <py:for each="name, value in c.social_networks">
- <tr>
- <td>${name}</td>
- <td>${value}</td>
- </tr>
- </py:for>
- </table>
+ ${stat_table(c.social_networks)}
</div>
<div class="tab-pane" id="languages">
- <table class="table table-condensed table-bordered table-striped">
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- <py:for each="name, value in c.languages">
- <tr>
- <td>${name}</td>
- <td>${value}</td>
- </tr>
- </py:for>
- </table>
+ ${stat_table(c.languages)}
</div>
<div class="tab-pane" id="country">
- <table class="table table-condensed table-bordered table-striped">
- <tr>
- <th>Name</th>
- <th>Value</th>
- </tr>
- <py:for each="name, value in c.country">
- <tr>
- <td>${name}</td>
- <td>${value}</td>
- </tr>
- </py:for>
- </table>
+ ${stat_table(c.country)}
</div>
@@ -148,6 +113,7 @@
<py:def function="optional_footer">
<script type='text/javascript'>
+ $('.dropdown-toggle').dropdown();
$('.nav-tabs li a').click(function (e) {
e.preventDefault();
$(this).tab('show');