changes after review

maestrano · Mar 28, 2018 · 1d8d979 · 1d8d979
1 parent 7616571
commit 1d8d979
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 49 deletions.
diff --git a/src/components/widgets/sales-average-purchase-size/sales-average-purchase-size.tmpl.html b/src/components/widgets/sales-average-purchase-size/sales-average-purchase-size.tmpl.html
@@ -54,6 +54,6 @@ <h2> The report found top store strategies on the horizon include: </h2>
     </div>
 
     <!-- No data found -->
-    <div ng-if="(isDataFound==false)" common-data-not-found on-display-alerts="onDisplayAlerts()" endpoint="::widget.category" width="::widget.width" />
+    <div ng-show="widget.demoData" common-data-not-found />
   </div>
 </div>
diff --git a/src/components/widgets/sales-average-visit/sales-average-visit.tmpl.html b/src/components/widgets/sales-average-visit/sales-average-visit.tmpl.html
@@ -26,6 +26,6 @@ <h4>Widget settings</h4>
     </div>
 
     <!-- No data found -->
-    <div ng-if="(isDataFound==false)" common-data-not-found on-display-alerts="onDisplayAlerts()" endpoint="::widget.category" width="::widget.width" />
+    <div ng-show="widget.demoData" common-data-not-found />
   </div>
 </div>
diff --git a/...components/widgets/sales-customers-engagement/sales-customers-engagement.directive.coffee b/...components/widgets/sales-customers-engagement/sales-customers-engagement.directive.coffee
@@ -1,6 +1,3 @@
-#
-# Component generated by Impac! Widget Generator!
-#
 module = angular.module('impac.components.widgets.sales-customers-engagement', [])
 module.controller('WidgetSalesCustomersEngagementCtrl', ($scope, $q, $filter, ImpacWidgetsSvc, ImpacAssets, HighchartsFactory, ImpacUtilities) ->
 
@@ -27,15 +24,6 @@ module.controller('WidgetSalesCustomersEngagementCtrl', ($scope, $q, $filter, Im
   # # == Sub-Components - Needed? =============================================================
   $scope.chartDeferred = $q.defer()
 
-  # == Chart Events Callbacks =====================================================================
-  # Sets the transactions list resources type and displays it
-  # onClickBar = (event) ->
-  #   $scope.isChartDisplayed = false
-
-  # == Directive Events Callbacks =====================================================================
-  # $scope.onButtonBack = () ->
-  #   $scope.isChartDisplayed = true
-
   # Widget specific methods
   # --------------------------------------
   w.initContext = ->
@@ -79,9 +67,6 @@ module.controller('WidgetSalesCustomersEngagementCtrl', ($scope, $q, $filter, Im
 
     $scope.chart.render(w.content.chart, options)
 
-    # # Add events callbacks to chart object
-    # $scope.chart.addSeriesEvent('click', onClickBar)
-
     # Notifies parent element that the chart is ready to be displayed
     $scope.chartDeferred.notify($scope.chart)
 

diff --git a/src/impac-angular.run.coffee b/src/impac-angular.run.coffee
@@ -11,3 +11,33 @@ module.run((ImpacAlerts)->
 module.run((editableOptions) ->
   editableOptions.theme = 'bs3'
 )
+
+module.run((ImpacTheming) ->
+  Highcharts.theme =
+  colors: ImpacTheming.get().chartColors.array
+  chart:
+    backgroundColor: null
+  title: style:
+    fontSize: '16px'
+    fontWeight: 'bold'
+    textTransform: 'uppercase'
+  tooltip:
+    borderWidth: 0
+    backgroundColor: 'rgba(219,219,216,0.8)'
+    shadow: true
+  legend: itemStyle:
+    fontWeight: 'bold'
+    fontSize: '13px'
+  xAxis:
+    labels: style: fontSize: '10px'
+  yAxis:
+    minorTickInterval: 'auto'
+    title: style: textTransform: 'uppercase'
+    labels: style: fontSize: '12px'
+  plotOptions: candlestick: lineColor: '#404048'
+  background2: '#F0F0EA'
+
+  # Apply the theme
+  Highcharts.setOptions Highcharts.theme
+
+)
diff --git a/src/services/highcharts-theme/highcharts-theme.svc.coffee b/src/services/highcharts-theme/highcharts-theme.svc.coffee