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..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,6 +38,7 @@ module.controller('WidgetSalesAverageVisitCtrl', ($scope, $q, $filter, ImpacWidg currency: w.metadata.currency showToday: true showLegend: true + zoomType: false $scope.chart = new HighchartsFactory($scope.chartId(), w.content.chart, options) @@ -54,8 +55,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 diff --git a/src/services/highcharts-factory/highcharts-factory.svc.coffee b/src/services/highcharts-factory/highcharts-factory.svc.coffee index de156a6c..0f6a5a2d 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: @@ -26,12 +26,18 @@ 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' xAxis: xAxis yAxis: yAxis series: series + navigator: + series: + dashStyle: _.get(options, 'dashStyle','Dash') + type: _.get(options, 'navigatorType', 'line') plotOptions: plotOptions rangeSelector: buttons: [