From 9b5dabd399813bc6a38fc63cc656e540b8a21fad Mon Sep 17 00:00:00 2001 From: Mathieu Duckerts-Antoine Date: Mon, 1 Oct 2018 14:27:14 +0200 Subject: [PATCH] [FIX] web: right labels in bar chart and comparison mode For a single groupby selected, the graph view didn't render well the data when simultaneously in bar chart and comparison mode. The labels were in that case always integers. This commit fixes that situation. --- addons/web/static/src/js/views/graph/graph_renderer.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js index 8f6f7d8bebb..c2bb79c491f 100644 --- a/addons/web/static/src/js/views/graph/graph_renderer.js +++ b/addons/web/static/src/js/views/graph/graph_renderer.js @@ -136,11 +136,7 @@ return AbstractRenderer.extend({ }]; } else if (this.state.groupedBy.length === 1) { values = this.state.data.map(function (datapt, index) { - if (self.state.comparisonData) { - return {x: index, y: datapt.value}; - } else { - return {x: datapt.labels, y: datapt.value}; - } + return {x: datapt.labels, y: datapt.value}; }); data.push({ values: values, @@ -148,7 +144,7 @@ return AbstractRenderer.extend({ }); if (this.state.comparisonData) { values = this.state.comparisonData.map(function (datapt, index) { - return {x: index, y: datapt.value}; + return {x: datapt.labels, y: datapt.value}; }); data.push({ values: values,