From 36085997f7d5fef731739e8a635c04e6d589d5d2 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 29 Dec 2025 11:52:45 +0530 Subject: [PATCH 1/3] FIX_CLIENT_OPEN_FOR_ENROLLMENT --- app/Views/client_policy.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index 93b0328..0da8700 100755 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -2437,7 +2437,7 @@ $(document).ready(function () { ${item.branch_name ? item.branch_name : ' - '} ${tpaValue} --> ${(item.policy_start_date)} / ${(item.policy_end_date)} - ${(enrollmentStatus)} + ${checkDateStatus(item.policy_end_date, 1)}
@@ -2474,7 +2474,7 @@ $(document).ready(function () { ${item.branch_name ? item.branch_name : ' - '} ${tpaValue} --> ${(item.policy_start_date)} / ${(item.policy_end_date)} - ${(enrollmentStatus)} + ${(enrollmentStatus)} --> ${checkDateStatus(item.policy_end_date, 1)}
From 5d331011276241f035ccbecbb3ed4ffbcfd095a4 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Tue, 30 Dec 2025 12:05:58 +0530 Subject: [PATCH 2/3] FIX_EMP_CODE_DUPLICATE_ISSUE --- app/Controllers/EmployeeServiceController.php | 14 +++++++ app/Helpers/excel_util_helper.php | 41 +++++++++++++++++++ app/Views/employee_upload.php | 5 +++ 3 files changed, 60 insertions(+) diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index 320903b..c52ebd7 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -1069,6 +1069,20 @@ class EmployeeServiceController extends AdminController } } + // check the employee code if dublicate exist + if(($file['action'] == 'inception' || $file['action'] == 'missed_inception' || $file['action'] == 'addition' || $file['action'] == 'enrollment')) + { + $res = check_emp_code_duplication($family, $file); + // dd($res); + if($res['status']) + { + foreach ($res['row_ids'] as $row_id) { + array_push($result['error_summary'],26); + $result['error_data'][ $row_id ]['emp_id']['error'][] = "Employee Code is already exist in the system"; + } + } + } + //check self avaialbe either same policy DB level(i.e.) gMC parents if($file['action'] == 'dependent_addition' || ($policy_details['policy_type_id'] == 3 && !$is_self_available_in_policy_terms)) // 3 is GMC parents as base policy not as dep addon) { diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 37fc8e2..a6b6222 100755 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -553,6 +553,47 @@ if (!function_exists('name_and_empid_check_in_db')) } } +if (!function_exists('check_emp_code_duplication')) { + function check_emp_code_duplication($family_data, $actionArr) + { + $employeeModel = new EmployeeModel(); + $row_ids = []; + $status = false; + $client_id = $actionArr['client_id']; + $policy_id = $actionArr['policy_id']; + $client_branch_id = $actionArr['client_branch_id']; + $current_action = $actionArr['action']; + + foreach ($family_data as $rkey => $row) { + + if ($current_action != 'dependent_addition' || (isset($row['temp']) && $row['temp']['source'] != 'db')) { + $res = $employeeModel + ->join('client_policy cp', "employees.client_id = cp.client_id") + ->join('employee_polices ep', "cp.id = ep.client_policy_id AND employees.id = ep.employee_id") + ->where("cp.id", $policy_id) + ->where("employees.client_id", $client_id) + ->where("employees.client_branch_id", $client_branch_id) + ->where("employees.is_active", 1) + ->where("employees.emp_status", 'active') + ->where("ep.is_active", 1) + ->where("ep.status", 'active') + ->where('TRIM(emp_code)', trim($row[1])) + ->findAll(); + + if(count($res) > 0){ + $row_ids[] = $row[0]; + } + } + } + + if(!empty($row_ids)){ + $status = true; + } + + return ['status' => $status, 'row_ids' => $row_ids]; + } +} + if (!function_exists('check_dependent_conflict')) { function check_dependent_conflict($family_data,$policy_terms,$actionArr,$is_lgbtq) diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php index 1d20b1d..98bb2c9 100755 --- a/app/Views/employee_upload.php +++ b/app/Views/employee_upload.php @@ -571,6 +571,11 @@ function fetchFileError(file_id) { "Rule conflict: Twofold relationship found within family " + err_count + ""; break; + case 26: + file_error_html += + "Duplicate Employee code found " + + err_count + ""; + break; default: file_error_html += ""; From 323bdc08eaa853f94bb2626d06a84d50a4e9da18 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Fri, 2 Jan 2026 10:55:39 +0530 Subject: [PATCH 3/3] FIX_ROUTE --- app/Config/Routes.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index d8d2548..92a6171 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -532,10 +532,12 @@ $routes->group("employeeRest", ['filter' => ['appSignature'] ], function ($route $routes->post("verifyOtp", "RestAuthenticationController::verifyOtp"); $routes->post("checkPassword", "RestAuthenticationController::checkPassword"); $routes->get("downloadSampleExcel", "EmployeeRestController::downloadSampleExcel"); - $routes->post("getPreEmployeePolicyCount", "EmployeeRestController::getPreEmployeePolicyCount"); + // $routes->post("getPreEmployeePolicyCount", "EmployeeRestController::getPreEmployeePolicyCount"); }); +$routes->post("getPreEmployeePolicyCount","EmployeeRestController::getPreEmployeePolicyCount", ['filter' => ['appSignature']]); + $routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy"); $routes->get("sendPushNotification", "EmployeeRestController::sendPushNotification"); $routes->post("sendEmail", "EmployeeRestController::send_email");