--- a/ckanext/ga_report/templates/ga_report/ga_util.html +++ b/ckanext/ga_report/templates/ga_report/ga_util.html @@ -30,36 +30,13 @@ </table> -<div py:def="rickshaw_graph(items_json,id,debug=False)"> +<div py:def="rickshaw_graph(items_json,id,mode='line',colorscheme='munin')"> <div id="chart_container_$id" class="rickshaw_chart_container"> <div id="y_axis_$id" class="rickshaw_y_axis"></div> <div id="chart_$id" class="rickshaw_chart"></div> - <div id="legend_$id" class="rickshaw_legend"></div> <script type="text/javascript"> $(function() { - var series = ${items_json}; - <py:if test="debug">console.log(series);</py:if> - var palette = new Rickshaw.Color.Palette( { scheme: 'spectrum2001' } ); - $.each(series, function(i, object) { - object['color'] = palette.color(); - }); - var graph = new Rickshaw.Graph( { - element: document.querySelector("#chart_$id"), - renderer: 'line', - series: series - }); - var x_axis = new Rickshaw.Graph.Axis.Time( { graph: graph } ); - var y_axis = new Rickshaw.Graph.Axis.Y( { - graph: graph, - orientation: 'left', - tickFormat: Rickshaw.Fixtures.Number.formatKMBT, - element: document.getElementById('y_axis_$id'), - } ); - var legend = new Rickshaw.Graph.Legend( { - element: document.querySelector('#legend_$id'), - graph: graph - } ); - graph.render(); + CKAN.GA_Reports.render_rickshaw('$id', $items_json, '$mode', '$colorscheme'); }); </script> </div>