[IMPAC-654] IE: Javascript errors on widget settings and display

src/components/alerts-config/alerts-config.directive.coffee

@@ -43,7 +43,7 @@ module.directive('alertsConfig', ($uibModal, $templateCache, $compile, $translat
           emailAlert = _.find($scope.kpi.alerts, (alert) -> alert.service == 'email')
           if emailAlert && $scope.members
             emailAlertRecipients = emailAlert.recipients.map((recipient) -> recipient.id)
-            _.forEach($scope.members, (member) -> member.active = true if emailAlertRecipients.includes(member.id))
+            _.forEach($scope.members, (member) -> member.active = true if _.includes(emailAlertRecipients, member.id))
           else if $scope.members
             defaultActiveMember = _.find($scope.members, (member) -> member.email == config.userData.email) || $scope.members[0]
             defaultActiveMember.active = true if defaultActiveMember

src/components/widget/widget.less

@@ -51,6 +51,7 @@
     .content-template-wrapper {
       height: 100%;
       overflow: auto;
+      overflow-x: hidden;
     }
   }
 

src/components/widgets-common/chart-threshold/chart-threshold.component.coffee

@@ -113,7 +113,7 @@ module.component('chartThreshold', {
       ctrl.chart = chart
       validateHistParameters()
       Highcharts.addEvent(chart.container, 'click', onChartClick)
-      thresholdSeries = _.select(chart.series, (s)-> s.name.toLowerCase().includes('threshold'))
+      thresholdSeries = _.filter(chart.series, (s) -> _.includes(s.name.toLowerCase(), 'threshold'))
       _.each(thresholdSeries, (t)->
         Highcharts.addEvent(t, 'click', (event)-> onThresholdClick(t))
       )

src/components/widgets-settings/chart-filters/chart-filters.less

@@ -14,6 +14,7 @@
     outline: none;
   }
   input[type="range"] {
-    height: 20px;
+    height: auto;
+    width: 100%;
   }
-}
+}

src/components/widgets/accounts-expense-weight/accounts-expense-weight.directive.coffee

@@ -1,6 +1,6 @@
 module = angular.module('impac.components.widgets.accounts-expense-weight',[])
 
