summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/graph/graph_view.js
diff options
context:
space:
mode:
authorMathieu Duckerts-Antoine <dam@odoo.com>2019-02-21 14:29:26 +0000
committerMathieu Duckerts-Antoine <dam@odoo.com>2019-04-01 14:40:51 +0000
commita9bcb12f6419aaf087bad4c8a3f7ed7c00dbf3c5 (patch)
tree5f25467a6a22ab75db6077eb35bf1b7ff83408a6 /addons/web/static/src/js/views/graph/graph_view.js
parentd23419fd86d5f8266c37526176c1bf79a09a1684 (diff)
[IMP] web: graph view improvements
This commit extends the support of comparison mode for the graph view and refine the tooltips and rendering in line mode. The graph view code has also been slightly refactored. Task ID: 1946138
Diffstat (limited to 'addons/web/static/src/js/views/graph/graph_view.js')
-rw-r--r--addons/web/static/src/js/views/graph/graph_view.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/web/static/src/js/views/graph/graph_view.js b/addons/web/static/src/js/views/graph/graph_view.js
index 4567daf0ead..e731835bc30 100644
--- a/addons/web/static/src/js/views/graph/graph_view.js
+++ b/addons/web/static/src/js/views/graph/graph_view.js
@@ -49,14 +49,12 @@ var GraphView = AbstractView.extend({
var groupBys = [];
var measures = {__count__: {string: _t("Count"), type: "integer"}};
var groupableFields = {};
- var intervalMapping = {};
this.fields.__count__ = {string: _t("Count"), type: "integer"};
this.arch.children.forEach(function (field) {
var fieldName = field.attrs.name;
var interval = field.attrs.interval;
if (interval) {
- intervalMapping[fieldName] = interval;
fieldName = fieldName + ':' + interval;
}
if (field.attrs.type === 'measure') {
@@ -81,13 +79,13 @@ var GraphView = AbstractView.extend({
this.controllerParams.measures = measures;
this.controllerParams.groupableFields = groupableFields;
+ this.rendererParams.fields = this.fields;
this.rendererParams.stacked = this.arch.attrs.stacked !== "False";
this.rendererParams.title = this.arch.attrs.title; // TODO: use attrs.string instead
this.loadParams.mode = this.arch.attrs.type || 'bar';
this.loadParams.measure = measure || '__count__';
- this.loadParams.groupBys = groupBys || [];
- this.loadParams.intervalMapping = intervalMapping;
+ this.loadParams.groupBys = groupBys;
this.loadParams.fields = this.fields;
this.loadParams.comparisonDomain = params.comparisonDomain;
},