refactor(payroll): replace "date_embauche" with"hiring_date"

Replaces the `date_embauche` with `hiring_date` for better English
consistency.

Closes #7821.

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

@@ -292,7 +292,7 @@ <h4 translate>FORM.LABELS.CURRENT_LOCATION</h4>
                         name="dateEmbauche"
                         type="text"
                         class="form-control"
-                        ng-model="EmployeeCtrl.employee.date_embauche"
+                        ng-model="EmployeeCtrl.employee.hiring_date"
                         uib-datepicker-popup="{{EmployeeCtrl.datepickerOptions.format}}"
                         datepicker-options="EmployeeCtrl.datepickerOptions"
                         is-open="EmployeeCtrl.dateEmbauchePopupIsOpen"

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

@@ -82,7 +82,7 @@ function EmployeeController(Employees, Services, Grades, Functions, Titles, Cred
 
     // Sanitise DOB for Date Input
     employee.dob = new Date(employee.dob);
-    employee.date_embauche = new Date(employee.date_embauche);
+    employee.hiring_date = new Date(employee.hiring_date);
 
     // Assign name
     employee.name = employee.display_name;

client/src/modules/employees/registry/registry.js

@@ -101,7 +101,7 @@ function EmployeeRegistryController(
       cellClass        : muteDisabledCells,
     },
     {
-      field            : 'date_embauche',
+      field            : 'hiring_date',
       displayName      : 'FORM.LABELS.DATE_EMBAUCHE',
       headerCellFilter : 'translate',
       type             : 'date',

server/controllers/payroll/configuration/index.js

@@ -193,7 +193,7 @@ async function updateEmployeesBasicIndice(idPeriod, dateTo) {
   // this query searches for the date of hire, their relative base index with their rank,
   // their responsibility index linked to their function,
   const sqlFindNewEmployees = `
-    SELECT emp.uuid, emp.date_embauche, sgi.value, sfi.value AS function_indice_value,
+    SELECT emp.uuid, emp.hiring_date, sgi.value, sfi.value AS function_indice_value,
     emp.grade_uuid, emp.fonction_id, pa.display_name
     FROM employee AS emp
     JOIN config_employee_item AS it ON it.employee_uuid = emp.uuid
@@ -211,7 +211,7 @@ async function updateEmployeesBasicIndice(idPeriod, dateTo) {
   // this query the date of the very first increment as well as the last value of the base index,
   // the responsibility index linked to the function and date of hire
   const sqlFindOldEmployees = `
-    SELECT emp.uuid, emp.date_embauche, lastIndice.date AS lastDateIncrease,
+    SELECT emp.uuid, emp.hiring_date, lastIndice.date AS lastDateIncrease,
     MAX(lastIndice.grade_indice) AS grade_indice, sfi.value AS function_indice_value, emp.grade_uuid,
     emp.fonction_id, pa.display_name
     FROM employee AS emp
@@ -251,8 +251,8 @@ async function updateEmployeesBasicIndice(idPeriod, dateTo) {
 
   // Processing of new employee data
   newEmployees.forEach(employee => {
-    employee.date_embauche = moment(employee.date_embauche).format('YYYY-MM-DD');
-    const yearOfSeniority = parseInt(moment(dateTo).diff(employee.date_embauche, 'years'), 10);
+    employee.hiring_date = moment(employee.hiring_date).format('YYYY-MM-DD');
+    const yearOfSeniority = parseInt(moment(dateTo).diff(employee.hiring_date, 'years'), 10);
 
     // Here we increment the base index based on the number of years
     for (let i = 0; i < yearOfSeniority; i++) {
@@ -272,14 +272,14 @@ async function updateEmployeesBasicIndice(idPeriod, dateTo) {
   });
 
   oldEmployees.forEach(employee => {
-    employee.date_embauche = moment(employee.date_embauche).format('YYYY-MM-DD');
+    employee.hiring_date = moment(employee.hiring_date).format('YYYY-MM-DD');
     employee.lastDateIncrease = moment(employee.lastDateIncrease).format('YYYY-MM-DD');
     // For employees who have already been configured, we will compare the number of years of seniority
     // and the difference in years between the date of the last increment of the base index,
     // if this difference is greater than zero, the we will have to increment
     // the base index in relation to this difference
-    const yearOfSeniority = parseInt(moment(dateTo).diff(employee.date_embauche, 'years'), 10);
-    const yearLastIncrementation = parseInt(moment(employee.lastDateIncrease).diff(employee.date_embauche, 'years'),
+    const yearOfSeniority = parseInt(moment(dateTo).diff(employee.hiring_date, 'years'), 10);
+    const yearLastIncrementation = parseInt(moment(employee.lastDateIncrease).diff(employee.hiring_date, 'years'),
       10);
 
     const diffSeniorityIncrementation = yearOfSeniority - yearLastIncrementation;

server/controllers/payroll/employees/index.js

@@ -114,7 +114,7 @@ function lookupEmployee(uid) {
   const sql = `
     SELECT
       BUID(employee.uuid) AS uuid, employee.code, patient.display_name, patient.sex,
-      patient.dob, employee.date_embauche, BUID(employee.service_uuid) as service_uuid,
+      patient.dob, employee.hiring_date, BUID(employee.service_uuid) as service_uuid,
       employee.nb_spouse, employee.nb_enfant, BUID(employee.grade_uuid) as grade_uuid,
       employee.locked, title_employee.is_medical, grade.text, grade.basic_salary,
       fonction.id AS fonction_id, fonction.fonction_txt, service.name AS service_txt, patient.hospital_no,
@@ -212,8 +212,8 @@ async function update(req, res, next) {
     employee.dob = new Date(employee.dob);
   }
 
-  if (employee.date_embauche) {
-    employee.date_embauche = new Date(employee.date_embauche);
+  if (employee.hiring_date) {
+    employee.hiring_date = new Date(employee.hiring_date);
   }
 
   const creditor = {
@@ -241,7 +241,7 @@ async function update(req, res, next) {
   };
 
   const clean = {
-    date_embauche : employee.date_embauche,
+    hiring_date : employee.hiring_date,
     service_uuid : employee.service_uuid,
     nb_enfant : employee.nb_enfant,
     grade_uuid : employee.grade_uuid,
@@ -332,8 +332,8 @@ function create(req, res, next) {
     employee.dob = new Date(employee.dob);
   }
 
-  if (employee.date_embauche) {
-    employee.date_embauche = new Date(employee.date_embauche);
+  if (employee.hiring_date) {
+    employee.hiring_date = new Date(employee.hiring_date);
   }
 
   const creditor = {
@@ -439,7 +439,7 @@ function find(options) {
   const sql = `
     SELECT
       BUID(employee.uuid) AS uuid, employee.code, patient.display_name, patient.sex,
-      patient.dob, employee.date_embauche, BUID(employee.service_uuid) as service_uuid, employee.nb_spouse,
+      patient.dob, employee.hiring_date, BUID(employee.service_uuid) as service_uuid, employee.nb_spouse,
       employee.nb_enfant, BUID(employee.grade_uuid) as grade_uuid, employee.locked, grade.text,
       grade.basic_salary, fonction.id AS fonction_id, fonction.fonction_txt, patient.hospital_no,
       patient.phone, patient.email, patient.address_1 AS adresse, BUID(employee.patient_uuid) AS patient_uuid,
@@ -468,9 +468,9 @@ function find(options) {
   const filters = new FilterParser(options, { tableAlias : 'employee' });
 
   filters.dateFrom('dateBirthFrom', 'dob', 'patient');
-  filters.dateFrom('dateEmbaucheFrom', 'date_embauche');
+  filters.dateFrom('dateEmbaucheFrom', 'hiring_date');
   filters.dateTo('dateBirthTo', 'dob', 'patient');
-  filters.dateTo('dateEmbaucheTo', 'date_embauche');
+  filters.dateTo('dateEmbaucheTo', 'hiring_date');
   filters.equals('code', 'code', 'employee');
   filters.equals('fonction_id', 'fonction_id', 'employee');
   filters.equals('grade_uuid', 'grade_uuid', 'employee');
@@ -546,8 +546,8 @@ function patientToEmployee(req, res, next) {
     text : `Debiteur [${employee.display_name}]`,
   };
 
-  if (employee.date_embauche) {
-    employee.date_embauche = new Date(employee.date_embauche);
+  if (employee.hiring_date) {
+    employee.hiring_date = new Date(employee.hiring_date);
   }
 
   delete employee.debtor_group_uuid;

server/controllers/payroll/multiplePayroll/find.js

@@ -26,7 +26,7 @@ function find(options) {
   }
 
   const sql = `
-    SELECT BUID(payroll.employee_uuid) AS employee_uuid, payroll.reference, payroll.code, payroll.date_embauche,
+    SELECT BUID(payroll.employee_uuid) AS employee_uuid, payroll.reference, payroll.code, payroll.hiring_date,
       payroll.nb_enfant, payroll.individual_salary, payroll.account_id, payroll.creditor_uuid, payroll.display_name,
       payroll.sex, payroll.payment_uuid, payroll.payroll_configuration_id, payroll.currency_id,
       payroll.payment_date, payroll.base_taxable, payroll.basic_salary, payroll.gross_salary, payroll.grade_salary,
@@ -36,7 +36,7 @@ function find(options) {
       IF (payroll.net_salary < 0, 1, 0) AS negativeValue
     FROM(
       SELECT employee.uuid AS employee_uuid, employee.reference, em.text AS hrreference, employee.code,
-        employee.date_embauche, employee.nb_enfant,employee.individual_salary, creditor_group.account_id,
+        employee.hiring_date, employee.nb_enfant,employee.individual_salary, creditor_group.account_id,
         BUID(employee.creditor_uuid) AS creditor_uuid,
         UPPER(patient.display_name) AS display_name, patient.sex, BUID(payment.uuid) AS payment_uuid,
         payment.payroll_configuration_id,  payment.currency_id, payment.payment_date, payment.base_taxable,
@@ -61,7 +61,7 @@ function find(options) {
         WHERE payment.payroll_configuration_id = '${options.payroll_configuration_id}'
       UNION
         SELECT employee.uuid AS employee_uuid,  employee.reference, em.text AS hrreference, employee.code,
-          employee.date_embauche, employee.nb_enfant, employee.individual_salary, creditor_group.account_id,
+          employee.hiring_date, employee.nb_enfant, employee.individual_salary, creditor_group.account_id,
         BUID(employee.creditor_uuid) AS creditor_uuid, UPPER(patient.display_name) AS display_name,
         patient.sex, NULL AS 'payment_uuid', '${options.payroll_configuration_id}' AS payroll_configuration_id,
         '${options.currency_id}' AS currency_id, NULL AS payment_date, 0 AS base_taxable, 0 AS basic_salary,

server/controllers/payroll/multiplePayroll/payrollSettings.js

@@ -90,7 +90,7 @@ function setConfig(
     const nbChildren = employee.nb_enfant;
 
     // determine the seniority of the employee by computing the difference between their hiring date and present date.
-    const yearsOfSeniority = moment(periodData.dateTo).diff(moment(employee.date_embauche), 'years');
+    const yearsOfSeniority = moment(periodData.dateTo).diff(moment(employee.hiring_date), 'years');
 
     /**
     * Some institutions allocate a percentage of the daily salary for off-day and holiday payments.

server/controllers/payroll/multiplePayroll/setConfiguration.js

@@ -62,8 +62,8 @@ async function config(req, res, next) {
     const workingDayCost = dailySalary * data.working_day;
     const nbChildren = employee.nb_enfant;
 
-    // Calcul of Seniority date Between date_embauche and the end date of Period
-    const yearsOfSeniority = moment(periodDateTo).diff(moment(employee.date_embauche), 'years');
+    // Calcul of Seniority date Between hiring_date and the end date of Period
+    const yearsOfSeniority = moment(periodDateTo).diff(moment(employee.hiring_date), 'years');
 
     /**
      * Some institution allocates a percentage for the offday and holiday payment.

server/controllers/payroll/multiplePayrollIndice/parameters.config.js

@@ -143,7 +143,7 @@ async function create(req, res, next) {
 
     // FIXME(@jniles) - we should make sure this can never be negative
     // if it is negative, can it be zeroed out?
-    const diff = moment(payrollPeriodDate).diff(moment(emp.date_embauche));
+    const diff = moment(payrollPeriodDate).diff(moment(emp.hiring_date));
     const duration = moment.duration(diff, 'milliseconds');
     const yearOfSeniority = parseInt(duration.asYears(), 10);
 
@@ -468,7 +468,7 @@ function stagePaymentIndice(payrollConfigurationId) {
 
   const sqlGetEmployees = `
      SELECT BUID(emp.uuid) AS employee_uuid, emp.uuid AS employee_buid, emp.code, ind.grade_indice,
-       ind.function_indice, ind.created_at, emp.date_embauche, patient.display_name
+       ind.function_indice, ind.created_at, emp.hiring_date, patient.display_name
      FROM payroll_configuration AS pc
        JOIN config_employee AS ce ON ce.id = pc.config_employee_id
        JOIN config_employee_item AS cei ON cei.config_employee_id = ce.id

server/controllers/payroll/reports/payslipGenerator.handlebars

@@ -21,7 +21,7 @@
           <div> <b>{{translate "FORM.LABELS.CODE"}} :</b> {{code}} </div>
           <div> <b>{{translate "FORM.LABELS.REFERENCE"}} :</b> {{hrreference}} </div>
           <div> <b>{{translate "FORM.LABELS.GRADE"}} :</b> {{text}} </div>
-          <div> <b>{{translate "FORM.LABELS.DATE_EMBAUCHE"}} :</b> {{date date_embauche}} </div>
+          <div> <b>{{translate "FORM.LABELS.DATE_EMBAUCHE"}} :</b> {{date hiring_date}} </div>
           <div> <b>{{translate "FORM.LABELS.NB_CHILD"}} :</b> {{nb_enfant}} </div>
         </div>
       </header>

server/controllers/payroll/reports/registrations.handlebars

@@ -31,7 +31,7 @@
             <td>{{this.fonction_txt}}</td>
             <td>{{this.service_name}}</td>
             <td>{{this.cost_center}}</td>
-            <td>{{date this.date_embauche}}</td>
+            <td>{{date this.hiring_date}}</td>
           </tr>
         {{else}}
           <tr>

server/models/01-schema.sql

@@ -515,7 +515,7 @@ DROP TABLE IF EXISTS `employee`;
 CREATE TABLE `employee` (
   `uuid`          BINARY(16) NOT NULL,
   `code`          VARCHAR(20) NOT NULL,
-  `date_embauche` DATETIME DEFAULT NULL,
+  `hiring_date`   DATETIME DEFAULT NULL,
   `grade_uuid`    BINARY(16) NOT NULL,
   `nb_spouse`     INT(2) DEFAULT 0,
   `nb_enfant`     INT(3) DEFAULT 0,

server/models/03-procedures.sql

@@ -3735,7 +3735,7 @@ DROP PROCEDURE IF EXISTS `UpdateStaffingIndices`$$
 CREATE PROCEDURE `UpdateStaffingIndices`(IN _dateFrom DATE, IN _dateTo DATE, IN _payroll_conf_id INT)
 BEGIN
   DECLARE _id mediumint(8) unsigned;
-  DECLARE _date_embauche DATE;
+  DECLARE _hiring_date DATE;
   DECLARE _employee_uuid, _grade_uuid, _current_staffing_indice_uuid, _last_staffing_indice_uuid BINARY(16);
   DECLARE _hiring_year, _fonction_id INT;
   DECLARE _grade_indice, _last_grade_indice, _function_indice, _grade_indice_rate DECIMAL(19,4);
@@ -3745,7 +3745,7 @@ BEGIN
   DECLARE curs1 CURSOR FOR
   -- The request should only return the employees affected by the pay period,
   -- just because two pay periods can have the same time range.
-  SELECT emp.uuid, emp.grade_uuid, emp.fonction_id, emp.date_embauche
+  SELECT emp.uuid, emp.grade_uuid, emp.fonction_id, emp.hiring_date
     FROM employee AS emp
     JOIN config_employee_item AS conf ON conf.employee_uuid = emp.uuid
     JOIN config_employee AS cemp ON cemp.id = conf.config_employee_id
@@ -3758,12 +3758,12 @@ BEGIN
 
     OPEN curs1;
         read_loop: LOOP
-        FETCH curs1 INTO _employee_uuid, _grade_uuid, _fonction_id, _date_embauche;
+        FETCH curs1 INTO _employee_uuid, _grade_uuid, _fonction_id, _hiring_date;
             IF done THEN
                 LEAVE read_loop;
             END IF;
             -- anciennette
-            SET _hiring_year = FLOOR(DATEDIFF(_dateTo, _date_embauche)/365);
+            SET _hiring_year = FLOOR(DATEDIFF(_dateTo, _hiring_date)/365);
             -- is there any staffing indice specified for the employee in this payroll config period interval ?
             -- _current_staffing_indice_uuid is the indice for this payroll config period interval
             SET _current_staffing_indice_uuid  = IFNULL((
@@ -3783,12 +3783,12 @@ BEGIN
 
             SET @shouldInsert = FALSE;
 
-            -- check if the date_embauche is in the current payroll config period interval
-            SET @hiring_date = DATE(CONCAT(YEAR(_dateTo), '-', MONTH(_date_embauche), '-', DAY(_date_embauche)));
-            SET @date_embauche_interval = (@hiring_date BETWEEN _dateFrom AND _dateTo);
+            -- check if the hiring_date is in the current payroll config period interval
+            SET @hiring_date = DATE(CONCAT(YEAR(_dateTo), '-', MONTH(_hiring_date), '-', DAY(_hiring_date)));
+            SET @hiring_date_interval = (@hiring_date BETWEEN _dateFrom AND _dateTo);
 
             -- should update staffing_indice and there's no previous staffing_indice for in this payroll config period interval
-            IF  ((@date_embauche_interval=1)  AND (_current_staffing_indice_uuid = HUID('0'))) THEN
+            IF  ((@hiring_date_interval=1)  AND (_current_staffing_indice_uuid = HUID('0'))) THEN
                 -- increase the _last_grade_indice if it exist
                 IF (_last_staffing_indice_uuid <> HUID('0')) THEN
                     SET _last_grade_indice = (SELECT grade_indice FROM staffing_indice WHERE uuid = _last_staffing_indice_uuid);
@@ -3802,7 +3802,7 @@ BEGIN
             -- no indice has been created for the employee previously(no record in the table for him)
             -- this is used when configuring for the first time
             ELSE
-                IF ((@date_embauche_interval = 0) && (_last_staffing_indice_uuid = HUID('0'))) THEN
+                IF ((@hiring_date_interval = 0) && (_last_staffing_indice_uuid = HUID('0'))) THEN
                     SET _grade_indice = (SELECT IFNULL(value, 0)  FROM staffing_grade_indice WHERE grade_uuid = _grade_uuid LIMIT 1);
                     SET _grade_indice = _grade_indice + (_grade_indice * _hiring_year * _grade_indice_rate);
                     SET @shouldInsert = TRUE;

server/models/migrations/next/migrate.sql

@@ -1,3 +1,4 @@
+-- migrate/next.sql
 
 -- @jniles: modify the email fields to standarize the field length
 ALTER TABLE `patient` MODIFY `email` VARCHAR(150) DEFAULT NULL;
@@ -11,5 +12,12 @@ ALTER TABLE `user` MODIFY `email` VARCHAR(150) DEFAULT NULL;
  * @date: 2024-11-27
  * @description: Fix and Update Cashflow Report and Budget Report #7897
  */
-
 INSERT INTO `account_reference_type` (`id`, `label`, `fixed`) VALUES (8, 'FORM.LABELS.BUDGET_ANALYSIS', 1);
+
+
+/*
+ * @author: jniles
+ * @date: 2024-12-24
+ * Change the name of the "hiring_date" column to "date_embauche" in the "employee" table
+ */
+ALTER TABLE `employee` CHANGE COLUMN date_embauche hiring_date DATETIME DEFAULT NULL;