-module.controller('WidgetAccountsExpenseWeightCtrl', ($scope, $q, ChartFormatterSvc, $filter, $translate) ->
+module.controller('WidgetAccountsExpenseWeightCtrl', ($scope, $q, ChartFormatterSvc, $filter, $translate, $timeout) ->
 
   w = $scope.widget
 
@@ -44,7 +44,7 @@ module.controller('WidgetAccountsExpenseWeightCtrl', ($scope, $q, ChartFormatter
 
   $scope.displayAccount = ->
     $scope.updateSettings(false).then ->
-      w.format()
+      $timeout -> (w.format())
 
   # Chart formating function
   # --------------------------------------
@@ -75,8 +75,8 @@ module.controller('WidgetAccountsExpenseWeightCtrl', ($scope, $q, ChartFormatter
           showXLabels: false,
           currency: "(ratio)"
         }
-        # chartData = ChartFormatterSvc.lineChart(lineData,lineOptions, true)
-        chartData = ChartFormatterSvc.combinedBarChart(lineData,lineOptions, false, true)
+        # chartData = ChartFormatterSvc.lineChart(lineData, lineOptions, true)
+        chartData = ChartFormatterSvc.combinedBarChart(lineData, lineOptions, false, true)
 
       else
         companies = _.map w.content.summary, (s) -> s.company
@@ -88,30 +88,29 @@ module.controller('WidgetAccountsExpenseWeightCtrl', ($scope, $q, ChartFormatter
 
         inputData = {labels: companies, values: ratios}
 
-
         options = {
           # scaleOverride: true,
           # scaleSteps: 4,
           # scaleStepWidth: 25,
           # scaleStartValue: 0,
-          scales: { yAxes: [
-            { ticks: {
-              suggestedMin: 0
-              suggestedMax: 100
-              maxTicksLimit: 5
+          scales:
+            yAxes: [
+              {
+                ticks:
+                  suggestedMin: 0
+                  suggestedMax: 100
+                  maxTicksLimit: 5
               }
-            }
-          ]}
+            ]
           showXLabels: false
           pointDot: false
           currency: '%'
         }
-        chartData = ChartFormatterSvc.lineChart([inputData],options)
+        chartData = ChartFormatterSvc.lineChart([inputData], options)
 
       # calls chart.draw()
       $scope.drawTrigger.notify(chartData)
 
-
   # Widget is ready: can trigger the "wait for settings to be ready"
   # --------------------------------------
   $scope.widgetDeferred.resolve(settingsPromises)

src/components/widgets/accounts-expense-weight/accounts-expense-weight.less

@@ -7,7 +7,4 @@
       text-align: center;
     }
   }
-  .chart-container {
-    max-height: 125px;
-  }
 }

src/components/widgets/hr-salaries-summary/hr-salaries-summary.less

@@ -1,3 +1,5 @@
-.analytics .widget-item .content.hr-salaries-summary {
-  .expandable-filterable-widget();
-}
+.analytics .widget-item {
+  .content.hr-salaries-summary {
+    .expandable-filterable-widget();
+  }
+}

src/components/widgets/hr-salaries-summary/hr-salaries-summary.tmpl.html

@@ -17,7 +17,7 @@ <h4 translate>impac.widget.hr_salaries_summary.settings.title</h4>
       <div ng-class="widget.isExpanded() ? 'col-md-6' : 'col-md-12'">
         <div setting-width parent-widget="widget" min="3" max="6" class="settings width" deferred="::widthDeferred" />
 
-        <h3 class="left" translate>impac.widget.hr_salaries_summary.average_rate</h3>
+        <h3 class="left" ng-class="widget.isExpanded() ? 'left' : 'reduced-left'" translate>impac.widget.hr_salaries_summary.average_rate</h3>
         <div class="price">
            {{widget.content.total.average_rate | mnoCurrency : widget.content.total.currency}}
         </div>

src/components/widgets/hr-workforce-summary/hr-workforce-summary.less

@@ -1,3 +1,5 @@
-.analytics .widget-item .content.hr-workforce-summary {
-  .expandable-filterable-widget();
+.analytics .widget-item  {
+  .content.hr-workforce-summary {
+    .expandable-filterable-widget();
+  }
 }

src/components/widgets/hr-workforce-summary/hr-workforce-summary.tmpl.html

@@ -17,7 +17,7 @@ <h4 translate>impac.widget.hr_workforce_summary.settings.title</h4>
       <div ng-class="widget.isExpanded() ? 'col-md-6' : 'col-md-12'">
         <div setting-width parent-widget="widget" min="3" max="6" class="settings width" deferred="::widthDeferred" />
 
-        <h3 class="left" translate>impac.widget.hr_workforce_summary.total_workforce</h3>
+        <h3 class="left" ng-class="widget.isExpanded() ? 'left' : 'reduced-left'" translate>impac.widget.hr_workforce_summary.total_workforce</h3>
         <div class="price">
            {{getTotalWorkforce() | mnoCurrency : getCurrency()}}
         </div>
@@ -27,7 +27,7 @@ <h3 class="left" translate>impac.widget.hr_workforce_summary.total_workforce</h3
         </div>
       </div>
 
-      <div class="right-panel" ng-class="{'col-md-12': !widget.isExpanded(), 'col-md-6': widget.isExpanded()}">
+      <div class="right-panel" ng-class="widget.isExpanded() ? 'col-md-6' : 'col-md-12'">
         <h3 class="right">{{'impac.widget.hr_workforce_summary.filter' | translate}} <span setting-param-selector parent-widget="widget" param="filter" options="filterOptions" selected="filter" deferred="::paramSelectorDeferred2"/></h3>
         <div class="chart-container">
           <div impac-chart draw-trigger="::drawTrigger.promise" deferred="::chartDeferred"></div>

src/services/highcharts-factory/highcharts-factory.svc.coffee

@@ -91,7 +91,7 @@ angular
       return if _.isEmpty(@hc)
       # Remove existing thresholds
       for s in @hc.series
-        s.remove() if s? && s.name.toLowerCase().includes('threshold')
+        s.remove() if s? && _.includes(s.name.toLowerCase(), 'threshold')
 
       return @hc if _.isEmpty(options.thresholds)
 

src/stylesheets/widget-master-styles.less

@@ -52,6 +52,10 @@
     @media (min-width: @screen-md-min) { margin-top: 69px; }
     text-align: center;
   }
+  h3.reduced-left {
+    @media (min-width: @screen-md-min) { margin-top: 10px; }
+    text-align: center;
+  }
   h3.right {
     margin-bottom: 10px;
     text-align: center;

workspace/app/services/dev-user.svc.js

@@ -49,7 +49,7 @@ angular.module('impacWorkspace').service('DevUser', function ($log, $http, $q, A
     return _self.getUserData(mnoeUrl).then(
       function (user) {
         var orgs = (user.organizations || []);
-        var orga = orgs.find(function(orga) { return orga.uid == orgUid });
+        var orga = _.find(orgs, function (orga) { return orga.uid == orgUid });
         var orgId = (orga && orga.id) || orgs[0].id || null;
 
         return { organizations: orgs, currentOrgId: orgId };