Code review

maestrano · Nov 14, 2017 · 132e984 · 132e984
1 parent 12d567b
commit 132e984
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/...ect-addon-modal/connec-addon-modal.coffee → ...ct-addon-modal/connect-addon-modal.coffee b/...ect-addon-modal/connec-addon-modal.coffee → ...ct-addon-modal/connect-addon-modal.coffee
@@ -5,7 +5,7 @@ angular.module('mnoEnterpriseAngular').component('connectAddonModal', {
     dismiss: '&'
   },
   templateUrl: 'app/components/connect-addon-modal/connect-addon-modal.html',
-  controller: (MnoeAppInstances, toastr, $filter) ->
+  controller: (MnoeAppInstances, toastr, $translate) ->
 
     ctrl = this
 
@@ -19,6 +19,18 @@ angular.module('mnoEnterpriseAngular').component('connectAddonModal', {
     ctrl.historicalData = false
     ctrl.date = new Date()
 
+    $translate([
+      'mno_enterprise.templates.components.addon_connect.sync.sync_launched',
+      'mno_enterprise.templates.components.addon_connect.link_account.submit_form',
+      'mno_enterprise.templates.components.addon_connect.entities.update_entities',
+      'mno_enterprise.templates.components.addon_connect.sync.start_sync',
+    ]).then((tls) ->
+      ctrl.syncLaunchedTl = tls['mno_enterprise.templates.components.addon_connect.sync.sync_launched']
+      ctrl.submitTl = tls['mno_enterprise.templates.components.addon_connect.link_account.submit_form']
+      ctrl.updateTl = tls['mno_enterprise.templates.components.addon_connect.entities.update_entities']
+      ctrl.startSyncTl = tls['mno_enterprise.templates.components.addon_connect.sync.start_sync']
+    )
+
     ctrl.$onInit = ->
       ctrl.app = ctrl.resolve.app
       ctrl.hasLinked = ctrl.app.addon_organization.has_account_linked
@@ -57,15 +69,15 @@ angular.module('mnoEnterpriseAngular').component('connectAddonModal', {
       MnoeAppInstances.sync(ctrl.app, ctrl.historicalData)
       ctrl.app.addon_organization.sync_enabled = true
       ctrl.close()
-      toastr.success($filter('translate')("mno_enterprise.templates.components.addon_connect.sync.sync_launched"))
+      toastr.success(ctrl.syncLaunchedTl)
 
     ctrl.titleForButton = ->
       if !ctrl.hasLinked
-        $filter('translate')("mno_enterprise.templates.components.addon_connect.link_account.submit_form")
+        ctrl.submitTl
       else if !ctrl.hasChosenEntities
-        $filter('translate')("mno_enterprise.templates.components.addon_connect.entities.update_entities")
+        ctrl.updateTl
       else
-        $filter('translate')("mno_enterprise.templates.components.addon_connect.sync.start_sync")
+        ctrl.startSyncTl
 
     ctrl.callToAction = (connectForm, historicalData)->
       if !ctrl.hasLinked

diff --git a/src/app/components/connect-addon-modal/connect-addon-modal.html b/src/app/components/connect-addon-modal/connect-addon-modal.html
@@ -59,13 +59,13 @@ <h4 class="text-center">{{"mno_enterprise.templates.components.addon_connect.ent
     </ul>
 
     <div class="modal-body">
-      <h4 class="text-center">Chose wether to synchronize historical data</h4>
+      <h4 class="text-center">{{"mno_enterprise.templates.components.addon_connect.sync.chose_historical" | translate}}</h4>
 
       <div>
         <p translate="mno_enterprise.templates.components.addon_connect.sync.warning_hisorical_html" translate-values="{appname: $ctrl.app.name}"></p>
         <input ng-model="$ctrl.historicalData" type="checkbox" display=inline-block></input>
         <small ng-show="!$ctrl.historicalData"
-               translate="mno_enterprise.templates.components.addon_connect.sync.historical_unchecked" translate-values="{date: ($ctrl.date | amDateFormat:'dddd, MMMM Do YYYY, h:mm:ss a')}">
+               translate="mno_enterprise.templates.components.addon_connect.sync.historical_unchecked" translate-values="{date: ($ctrl.date | amDateFormat:'LLL')}">
         </small>
         <small translate="mno_enterprise.templates.components.addon_connect.sync.historical_checked" translate-values="{appname: $ctrl.app.name}" ng-show="$ctrl.historicalData"></small>
       </div>

diff --git a/src/app/views/apps/modals/app-connect-modal.less b/src/app/views/apps/modals/app-connect-modal.less
@@ -13,8 +13,4 @@
   ul.breadcrumb {
     margin-bottom: 0px;
   }
-
-  toast {
-    z-index: 9999;
-  }
 }
diff --git a/src/app/views/apps/modals/app-settings-modal.coffee b/src/app/views/apps/modals/app-settings-modal.coffee
@@ -138,12 +138,7 @@ angular.module 'mnoEnterpriseAngular'
           changeEntity: (model) ->
             $scope.loadIdMaps(model)
           getIndexFromValue: (value, array) ->
-            i = 0
-            for type in array
-              if type == value
-                return i
-              i++
-            return 0
+            _.indexOf(array ,value)
 
         template: htmlTemplate
       }