#167 Render percentages on the site_usage graphs
--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -445,6 +445,10 @@
# Roll insignificant series into one
data = significant_series
data.append(catch_all)
+ # Turn each point into a percentage
+ for package in data:
+ for point in package['data']:
+ point['y'] = (point['y']*100) / totals[point['x']]
# Sort the points
for package in data:
package['data'] = sorted( package['data'], key=lambda x:x['x'] )
--- a/ckanext/ga_report/public/scripts/ckanext_ga_reports.js
+++ b/ckanext/ga_report/public/scripts/ckanext_ga_reports.js
@@ -16,7 +16,6 @@
series: data ,
height: 328
});
- graph.render();
var x_axis = new Rickshaw.Graph.Axis.Time( { graph: graph } );
var y_axis = new Rickshaw.Graph.Axis.Y( {
graph: graph,
@@ -37,6 +36,7 @@
return content;
}
} );
+ graph.render();
};