chore(employees): rework employee registration page

Moves the rubrics for payroll lower in the "Optional Information"
section for better consistency.  It also cleans up the controller's
eslint issues.

client/src/modules/employees/registration/employees.html

@@ -8,9 +8,9 @@
 
     <!-- ng-if to stop flickering on load -->
     <span
-        ng-if="EmployeeCtrl.isUpdating"
-        style="margin-left : 5px"
-        class="label label-warning text-uppercase">
+      ng-if="EmployeeCtrl.isUpdating"
+      style="margin-left : 5px"
+      class="label label-warning text-uppercase">
       <span translate>FORM.LABELS.EDIT</span>
     </span>
   </div>
@@ -464,21 +464,10 @@ <h4 translate>FORM.LABELS.CURRENT_LOCATION</h4>
                     id="individual_salary"
                     currency-id="EmployeeCtrl.enterprise.currency_id"
                     model="EmployeeCtrl.employee.individual_salary"
-                    min = 0>
+                    min = 0
+                    horizontal = "true">
                   </bh-currency-input>
 
-                  <div ng-repeat="rubric in EmployeeCtrl.rubrics">
-                    <bh-currency-input
-                      data-payment-currency-input
-                      label="{{rubric.label}}"
-                      id="{{rubric.abbr}}"
-                      currency-id="EmployeeCtrl.enterprise.currency_id"
-                      model="EmployeeCtrl.employee.payroll[rubric.id]"
-                      required ="false"
-                      min = 0>
-                    </bh-currency-input>
-                  </div>
-
                   <!-- Employee bank -->
                   <div
                     class="form-group"
@@ -515,20 +504,23 @@ <h4 translate>FORM.LABELS.CURRENT_LOCATION</h4>
                     </div>
                   </div>
 
-                  <!-- Employee locked state
-                  <div class="form-group"
-                    ng-class="{'has-error' : OptionalForm.locked.$invalid && EmployeeRegistrationForm.$submitted}">
-                    <label class="control-label">
-                      <input
-                        type="checkbox"
-                        name="locked"
-                        ng-true-value="1"
-                        ng-false-value="0"
-                        ng-model="EmployeeCtrl.employee.locked">
-                        <span translate>FORM.LABELS.LOCKED</span>
-                    </label>
+                  <h4 class="text-capitalize" translate>FORM.LABELS.RUBRICS</h4>
+
+                  <!-- TODO(@jniles): are all employee rubrics really currency values? -->
+
+                  <!-- loop through rubrics and display them -->
+                  <div ng-repeat="rubric in EmployeeCtrl.rubrics">
+                    <bh-currency-input
+                      data-payment-currency-input
+                      label="{{rubric.label}}"
+                      id="{{rubric.abbr}}"
+                      currency-id="EmployeeCtrl.enterprise.currency_id"
+                      model="EmployeeCtrl.employee.payroll[rubric.id]"
+                      required ="false"
+                      min = 0
+                      horizontal = "true">
+                    </bh-currency-input>
                   </div>
-                  -->
                 </div>
               </div>
             </div>

client/src/modules/employees/registration/employees.js

@@ -5,11 +5,11 @@ angular.module('bhima.controllers')
 EmployeeController.$inject = [
   'EmployeeService', 'ServiceService', 'GradeService', 'FunctionService', 'TitleService',
   'CreditorGroupService', 'util', 'NotifyService', '$state',
-  'bhConstants', 'ReceiptModal', 'SessionService', 'RubricService', 'PatientService',
+  'bhConstants', 'ReceiptModal', 'SessionService', 'RubricService', 'PatientService', 'moment',
 ];
 
 function EmployeeController(Employees, Services, Grades, Functions, Titles, CreditorGroups, util, Notify,
-  $state, bhConstants, Receipts, Session, Rubrics, Patients) {
+  $state, bhConstants, Receipts, Session, Rubrics, Patients, moment) {
   const vm = this;
   const referenceUuid = $state.params.uuid;
   const { saveAsEmployee } = $state.params;
@@ -32,7 +32,7 @@ function EmployeeController(Employees, Services, Grades, Functions, Titles, Cred
         vm.employee = employee;
         vm.employee.payroll = {};
 
-        /**
+        /*
         /* Finds the amounts of all Rubrics (advantage) defined by employees,
         /* these rubrics are those whose value Is defined by employee? is true
         */
@@ -87,8 +87,8 @@ function EmployeeController(Employees, Services, Grades, Functions, Titles, Cred
     // Assign name
     employee.name = employee.display_name;
     employee.displayGender = employee.sex;
-    // eslint-disable-next-line no-undef
     employee.displayAge = moment().diff(employee.dob, 'years');
+
   }
 
   function onSelectGrade(element) {
@@ -97,7 +97,7 @@ function EmployeeController(Employees, Services, Grades, Functions, Titles, Cred
     }
   }
 
-  // Expose lenths from util
+  // Expose lengths from util
   vm.length20 = util.length20;
 
   // Expose validation rule for date
@@ -106,7 +106,6 @@ function EmployeeController(Employees, Services, Grades, Functions, Titles, Cred
     minDate : bhConstants.dates.minDOB,
   };
 
-  // const yearOptions = bhConstants.yearOptions;
   const { dayOptions } = bhConstants;
 
   setupRegistration();
@@ -138,6 +137,7 @@ function EmployeeController(Employees, Services, Grades, Functions, Titles, Cred
     const currentOptions = dayOptions;
 
     // set the database flag to track if a date is set to JAN 01 or if the date is unknown
+    // TODO(@jniles): I don't think this is necessary in the case of employees.  We require a DOB.
     vm.employee.dob_unknown_date = !vm.fullDateEnabled;
 
     angular.merge(vm.datepickerOptions, currentOptions);