From bb2a94821619c8a2551c9f17c2034ed46db04b8f Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 22 Dec 2016 14:39:57 +0100 Subject: [PATCH] [FIX] web: y-axis width in graph view Simplifies the left margin calculation logic with a pre-defined width. In practice, more use cases should be taken into account, and that could just make the logic overkill. opw-697626 --- addons/web/static/src/js/views/graph_widget.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js index 183d99047c9..64ba42b1928 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -167,9 +167,8 @@ return Widget.extend({ svg.transition().duration(0); var chart = nv.models.multiBarChart(); - var maxVal = _.max(values, function(v) {return v.y}) chart.options({ - margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length, bottom: 60}, + margin: {left: 120, bottom: 60}, delay: 250, transition: 10, showLegend: _.size(data) <= MAX_LEGEND_LENGTH, @@ -308,9 +307,8 @@ return Widget.extend({ svg.transition().duration(0); var chart = nv.models.lineChart(); - var maxVal = _.max(values, function(v) {return v.y}) chart.options({ - margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length, right: 50}, + margin: {left: 120, bottom: 60}, useInteractiveGuideline: true, showLegend: _.size(data) <= MAX_LEGEND_LENGTH, showXAxis: true,