From 2528837757e40ced0c0331b8e0dbde40ecf354c3 Mon Sep 17 00:00:00 2001 From: Emmanuel Darnis Date: Mon, 12 Mar 2018 13:06:17 +0000 Subject: [PATCH 1/2] Ability to hide common time in time-period-info --- .../widgets-settings/hist-mode/hist-mode.directive.coffee | 3 +++ src/components/widgets-settings/hist-mode/hist-mode.tmpl.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/widgets-settings/hist-mode/hist-mode.directive.coffee b/src/components/widgets-settings/hist-mode/hist-mode.directive.coffee index 0afaab3b..3f729d79 100644 --- a/src/components/widgets-settings/hist-mode/hist-mode.directive.coffee +++ b/src/components/widgets-settings/hist-mode/hist-mode.directive.coffee @@ -10,6 +10,9 @@ module.controller('SettingHistModeCtrl', ($scope, $translate, $timeout, ImpacWid $scope.accountingBehaviour } + $scope.isCommonTimeHidden = -> + $scope.endDate == 'not-displayed' + $scope.toggleHistMode = (mode) -> return if (w.isHistoryMode && mode == 'history') || (!w.isHistoryMode && mode =='current') w.isHistoryMode = !w.isHistoryMode diff --git a/src/components/widgets-settings/hist-mode/hist-mode.tmpl.html b/src/components/widgets-settings/hist-mode/hist-mode.tmpl.html index ca33a32b..2a1dc670 100644 --- a/src/components/widgets-settings/hist-mode/hist-mode.tmpl.html +++ b/src/components/widgets-settings/hist-mode/hist-mode.tmpl.html @@ -1,5 +1,5 @@
-
+
{{currentLabel}} | From d8dca20c838640a7397dd8b641ae91fe7c441b18 Mon Sep 17 00:00:00 2001 From: Emmanuel Darnis Date: Mon, 12 Mar 2018 13:06:58 +0000 Subject: [PATCH 2/2] [IMPAC-736] Widget new customers --- .../sales-new-customers.directive.coffee | 61 +++++++++++++++++++ .../sales-new-customers.less | 11 ++++ .../sales-new-customers.tmpl.html | 39 ++++++++++++ src/impac-angular.module.js | 3 +- 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 src/components/widgets/sales-new-customers/sales-new-customers.directive.coffee create mode 100644 src/components/widgets/sales-new-customers/sales-new-customers.less create mode 100644 src/components/widgets/sales-new-customers/sales-new-customers.tmpl.html diff --git a/src/components/widgets/sales-new-customers/sales-new-customers.directive.coffee b/src/components/widgets/sales-new-customers/sales-new-customers.directive.coffee new file mode 100644 index 00000000..d1a9ceab --- /dev/null +++ b/src/components/widgets/sales-new-customers/sales-new-customers.directive.coffee @@ -0,0 +1,61 @@ +module = angular.module('impac.components.widgets.sales-new-customers', []) +module.controller('WidgetSalesNewCustomersCtrl', ($scope, $q, $filter, ChartFormatterSvc) -> + + w = $scope.widget + + # Define settings + # -------------------------------------- + $scope.orgDeferred = $q.defer() + $scope.chartDeferred = $q.defer() + $scope.histModeDeferred = $q.defer() + settingsPromises = [ + $scope.orgDeferred.promise + $scope.chartDeferred.promise + $scope.histModeDeferred.promise + ] + + # Widget specific methods + # -------------------------------------- + w.initContext = -> + $scope.isDataFound = w.content? + + + $scope.getColorByIndex = (index) -> + ChartFormatterSvc.getColor(index) + + # Chart formating function + # -------------------------------------- + $scope.drawTrigger = $q.defer() + w.format = -> + if $scope.isDataFound + dates = _.map w.content.small_chart.dates, (date) -> + $filter('date')(date, 'MMM yy') + + lineOptions = { + scaleBeginAtZero: true, + showXLabels: false, + currency: 'hide' + } + + lineData = [ + {title: 'Merchant', labels: dates, values: w.content.small_chart.merchant_values}, + {title: 'Competitive Set', labels: dates, values: w.content.small_chart.competitive_values}, + {title: 'Industry', labels: dates, values: w.content.small_chart.industry_values} + ] + + # init chartData after transletion chages + chartData = ChartFormatterSvc.lineChart(lineData,lineOptions) + + # calls chart.draw() + $scope.drawTrigger.notify(chartData) + + # Widget is ready: can trigger the "wait for settings to be ready" + # -------------------------------------- + $scope.widgetDeferred.resolve(settingsPromises) +) +module.directive('widgetSalesNewCustomers', -> + return { + restrict: 'A', + controller: 'WidgetSalesNewCustomersCtrl' + } +) \ No newline at end of file diff --git a/src/components/widgets/sales-new-customers/sales-new-customers.less b/src/components/widgets/sales-new-customers/sales-new-customers.less new file mode 100644 index 00000000..7517452a --- /dev/null +++ b/src/components/widgets/sales-new-customers/sales-new-customers.less @@ -0,0 +1,11 @@ +.analytics .widget-item .content.sales-new-customers { + h6 { + text-align: center; + .font(11px, 300, @impac-widget-text-color); + margin-top: 2px; + } + + ::-webkit-scrollbar { + width: 0px; + } +} diff --git a/src/components/widgets/sales-new-customers/sales-new-customers.tmpl.html b/src/components/widgets/sales-new-customers/sales-new-customers.tmpl.html new file mode 100644 index 00000000..8626f931 --- /dev/null +++ b/src/components/widgets/sales-new-customers/sales-new-customers.tmpl.html @@ -0,0 +1,39 @@ +
+ +
+

Widget settings

+ +
+ + +
+ + +
+
+ + +
+ +
+
Percentage of customers visiting for the first time
+
+ +
+ +
+ +
+
+
+ Merchant - + Competitive Set - + Industry +
+
+
+ + +
+
+
\ No newline at end of file diff --git a/src/impac-angular.module.js b/src/impac-angular.module.js index 6347dbe6..93c99f48 100644 --- a/src/impac-angular.module.js +++ b/src/impac-angular.module.js @@ -92,7 +92,8 @@ angular.module('impac.components.widgets', 'impac.components.widgets.sales-summary', 'impac.components.widgets.sales-top-opportunities', 'impac.components.widgets.sales-top-customers', - 'impac.components.widgets.sales-new-vs-existing-customers' + 'impac.components.widgets.sales-new-vs-existing-customers', + 'impac.components.widgets.sales-new-customers' ] ); angular.module('impac.components.widgets-settings',