perf(cleanning): cleanning code and removing es6 code form the client

IMA-WorldHealth · Jun 3, 2017 · 73649e6 · 73649e6
1 parent d1b7e30
commit 73649e6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/client/src/modules/employees/registration/employees.html b/client/src/modules/employees/registration/employees.html
@@ -131,7 +131,7 @@
                         <ui-select-match placeholder="{{ 'FORM.SELECT.GRADE' | translate }}">
                           <span>{{$select.selected.format}}</span>
                         </ui-select-match>
-                        <ui-select-choices ui-select-focus-patch repeat="g.uuid as g in EmployeeCtrl.grades | filter:{format : $select.search} | orderBy:'text'">
+                        <ui-select-choices ui-select-focus-patch repeat="g.uuid as g in EmployeeCtrl.grades | filter:{format : $select.search}">
                           <span ng-bind-html="g.format | highlight:$select.search"></span>
                         </ui-select-choices>
                       </ui-select>
@@ -439,12 +439,15 @@ <h4 translate>FORM.LABELS.CURRENT_LOCATION</h4>
 
                     <label class="col-md-3 control-label" translate>FORM.LABELS.DAILY_SALARY</label>
                     <div class="col-md-9">
-                      <input
-                      type="number"
-                        class="form-control"
-                        name="daily_salary"
-                        ng-model="EmployeeCtrl.employee.daily_salary"
-                        autocomplete="off">
+                      <div class="input-group">
+                        <span class="input-group-addon text-uppercase">{{ EmployeeCtrl.enterprise.currencySymbol || '...' }}</span>
+                        <input
+                          type="number"
+                          class="form-control"
+                          name="daily_salary"
+                          ng-model="EmployeeCtrl.employee.daily_salary"
+                          autocomplete="off">                        
+                      </div>                      
                       <div class="help-block" ng-messages="DetailForm.daily_salary.$error" ng-show="EmployeeRegistrationForm.$submitted">
                         <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
                       </div>

diff --git a/client/src/modules/employees/registration/employees.js b/client/src/modules/employees/registration/employees.js
@@ -5,11 +5,12 @@ angular.module('bhima.controllers')
 EmployeeController.$inject = [
   'EmployeeService', 'ServiceService', 'GradeService', 'FunctionService',
   'CreditorGroupService', 'DebtorGroupService', 'util', 'NotifyService',
-  'bhConstants', 'ReceiptModal'
+  'bhConstants', 'ReceiptModal', 'SessionService'
 ];
 
-function EmployeeController(Employees, Services, Grades, Functions, CreditorGroups, DebtorGroups, util, Notify, bhConstants, Receipts) {
+function EmployeeController(Employees, Services, Grades, Functions, CreditorGroups, DebtorGroups, util, Notify, bhConstants, Receipts, Session) {
   var vm = this;
+  vm.enterprise = Session.enterprise;
 
   // Expose lenths from util
   vm.length20 = util.length20;
@@ -27,7 +28,7 @@ function EmployeeController(Employees, Services, Grades, Functions, CreditorGrou
   vm.submit = submit;
 
   // Loading Grades
-  Grades.read(null, { detailed : 1 }).then((data) => {
+  Grades.read(null, { detailed : 1 }).then(function (data) {
     data.forEach(function (g){
       g.format = g.code + ' - ' + g.text;
     });      

diff --git a/client/src/modules/employees/registry/registry.js b/client/src/modules/employees/registry/registry.js
@@ -2,8 +2,8 @@ angular.module('bhima.controllers')
   .controller('EmployeeRegistryController', EmployeeRegistryController);
 
 EmployeeRegistryController.$inject = [
-  '$state', 'EmployeeService', 'NotifyService', 'AppCache',
-  'util', 'ReceiptModal', 'uiGridConstants', '$translate',
+  'EmployeeService', 'NotifyService',
+  'util', 'ReceiptModal', 'uiGridConstants',
   'GridColumnService', 'bhConstants', 'FilterService'
 ];
 
@@ -12,8 +12,8 @@ EmployeeRegistryController.$inject = [
  *
  * This module is responsible for the management of Employe Registry.
  */
-function EmployeeRegistryController($state, Employees, Notify, AppCache,
-  util, Receipts, uiGridConstants, $translate,
+function EmployeeRegistryController(Employees, Notify,
+  util, Receipts, uiGridConstants,
   Columns, bhConstants, Filters) {
   var vm = this;
 

diff --git a/client/src/modules/employees/registry/search.modal.js b/client/src/modules/employees/registry/search.modal.js
@@ -18,7 +18,7 @@ function EmployeeRegistryModalController(ModalInstance, Functions, Grades, bhCon
   var changes = new Store({identifier : 'key'});
 
   vm.filters = filters;
-  vm.serchQueries = {};
+  vm.searchQueries = {};
   vm.defaultQueries = {};
   vm.today = new Date();
 

diff --git a/client/src/modules/templates/bhCurrencyInput.tmpl.html b/client/src/modules/templates/bhCurrencyInput.tmpl.html
@@ -15,7 +15,6 @@
         required>
     </div>
 
-
     <!-- validation messages -->
     <p class="help-block" ng-messages="bhCurrencyInputForm.currencyInputValue.$error" ng-show="$ctrl.validationTrigger">
 

diff --git a/server/controllers/payroll/employees/index.js b/server/controllers/payroll/employees/index.js
@@ -42,7 +42,7 @@ function list(req, res, next) {
     .then((rows) => {
       res.status(200).json(rows);
     })
-    .catch(function (err){console.log(err);})
+    .catch(next)
     .done();
 }