From dbd6167382902c78a64daf3db4b4b810f1d6905e Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Thu, 19 Mar 2026 18:17:29 +0530 Subject: [PATCH 1/2] FIX_LIVE_ISSUES --- app/Models/EmployeePolicyModel.php | 9 +++++---- app/Views/file_list.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index d61d75a..1149174 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -162,14 +162,15 @@ class EmployeePolicyModel extends Model END) AS removed_summary", "(CASE - WHEN emp.relationship != 'Self' AND DATE(emp.created_at) > ( - SELECT DATE(MIN(e_sub.created_at)) + WHEN emp.relationship != 'Self' + AND emp.created_at > ( + SELECT MIN(e_sub.created_at) FROM employees e_sub - JOIN employee_polices ep ON e_sub.id = ep.employee_id + INNER JOIN employee_polices ep_sub ON e_sub.id = ep_sub.employee_id WHERE e_sub.emp_code = emp.emp_code AND e_sub.relationship = 'Self' AND e_sub.is_active = 1 - AND ep.client_policy_id = employee_polices.client_policy_id + AND ep_sub.client_policy_id = employee_polices.client_policy_id ) THEN 'Newly Added' ELSE NULL diff --git a/app/Views/file_list.php b/app/Views/file_list.php index 993ebe6..4e9588c 100755 --- a/app/Views/file_list.php +++ b/app/Views/file_list.php @@ -128,7 +128,7 @@ ">Download View - + Truncate From 7aa4e8fb9857f83896b61f6a9fcca8ec6123b5ba Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Fri, 20 Mar 2026 11:39:12 +0530 Subject: [PATCH 2/2] CHANGE_EMP_ADD_OR_REMOVE --- app/Controllers/EmployeeRestController.php | 3 +- app/Models/EmployeeModel.php | 1 + app/Models/EmployeePolicyModel.php | 34 ++++++++++++---------- app/Views/employee_data_list.php | 6 ++-- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 8541d19..302a569 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -284,6 +284,7 @@ class EmployeeRestController extends AdminController $item->gender = $this->GenderMap($item->relationship , $item->emp_code); $item->dob = $this->convertDateFormatYMD($item->dob); $item->emp_status = 'draft'; + $item->is_dependent_modified = 1; $item->band = $this->getSelfBand($item->emp_code,$item->client_id,$item->client_branch_id); // dd($item); $employee = $this->employeeModel->insert($item); @@ -564,7 +565,7 @@ class EmployeeRestController extends AdminController $this->employeeModel->where('id', $this->request->getGet('id') ) ->where('is_active', 1 ) - ->set(['emp_status' => 'truncated', 'is_active' => 0]) + ->set(['emp_status' => 'truncated', 'is_active' => 0, 'is_dependent_modified' => 0]) ->update(); } diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php index c5bd85b..d6dfa27 100755 --- a/app/Models/EmployeeModel.php +++ b/app/Models/EmployeeModel.php @@ -46,6 +46,7 @@ class EmployeeModel extends Model "is_mpin_skipped", "is_biometric_enabled", "password", + "is_dependent_modified", ]; // Callbacks diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 1149174..dafe21c 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -154,27 +154,29 @@ class EmployeePolicyModel extends Model FROM employees e JOIN employee_polices ep ON e.id = ep.employee_id WHERE e.emp_code = emp.emp_code - AND e.is_active = 0 - AND e.emp_status != 'truncated' + AND (e.is_dependent_modified = 0 OR (e.is_active = 0 AND e.emp_status != 'truncated')) AND ep.client_policy_id = employee_polices.client_policy_id ) ELSE NULL END) AS removed_summary", - "(CASE - WHEN emp.relationship != 'Self' - AND emp.created_at > ( - SELECT MIN(e_sub.created_at) - FROM employees e_sub - INNER JOIN employee_polices ep_sub ON e_sub.id = ep_sub.employee_id - WHERE e_sub.emp_code = emp.emp_code - AND e_sub.relationship = 'Self' - AND e_sub.is_active = 1 - AND ep_sub.client_policy_id = employee_polices.client_policy_id - ) - THEN 'Newly Added' - ELSE NULL - END) AS newly_added", + "(IF(COALESCE(emp.is_dependent_modified, 0) = 1, 'Newly Added, ', + CASE + WHEN emp.relationship != 'Self' + AND emp.created_by = ( + SELECT e_sub.id + FROM employees e_sub + INNER JOIN employee_polices ep_sub ON e_sub.id = ep_sub.employee_id + WHERE e_sub.emp_code = emp.emp_code + AND e_sub.relationship = 'Self' + AND e_sub.is_active = 1 + AND ep_sub.client_policy_id = employee_polices.client_policy_id + LIMIT 1 + ) + THEN 'Newly Added, ' + ELSE NULL + END + )) AS newly_added", $status_query ], false) diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php index 80436a2..7659250 100755 --- a/app/Views/employee_data_list.php +++ b/app/Views/employee_data_list.php @@ -200,6 +200,9 @@ " . $employee['newly_added'] . "

"; + } if(!empty($employee['name_first_old']) ){ echo "

Name : " . $employee['name_first_old'] . ' => ' . $employee['name_last_new'] . "

"; } @@ -209,9 +212,6 @@ if(!empty($employee['gender_first_old'])){ echo "

Gender : " . $employee['gender_first_old'] . ' => ' . $employee['gender_last_new'] . "

"; } - if(!empty($employee['newly_added'])){ - echo "

" . $employee['newly_added'] . "

"; - } // if(!empty($employee['removed_count'])){ // echo "

" . $employee['removed_count'] . " People removed

"; // }