diff --git a/addons/web_graph/static/src/css/graph.css b/addons/web_graph/static/src/css/graph.css index e69de29bb2d..b6412b8856c 100644 --- a/addons/web_graph/static/src/css/graph.css +++ b/addons/web_graph/static/src/css/graph.css @@ -0,0 +1,12 @@ + +.graph_main_content td { + border: 1px solid black; + padding: 0.5rem; + text-align: right; +} + +td.graph_border { + background-color: rgb(227, 227, 227); + text-align: left; +} + diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index a36f8f68db0..e8836604324 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -10,6 +10,7 @@ openerp.web_graph = function (instance) { var _lt = instance.web._lt; var _t = instance.web._t; +var QWeb = instance.web.qweb; instance.web.views.add('graph', 'instance.web_graph.GraphView'); @@ -94,6 +95,7 @@ var BasicDataView = instance.web.Widget.extend({ this.fields = fields; this.groupby = groupby; this.measure = measure; + this.measure_label = measure ? fields[measure].string : 'Quantity'; }, show: function () { @@ -113,7 +115,23 @@ var PivotTable = BasicDataView.extend({ template: 'pivot_table', draw: function () { - console.log('data',this.data); + var self = this; + console.log("data",this.data); + + var rows = '