From 317e456dafcf3f447ee03f20e89122dbfa2e24f7 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Oct 2025 10:24:01 +0530 Subject: [PATCH 1/5] CHANGE_inception mail notification template updation - VADIVEL J 2025-10-27 10:23 --- app/Controllers/EmployeeRestController.php | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index ecbba2f7..d5cca1d8 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -4179,7 +4179,7 @@ class EmployeeRestController extends AdminController // Save into DB $result = $this->hrFileUploadModel->insert($data); - if($result && $data['file_action'] == "addition"){ + if($result){ $this->giveNotificationToClientsAccountManager($data); } @@ -4196,24 +4196,12 @@ class EmployeeRestController extends AdminController } private function giveNotificationToClientsAccountManager($data){ - - // $data = [ - // 'client_id' => $this->request->getPost('client_id'), - // 'client_branch_id' => $this->request->getPost('client_branch_id'), - // 'policy_id' => $this->request->getPost('policy_id'), - // 'policy_no' => $this->request->getPost('policy_no'), - // 'file_name' => $newFileName, - // 'file_action' => $this->request->getPost('file_action'), - // 'status' => 'Yet to start', - // 'created_by' => $this->request->getPost('created_by'), - // 'updated_by' => $this->request->getPost('created_by'), - // ]; $client_name = $this->clientModel->where('id',$data['client_id'])->findAll()[0]['client_name'] ?? [] ; $account_manager_email = $this->clientRMModel->findAccountManagerEmail($data['client_id']); - $templateName = "inception_addition"; + $templateName = "hr_endorsement_template"; $mailTemplate = $this->ticketMailTemplateModel->where('template_name', $templateName)->findAll()[0] ?? []; @@ -4223,9 +4211,13 @@ class EmployeeRestController extends AdminController return ; } + $mailTemplate['mail_content'] = str_replace('%file_action%', $data['file_action'] ?? '', $mailTemplate['mail_content']); $mailTemplate['mail_content'] = str_replace('%client_name%', $client_name ?? '', $mailTemplate['mail_content']); $mailTemplate['mail_content'] = str_replace('%policy_no%', $data['policy_no'] ?? '', $mailTemplate['mail_content']); + $mailTemplate['subject'] = str_replace('%subject%',$data['file_action']??'',$mailTemplate['subject']); + $mailTemplate['subject'] = str_replace('%client_name%',$client_name??'',$mailTemplate['subject']); + $from_mail = ""; $to_mail = $account_manager_email; $subject = $mailTemplate['subject']; From 53dffb08e90e2b3ccbba302e559aa5f355f8d976 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Oct 2025 11:09:04 +0530 Subject: [PATCH 2/5] CHANGE_inception mail notification template updation-2 - VADIVEL J 2025-10-27 11:08 --- app/Controllers/EmployeeRestController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index d5cca1d8..83015c20 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -54,6 +54,7 @@ use Illuminate\Http\Request; use App\Controllers\EmployeeServiceController; use App\Models\ClaimFilesModel; use App\Models\TicketMailTemplateModel; +use Composer\Pcre\Preg; use Kreait\Firebase\Factory; use Kreait\Firebase\Messaging\CloudMessage; use Kreait\Firebase\Messaging\Notification; @@ -4210,6 +4211,8 @@ class EmployeeRestController extends AdminController log_message("error","Empty mail template for inception_addition please update the template in database or create one..!!"); return ; } + + $data['file_action'] = ucwords(preg_replace("/_/", " ", $data['file_action'])); $mailTemplate['mail_content'] = str_replace('%file_action%', $data['file_action'] ?? '', $mailTemplate['mail_content']); $mailTemplate['mail_content'] = str_replace('%client_name%', $client_name ?? '', $mailTemplate['mail_content']); From f6e6056a7625784e7f964feb5413b3a0d481d2f5 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Oct 2025 11:56:23 +0530 Subject: [PATCH 3/5] CHANGE_ADD_user_in_masters_minor_fix - VADIVEL J 2025-10-29 11:55 --- app/Views/UserList.php | 11 ++++---- app/Views/leads_list.php | 55 ++++++++++++++++++++++++++++++++-------- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/app/Views/UserList.php b/app/Views/UserList.php index f7b7098a..82441b22 100755 --- a/app/Views/UserList.php +++ b/app/Views/UserList.php @@ -521,12 +521,13 @@ table.dataTable tbody td { diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php index 1b411599..1762f32c 100644 --- a/app/Views/leads_list.php +++ b/app/Views/leads_list.php @@ -164,7 +164,7 @@ table.dataTable tbody td { -
S.No 
+
S.No  
Lead Type  
Issuer  
Client Type  
@@ -209,8 +209,10 @@ table.dataTable tbody td {
-
@@ -331,12 +333,19 @@ table.dataTable tbody td { document.body.appendChild(customDropdown); - row.addEventListener("click", function(event) { - // Ignore clicks on the action column - if (event.target.closest('td:last-child')) { - return; - } - + row.addEventListener("click", function(event) { + + // 1. CRITICAL CHECK: Stop propagation if the click came from the dropdown toggle itself. + if (event.target.closest('.dropdown-toggle')) { + event.stopPropagation(); + + // **IMPORTANT:** Since you're using a custom script, you need to + // manually trigger the logic for your custom detached dropdown here. + // The code below should run when the dropdown toggle is clicked: + const originalDropdown = event.target.closest('.btn-group').querySelector('.dropdown-menu'); + if (originalDropdown) { + + // This is the code that opens your custom dropdown if (activeDropdown) { activeDropdown.style.display = 'none'; } @@ -349,8 +358,32 @@ table.dataTable tbody td { customDropdown.style.top = `${rect.bottom + 5}px`; activeDropdown = customDropdown; - event.stopPropagation(); - }); + } + + return; // Exit the row listener early + } + + // 2. Ignore clicks on the entire action column (your existing, good check) + if (event.target.closest('td:last-child')) { + return; + } + + // ... rest of your row logic for general row clicks ... + + if (activeDropdown) { + activeDropdown.style.display = 'none'; + } + + const rect = event.target.getBoundingClientRect(); + + customDropdown.style.display = 'block'; + customDropdown.style.position = 'fixed'; + customDropdown.style.left = `${rect.left}px`; + customDropdown.style.top = `${rect.bottom + 5}px`; + + activeDropdown = customDropdown; + event.stopPropagation(); // Only needed if there is a parent handler + }); // Handle clicks on dropdown items customDropdown.querySelectorAll('.dropdown-item').forEach(item => { From 57a5b57fa583028f260be1cf05a61912a70ef5b2 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Oct 2025 15:26:16 +0530 Subject: [PATCH 4/5] CHANGE_slider_issue_solved - VADIVEL J 2025-10-29 15:24 --- app/Views/client_policy.php | 66 +++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index 4d2e70e9..080c1e87 100755 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -46,33 +46,40 @@ height: 0; } -.slider { - position: relative; - width: 50px; - height: 25px; - background-color: #fff; - border-radius: 25px; - box-shadow: 0 0 5px rgba(0,0,0,0.2); - transition: 0.3s; +.slider, +.slider_blue { +position: relative; +width: 50px; +height: 25px; +background-color: #fff; +border-radius: 25px; +box-shadow: 0 0 5px rgba(0,0,0,0.2); +transition: 0.3s; } -.slider::before { - content: ""; - position: absolute; - height: 19px; - width: 19px; - left: 3px; - top: 3px; - background-color: #ccc; - border-radius: 50%; - transition: 0.3s; +.slider::before , +.slider_blue::before { +content: ""; +position: absolute; +height: 19px; +width: 19px; +left: 3px; +top: 3px; +background-color: #ccc; +border-radius: 50%; +transition: 0.3s; } input:checked + .slider { background-color: #ff4d4d; /* red when ON */ } -input:checked + .slider::before { +input:checked + .slider_blue { + background-color: #268ef5ff; /* blue when ON */ +} + +input:checked + .slider::before , +input:checked + .slider_blue::before { transform: translateX(25px); background-color: #fff; } @@ -269,23 +276,18 @@ input:checked + .slider::before {
-
-
From 0eef4cccadd80b0db848eea89df3b14d330e77f2 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Oct 2025 16:41:17 +0530 Subject: [PATCH 5/5] CHANGE_bds_table_responsive issue - VADIVEL J 2025-10-29 16:40 --- app/Views/layout/header.php | 14 -------------- app/Views/report_bds.php | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index cca6f05d..6f22e162 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -958,21 +958,7 @@ /* aligns text properly */ } - -