From 344ff461e5feed7c37dcedab6e400527f303a0bd Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 26 May 2016 13:54:39 +0200 Subject: [FIX] web: graph numbers Backport of commit 68b127797e717ee71b5b0552d69f0f4b4e083f03 opw-678645 --- addons/web/static/src/js/view_graph.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/view_graph.js b/addons/web/static/src/js/view_graph.js index 2179974a2cd..5a091da9a12 100644 --- a/addons/web/static/src/js/view_graph.js +++ b/addons/web/static/src/js/view_graph.js @@ -271,7 +271,9 @@ instance.web.GraphWidget = instance.web.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 || 0).length}, delay: 250, transitionDuration: 10, showLegend: true, @@ -400,8 +402,9 @@ instance.web.GraphWidget = instance.web.Widget.extend({ svg.transition().duration(0); var chart = nv.models.lineChart(); + var maxVal = _.max(values, function(v) {return v.y}) chart.options({ - margin: {left: 50, right: 50}, + margin: {left: 12 * String(maxVal && maxVal.y || 0).length, right: 50}, useInteractiveGuideline: true, showLegend: true, showXAxis: true, -- cgit v1.2.3 From 82b9d7d51133a2b0510092c823ba7b6db4f9b565 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 26 May 2016 14:51:21 +0200 Subject: [FIX] web: minimum margin Make sure to define a minimum margin large enough. opw-678645 --- addons/web/static/src/js/view_graph.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web/static/src') diff --git a/addons/web/static/src/js/view_graph.js b/addons/web/static/src/js/view_graph.js index 5a091da9a12..a1dc230b5b6 100644 --- a/addons/web/static/src/js/view_graph.js +++ b/addons/web/static/src/js/view_graph.js @@ -273,7 +273,7 @@ instance.web.GraphWidget = instance.web.Widget.extend({ var chart = nv.models.multiBarChart(); var maxVal = _.max(values, function(v) {return v.y}) chart.options({ - margin: {left: 12 * String(maxVal && maxVal.y || 0).length}, + margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length}, delay: 250, transitionDuration: 10, showLegend: true, @@ -404,7 +404,7 @@ instance.web.GraphWidget = instance.web.Widget.extend({ var chart = nv.models.lineChart(); var maxVal = _.max(values, function(v) {return v.y}) chart.options({ - margin: {left: 12 * String(maxVal && maxVal.y || 0).length, right: 50}, + margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length, right: 50}, useInteractiveGuideline: true, showLegend: true, showXAxis: true, -- cgit v1.2.3