From: Tom Rees Date: Wed, 16 Jan 2013 15:27:14 +0000 Subject: Graphing dataset downloads. X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=bfe51ee1f1cbae0df4166d5dd06d161327ada935 --- Graphing dataset downloads. --- --- a/ckanext/ga_report/controller.py +++ b/ckanext/ga_report/controller.py @@ -113,24 +113,24 @@ return key, val # Query historic values for sparkline rendering - graph_query = model.Session.query(GA_Stat)\ + sparkline_query = model.Session.query(GA_Stat)\ .filter(GA_Stat.stat_name=='Totals')\ .order_by(GA_Stat.period_name) - graph_data = {} - for x in graph_query: - graph_data[x.key] = graph_data.get(x.key,[]) + sparkline_data = {} + for x in sparkline_query: + sparkline_data[x.key] = sparkline_data.get(x.key,[]) key, val = clean_key(x.key,float(x.value)) tooltip = '%s: %s' % (_get_month_name(x.period_name), val) - graph_data[x.key].append( (tooltip,x.value) ) + sparkline_data[x.key].append( (tooltip,x.value) ) # Trim the latest month, as it looks like a huge dropoff - for key in graph_data: - graph_data[key] = graph_data[key][:-1] + for key in sparkline_data: + sparkline_data[key] = sparkline_data[key][:-1] c.global_totals = [] if c.month: for e in entries: key, val = clean_key(e.key, e.value) - sparkline = graph_data[e.key] + sparkline = sparkline_data[e.key] c.global_totals.append((key, val, sparkline)) else: d = collections.defaultdict(list) @@ -141,11 +141,18 @@ v = sum(v) else: v = float(sum(v))/float(len(v)) - sparkline = graph_data[k] + sparkline = sparkline_data[k] key, val = clean_key(k,v) c.global_totals.append((key, val, sparkline)) - c.global_totals = sorted(c.global_totals, key=operator.itemgetter(0)) + # Sort the global totals into a more pleasant order + def sort_func(x): + key = x[0] + total_order = ['Total page views','Total visits','Pages per visit'] + if key in total_order: + return total_order.index(key) + return 999 + c.global_totals = sorted(c.global_totals, key=sort_func) keys = { 'Browser versions': 'browser_versions', @@ -266,7 +273,7 @@ if not c.publisher: abort(404, 'A publisher with that name could not be found') - packages = self._get_packages(c.publisher) + packages, graph_data = self._get_packages(c.publisher) response.headers['Content-Type'] = "text/csv; charset=utf-8" response.headers['Content-Disposition'] = \ str('attachment; filename=datasets_%s_%s.csv' % (c.publisher_name, month,)) @@ -312,6 +319,7 @@ q = q.filter(GA_Url.department_id==publisher.name) q = q.filter(GA_Url.period_name==month) q = q.order_by('ga_url.pageviews::int desc') + graph_data = [] top_packages = [] if count == -1: entries = q.all() @@ -320,6 +328,7 @@ for entry,package in entries: if package: + graph = [] # Downloads .... if have_download_data: dls = model.Session.query(GA_Stat).\ @@ -327,15 +336,18 @@ filter(GA_Stat.key==package.name) if month != 'All': # Fetch everything unless the month is specific dls = dls.filter(GA_Stat.period_name==month) - - downloads = sum(int(d.value) for d in dls.all()) + downloads = 0 + for x in dls: + graph.append({ 'x': _get_unix_epoch(d.period_name), 'y': int(d.value)}) + downloads += int(d.value) else: downloads = 'No data' - top_packages.append((package, entry.pageviews, entry.visits, downloads)) + top_packages.append((package, entry.pageviews, entry.visits, downloads, graph_data)) + graph_data.append({'name':package.title, 'data':graph}) else: log.warning('Could not find package associated package') - return top_packages + return top_packages,graph_data def read(self): ''' @@ -377,7 +389,8 @@ entry = q.filter(GA_Url.period_name==c.month).first() c.publisher_page_views = entry.pageviews if entry else 0 - c.top_packages = self._get_packages(c.publisher, 20) + c.top_packages, graph_data = self._get_packages(c.publisher, 20) + c.graph_data = json.dumps(graph_data) return render('ga_report/publisher/read.html') --- /dev/null +++ b/ckanext/ga_report/public/css/ga_report.css @@ -1,1 +1,33 @@ +.table-condensed td.sparkline-cell { + padding: 1px 0 0 0; + width: 108px; + text-align: center; +} +.rickshaw_chart_container { + position: relative; + height: 300px; + margin: 0 auto 20px auto; +} +.rickshaw_chart { + position: absolute; + left: 40px; + width: 500px; + top: 0; + bottom: 0; +} +.rickshaw_legend { + position: absolute; + right: 0; + top: 0; + margin-left: 15px; + background: transparent; + max-width: 150px; + overflow: hidden; +} +.rickshaw_y_axis { + position: absolute; + top: 0; + bottom: 0; + width: 40px; +} --- a/ckanext/ga_report/templates/ga_report/ga_util.html +++ b/ckanext/ga_report/templates/ga_report/ga_util.html @@ -30,14 +30,15 @@ -
-
-
-
-
+
+
+
+
+
+ + + +
@@ -34,6 +42,7 @@
+ ${rickshaw_graph('[{name:"test series",data:[{x:1,y:200},{x:3,y:300},{x:5,y:100}]}]','dataset-downloads',debug=True)} --- a/ckanext/ga_report/templates/ga_report/publisher/read.html +++ b/ckanext/ga_report/templates/ga_report/publisher/read.html @@ -6,6 +6,15 @@ Usage by Dataset + + + + + + + + +
  • @@ -41,21 +50,26 @@

    ${c.publisher.title}

    No page views in this period

    -
    • Publisher
    - - - - - - - - - - - + + + ${rickshaw_graph(c.graph_data,'dataset-downloads',debug=True)} +
    DatasetViewsDownloads
    ${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))} - ${views}${downloads}
    + + + + + + + + + + + -
    DatasetViewsDownloads
    + ${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))} + ${views}${downloads}
    + +
    --- a/ckanext/ga_report/templates/ga_report/site/index.html +++ b/ckanext/ga_report/templates/ga_report/site/index.html @@ -9,44 +9,11 @@ + - @@ -160,13 +127,8 @@ ${rickshaw_graph(c.country_graph,'country')} ${stat_table(c.country)}
    - -
    - - -