From 298a7012bfb1ba3b66bee56d196aa52be7bb2789 Mon Sep 17 00:00:00 2001 From: Gery Debongnie Date: Tue, 12 Nov 2013 14:53:44 +0100 Subject: [PATCH] [IMP] add rendering of basic table in pivottable widget (addon web_graph) bzr revid: ged@openerp.com-20131112135344-fi7mwyd49bqnbg69 --- addons/web_graph/static/src/css/graph.css | 12 ++++++++++ addons/web_graph/static/src/js/graph.js | 23 ++++++++++++++++--- addons/web_graph/static/src/xml/web_graph.xml | 2 +- 3 files changed, 33 insertions(+), 4 deletions(-) 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 = '' + + this.fields[this.groupby[0]].string + + '' + + this.measure_label + + ''; + _.each(this.data, function (datapt) { + rows += '' + + datapt.attributes.value[1] + + '' + + datapt.attributes.aggregates[self.measure]+ + ''; + }); + + this.$el.append(rows); }, }); @@ -181,10 +199,9 @@ var ChartView = BasicDataView.extend({ }, render_line_chart: function () { - var measure_label = (this.measure) ? this.measure : 'Quantity'; var formatted_data = [{ - key: measure_label, + key: this.measure_label, values: _.map(this.data, this.format_data.bind(this)) }]; diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml index 409a86dfc06..4e8c3883b4e 100644 --- a/addons/web_graph/static/src/xml/web_graph.xml +++ b/addons/web_graph/static/src/xml/web_graph.xml @@ -19,7 +19,7 @@ -
Hello Pivot
+