From 3faa8dfdd54af9d9366c4d3da5c0f7cca51dfc9c Mon Sep 17 00:00:00 2001 From: Isaac Seessel Date: Mon, 26 Feb 2018 15:00:56 -0500 Subject: [PATCH 1/4] [IMPAC-741] Add $ to right axis --- .../sales-average-visit/sales-average-visit.directive.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee b/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee index 965eb661..d0630f15 100644 --- a/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee +++ b/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee @@ -54,8 +54,11 @@ module.controller('WidgetSalesAverageVisitCtrl', ($scope, $q, $filter, ImpacWidg labels: formatter: -> $filter('mnoCurrency')(this.value, currency, false) + leftYAxis = w.content.chart.yAxis[0] + rightYAxis = angular.merge(w.content.chart.yAxis[1], yAxisLabels) + xAxis: angular.merge([w.content.chart.xAxis[0]], [xAxisLabels]) - yAxis: angular.merge([w.content.chart.yAxis[0]], [yAxisLabels]) + yAxis: [leftYAxis, rightYAxis] rangeSelector: selected: 5 From 52ae0bd249f31bb0f27f6273bfcfc929de387a79 Mon Sep 17 00:00:00 2001 From: Isaac Seessel Date: Mon, 26 Feb 2018 16:39:28 -0500 Subject: [PATCH 2/4] [IMPAC-741] Disable zooming for average visit --- .../sales-average-visit.directive.coffee | 5 +++++ .../highcharts-factory/highcharts-factory.svc.coffee | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee b/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee index d0630f15..d05210a5 100644 --- a/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee +++ b/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee @@ -38,6 +38,10 @@ module.controller('WidgetSalesAverageVisitCtrl', ($scope, $q, $filter, ImpacWidg currency: w.metadata.currency showToday: true showLegend: true + # navigatorEnabled: false + # scrollbarEnabled: false + # rangeSelectorEnabled: false + zoomType: false $scope.chart = new HighchartsFactory($scope.chartId(), w.content.chart, options) @@ -46,6 +50,7 @@ module.controller('WidgetSalesAverageVisitCtrl', ($scope, $q, $filter, ImpacWidg xAxisLabels = labels: formatter: -> + # moment.utc(this.value).format('MMM YYYY') if (this.chart.rangeSelector.options.selected >= 3) moment.utc(this.value).format('MMM YYYY') else diff --git a/src/services/highcharts-factory/highcharts-factory.svc.coffee b/src/services/highcharts-factory/highcharts-factory.svc.coffee index de156a6c..bc8b0a25 100644 --- a/src/services/highcharts-factory/highcharts-factory.svc.coffee +++ b/src/services/highcharts-factory/highcharts-factory.svc.coffee @@ -16,7 +16,7 @@ angular chart: type: 'line' - zoomType: 'x' + zoomType: _.get(options, 'zoomType', 'x') spacingTop: 20 spacingRight: 60 events: @@ -32,8 +32,13 @@ angular xAxis: xAxis yAxis: yAxis series: series + # navigator: + # enabled: _.get(options, 'navigatorEnabled', true) + # scrollbar: + # enabled: _.get(options, 'scrollbarEnabled', true) plotOptions: plotOptions rangeSelector: + # enabled: _.get(options, 'rangeSelectorEnabled', true) buttons: [ { type: 'month', count: 4, text: 'def.' }, { type: 'month', count: 1, text: '1m' }, From 3e3bd780cd668bd24eac8aa9fff10f9124581c0e Mon Sep 17 00:00:00 2001 From: Isaac Seessel Date: Mon, 26 Feb 2018 16:58:24 -0500 Subject: [PATCH 3/4] [IMPAC-741] Add margin to legend --- src/services/highcharts-factory/highcharts-factory.svc.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/services/highcharts-factory/highcharts-factory.svc.coffee b/src/services/highcharts-factory/highcharts-factory.svc.coffee index bc8b0a25..b3382e1c 100644 --- a/src/services/highcharts-factory/highcharts-factory.svc.coffee +++ b/src/services/highcharts-factory/highcharts-factory.svc.coffee @@ -26,6 +26,8 @@ angular enabled: false legend: enabled: _.get(options, 'showLegend', true) + itemMarginTop: _.get(options,'itemMarginTop', 5) + itemMarginBottom: _.get(options,'itemMarginBottom', 5) layout: 'vertical' align: 'left' verticalAlign: 'middle' From c3014b2c6796145d3bff5303f4d408160b13cb8a Mon Sep 17 00:00:00 2001 From: Isaac Seessel Date: Mon, 26 Feb 2018 20:00:12 -0500 Subject: [PATCH 4/4] [IMPAC-741] Standardize navigator line to straight dashed --- .../sales-average-visit.directive.coffee | 4 ---- .../highcharts-factory/highcharts-factory.svc.coffee | 9 ++++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee b/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee index d05210a5..9e2ad993 100644 --- a/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee +++ b/src/components/widgets/sales-average-visit/sales-average-visit.directive.coffee @@ -38,9 +38,6 @@ module.controller('WidgetSalesAverageVisitCtrl', ($scope, $q, $filter, ImpacWidg currency: w.metadata.currency showToday: true showLegend: true - # navigatorEnabled: false - # scrollbarEnabled: false - # rangeSelectorEnabled: false zoomType: false $scope.chart = new HighchartsFactory($scope.chartId(), w.content.chart, options) @@ -50,7 +47,6 @@ module.controller('WidgetSalesAverageVisitCtrl', ($scope, $q, $filter, ImpacWidg xAxisLabels = labels: formatter: -> - # moment.utc(this.value).format('MMM YYYY') if (this.chart.rangeSelector.options.selected >= 3) moment.utc(this.value).format('MMM YYYY') else diff --git a/src/services/highcharts-factory/highcharts-factory.svc.coffee b/src/services/highcharts-factory/highcharts-factory.svc.coffee index b3382e1c..0f6a5a2d 100644 --- a/src/services/highcharts-factory/highcharts-factory.svc.coffee +++ b/src/services/highcharts-factory/highcharts-factory.svc.coffee @@ -34,13 +34,12 @@ angular xAxis: xAxis yAxis: yAxis series: series - # navigator: - # enabled: _.get(options, 'navigatorEnabled', true) - # scrollbar: - # enabled: _.get(options, 'scrollbarEnabled', true) + navigator: + series: + dashStyle: _.get(options, 'dashStyle','Dash') + type: _.get(options, 'navigatorType', 'line') plotOptions: plotOptions rangeSelector: - # enabled: _.get(options, 'rangeSelectorEnabled', true) buttons: [ { type: 'month', count: 4, text: 'def.' }, { type: 'month', count: 1, text: '1m' },