From 1c2a473c5aeb2a8de8f2db1999dc947ff07cebaa Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Tue, 19 Aug 2025 15:57:57 +0530
Subject: [PATCH 01/54] CHANGE_API

---
 app/Controllers/ThzController.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index fd2f424f..c725b49a 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -110,14 +110,17 @@ class ThzController extends BaseController
                         ->where('thz_master.thz_id', $thz_id)
                         ->findAll();
 
-                $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id);
-                $result['notes'] = !empty($notes) ? $notes : [];
-                
+                if(!empty($result['master'])){
+                    $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id);
+                    $result['notes'] = !empty($notes) ? $notes : [];
+                }else{
+                    return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets master found']))->setStatusCode(400);        
+                }
             }else{
                 return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
             }
             
-            return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(400);
+            return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
 
     }
 

From b6a2dad5ea0724a166244cbde4ad108af145544b Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Tue, 19 Aug 2025 16:05:38 +0530
Subject: [PATCH 02/54] CHANGE_API

---
 app/Controllers/ThzController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index c725b49a..094f8c0a 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -114,7 +114,7 @@ class ThzController extends BaseController
                     $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id);
                     $result['notes'] = !empty($notes) ? $notes : [];
                 }else{
-                    return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets master found']))->setStatusCode(400);        
+                    return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(400);        
                 }
             }else{
                 return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);

From 066334791598bf98551fe7234ef9c3a904873382 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Tue, 19 Aug 2025 17:31:38 +0530
Subject: [PATCH 03/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-19

---
 app/Controllers/ThzController.php |  2 +-
 app/Helpers/header.php            |  1 -
 app/Views/DashBoard.php           | 15 +++++++--------
 app/Views/bds_dash.php            |  4 ++--
 app/Views/claims_dash.php         | 12 ++++++------
 app/Views/client_onboarding.php   |  4 ----
 app/Views/endorsement_dash.php    | 20 ++++++++++++--------
 app/Views/hr_access_controll.php  |  8 ++++----
 app/Views/layout/header.php       |  4 ++++
 app/Views/leads_dash.php          |  8 ++++----
 app/Views/ticket_list.php         |  2 +-
 11 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index fd2f424f..8eac6932 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -128,7 +128,7 @@ class ThzController extends BaseController
     public function ticketConversationSaveNotification($data){
 
     }
-
+    
     public function ticketAssigning(){
 
         $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
diff --git a/app/Helpers/header.php b/app/Helpers/header.php
index 2ade2b0b..dc193798 100755
--- a/app/Helpers/header.php
+++ b/app/Helpers/header.php
@@ -267,7 +267,6 @@
 
 
         .right-bar {
-            width: 300px;
             /* Adjust as needed */
             overflow: hidden;
         }
diff --git a/app/Views/DashBoard.php b/app/Views/DashBoard.php
index b9e1294c..e3c54d7d 100755
--- a/app/Views/DashBoard.php
+++ b/app/Views/DashBoard.php
@@ -381,15 +381,14 @@ $(document).ready(function(){
 
 <script>
 
-// $(document).on('click', '.dash-anchor', function () {
-//     console.log("clicked dynamic", this);
+$(document).on('click', '.dash-anchor', function () {
+    
+    // remove active class from all tabs
+    $('.dash-tab').removeClass('active');
 
-//     // remove active class from all tabs
-//     $('.dash-tab').removeClass('active');
-
-//     // add active only to the clicked one's child span
-//     $(this).find('.dash-tab').addClass('active');
-// });
+    // add active only to the clicked one's child span
+    $(this).find('.dash-tab').addClass('active');
+});
 
 
 
diff --git a/app/Views/bds_dash.php b/app/Views/bds_dash.php
index 52996c3f..c91b2b6e 100644
--- a/app/Views/bds_dash.php
+++ b/app/Views/bds_dash.php
@@ -132,7 +132,7 @@
     border-radius: 15px !important;
     border:2px solid #09B9BF;
     box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.2);
-    min-width: 250px;
+    min-width: 300px;
 }
 
 #bds-dash-tab{
@@ -182,7 +182,7 @@
                         <h2>
                             <span class="mb-3 span-color"><?= $businessTeamCount ?>
                         </h2>
-                        <h6 >&nbsp;<span class="text-danger"> Team Action</span></h6>
+                        <h6 >&nbsp;<span class="text-danger"> Team Action </span></h6>
                     </div>
                 </div>
             </div>
diff --git a/app/Views/claims_dash.php b/app/Views/claims_dash.php
index e5a104a6..f37a2ed7 100644
--- a/app/Views/claims_dash.php
+++ b/app/Views/claims_dash.php
@@ -138,8 +138,8 @@
         border-radius:25px;
         border:2px solid #09B9BF;
         box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.2);
-        min-width: 250px;
-        max-width: 250px;
+        min-width: 300px;
+        max-width: 300px;
     }
 
     #claims-dash-tab{
@@ -161,7 +161,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
                 <div class="card dash-card" onclick="hideAndShowTile(1,1)">
                     <div class="card-block">
                         <h4 class="mb-3">GMC</h4>
-                        <h2 class="span-color"><span><?= isset($claim_data[1]['total']) ? $claim_data[1]['total'] : '0' ?></span></h2>
+                        <h2 ><span class="span-color"><?= isset($claim_data[1]['total']) ? $claim_data[1]['total'] : '0' ?></span></h2>
                         <h6><span class="text-danger">All GMC Records</span></h6>
                     </div>
                 </div>
@@ -171,7 +171,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
                 <div class="card dash-card" onclick="hideAndShowTile(1,2)">
                     <div class="card-block">
                         <h4 class="mb-3">GPA</h4>
-                        <h2 class="span-color"><span><?= isset($claim_data[2]['total']) ? $claim_data[2]['total'] : '0' ?></span></h2>
+                        <h2 ><span class="span-color"><?= isset($claim_data[2]['total']) ? $claim_data[2]['total'] : '0' ?></span></h2>
                         <h6><span class="text-danger">All GPA Records</span></h6>
                     </div>
                 </div>
@@ -180,7 +180,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
                 <div class="card dash-card" onclick="hideAndShowTile(1,3)">
                     <div class="card-block">
                         <h4 class="mb-3">EDLI</h4>
-                        <h2 class="span-color"><span><?= isset($claim_data[3]['total']) ? $claim_data[3]['total'] : '0' ?></span></h2>
+                        <h2 ><span class="span-color"><?= isset($claim_data[3]['total']) ? $claim_data[3]['total'] : '0' ?></span></h2>
                         <h6><span class="text-danger">All EDLI Records</span></h6>
                     </div>
                 </div>
@@ -189,7 +189,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team(
                 <div class="card dash-card" onclick="hideAndShowTile(1,4)">
                     <div class="card-block">
                         <h4 class="mb-3">GTLI</h4>
-                        <h2 class="span-color"><span><?= isset($claim_data[4]['total']) ? $claim_data[4]['total'] : '0' ?></span></h2>
+                        <h2 ><span class="span-color"><?= isset($claim_data[4]['total']) ? $claim_data[4]['total'] : '0' ?></span></h2>
                         <h6><span class="text-danger">All GTLI Records</span></h6>
                     </div>
                 </div>
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index d37f28e5..44ee748c 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -570,8 +570,6 @@ body {
             if (otherCard !== card) {
                 const otherContent = otherCard.querySelector('.card-content');
                 const otherIcon = otherCard.querySelector('.accordion-icon i');
-                otherContent.classList.remove('active');
-                otherIcon.classList.remove('mdi mdi-chevron-up');
                 otherIcon.classList.add('mdi mdi-chevron-down');
             }
         });
@@ -579,10 +577,8 @@ body {
         // Toggle current accordion
         content.classList.toggle('active');
         if (content.classList.contains('active')) {
-            icon.classList.remove('mdi mdi-chevron-down');
             icon.classList.add('mdi mdi-chevron-up');
         } else {
-            icon.classList.remove('mdi mdi-chevron-up');
             icon.classList.add('mdi mdi-chevron-down');
         }
     }
diff --git a/app/Views/endorsement_dash.php b/app/Views/endorsement_dash.php
index 30b78f8e..adfd445e 100755
--- a/app/Views/endorsement_dash.php
+++ b/app/Views/endorsement_dash.php
@@ -166,6 +166,10 @@
     color:#09B9BF;
 }
 
+.diff-span-color{
+    color: #0EB96E !important;
+}
+
 .endorsement-div{
     margin-left:20px;
 }
@@ -215,7 +219,7 @@
                                 <span  class="span-color"><?= $pendingActionsData['uhid'] ?></span>
                             </h2>
                             <h6 class="text-right">
-                                <span class="span-color f-left">Exported : <?= $pendingActionsData['uhid_export_count'] ?></span>
+                                <span class="diff-span-color f-left">Exported : <?= $pendingActionsData['uhid_export_count'] ?></span>
                                 <span class="text-danger">Not Exported : <?= $pendingActionsData['uhid_not_export_count'] ?></span>
                             </h6>
                             
@@ -232,7 +236,7 @@
                                 <span  class="span-color"><?= $pendingActionsData['tpa'] ?></span>
                             </h2>
                             <h6 class="text-right">
-                                <span class="span-color f-left">Exported : <?= $pendingActionsData['tpa_export_count'] ?></span>
+                                <span class="diff-span-color f-left">Exported : <?= $pendingActionsData['tpa_export_count'] ?></span>
                                 <span class="text-danger">Not Exported   : <?= $pendingActionsData['tpa_not_export_count'] ?></span>
                             </h6>
                             
@@ -249,8 +253,8 @@
                                 <span  class="span-color"><?= $pendingActionsData['correction'] ?></span>
                             </h2>
                             <h6 class="tex-right">
-                                <span class="span-color">Exported : <?= $pendingActionsData['correction_export_count'] ?></span>
-                                <span class="text-danger f-right">Not Exported : <span ><?= $pendingActionsData['correction_not_export_count'] ?></span></span>
+                                <span class="diff-span-color">Exported : <?= $pendingActionsData['correction_export_count'] ?></span>
+                                <span class="text-danger f-right">Not Exported : <?= $pendingActionsData['correction_not_export_count'] ?></span>
                             </h6>
                             
                         </div>
@@ -266,8 +270,8 @@
                             <span  class="span-color"><?= $pendingActionsData['deletion'] ?></span>
                         </h2>
                         <h6>
-                            <span class="span-color">Exported : <?= $pendingActionsData['deletion_export_count'] ?></span>
-                            <span class="text-danger f-right">Not Exported : <span ><?= $pendingActionsData['deletion_not_export_count'] ?></span></span>
+                            <span class="diff-span-color">Exported : <?= $pendingActionsData['deletion_export_count'] ?></span>
+                            <span class="text-danger f-right">Not Exported : <?= $pendingActionsData['deletion_not_export_count'] ?></span>
                         </h6>
                         
                     </div>
@@ -283,8 +287,8 @@
                             <span  class="span-color"><?= $pendingActionsData['si_enhancement'] ?></span>
                         </h2>
                         <h6>
-                            <span class="span-color">Exported : <?= $pendingActionsData['si_export_count'] ?></span>
-                            <span class="text-danger f-right">Not Exported : <span ><?= $pendingActionsData['si_not_export_count'] ?></span></span>
+                            <span class="diff-span-color">Exported : <?= $pendingActionsData['si_export_count'] ?></span>
+                            <span class="text-danger f-right">Not Exported : <?= $pendingActionsData['si_not_export_count'] ?></span>
                         </h6>
                         
                     </div>
diff --git a/app/Views/hr_access_controll.php b/app/Views/hr_access_controll.php
index 877bec10..7d262a17 100644
--- a/app/Views/hr_access_controll.php
+++ b/app/Views/hr_access_controll.php
@@ -38,7 +38,7 @@
                                                         value="1" <?php if (in_array(1, $value['allowed_pre_modules'] ?? [])) {
                                                                         echo 'checked';
                                                                     } ?>>
-                                                    <i class="fas fa-user-plus mr-2"></i>Pre enrollment
+                                                    <i class="mdi mdi-account-plus mr-2"></i>Pre enrollment
                                                 </div>
 
                                                 <div class="<?= in_array(1, $value['allowed_pre_modules']) ? 'checkbox-group' : 'checkbox-group hidden' ?>" id="<?= 'user' . $key ?>-pre">
@@ -84,7 +84,7 @@
                                                         value="2" <?php if (in_array(2, $value['allowed_post_modules'])) {
                                                                         echo 'checked';
                                                                     } ?>>
-                                                    <i class="fas fa-check-circle mr-2"></i>Active policies
+                                                    <i class="mdi mdi-check-circle mr-2"></i>Active policies
                                                 </div>
                                                 <div class="<?php if (in_array(2, $value['allowed_post_modules'])) {echo 'checkbox-group';} else {echo 'checkbox-group hidden';} ?>" id="<?= 'user' . $key ?>-active">
 
@@ -128,7 +128,7 @@
                                                 <div class="section-title">
                                                     <input type="checkbox" class="main-checkbox"
                                                         onchange="toggleSection(this, '<?= 'user' . $key ?>-cd')" name="<?= 'user' . $key ?>_modules" value="3" <?php if (in_array(3, $value['allowed_post_modules'])) { echo 'checked';} ?>>
-                                                    <i class="fas fa-file-alt mr-2"></i>CD statement
+                                                    <i class="mdi mdi-file mr-2"></i>CD statement
                                                 </div>
 
                                                 <div class="<?php if (in_array(3, $value['allowed_post_modules'])) {echo 'checkbox-group';} else {echo 'checkbox-group hidden';} ?>" id="<?= 'user' . $key ?>-cd">
@@ -153,7 +153,7 @@
                                             <div class="section">
                                                 <div class="section-title">
                                                     <input type="checkbox" class="main-checkbox" name="<?= 'user' . $key ?>_modules" value="4" <?php if (in_array(4, $value['allowed_post_modules'])) {echo 'checked';} ?>>
-                                                    <i class="fas fa-clipboard-list mr-2"></i>Claims
+                                                    <i class="mdi mdi-clipboard-text mr-2"></i>Claims
                                                 </div>
                                             </div>
                                         </div>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 8085112c..6016cefb 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -510,6 +510,10 @@
             font-weight: 600!important;
         }
 
+        body{
+            padding-right: 0px !important;
+        }
+
     </style>
 
 
diff --git a/app/Views/leads_dash.php b/app/Views/leads_dash.php
index e6874de1..c8a0beba 100644
--- a/app/Views/leads_dash.php
+++ b/app/Views/leads_dash.php
@@ -136,7 +136,7 @@
         border-radius:25px;
         border:2px solid #09B9BF;
         box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.2);
-        min-width: 250px;
+        min-width: 300px;
     }
 
     #leads-dash-tab{
@@ -166,7 +166,7 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
                 <div class="card dash-card" onclick="hide_and_show_tile(1,1)">
                     <div class="card-block">
                         <h4 class="mb-3">Leads</h4>
-                        <h2 class="span-color"><span><?= isset($lead_data) ? $lead_data['total'] : 0 ?></span>
+                        <h2 ><span class="span-color"><?= isset($lead_data) ? $lead_data['total'] : 0 ?></span>
                         </h2>
                         <h6><span class="text-danger">Lead Tracker</span></h6>
                     </div>
@@ -176,8 +176,8 @@ $isActive = get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID, user_
                 <div class="card dash-card" onclick="hide_and_show_tile(1,2)">
                     <div class="card-block">
                         <h4 class="mb-3">BDS Renewals</h4>
-                        <h2 class="span-color">
-                            <span><?= isset($bds_renewal) ? $bds_renewal['total'] : 0 ?></span>
+                        <h2 >
+                            <span class="span-color"><?= isset($bds_renewal) ? $bds_renewal['total'] : 0 ?></span>
                         </h2>
                         <h6><span class="text-danger">Renewal Tracker</span></h6>
                     </div>
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index 920c1f33..5674bd08 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -148,7 +148,7 @@ table.dataTable tbody td {
                                                     if ($row['is_head_approved'] == 0) {
                                                         echo $row['status'] . '&nbsp;<i class="fa fa-exclamation-triangle" style="color:#cece00;" aria-hidden="true"></i>'; 
                                                     } elseif ($row['is_head_approved'] == 1) {
-                                                        echo $row['status'] . '&nbsp;<i class="fa fa-check-circle" style="color:green;" aria-hidden="true"></i>';
+                                                        echo $row['status'] . '&nbsp;<i class="mdi mdi-check-circle" style="color:green;" aria-hidden="true"></i>';
                                                     } elseif ($row['is_head_approved'] == 2) {
                                                         echo $row['status'] . '&nbsp;<i class="fa fa-times-circle" style="color:red;" aria-hidden="true"></i>';
                                                     } else {

From 12f262e2fa0716c4706078d3591de2abb6e7ff1a Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Wed, 20 Aug 2025 10:12:41 +0530
Subject: [PATCH 04/54] CHANGE_API 3

---
 app/Controllers/ThzController.php | 36 ++++++++++++++++++++++++++++++-
 app/Models/ThzMasterModel.php     | 25 +++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 2ff16099..72f89c03 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -9,6 +9,8 @@ use App\Models\ThzMasterModel;
 use App\Models\ThzMasterNotesModel;
 use App\ControllerCleaners\ThzControllerCleaner;
 use App\Models\UserModel;
+use App\Models\ClientPolicyModel;
+
 
 class ThzController extends BaseController
 {
@@ -19,6 +21,7 @@ class ThzController extends BaseController
     protected $thzControllerCleaner;
 
     protected $userModel;
+    protected $clientPolicyModel;
 
     public function __construct()
     {
@@ -26,6 +29,7 @@ class ThzController extends BaseController
         $this->thzMasterNotesModel  = new ThzMasterNotesModel();
         $this->thzControllerCleaner = new ThzControllerCleaner();
         $this->userModel            = new UserModel();
+        $this->clientPolicyModel    = new ClientPolicyModel();
     }
 
     public function index()
@@ -70,6 +74,7 @@ class ThzController extends BaseController
             $data['page_name'] = "Ticket List";
             $data['ticket_data'] = $tickets;
             $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['1', '5'])->findAll(); // enga 5-"head" and 1-"admin" role person thaan assignee..
+            $data['client_list'] = $this->clientModel->getCreatedByUserName();
             return $this->loadLayout('thz_list', $data);
         }       
 
@@ -81,7 +86,7 @@ class ThzController extends BaseController
 
     public function ticketConversationSave(){
 
-            $data = $this->request->getJSON(true);
+            $data = $this->request->getPost();
 
             $result = $this->thzMasterNotesModel->insert($data);
 
@@ -97,6 +102,35 @@ class ThzController extends BaseController
     
     }
 
+    public function ticketAutoFetchDetails(){
+            $data = $this->request->getPost();
+
+            $client_id = $data['client_id'];
+            $mobile = $data['mobile'];
+
+            if($client_id && $mobile){
+                $details = $this->thzMasterModel->ticketAutoFetchDetails($client_id,$mobile);
+                
+                if(empty($details)){
+                    return $this->response->setJSON((['status' => 'error', 'message' => 'No Data found']))->setStatusCode(400);        
+                }else{
+
+                    $policyIds = array_column($details, 'policy_id');
+                    $policyIds = array_filter($policyIds);
+                    $clientPolicy = $this->clientPolicyModel->whereIn('policy_id', $policyIds)->where('is_active', 1)->get()->getResultArray();
+                    $result['client'] =[];
+
+
+                }
+            }else{
+                return $this->response->setJSON((['status' => 'error', 'message' => 'Client and Mobile Not found']))->setStatusCode(400);
+            }
+            
+            return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
+        
+
+    }
+
     public function ticketConversationList(){
 
             $data = $this->request->getGet();
diff --git a/app/Models/ThzMasterModel.php b/app/Models/ThzMasterModel.php
index 580c6181..b669a360 100644
--- a/app/Models/ThzMasterModel.php
+++ b/app/Models/ThzMasterModel.php
@@ -39,4 +39,29 @@ class ThzMasterModel extends Model
     protected $afterFind      = [];
     protected $beforeDelete   = [];
     protected $afterDelete    = [];
+
+    public function ticketAutoFetchDetails(){
+
+        $autofetch_sql = "SELECT 
+                            employees.id,employees.client_id,
+                            employees.client_branch_id as branch_id,
+                            employees.mobile,
+                            employees.emp_code,
+                            employees.name,
+                            employee_polices.client_policy_id as policy_id
+                    FROM employees
+                    LEFT JOIN employee_polices 
+                           ON employee_polices.employee_id = employees.id
+                    WHERE employees.emp_status IN ('active','draft','enrolled')
+                      AND  employees.is_active = 1
+                      AND  employees.mobile = " . $mobile . "
+                      AND  employees.client_id = " . $client_id . "
+                    ORDER BY employees.id DESC";
+
+        $result = $this->db->query($autofetch_sql)->getResultArray();
+
+        return $result;
+        
+    }
+
 }

From 157caeda039f6a34ffe639ee12af263d7734c2cc Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Wed, 20 Aug 2025 12:41:00 +0530
Subject: [PATCH 05/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-20

---
 app/Controllers/ThzController.php  | 183 +++++++++++++++++++++++++----
 app/Models/ThzMasterNotesModel.php |   2 +-
 app/Views/client_onboarding.php    |   7 +-
 3 files changed, 166 insertions(+), 26 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 2ff16099..65109dc3 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -3,6 +3,7 @@
 namespace App\Controllers;
 
 use App\Controllers\BaseController;
+use App\Helpers\MailHelper;
 use CodeIgniter\HTTP\ResponseInterface;
 
 use App\Models\ThzMasterModel;
@@ -36,16 +37,25 @@ class ThzController extends BaseController
     public function ticketSave(){
 
         $data = $this->request->getPost();
-        // $data = $this->request->getJSON(true);
-        // $return_type = isset($data['return_type']) ? $data['return_type'] : 'api';
+
         if (!empty($data['thz_id'])) {
-            $text = "update";            
+
+            $text   = "update";            
             $result = $this->updateTicket($data);
+            $updateID = $data['thz_id'];
+
         } else {
-            $text = "create";
-            $result = $this->insertTicket($data);
+
+            $text   = "create";
+            $insertID = $this->insertTicket($data);
+            $result = true;
+
         }
 
+        $id = isset($insertID) && !empty($insertID) ? $insertID : $updateID ;
+
+        $this->ticketSaveNotification($data , $insertOrUpdate = $text , $id);
+
         return $this->response->setJSON([ 
                 'status' => $result ? 'success' : 'error',
                 'message' => $result ? "Ticket {$text}d successfully" : "Unable to {$text} ticket. Please try again." 
@@ -124,14 +134,12 @@ class ThzController extends BaseController
 
     }
 
-    public function ticketSaveNotification($data){
-       
-    }
+
 
     public function ticketConversationSaveNotification($data){
 
     }
-    
+
     public function ticketAssigning(){
 
         $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
@@ -201,20 +209,152 @@ class ThzController extends BaseController
                     ->findAll();
     }
 
-    private function notificationBasedOnRole($data){
 
-        $id        = $data['thz_id']    ?? null;
-        $assign_to = $data['assign_to'] ?? null;
-        $mobile    = $data['mobile']    ?? null;
 
-        if (!empty($assign_to)) {
+    private function ticketSaveNotification( $data , $insertOrUpdate , $id){
+       
+        $user_email  = $data['email'] ?? null;
+
+        $assignee_id = $data['assign_to'] ?? null;
+
+        $assignee_email = $this->findAssigneeEmail($assignee_id);
+
+        $emailToNotified = [
+            'user_email' => $user_email,
+            'assignee_email' => $assignee_email 
+        ];
+
+        $ticketId = $id;
+
+         $result = $this->emailNotificationBasedOnRole($emailToNotified , $insertOrUpdate , $ticketId , $data);
+
+         return $result;
+
+    }
+
+    private function findAssigneeEmail($assignee_id){
+
+        $result = $this->userModel->where('id',$assignee_id)->find()->getResultArray();
+
+        $assigneeEmail = $result[0]['email'];
+
+       return $assigneeEmail;
+        
+    }
+
+    private function emailNotificationBasedOnRole($emailToNotified ,  $insertOrUpdate , $ticketId , $data){
+
+        $user_email     = $emailToNotified['user_email'] ?? null;
+        $assignee_email = $emailToNotified['assignee_email'] ?? null;
+
+
+        if (!empty($assignee_email)) {
+
+            switch ($insertOrUpdate) {
+
+                case 'update':
+
+                    $messageUpdated   = "<p>Hi From <b> Nhance Support</b>, 
+                                                <p>Your Assigned  Ticket No -%ticketId%  for Subject - %subject% Updated With Latest Information .   </p> </p>
+                                                <p align='center' >Thank you</p>" ; 
+
+
+                    $from_mail      =  "";
+                    $to_mail        =  $assignee_email;
+                    $cc_string      =  "";
+                    $subject        =  "<p> Ticket Created For %subject% </p>";
+                    $message        =  $messageUpdated ;    
+                    $attachments    =  "";
+                    $reply_to       =  "";
+                    $bcc_string     =  "";
+
+                    $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
+
+                    break;
+                    
+                case 'create':
+
+                    $messageCreated   = "<p>Hi From <b> Nhance Support</b>, 
+                                                <p>Your Assigned With New Ticket No -%ticketId%  for Subject %subject% Updated With Latest Information .   </p> </p>
+                                                <p align='center' >Thank you</p>"; 
+
+                    $from_mail      =  "";
+                    $to_mail        =  $assignee_email;
+                    $cc_string      =  "";
+                    $subject        =  "<p> Ticket Created For %subject% </p>";
+                    $message        =  $messageCreated ;
+                    $attachments    =  "";
+                    $reply_to       =  "";
+                    $bcc_string     =  "";
+
+                    $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
+
+                    
+                    break;
+                
+                default:
+                    # code...
+                    break;
+            }
             
         }
 
-        if (!empty($id) && !empty($mobile)) {
+        if (!empty($user_email)) {
+
+            switch ($insertOrUpdate) {
+
+                case 'update':
+
+                    $messageUpdated   = "<p>Hi From <b> Nhance Support</b>, 
+                                                <p>Your Ticket for Subject %subject% Updated With Latest Information For Your Ticket No %ticketId%. </p> </p>
+                                                <p align='center' >Thank you</p>"; 
+
+                    $from_mail      =  "";
+                    $to_mail        =  $user_email;
+                    $cc_string      =  "";
+                    $subject        =  "<p> Ticket Created For %subject% </p>";
+                    $message        =  $messageUpdated ;
+                    $attachments    =  "";
+                    $reply_to       =  "";
+                    $bcc_string     =  "";
+
+                    $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
+
+                    break;
+                    
+                case 'create':
+
+                    $messageForAssigned     = "<p>Hi From <b> Nhance Support</b>, 
+                                                <p>Your Ticket for Subject %subject% Created and  Assigned To %assignee_email%.  TicketNo - %ticketId% </p> </p>
+                                                <p align='center' >Thank you</p>";
+
+                    $messageForUnAssigned   = "<p>Hi From <b> Nhance Support</b>, 
+                                                <p>Your Ticket for Subject %subject% Created and Will be Assigned Shortly.Here is  Your TicketNo - %ticketId% </p> </p>
+                                                <p align='center' >Thank you</p>"; 
+
+                    $from_mail      =  "";
+                    $to_mail        =  $user_email;
+                    $cc_string      =  "";
+                    $subject        =  "<p> Ticket Created For %subject% </p>";
+                    $message        =  empty($assignee_email) ? $messageForUnAssigned : $messageForAssigned ;
+                    $attachments    =  "";
+                    $reply_to       =  "";
+                    $bcc_string     =  "";
+
+                    $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
+
+                    
+                    break;
+                
+                default:
+                    # code...
+                    break;
+            }
 
         }
 
+        return true;
+
 
     }
 
@@ -228,14 +368,13 @@ class ThzController extends BaseController
 
     }
 
-    private function insertTicket($data){
+private function insertTicket($data)
+{
+    $data['created_by'] = get_session_userid();
+    $this->thzMasterModel->insert($data);
 
-        $data['created_by'] = get_session_userid();
-        $result = $this->thzMasterModel->insert($data);
-
-        return $result;
-
-    }
+    return $this->thzMasterModel->insertID(); // returns the inserted row's ID
+}
 
 
 
diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index 6b738219..af8c8f8b 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -95,7 +95,7 @@ class ThzMasterNotesModel extends Model
                     LEFT JOIN thz_master 
                             ON thz_master.thz_id = thz_master_notes.thz_id 
                         AND LOWER(thz_master_notes.notes_by) = 'user'
-                    WHERE thz_master_notes.thz_id = " . (int)$thz_id . "
+                    WHERE thz_master_notes.thz_id = '.(int)$thz_id.'
                     ORDER BY thz_master_notes.created_at ASC";
 
         $result = $this->db->query($notes_sql)->getResultArray();
diff --git a/app/Views/client_onboarding.php b/app/Views/client_onboarding.php
index 44ee748c..059e07fa 100755
--- a/app/Views/client_onboarding.php
+++ b/app/Views/client_onboarding.php
@@ -570,16 +570,17 @@ body {
             if (otherCard !== card) {
                 const otherContent = otherCard.querySelector('.card-content');
                 const otherIcon = otherCard.querySelector('.accordion-icon i');
-                otherIcon.classList.add('mdi mdi-chevron-down');
+                otherIcon.setAttribute('class', 'mdi mdi-chevron-down');
+
             }
         });
 
         // Toggle current accordion
         content.classList.toggle('active');
         if (content.classList.contains('active')) {
-            icon.classList.add('mdi mdi-chevron-up');
+            icon.classList.setAttribute('class', 'mdi mdi-chevron-up');
         } else {
-            icon.classList.add('mdi mdi-chevron-down');
+            icon.classList.setAttribute('class', 'mdi mdi-chevron-down');
         }
     }
 

From 7e4302b3ecc7c2ee11fdfef422428531596c7eb5 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Wed, 20 Aug 2025 18:02:25 +0530
Subject: [PATCH 06/54] FIX_CODEMERGE

---
 app/Config/Routes.php         |   3 +-
 app/Models/ThzMasterModel.php |  29 +--
 app/Views/layout/header.php   |  33 ++-
 app/Views/thz_list.php        | 426 ++++++++++++++++++++++++----------
 4 files changed, 341 insertions(+), 150 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index ea9c7fc0..105f9836 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -646,4 +646,5 @@ $routes->post("ticketSave", "ThzController::ticketSave");
 $routes->get("ticketList", "ThzController::ticketList");
 $routes->post("ticketConversationSave", "ThzController::ticketConversationSave");
 $routes->get("ticketConversationList", "ThzController::ticketConversationList");
-$routes->get('ticketAssigning',"ThzController::ticketAssigning");
\ No newline at end of file
+$routes->get('ticketAssigning',"ThzController::ticketAssigning");
+$routes->post('ticketAutoFetchDetails',"ThzController::ticketAutoFetchDetails");
\ No newline at end of file
diff --git a/app/Models/ThzMasterModel.php b/app/Models/ThzMasterModel.php
index b669a360..aa33fc32 100644
--- a/app/Models/ThzMasterModel.php
+++ b/app/Models/ThzMasterModel.php
@@ -40,25 +40,18 @@ class ThzMasterModel extends Model
     protected $beforeDelete   = [];
     protected $afterDelete    = [];
 
-    public function ticketAutoFetchDetails(){
+    public function ticketAutoFetchDetails($client_id ,$mobile){
 
-        $autofetch_sql = "SELECT 
-                            employees.id,employees.client_id,
-                            employees.client_branch_id as branch_id,
-                            employees.mobile,
-                            employees.emp_code,
-                            employees.name,
-                            employee_polices.client_policy_id as policy_id
-                    FROM employees
-                    LEFT JOIN employee_polices 
-                           ON employee_polices.employee_id = employees.id
-                    WHERE employees.emp_status IN ('active','draft','enrolled')
-                      AND  employees.is_active = 1
-                      AND  employees.mobile = " . $mobile . "
-                      AND  employees.client_id = " . $client_id . "
-                    ORDER BY employees.id DESC";
-
-        $result = $this->db->query($autofetch_sql)->getResultArray();
+        $result = $this->db->table('employees e')
+                        ->select('e.id, e.email_personal, e.client_id, e.client_branch_id as branch_id, e.mobile, e.emp_code, e.name, ep.client_policy_id as policy_id')
+                        ->join('employee_polices ep', 'ep.employee_id = e.id AND ep.is_active = 1', 'left')
+                        ->whereIn('e.emp_status', ['active', 'draft', 'enrolled'])
+                        ->where('e.is_active', 1)
+                        ->where('e.mobile', $mobile)
+                        ->where('e.client_id', $client_id)
+                        ->groupBy('e.client_id')
+                        ->get()
+                        ->getResultArray();
 
         return $result;
         
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 6016cefb..abfe7759 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -429,6 +429,7 @@
 
         .search-bar input {
             width: 100%;
+            padding-right: 40px; /* make space for the button */
             border-radius: 10px !important;
             background-color: #F4F4F4;
             box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1), 0px 4px 8px rgba(0, 0, 0, 0.2);
@@ -510,9 +511,35 @@
             font-weight: 600!important;
         }
 
-        body{
-            padding-right: 0px !important;
-        }
+  .btn-ternary {
+    color: #fff !important;
+    background-color: #E26728;
+    border-color: #E26728; }
+  .btn-ternary:hover {
+    color: #fff !important;
+    background-color: #B9501F;
+    border-color: #A6471C; }
+  .btn-ternary:focus, .btn-ternary.focus {
+    color: #fff !important;
+    background-color: #B9501F;
+    border-color: #A6471C;
+    box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
+  .btn-ternary.disabled, .btn-ternary:disabled {
+    color: #fff !important;
+    background-color: #E26728;
+    border-color: #E26728; }
+  .btn-ternary:not(:disabled):not(.disabled):active, .btn-ternary:not(:disabled):not(.disabled).active,
+  .show > .btn-ternary.dropdown-toggle {
+    color: #fff !important;
+    background-color: #A6471C;
+    border-color: #933E19; }
+    .btn-ternary:not(:disabled):not(.disabled):active:focus, .btn-ternary:not(:disabled):not(.disabled).active:focus,
+    .show > .btn-ternary:dropdown-toggle:focus {
+      box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
+
+    .btn-border-radius{ .border-radius: 10px !important; }
+
+
 
     </style>
 
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index cc6f4c11..1565e6fa 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -1,12 +1,54 @@
 <style>
-.table th,
+/* .table th,
 .table td {
     padding: 8px;
+} */
+
+table {
+    border-collapse: separate !important; 
+    border-spacing : 0 8px !important; /* spacing only between rows */
 }
 
-table.dataTable tbody td {
-    padding: 4px 4px !important;
+thead {
+    background-color: #00999E; /* header background */
+    color: #fff;
 }
+ 
+thead tr th:first-child {
+    border-top-left-radius: 100px !important;
+    border-bottom-left-radius: 100px !important;
+}
+thead tr th:last-child {
+    border-top-right-radius: 100px !important;
+    border-bottom-right-radius: 100px !important;
+}
+
+tbody tr {
+  background: #F5FFFF;
+  box-shadow: 0 2px 5px rgba(0,0,0,0.08);
+  border-bottom: 6px solid #fff;
+  border-top: 6px solid #fff;
+}
+ 
+tbody td {
+    padding: 12px;
+    border-top: 1px solid #eee;
+    border-bottom: 1px solid #eee;
+}
+
+thead tr th:first-child {
+    border-top-left-radius: 100px !important;
+    border-bottom-left-radius: 100px !important;
+}
+thead tr th:last-child {
+    border-top-right-radius: 100px !important;
+    border-bottom-right-radius: 100px !important;
+}
+
+
+/* table.dataTable tbody td {
+    padding: 4px 4px !important;
+} */
 
 .col-12 {
 
@@ -17,13 +59,16 @@ table.dataTable tbody td {
     position: absolute;
 }
 
+.dataTables_filter input {
+    padding-right: 30px; /* space for icon */
+    background: url('https://cdn.jsdelivr.net/npm/@mdi/svg/svg/magnify.svg') no-repeat right 8px center;
+    background-size: 16px;
+}
+
 .right-align-input {
     text-align: right;
 }
 
-.addbtnStyle {
-    margin-left: 20px !important;
-}
 </style>
 <style>
 .table th:nth-child(1),
@@ -54,7 +99,7 @@ table.dataTable tbody td {
             </div>
             <div class="table-responsive">
                 <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
-                    <thead class="bg-light">
+                    <thead>
                         <tr>
                             <th>Ticket Number</th>
                             <th>Name</th>
@@ -131,28 +176,58 @@ table.dataTable tbody td {
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content">
       <form id="ticketForm">
-        <div class="modal-header">
+        <!-- <div class="modal-header">
           <h4 class="modal-title" id="modalLabel">New Ticket</h4>
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        </div> -->
+        <div class="modal-header flex-column">
+
+              <!-- first row -->
+              <div class="d-flex w-100 justify-content-between align-items-center">
+                <h4 class="modal-title mb-0" id="modalLabel">New Ticket</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+              </div>
+
+              <!-- second row -->
+              <div class="form-row mt-3 w-100">
+                <div class="form-group col-md-6">
+                  <label for="client_id">Client</label>
+                  <select class="form-control" id="client_id" name="client_id">
+                    <option value="">Select Client</option>
+                    <?php if(isset($client_list)) { ?>
+                    <?php foreach ($client_list as $c) { ?>
+                      <option value="<?= $c->id ?>"><?= $c->client_name ?> (<?= $c->short_name ?>) </option>
+                    <?php } ?>
+                  <?php } ?>
+                  </select>
+                </div>
+
+                <div class="form-group col-md-5">
+                  <label for="mobile">Mobile<span class="text-danger">*</span></label>
+                  <input type="text" class="form-control" id="mobile" 
+                        name="mobile" placeholder="Enter Mobile"
+                        pattern="^[0-9]{10}$" required
+                        title="Please enter a valid 10-digit mobile number">
+                </div>
+
+                <div class="form-group col-md-1" style="padding:27.5px 0 0 0;">
+                  <button type="button" class="btn btn-primary" style="padding: 0 10px !important; border-radius:13px;" onclick="getAutoFetchDetails()"><i class="mdi mdi-cached" style="font-size:24px; color:#fff !important;"></i></button>
+                </div>
+              </div>
         </div>
-        <div class="modal-body">
+                
+        <div class="modal-body">    
           <div class="form-row">
             <input type="hidden" id="thz_id" name="thz_id">
             <input type="hidden" id="return_type" name="return_type">
+            <input type="hidden" id="branch_id" name="branch_id">
+            <input type="hidden" id="policy_id" name="policy_id">
 
             <div class="form-group col-md-6">
               <label for="name">Name<span class="text-danger">*</span></label>
               <input type="text" class="form-control" id="name" name="name" placeholder="Enter Name" required>
             </div>
 
-            <div class="form-group col-md-6">
-              <label for="mobile">Mobile<span class="text-danger">*</span></label>
-              <input type="text" class="form-control" id="mobile" 
-                     name="mobile" placeholder="Enter Mobile"
-                     pattern="^[0-9]{10}$" required
-                     title="Please enter a valid 10-digit mobile number">
-            </div>
-
             <div class="form-group col-md-6">
               <label for="email">Email Id<span class="text-danger">*</span></label>
               <input type="email" class="form-control" id="email" 
@@ -169,7 +244,9 @@ table.dataTable tbody td {
 
             <div class="form-group col-md-6">
               <label for="policy_no">Policy Number</label>
-              <input type="text" class="form-control" id="policy_no" name="policy_no" placeholder="Enter Policy Number">
+                <select class="form-control" id="policy_no" name="policy_no" onchange="changevalue()">
+                  <option value="" selected data-id="">Select Policy</option>
+                </select>
             </div>
 
             <div class="form-group col-md-6">
@@ -181,18 +258,8 @@ table.dataTable tbody td {
               </select>
             </div>
 
-            <div class="form-group col-md-6">
-              <label for="subject">Subject</label>
-              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject">
-            </div>
 
-            <div class="form-group col-md-6">
-              <label for="message">Message</label>
-              <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
-              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4"></textarea>
-            </div>
-
-            <div class="form-group col-md-6">
+            <!-- <div class="form-group col-md-6">
               <label for="status">Status</label>
               <select class="form-control" id="status" name="status">
                 <option value="">Select Status</option>
@@ -201,7 +268,7 @@ table.dataTable tbody td {
                 <option value="Resolved">Resolved</option>
                 <option value="Closed">Closed</option>
               </select>
-            </div>
+            </div> -->
 
             <div class="form-group col-md-6">
               <label for="assign_to">Assign To</label>
@@ -215,10 +282,21 @@ table.dataTable tbody td {
               </select>
             </div>
 
+            <div class="form-group col-md-12">
+              <label for="subject">Subject</label>
+              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject">
+            </div>
+
+            <div class="form-group col-md-12">
+              <label for="message">Message</label>
+              <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
+              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4"></textarea>
+            </div>
+
           </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-primary" onclick="submitTicket()">Submit</button>
+          <button type="button" class="btn btn-ternary btn-border-radius" onclick="submitTicket()">Save</button>
         </div>
       </form>
     </div>
@@ -250,7 +328,7 @@ table.dataTable tbody td {
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary" onclick="updateAssignTo()">Submit</button>
+        <button type="button" class="btn btn-ternary btn-border-radius" onclick="updateAssignTo()">Save</button>
       </div>
     </div>
   </div>
@@ -264,79 +342,73 @@ table.dataTable tbody td {
         form.reset(); 
         document.getElementById('thz_id').value = '';
         document.getElementById('modalLabel').innerText = "New Ticket";
-        document.getElementById('return_type').innerText = "WEB";
+        document.getElementById('return_type').innerText = "Web";
         var myModal = new bootstrap.Modal(document.getElementById('ticketModal'));
         myModal.show();
     }
 
     function submitTicket() {
-    var form = document.getElementById('ticketForm');
+        var form = document.getElementById('ticketForm');
 
-    // reset any old error styles
-    form.classList.remove('was-validated');
+        // reset any old error styles
+        form.classList.remove('was-validated');
 
+        var name       = document.getElementById('name').value.trim();
+        var mobile     = document.getElementById('mobile').value.trim();
+        var email      = document.getElementById('email').value.trim();
+        var ticketType = document.getElementById('ticket_type').value.trim();
 
-    var name      = document.getElementById('name').value.trim();
-    var mobile    = document.getElementById('mobile').value.trim();
-    var email     = document.getElementById('email').value.trim();
-    var ticketType= document.getElementById('ticket_type').value.trim();
+        // Validation checks
+        if (name === "" || mobile === "" || email === "" || ticketType === "") {
+            toastr.warning('Please fill all required fields.', 'warning');
+            form.classList.add('was-validated');
+            return;
+        }
 
+        var mobilePattern = /^[0-9]{10}$/;
+        if (!mobilePattern.test(mobile)) {
+            toastr.warning('Please enter a valid 10-digit mobile number.', 'warning');
+            document.getElementById('mobile').focus();
+            return;
+        }
+
+        var emailPattern = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
+        if (!emailPattern.test(email)) {
+            toastr.warning('Please enter a valid email address.', 'warning');
+            document.getElementById('email').focus();
+            return;
+        }
+
+        var form = document.getElementById("ticketForm"); // your form ID
+        var formData = new FormData(form);
+
+        $.ajax({
+            url: "<?= base_url('ticketSave') ?>",
+            type: "POST",
+            data: formData,
+            processData: false,   
+            contentType: false,   
+            dataType: 'json',
+            success: function(response) {
+                if (response.status === "success") {
+                    toastr.success(response.message, 'success');
+                    $('#ticketModal').modal('hide');
+                    form.reset();
+                    window.location.href = "<?= base_url('ticketList?return_type=web') ?>";
+                } else {
+                    toastr.error(response.message, 'error');
+                }
+            },
+            error: function(xhr) {
+                toastr.error("Something went wrong!", 'error');
+                console.error(xhr.responseText);
+            }
+        });
+    }
     
-    if (name === "" || mobile === "" || email === "" || ticketType === "") {
-        toastr.warning('Please fill all required fields.', 'warning');
-        form.classList.add('was-validated');
-        return;
-    }
-
-    var mobilePattern = /^[0-9]{10}$/;
-    if (!mobilePattern.test(mobile)) {
-        toastr.warning('Please enter a valid 10-digit mobile number.', 'warning');
-        document.getElementById('mobile').focus();
-        return;
-    }
-
-    var emailPattern = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
-    if (!emailPattern.test(email)) {
-        toastr.warning('Please enter a valid email address.', 'warning');
-        document.getElementById('email').focus();
-        return;
-    }
-
-    var form = document.getElementById("ticketForm"); // your form ID
-    var formData = new FormData(form);
-
-    let obj = {};
-    formData.forEach((value, key) => obj[key] = value);
-    // obj["return_type"] = "web";
-
-      $.ajax({
-          url: "<?= base_url('ticketSave') ?>",
-          type: "POST",
-          data: JSON.stringify(obj),   
-          contentType: "application/json", 
-          dataType: 'json',
-          success: function(response) {
-              if (response.status === "success") {
-                  toastr.success(response.message, 'success');
-                  $('#ticketModal').modal('hide');
-                  form.reset();
-                  window.location.href = "<?= base_url('ticketList?return_type=web') ?>";
-              } else {
-                  toastr.error(response.message, 'error');
-              }
-          },
-          error: function(xhr) {
-              toastr.error("Something went wrong!", 'error');
-              console.error(xhr.responseText);
-          }
-      });
-
-
-}
-
-    
-
+</script>
 
+<script>
 
     function openAssignee(button) {
       document.getElementById('hidden_thz_id').value = "";
@@ -354,7 +426,93 @@ table.dataTable tbody td {
       var myModal = new bootstrap.Modal(document.getElementById('AssignModal'));
       myModal.show();
     }
+</script>
 
+<script>
+  function getAutoFetchDetails() {
+    var client_id = document.getElementById('client_id').value.trim();
+    var mobile    = document.getElementById('mobile').value.trim();
+
+    // reset fields
+    document.getElementById('name').value     = "";
+    document.getElementById('email').value    = "";
+    document.getElementById('empcode').value  = "";
+    document.getElementById('branch_id').value = "";
+    document.getElementById('policy_id').value = "";
+
+    // reset select dropdown
+    var policySelect = document.getElementById('policy_no');
+    policySelect.innerHTML = '<option value="" data-id="">Select Policy</option>';
+
+    if (client_id === "") {
+        toastr.warning('Please Select Client.', 'warning');
+        return;
+    }
+
+    if (mobile === "") {
+        toastr.warning('Please Enter a mobile number.', 'warning');
+        return;
+    }
+
+    var mobilePattern = /^[0-9]{10}$/;
+    if (!mobilePattern.test(mobile)) {
+        toastr.warning('Please enter a valid 10-digit mobile number.', 'warning');
+        document.getElementById('mobile').focus();
+        return;
+    }
+
+    $.ajax({
+        url: "<?= base_url('ticketAutoFetchDetails') ?>",
+        type: "POST",
+        data: { client_id: client_id, mobile: mobile },
+        dataType: 'json',
+        success: function(response) {
+            if (response.status === "success") {
+                let client = response.data.client_details[0];
+                let policies = response.data.policy_details; 
+
+                document.getElementById('name').value    = client.name || "";
+                document.getElementById('email').value   = client.email_personal || "";
+                document.getElementById('empcode').value = client.emp_code || "";
+                document.getElementById('branch_id').value = client.branch_id || "";
+
+                if (policies && policies.length > 0) {
+                      policies.forEach(function(p) {
+                          let opt = document.createElement("option");
+                          opt.value = p.policy_no;
+                          opt.text  = p.policy_no;
+                          opt.setAttribute("data-id", p.policy_id);
+                          policySelect.appendChild(opt);
+                      });
+
+                      // If you want to auto-select the first real policy instead of "Select Policy"
+                      policySelect.value = policies[0].policy_no;
+                      document.getElementById('policy_no').value = policies[0].policy_no || "";
+                      document.getElementById('policy_id').value = policies[0].policy_id;
+                }
+            } else {
+                toastr.warning(response.message || "No details found.", 'warning');
+            }
+        },
+        error: function(xhr) {
+            toastr.error("Something went wrong!", 'error');
+            console.error(xhr.responseText);
+        }
+    });
+}
+
+</script>
+
+<script>
+  function changevalue() {
+      var select = document.getElementById('policy_no');
+      var selectedOption = select.options[select.selectedIndex];
+      var policyId = selectedOption.getAttribute("data-id");
+      document.getElementById('policy_id').value = policyId || "";
+  }
+</script>
+
+<script>
 
     function updateAssignTo(){
         console.log('function called then call the api then refresh the updateAssignTo');
@@ -370,9 +528,11 @@ table.dataTable tbody td {
 $(document).ready(function() {
     $('[data-toggle="tooltip"]').tooltip();
     // Initialize select2
+    $("#client_id").select2();
     $("#ticket_type").select2();
     $("#status").select2();
     $("#assign_to").select2();
+    $("#policy_no").select2();
     $("#modal_assignee").select2();
 });
 
@@ -380,43 +540,53 @@ $(document).ready(function() {
 $(document).ready(function() {
 
     var ticketsTable = $('#scroll-horizontal-datatable');
+    $('#scroll-horizontal-datatable_filter').prepend('<i class="mdi mdi-magnify"></i>');
 
     if (ticketsTable.length) {
 
-        ticketsTable.DataTable({
-            scrollX: true,
-            dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
-                "<'row'<'col-sm-12'tr>>" +
-                "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
-            buttons: [{
-                    extend: 'csv',
-                    text: 'CSV',
-                    title: 'ticket-List',
-                },
-                {
-                    extend: 'excel',
-                    text: 'Excel',
-                    title: 'ticket-List',
-                    exportOptions: {
-                        orthogonal: 'sort'
-                    },
-                },
-                {
-                    text: 'New ticket',
-                    className: 'buttons-html5 addbtnStyle',
-                    action: function(e, dt, node, config) { 
-                        openTicket()
-                    }
-                }
-            ],
-            language: {
-                search: "_INPUT_",
-                searchPlaceholder: "Search..."
-            },
-            paging: true, // Enable pagination
-            pageLength: 25, // Set default number of rows per page (optional)
-            ordering: false,
-        });
+      ticketsTable.DataTable({
+          scrollX: true,
+          dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + 
+              "<'row'<'col-sm-12'tr>>" +
+              "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
+          buttons: [
+              {
+                  text: '<i class="mdi mdi-plus"></i> Create New Ticket',
+                  className: 'btn btn-ternary btn-border-radius text-white mr-2',
+                  attr:  { style: "color:#fff !important;" },
+                  action: function(e, dt, node, config) { 
+                      openTicket();
+                  }
+              },
+              {
+                  extend: 'collection',
+                  text: ' Export <i class="mdi mdi-menu-down"></i>',
+                  buttons: [
+                      {
+                          extend: 'csv',
+                          text: 'CSV',
+                          title: 'ticket-List'
+                      },
+                      {
+                          extend: 'excel',
+                          text: ' Excel',
+                          title: 'ticket-List',
+                          exportOptions: {
+                              orthogonal: 'sort'
+                          }
+                      }
+                  ]
+              }
+          ],
+          language: {
+              search: "_INPUT_",
+              searchPlaceholder: "Search..."
+          },
+          paging: true,
+          pageLength: 25,
+          ordering: false,
+      });
+
     } else {
         console.error("Table Not found.");
     }

From 66e9fc6ffc6651d8288c6c0f5021feca822d5a39 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Wed, 20 Aug 2025 18:36:44 +0530
Subject: [PATCH 07/54] FIX_error fixed

---
 app/Controllers/ThzController.php  | 19 ++++++++-----------
 app/Models/ThzMasterNotesModel.php |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index fcf68c4b..8c521de2 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -119,7 +119,8 @@ class ThzController extends BaseController
             $mobile = $data['mobile'];
 
             if($client_id && $mobile){
-                $details = $this->thzMasterModel->ticketAutoFetchDetails($client_id,$mobile);
+                
+                $details = $this->thzMasterModel->ticketAutoFetchDetails($client_id ,$mobile);
                 
                 if(empty($details)){
                     return $this->response->setJSON((['status' => 'error', 'message' => 'No Data found']))->setStatusCode(400);        
@@ -128,8 +129,8 @@ class ThzController extends BaseController
                     $policyIds = array_column($details, 'policy_id');
                     $policyIds = array_filter($policyIds);
                     $clientPolicy = $this->clientPolicyModel->whereIn('policy_id', $policyIds)->where('is_active', 1)->get()->getResultArray();
-                    $result['client'] =[];
-
+                    $result['client_details'] = $details;
+                    $result['policy_details'] = empty($clientPolicy)  ? [] : $clientPolicy ;
 
                 }
             }else{
@@ -145,7 +146,7 @@ class ThzController extends BaseController
 
             $data = $this->request->getGet();
 
-            $thz_id = $data['thz_id'] ?? null;
+            $thz_id = $data['thz_id'] ?? null;            
 
             if($thz_id){
                 $result['master'] = $this->thzMasterModel
@@ -168,8 +169,6 @@ class ThzController extends BaseController
 
     }
 
-
-
     public function ticketConversationSaveNotification($data){
 
     }
@@ -268,11 +267,9 @@ class ThzController extends BaseController
 
     private function findAssigneeEmail($assignee_id){
 
-        $result = $this->userModel->where('id',$assignee_id)->find()->getResultArray();
-
-        $assigneeEmail = $result[0]['email'];
-
-       return $assigneeEmail;
+        $row = $this->userModel->where('id', $assignee_id)->get()->getRow();
+        $assigneeEmail = $row ? $row->email : null;
+       return $assigneeEmail ? $assigneeEmail : "";
         
     }
 
diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index af8c8f8b..6b738219 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -95,7 +95,7 @@ class ThzMasterNotesModel extends Model
                     LEFT JOIN thz_master 
                             ON thz_master.thz_id = thz_master_notes.thz_id 
                         AND LOWER(thz_master_notes.notes_by) = 'user'
-                    WHERE thz_master_notes.thz_id = '.(int)$thz_id.'
+                    WHERE thz_master_notes.thz_id = " . (int)$thz_id . "
                     ORDER BY thz_master_notes.created_at ASC";
 
         $result = $this->db->query($notes_sql)->getResultArray();

From e97d6230211286f9e780d1e4edf4ac3e3a250b58 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Wed, 20 Aug 2025 18:46:57 +0530
Subject: [PATCH 08/54] FIX_refix

---
 app/Controllers/ThzController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 8c521de2..1d3b7f4a 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -71,9 +71,11 @@ class ThzController extends BaseController
 
         $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
         
+        
         $data = $this->request->getGet();
 
         $tickets = $this->fetchTicketsBasedOnrole($data);
+        
 
         if ($returnType === 'api') {
             if (empty($tickets)) {

From ef3dc17ccabad3a731354eda2cb7466d97dd9ef7 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Wed, 20 Aug 2025 18:49:50 +0530
Subject: [PATCH 09/54] FIX_Clientmodel missing

---
 app/Controllers/ThzController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 1d3b7f4a..e2f86646 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -11,6 +11,7 @@ use App\Models\ThzMasterNotesModel;
 use App\ControllerCleaners\ThzControllerCleaner;
 use App\Models\UserModel;
 use App\Models\ClientPolicyModel;
+use App\Models\ClientModel;
 
 
 class ThzController extends BaseController
@@ -23,6 +24,7 @@ class ThzController extends BaseController
 
     protected $userModel;
     protected $clientPolicyModel;
+    protected $clientModel;
 
     public function __construct()
     {
@@ -31,6 +33,7 @@ class ThzController extends BaseController
         $this->thzControllerCleaner = new ThzControllerCleaner();
         $this->userModel            = new UserModel();
         $this->clientPolicyModel    = new ClientPolicyModel();
+        $this->clientModel          = new ClientModel();
     }
 
     public function index()

From b876f73d901291e2a072bc86719834e6c19563be Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 09:16:25 +0530
Subject: [PATCH 10/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 134 ++++++++++++------------------
 1 file changed, 53 insertions(+), 81 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index fcf68c4b..b9cf2967 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -11,6 +11,7 @@ use App\Models\ThzMasterNotesModel;
 use App\ControllerCleaners\ThzControllerCleaner;
 use App\Models\UserModel;
 use App\Models\ClientPolicyModel;
+use App\Models\TicketMailTemplateModel;
 
 
 class ThzController extends BaseController
@@ -24,13 +25,16 @@ class ThzController extends BaseController
     protected $userModel;
     protected $clientPolicyModel;
 
+    protected $ticketMailTemplateModel;
+
     public function __construct()
     {
-        $this->thzMasterModel       = new ThzMasterModel();
-        $this->thzMasterNotesModel  = new ThzMasterNotesModel();
-        $this->thzControllerCleaner = new ThzControllerCleaner();
-        $this->userModel            = new UserModel();
-        $this->clientPolicyModel    = new ClientPolicyModel();
+        $this->thzMasterModel           = new ThzMasterModel();
+        $this->thzMasterNotesModel      = new ThzMasterNotesModel();
+        $this->thzControllerCleaner     = new ThzControllerCleaner();
+        $this->userModel                = new UserModel();
+        $this->clientPolicyModel        = new ClientPolicyModel();
+        $this->ticketMailTemplateModel  = new TicketMailTemplateModel();
     }
 
     public function index()
@@ -58,11 +62,12 @@ class ThzController extends BaseController
 
         $id = isset($insertID) && !empty($insertID) ? $insertID : $updateID ;
 
-        $this->ticketSaveNotification($data , $insertOrUpdate = $text , $id);
+        $emailNotificationResult = $this->ticketSaveNotification($data , $insertOrUpdate = $text , $id);
 
         return $this->response->setJSON([ 
                 'status' => $result ? 'success' : 'error',
-                'message' => $result ? "Ticket {$text}d successfully" : "Unable to {$text} ticket. Please try again." 
+                'message' => $result ? "Ticket {$text}d successfully " : "Unable to {$text} ticket. Please try again." ,
+                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed..!!'
                 ])->setStatusCode($result ? 200 : 400);
     }
     
@@ -260,7 +265,7 @@ class ThzController extends BaseController
 
         $ticketId = $id;
 
-         $result = $this->emailNotificationBasedOnRole($emailToNotified , $insertOrUpdate , $ticketId , $data);
+         $result = $this->ticketSaveEmailNotificationBasedOnRole($emailToNotified , $insertOrUpdate , $ticketId , $data);
 
          return $result;
 
@@ -276,7 +281,7 @@ class ThzController extends BaseController
         
     }
 
-    private function emailNotificationBasedOnRole($emailToNotified ,  $insertOrUpdate , $ticketId , $data){
+    private function ticketSaveEmailNotificationBasedOnRole($emailToNotified ,  $insertOrUpdate , $ticketId , $data){
 
         $user_email     = $emailToNotified['user_email'] ?? null;
         $assignee_email = $emailToNotified['assignee_email'] ?? null;
@@ -288,41 +293,13 @@ class ThzController extends BaseController
 
                 case 'update':
 
-                    $messageUpdated   = "<p>Hi From <b> Nhance Support</b>, 
-                                                <p>Your Assigned  Ticket No -%ticketId%  for Subject - %subject% Updated With Latest Information .   </p> </p>
-                                                <p align='center' >Thank you</p>" ; 
-
-
-                    $from_mail      =  "";
-                    $to_mail        =  $assignee_email;
-                    $cc_string      =  "";
-                    $subject        =  "<p> Ticket Created For %subject% </p>";
-                    $message        =  $messageUpdated ;    
-                    $attachments    =  "";
-                    $reply_to       =  "";
-                    $bcc_string     =  "";
-
-                    $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
+                    $this->sendEmail( 'ticket_save_update_assignee', $data ,$assignee_email , $ticketId ) ;
 
                     break;
                     
                 case 'create':
 
-                    $messageCreated   = "<p>Hi From <b> Nhance Support</b>, 
-                                                <p>Your Assigned With New Ticket No -%ticketId%  for Subject %subject% Updated With Latest Information .   </p> </p>
-                                                <p align='center' >Thank you</p>"; 
-
-                    $from_mail      =  "";
-                    $to_mail        =  $assignee_email;
-                    $cc_string      =  "";
-                    $subject        =  "<p> Ticket Created For %subject% </p>";
-                    $message        =  $messageCreated ;
-                    $attachments    =  "";
-                    $reply_to       =  "";
-                    $bcc_string     =  "";
-
-                    $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
-
+                    $this->sendEmail( 'ticket_save_create_assignee', $data ,$assignee_email , $ticketId ) ;
                     
                     break;
                 
@@ -338,45 +315,16 @@ class ThzController extends BaseController
             switch ($insertOrUpdate) {
 
                 case 'update':
-
-                    $messageUpdated   = "<p>Hi From <b> Nhance Support</b>, 
-                                                <p>Your Ticket for Subject %subject% Updated With Latest Information For Your Ticket No %ticketId%. </p> </p>
-                                                <p align='center' >Thank you</p>"; 
-
-                    $from_mail      =  "";
-                    $to_mail        =  $user_email;
-                    $cc_string      =  "";
-                    $subject        =  "<p> Ticket Created For %subject% </p>";
-                    $message        =  $messageUpdated ;
-                    $attachments    =  "";
-                    $reply_to       =  "";
-                    $bcc_string     =  "";
-
-                    $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
-
-                    break;
+                     $this->sendEmail( 'ticket_save_update_user', $data ,$user_email , $ticketId ) ;
+                     break;
                     
                 case 'create':
 
-                    $messageForAssigned     = "<p>Hi From <b> Nhance Support</b>, 
-                                                <p>Your Ticket for Subject %subject% Created and  Assigned To %assignee_email%.  TicketNo - %ticketId% </p> </p>
-                                                <p align='center' >Thank you</p>";
-
-                    $messageForUnAssigned   = "<p>Hi From <b> Nhance Support</b>, 
-                                                <p>Your Ticket for Subject %subject% Created and Will be Assigned Shortly.Here is  Your TicketNo - %ticketId% </p> </p>
-                                                <p align='center' >Thank you</p>"; 
-
-                    $from_mail      =  "";
-                    $to_mail        =  $user_email;
-                    $cc_string      =  "";
-                    $subject        =  "<p> Ticket Created For %subject% </p>";
-                    $message        =  empty($assignee_email) ? $messageForUnAssigned : $messageForAssigned ;
-                    $attachments    =  "";
-                    $reply_to       =  "";
-                    $bcc_string     =  "";
-
-                    $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
-
+                    if(empty($assignee_email)){
+                        $this->sendEmail( 'ticket_save_create_user_unassigned', $data ,$user_email , $ticketId ) ;
+                    }else{
+                         $this->sendEmail( 'ticket_save_create_user_assigned', $data , $user_email , $ticketId ) ;
+                    }
                     
                     break;
                 
@@ -402,13 +350,37 @@ class ThzController extends BaseController
 
     }
 
-private function insertTicket($data)
-{
-    $data['created_by'] = get_session_userid();
-    $this->thzMasterModel->insert($data);
+    private function insertTicket($data)
+    {
+        $data['created_by'] = get_session_userid();
+        $this->thzMasterModel->insert($data);
 
-    return $this->thzMasterModel->insertID(); // returns the inserted row's ID
-}
+        return $this->thzMasterModel->insertID(); // returns the inserted row's ID
+    }
+
+
+    private function sendEmail( $templateName, $data , $to_email , $ticketId){
+        
+        $mail    =  $this->ticketMailTemplateModel->where('template_name',$templateName )->findAll();
+
+        $mail['subject'] = str_replace('%subject%', $data['subject'] ?? '', $mail['subject']);
+
+        $mail['mail_content'] = str_replace('%subject%', $data['subject'] ?? '', $mail['mail_content']);
+
+        $mail['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mail['mail_content']);
+
+        $from_mail      =  "";
+        $to_mail        =  $to_email;
+        $cc_string      =  "";
+        $subject        =  $mail['subject']      ;
+        $message        =  $mail['mail_content'] ;
+        $attachments    =  "";
+        $reply_to       =  "";
+        $bcc_string     =  "";
+
+        $res = MailHelper::send_email(['from_mail' => $from_mail, 'mail' => $to_mail , 'cc' => $cc_string, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_string]);
+
+    }
 
 
 

From ba95c0764297921e9aaea1906c2721555ce5e735 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 09:46:27 +0530
Subject: [PATCH 11/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 87d7f2bc..564cde2a 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -363,7 +363,11 @@ class ThzController extends BaseController
 
     private function sendEmail( $templateName, $data , $to_email , $ticketId){
         
-        $mail    =  $this->ticketMailTemplateModel->where('template_name',$templateName )->findAll();
+        $mail    =  $this->ticketMailTemplateModel->where('template_name',$templateName )->findAll()[0] ?? [];
+
+        if(empty($mail)){
+            return ;
+        }
 
         $mail['subject'] = str_replace('%subject%', $data['subject'] ?? '', $mail['subject']);
 

From 9fc5a33d610c27fc22b1387f70ce3c7050534bc8 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 11:19:06 +0530
Subject: [PATCH 12/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 53 +++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 564cde2a..123c06da 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -114,10 +114,13 @@ class ThzController extends BaseController
                 return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
             }
 
+            $emailNotificationResult = $this->ticketConversationSaveNotification($data);
+
             
             return $this->response->setJSON([ 
                 'status' => $result ? 'success' : 'error',
-                'message' => $result ? "Ticket Notes created successfully" : "Unable to create ticket notes. Please try again." 
+                'message' => $result ? "Ticket Notes created successfully" : "Unable to create ticket notes. Please try again." ,
+                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed..!!'
                 ])->setStatusCode($result ? 200 : 400);
     
     }
@@ -179,10 +182,6 @@ class ThzController extends BaseController
 
     }
 
-    public function ticketConversationSaveNotification($data){
-
-    }
-
     public function ticketAssigning(){
 
         $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
@@ -275,6 +274,32 @@ class ThzController extends BaseController
 
     }
 
+    private function ticketConversationSaveNotification($data){
+
+        $thz_id = $data['thz_id'] ;
+
+        $user_email  = $data['email'] ?? '';
+        
+        $assignee_email = $this->findAssigneeEmail($data['assign_to']) ?? '';
+
+        $sender_mail    =  $data['notes_by'] == "User" ? $user_email        : $assignee_email ;
+        $receiver_mail   =  $data['notes_by'] == "User" ? $assignee_email    : $user_email ;
+
+        $templateName   = "ticket_conversation_save_notification";
+
+        $to_email       = $receiver_mail;
+
+        $ticketId       = $thz_id;
+
+        $message        = $data['notes'] ?? '';
+
+        $this->sendEmail( $templateName, $data , $to_email , $ticketId , $message);
+
+        return true;
+
+    }
+
+
     private function findAssigneeEmail($assignee_id){
 
         $row = $this->userModel->where('id', $assignee_id)->get()->getRow();
@@ -361,25 +386,27 @@ class ThzController extends BaseController
     }
 
 
-    private function sendEmail( $templateName, $data , $to_email , $ticketId){
+    private function sendEmail( $templateName, $data , $to_email , $ticketId , $message = ""){
         
-        $mail    =  $this->ticketMailTemplateModel->where('template_name',$templateName )->findAll()[0] ?? [];
+        $mailTemplate    =  $this->ticketMailTemplateModel->where('template_name',$templateName )->findAll()[0] ?? [];
 
-        if(empty($mail)){
+        if(empty($mailTemplate)){
             return ;
         }
 
-        $mail['subject'] = str_replace('%subject%', $data['subject'] ?? '', $mail['subject']);
+        $mailTemplate['subject'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['subject']);
 
-        $mail['mail_content'] = str_replace('%subject%', $data['subject'] ?? '', $mail['mail_content']);
+        $mailTemplate['mail_content'] = str_replace('%subject%', $data['subject'] ?? '', $mailTemplate['mail_content']);
 
-        $mail['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mail['mail_content']);
+        $mailTemplate['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%message%', $message ?? '', $mailTemplate['mail_content']);
 
         $from_mail      =  "";
         $to_mail        =  $to_email;
         $cc_string      =  "";
-        $subject        =  $mail['subject']      ;
-        $message        =  $mail['mail_content'] ;
+        $subject        =  $mailTemplate['subject']      ;
+        $message        =  $mailTemplate['mail_content'] ;
         $attachments    =  "";
         $reply_to       =  "";
         $bcc_string     =  "";

From e487e55ed2505bfb583def0f1078a10f4dd0d69f Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 11:49:37 +0530
Subject: [PATCH 13/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 123c06da..51b46be8 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -276,11 +276,13 @@ class ThzController extends BaseController
 
     private function ticketConversationSaveNotification($data){
 
-        $thz_id = $data['thz_id'] ;
+        $thz_id = $data['thz_id'] ; // thz is alias of ticket
+
+        $assignee_id = $this->findAssigneeId($data['thz_id']) ;
 
         $user_email  = $data['email'] ?? '';
         
-        $assignee_email = $this->findAssigneeEmail($data['assign_to']) ?? '';
+        $assignee_email = $this->findAssigneeEmail($assignee_id) ?? '';
 
         $sender_mail    =  $data['notes_by'] == "User" ? $user_email        : $assignee_email ;
         $receiver_mail   =  $data['notes_by'] == "User" ? $assignee_email    : $user_email ;
@@ -308,6 +310,12 @@ class ThzController extends BaseController
         
     }
 
+    private function findAssigneeId($ticketId){
+        $row = $this->userModel->where('thz_id', $ticketId)->get()->getRow();
+        $assigneeId = $row ? $row->assign_to : null;
+        return $assigneeId ? $assigneeId : 0 ;
+    }
+
     private function ticketSaveEmailNotificationBasedOnRole($emailToNotified ,  $insertOrUpdate , $ticketId , $data){
 
         $user_email     = $emailToNotified['user_email'] ?? null;

From 9fc435d5c02c58332aa89cfddee25305ca02ada7 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 11:53:50 +0530
Subject: [PATCH 14/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 51b46be8..93b0c161 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -284,7 +284,7 @@ class ThzController extends BaseController
         
         $assignee_email = $this->findAssigneeEmail($assignee_id) ?? '';
 
-        $sender_mail    =  $data['notes_by'] == "User" ? $user_email        : $assignee_email ;
+        $sender_mail     =  $data['notes_by'] == "User" ? $user_email        : $assignee_email ;
         $receiver_mail   =  $data['notes_by'] == "User" ? $assignee_email    : $user_email ;
 
         $templateName   = "ticket_conversation_save_notification";
@@ -311,7 +311,7 @@ class ThzController extends BaseController
     }
 
     private function findAssigneeId($ticketId){
-        $row = $this->userModel->where('thz_id', $ticketId)->get()->getRow();
+        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
         $assigneeId = $row ? $row->assign_to : null;
         return $assigneeId ? $assigneeId : 0 ;
     }

From a6e06596ad4b6533bad6a201b848c3c48259b1c2 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 14:29:44 +0530
Subject: [PATCH 15/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

---
 app/Config/Routes.php             |  1 -
 app/Controllers/ThzController.php | 55 +++++++++++++------------------
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 105f9836..609245b4 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -646,5 +646,4 @@ $routes->post("ticketSave", "ThzController::ticketSave");
 $routes->get("ticketList", "ThzController::ticketList");
 $routes->post("ticketConversationSave", "ThzController::ticketConversationSave");
 $routes->get("ticketConversationList", "ThzController::ticketConversationList");
-$routes->get('ticketAssigning',"ThzController::ticketAssigning");
 $routes->post('ticketAutoFetchDetails',"ThzController::ticketAutoFetchDetails");
\ No newline at end of file
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 93b0c161..f15cff4a 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -182,37 +182,6 @@ class ThzController extends BaseController
 
     }
 
-    public function ticketAssigning(){
-
-        $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
-
-        $data = $this->request->getVar();
-
-        $assignee_id    = $data['assignee_id']; 
-
-        $thz_id         = $data['thz_id'];
-
-        $result         = $this->thzMasterModel->set('assign_to',$assignee_id)->where('thz_id',$thz_id)->update();
-
-        if($returnType === 'api'){
-
-            if(empty($result)){
-                return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']));
-            }
-
-                return $this->response->setJSON((['status' => 'success', 'data' => $result]));
-
-        }else{
-
-            
-
-        }
-
-
-
-
-
-    }
 
 
     /**************************************************   PRIVATE FUNCTIONS  ********************************************************/
@@ -278,6 +247,8 @@ class ThzController extends BaseController
 
         $thz_id = $data['thz_id'] ; // thz is alias of ticket
 
+        $data['subject'] = $this->findSubject($data['thz_id']);
+
         $assignee_id = $this->findAssigneeId($data['thz_id']) ;
 
         $user_email  = $data['email'] ?? '';
@@ -316,7 +287,13 @@ class ThzController extends BaseController
         return $assigneeId ? $assigneeId : 0 ;
     }
 
-    private function ticketSaveEmailNotificationBasedOnRole($emailToNotified ,  $insertOrUpdate , $ticketId , $data){
+    private function findSubject($ticketId){
+        $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
+        $subject = $row ? $row->subject : null;
+        return $subject ? $subject : " " ;
+    }
+
+    private function    ticketSaveEmailNotificationBasedOnRole($emailToNotified ,  $insertOrUpdate , $ticketId , $data){
 
         $user_email     = $emailToNotified['user_email'] ?? null;
         $assignee_email = $emailToNotified['assignee_email'] ?? null;
@@ -350,7 +327,15 @@ class ThzController extends BaseController
             switch ($insertOrUpdate) {
 
                 case 'update':
-                     $this->sendEmail( 'ticket_save_update_user', $data ,$user_email , $ticketId ) ;
+                    
+                    if(empty($assignee_email)){
+                        $data['assigneeAndStatus']  = "Not Yet Assigned";
+                        $this->sendEmail( 'ticket_save_update_user', $data ,$user_email , $ticketId ) ;
+                    }else{
+                         $data['assigneeAndStatus'] = "Assigned With {$assignee_email}"; 
+                         $this->sendEmail( 'ticket_save_update_user', $data ,$user_email , $ticketId ) ;
+                    }
+
                      break;
                     
                 case 'create':
@@ -410,6 +395,10 @@ class ThzController extends BaseController
 
         $mailTemplate['mail_content'] = str_replace('%message%', $message ?? '', $mailTemplate['mail_content']);
 
+        $mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']);
+
+        $mailTemplate['mail_content'] = str_replace('%assigneeAndStatus%',$data['assigneeAndStatus'] ?? '' ,$mailTemplate['mail_content']);
+
         $from_mail      =  "";
         $to_mail        =  $to_email;
         $cc_string      =  "";

From 3c0d2f062cdec4006323d0be0cb5ed0841262ce6 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 15:03:52 +0530
Subject: [PATCH 16/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index f15cff4a..68511d1c 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -199,6 +199,7 @@ class ThzController extends BaseController
                         ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
                         ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
                         ->where('thz_master.assign_to', $assign_to)
+                        ->orderBy('thz_master.created_at','desc')
                         ->findAll();
         }
 
@@ -210,6 +211,7 @@ class ThzController extends BaseController
                         ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
                         // ->where('thz_id', $id)
                         ->where('thz_master.mobile', $mobile)
+                        ->orderBy('thz_master.created_at','desc')
                         ->findAll();
         }
 
@@ -217,6 +219,7 @@ class ThzController extends BaseController
         return $this->thzMasterModel
                     ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
                     ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                    ->orderBy('thz_master.created_at','desc')
                     ->findAll();
     }
 
@@ -327,7 +330,7 @@ class ThzController extends BaseController
             switch ($insertOrUpdate) {
 
                 case 'update':
-                    
+
                     if(empty($assignee_email)){
                         $data['assigneeAndStatus']  = "Not Yet Assigned";
                         $this->sendEmail( 'ticket_save_update_user', $data ,$user_email , $ticketId ) ;
@@ -343,6 +346,7 @@ class ThzController extends BaseController
                     if(empty($assignee_email)){
                         $this->sendEmail( 'ticket_save_create_user_unassigned', $data ,$user_email , $ticketId ) ;
                     }else{
+                        $data['assignee_email']  = $assignee_email ;
                          $this->sendEmail( 'ticket_save_create_user_assigned', $data , $user_email , $ticketId ) ;
                     }
                     

From c2becd03389e02b52c7deeefdcc0731a7c9255cd Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 16:22:01 +0530
Subject: [PATCH 17/54] CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php  | 16 ++++++++++------
 app/Models/ThzMasterNotesModel.php | 19 +++++++++++++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 68511d1c..e2ca1a06 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -108,6 +108,8 @@ class ThzController extends BaseController
 
             $data = $this->request->getPost();
 
+            $data['notes_type'] = $data['notes_ticket_type'] ?? 'External' ;
+
             $result = $this->thzMasterNotesModel->insert($data);
 
             if(empty($result)){
@@ -155,21 +157,23 @@ class ThzController extends BaseController
 
     }
 
-    public function ticketConversationList(){
+    public function ticketConversationList(){   
 
-            $data = $this->request->getGet();
+            $data       = $this->request->getGet();
 
-            $thz_id = $data['thz_id'] ?? null;            
+            $thz_id     = $data['thz_id'] ?? null;       
+            
+            $ticketType = $data['notes_ticket_type'] ?? 'External' ;
 
             if($thz_id){
                 $result['master'] = $this->thzMasterModel
                         ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
                         ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                        ->where('thz_master.thz_id', $thz_id)
+                        ->where('thz_master.thz_id', $thz_id)       
                         ->findAll();
 
                 if(!empty($result['master'])){
-                    $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id);
+                    $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $ticketType );
                     $result['notes'] = !empty($notes) ? $notes : [];
                 }else{
                     return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(400);        
@@ -296,7 +300,7 @@ class ThzController extends BaseController
         return $subject ? $subject : " " ;
     }
 
-    private function    ticketSaveEmailNotificationBasedOnRole($emailToNotified ,  $insertOrUpdate , $ticketId , $data){
+    private function ticketSaveEmailNotificationBasedOnRole($emailToNotified ,  $insertOrUpdate , $ticketId , $data){
 
         $user_email     = $emailToNotified['user_email'] ?? null;
         $assignee_email = $emailToNotified['assignee_email'] ?? null;
diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index 6b738219..73e355bd 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -12,7 +12,7 @@ class ThzMasterNotesModel extends Model
     protected $returnType       = 'array';
     protected $useSoftDeletes   = false;
     protected $protectFields    = true;
-    protected $allowedFields    = ['thz_id','notes','notes_by','created_by','created_at'];
+    protected $allowedFields    = ['thz_id','notes','notes_by','notes_type','created_by','created_at'];
 
     protected bool $allowEmptyInserts = false;
 
@@ -76,9 +76,19 @@ class ThzMasterNotesModel extends Model
 
     }
 
-    public function ticketConversationList($thz_id)
+    public function ticketConversationList($thz_id , $ticketType)
     {
-        
+        $ticketTypeFilter = "";
+
+        if ($ticketType == 'External') {
+            //user only see his message
+            $ticketTypeFilter = "AND thz_master_notes.notes_type = 'External' ";
+        } elseif ($ticketType == 'Internal') {
+            // internal team needs to see both the tickets
+            $ticketTypeFilter = "AND ( thz_master_notes.notes_type = 'External' OR thz_master_notes.notes_type = 'Internal' ) ";
+        }
+
+
         $notes_sql = "SELECT 
                             thz_master_notes.*,
                             CASE 
@@ -95,7 +105,8 @@ class ThzMasterNotesModel extends Model
                     LEFT JOIN thz_master 
                             ON thz_master.thz_id = thz_master_notes.thz_id 
                         AND LOWER(thz_master_notes.notes_by) = 'user'
-                    WHERE thz_master_notes.thz_id = " . (int)$thz_id . "
+                    WHERE thz_master_notes.thz_id = '. (int)$thz_id .'
+                    $ticketTypeFilter
                     ORDER BY thz_master_notes.created_at ASC";
 
         $result = $this->db->query($notes_sql)->getResultArray();

From 2dcc7129bbbb951903b4dbc4cf3e065c4ae1f6ca Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Thu, 21 Aug 2025 16:25:25 +0530
Subject: [PATCH 18/54] CHANGE_ticket full changes

---
 app/Controllers/ThzController.php  |  20 +-
 app/Models/ThzMasterNotesModel.php |   2 +-
 app/Views/thz_list.php             | 218 ++++----
 app/Views/thz_notes.php            | 777 ++++++++++++++---------------
 4 files changed, 510 insertions(+), 507 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index e2ca1a06..90e039f6 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -93,7 +93,8 @@ class ThzController extends BaseController
           
             $data['page_name'] = "Ticket List";
             $data['ticket_data'] = $tickets;
-            $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['1', '5'])->findAll(); // enga 5-"head" and 1-"admin" role person thaan assignee..
+            $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3','4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
+                                                                                                                     // 2,3,4 remain person varannum. 
             $data['client_list'] = $this->clientModel->getCreatedByUserName();
             return $this->loadLayout('thz_list', $data);
         }       
@@ -160,6 +161,8 @@ class ThzController extends BaseController
     public function ticketConversationList(){   
 
             $data       = $this->request->getGet();
+            $data = $this->request->getGet();
+            $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
 
             $thz_id     = $data['thz_id'] ?? null;       
             
@@ -182,7 +185,20 @@ class ThzController extends BaseController
                 return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
             }
             
-            return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
+        
+            if ($returnType === 'api') {
+                return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
+            }else{
+                $toGetRelated = $result['master'][0]['created_by'];
+                $result['related_tickets'] = $this->thzMasterModel
+                                        ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
+                                        ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                                        ->where('thz_master.created_by', $toGetRelated)
+                                        ->findAll();
+                $result['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3','4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
+                                                                                                                           // 2,3,4 remain person varannum. 
+                return $this->loadLayout('thz_notes', $result);
+            }       
 
     }
 
diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index 73e355bd..8654a936 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -12,7 +12,7 @@ class ThzMasterNotesModel extends Model
     protected $returnType       = 'array';
     protected $useSoftDeletes   = false;
     protected $protectFields    = true;
-    protected $allowedFields    = ['thz_id','notes','notes_by','notes_type','created_by','created_at'];
+    protected $allowedFields    = ['thz_id','notes','notes_by','created_by','created_at','notes_type'];
 
     protected bool $allowEmptyInserts = false;
 
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 1565e6fa..eb16be9b 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -1,54 +1,84 @@
 <style>
-/* .table th,
-.table td {
-    padding: 8px;
+
+/* Force DataTable to allow rounded corners */
+#scroll-horizontal-datatable {
+    border-collapse: separate !important;
+    border-spacing: 0 8px !important; /* space between rows */
+    width: 100%;
+}
+
+/* HEADER */
+thead th {
+    background-color: #00999E;
+    color: #fff !important;
+    border-top: 0px solid #fff !important;
+    border-bottom: 0px solid #fff !important;
+}
+
+/* .table thead th {
+  vertical-align: bottom;
+  border-bottom: 2px solid #fff;
 } */
 
-table {
-    border-collapse: separate !important; 
-    border-spacing : 0 8px !important; /* spacing only between rows */
+/* Rounded header corners */
+thead th:first-child {
+    border-top-left-radius: 15px !important;
+    border-bottom-left-radius: 15px !important;
+}
+thead th:last-child {
+    border-top-right-radius: 15px !important;
+    border-bottom-right-radius: 15px !important;
 }
 
-thead {
-    background-color: #00999E; /* header background */
-    color: #fff;
-}
- 
-thead tr th:first-child {
-    border-top-left-radius: 100px !important;
-    border-bottom-left-radius: 100px !important;
-}
-thead tr th:last-child {
-    border-top-right-radius: 100px !important;
-    border-bottom-right-radius: 100px !important;
-}
-
-tbody tr {
-  background: #F5FFFF;
-  box-shadow: 0 2px 5px rgba(0,0,0,0.08);
-  border-bottom: 6px solid #fff;
-  border-top: 6px solid #fff;
-}
- 
+/* BODY ROWS */
 tbody td {
+    background: #F5FFFF;   /* apply bg to td not tr */
     padding: 12px;
     border-top: 1px solid #eee;
     border-bottom: 1px solid #eee;
 }
 
-thead tr th:first-child {
-    border-top-left-radius: 100px !important;
-    border-bottom-left-radius: 100px !important;
-}
-thead tr th:last-child {
-    border-top-right-radius: 100px !important;
-    border-bottom-right-radius: 100px !important;
+/* Add shadow + spacing row "card" effect */
+tbody tr {
+    box-shadow: 0 2px 5px rgba(0,0,0,0.08);
 }
 
+/* Rounded corners for first + last cell of each row */
+tbody tr td:first-child {
+    border-top-left-radius: 15px !important;
+    border-bottom-left-radius: 15px !important;
+}
+tbody tr td:last-child {
+    border-top-right-radius: 15px !important;
+    border-bottom-right-radius: 15px !important;
+}
 
-/* table.dataTable tbody td {
-    padding: 4px 4px !important;
-} */
+/* Hover effect */
+#scroll-horizontal-datatable tbody tr:hover td {
+    background-color: #e0e0e0;
+    border-top-left-radius: 15px !important;
+    border-bottom-left-radius: 15px !important;
+}
+
+/* Search input with icon */
+.dataTables_filter {
+    position: absolute;
+}
+.dataTables_filter input {
+    padding-right: 30px;
+    background: url('https://cdn.jsdelivr.net/npm/@mdi/svg/svg/magnify.svg') no-repeat right 8px center;
+    background-size: 16px;
+}
+
+/* Optional: control first column width */
+.table th:nth-child(1),
+.table td:nth-child(1) {
+    max-width: 200px !important; 
+    min-width: 100px !important;
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    white-space: nowrap !important;
+}
 
 .col-12 {
 
@@ -71,19 +101,24 @@ thead tr th:last-child {
 
 </style>
 <style>
-.table th:nth-child(1),
+/* .table th:nth-child(1),
 .table td:nth-child(1) {
     max-width: 200px !important; 
     min-width: 100px !important;
     overflow: hidden !important;
     text-overflow: ellipsis !important;
     white-space: nowrap !important;
-}
+} */
 
 #scroll-horizontal-datatable tbody tr:hover {
     background-color: #e0e0e0;
 }
 
+td .text-muted {
+    font-size: 0.85em;   /* smaller than default */
+    color: #6c757d !important; /* Bootstrap muted grey */
+}
+
 
 </style>
 
@@ -103,18 +138,13 @@ thead tr th:last-child {
                         <tr>
                             <th>Ticket Number</th>
                             <th>Name</th>
-                            <th>Mobile Number</th>
-                            <th>Email</th>
-                            <th>Emp Code</th>
                             <th>Policy Number</th>
                             <th>Ticket Type</th>
                             <th>Subject</th>
-                            <th>Message</th>
                             <th>Status</th>
-                            <th>Assignee</th>
-                            <?php if(in_array(get_role_id(), [1,2,3]) ) { ?> <!-- admin,manager,acc.m -->
-                              <th>ACTION</th>
-                            <?php } ?>
+                            <th>Assign To</th>
+                            <th>Created At</th>
+                            <th>Updated At</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -123,42 +153,30 @@ thead tr th:last-child {
 
                                     <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
                                     <td><?php echo $row['thz_id']; ?></td>
-                                    <td><?php echo $row['name']; ?></td>
-                                    <td><?php echo $row['mobile']; ?></td>
-                                    <td><?php echo $row['email']; ?></td>
-                                    <td><?php echo $row['empcode']; ?></td>
+                                    <td>
+                                        <?php echo $row['name']; ?> 
+                                        <span class="text-muted"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
+                                        <span class="text-muted"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
+                                    </td>
                                     <td><?php echo $row['policy_no']; ?></td>
                                     <td><?php echo $row['ticket_type']; ?></td>
                                     <td><?php echo $row['subject']; ?></td>
-                                    <td><?php echo $row['message']; ?></td>
                                     <td><?php echo $row['status']; ?></td>
-                                    <td><?php echo $row['assignee_name']; ?></td>
-                                    <?php if(in_array(get_role_id(), [1,2,3]) ) { ?> <!-- admin,manager,acc.m -->
+                                    <td><?php echo $row['assignee_name']; ?></td>        
                                     <td>
-                                            <div class="btn-group dropdown">
-                                                <button type="button" 
-                                                        class="btn btn-sm btn-primary" 
-                                                        data-id="<?= $row['thz_id']; ?>" 
-                                                        data-assignee="<?= $row['assign_to']; ?>" 
-                                                        data-subject="<?= $row['subject']; ?>"
-                                                        onclick="openAssignee(this)">
-                                                    Assign
-                                                </button>
-                                            </div>
-                                                <!-- <a href="javascript:void(0);" 
-                                                            data-toggle="modal" 
-                                                            data-target="#AssignModal" 
-                                                            data-id="<?= $row['thz_id']; ?>" 
-                                                            data-subject="<?= $row['subject']; ?>">
-                                                                <i class="fa fa-users" 
-                                                                    title="Assign To"
-                                                                    style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
-                                                                    onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
-                                                                    onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
-                                                                </i>
-                                                </a> -->
+                                    <?php if (!empty($row['created_at'])):
+                                        $cdt = new DateTime($row['created_at']); 
+                                        echo $cdt->format('d/m/Y') . "<br><span class='time'>" . $cdt->format('h:i a') . "</span>"; 
+                                        endif;
+                                    ?>
+                                    </td>
+                                    <td>
+                                    <?php if (!empty($row['updated_at'])):
+                                        $udt = new DateTime($row['updated_at']); 
+                                        echo $udt->format('d/m/Y') . "<br><span class='time'>" . $udt->format('h:i a') . "</span>"; 
+                                        endif;
+                                    ?>
                                     </td>
-                                    <?php } ?>
                                 </tr>
                             <?php } ?>
                         <?php } ?>
@@ -222,6 +240,7 @@ thead tr th:last-child {
             <input type="hidden" id="return_type" name="return_type">
             <input type="hidden" id="branch_id" name="branch_id">
             <input type="hidden" id="policy_id" name="policy_id">
+            <input type="hidden" id="created_by" name="created_by" value="<?= get_session_userid(); ?>">
 
             <div class="form-group col-md-6">
               <label for="name">Name<span class="text-danger">*</span></label>
@@ -270,17 +289,21 @@ thead tr th:last-child {
               </select>
             </div> -->
 
-            <div class="form-group col-md-6">
-              <label for="assign_to">Assign To</label>
-              <select class="form-control" id="assign_to" name="assign_to">
-                <option value="">Select Assign To</option>
-                <?php if(isset($assignee)) { ?>
-                  <?php foreach ($assignee as $a) { ?>
-                    <option value="<?= $a['id']?>"><?= $a['emp_code'] ?> - <?= $a['first_name'] ?> <?= $a['last_name'] ?></option>
+            <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu 
+                 // 2,3,4 dropdown data'va varannum but those role means hide it  --> 
+            <?php if(in_array(get_role_id(), [2,3,4]) ) { ?> 
+              <div class="form-group col-md-6">
+                <label for="assign_to">Assign To</label>
+                <select class="form-control" id="assign_to" name="assign_to">
+                  <option value="">Select Assign To</option>
+                  <?php if(isset($assignee)) { ?>
+                    <?php foreach ($assignee as $a) { ?>
+                      <option value="<?= $a['id']?>"><?= $a['emp_code'] ?> - <?= $a['first_name'] ?> <?= $a['last_name'] ?></option>
+                    <?php } ?>
                   <?php } ?>
-                <?php } ?>
-              </select>
-            </div>
+                </select>
+              </div>
+            <?php } ?>
 
             <div class="form-group col-md-12">
               <label for="subject">Subject</label>
@@ -408,25 +431,6 @@ thead tr th:last-child {
     
 </script>
 
-<script>
-
-    function openAssignee(button) {
-      document.getElementById('hidden_thz_id').value = "";
-      document.getElementById('modal_assignee').value = "";
-      document.getElementById('assignModalLabel').innerText = "Ticket";
-
-      var id = button.getAttribute('data-id');
-      var subject = button.getAttribute('data-subject');
-      var assignee = button.getAttribute('data-assignee');
-
-      document.getElementById('hidden_thz_id').value = id;
-      document.getElementById('modal_assignee').value = assignee;
-      document.getElementById('assignModalLabel').innerText = "Ticket: " + subject + " (" + id + ")";
-
-      var myModal = new bootstrap.Modal(document.getElementById('AssignModal'));
-      myModal.show();
-    }
-</script>
 
 <script>
   function getAutoFetchDetails() {
@@ -597,7 +601,7 @@ function viewTicket(ticket_id){
     // $('.loader').fadeIn();
     // $('.loader-mask').fadeIn();
 
-    let url = '<?= base_url('ThzControllerview/'); ?>' + ticket_id;
+    let url = '<?= base_url('ticketConversationList?return_type=web&notes_ticket_type=Internal&thz_id='); ?>' + ticket_id;
     window.location.href = url;
 
 
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 21a1d8d2..c558e88e 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -2,435 +2,418 @@
 .bg-staff {
     background-color: #FFF5E5;
 }
+
+.notes-box {
+  display: flex;
+  align-items: center;
+  border: 1px solid #00aaff;
+  border-radius: 6px;
+  padding: 5px;
+}
+
+.notes-box textarea {
+  flex: 1;
+  border: none;
+  outline: none;
+  resize: none;
+  padding: 8px;
+  font-size: 14px;
+}
+
+.icon-buttons {
+  display: flex;
+  gap: 6px;
+  margin-left: 5px;
+}
+
+.btn-icon {
+  background: #008b8b;
+  border: none;
+  color: white;
+  border-radius: 50%;
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.btn-icon i {
+  font-size: 18px;
+}
+
+.conversation-card{
+    border-radius: 15px !important;
+    box-shadow: 0 1px 4px #000000;
+}
+
+.conversation-card,
+.conversation-card .card-header,
+.conversation-card .card-body {
+  background: #F5FFFF !important;
+  overflow-y:auto;
+}
+.master-card{
+    border-radius: 15px !important;
+    box-shadow: 0 1px 4px #000000;
+}
 </style>
-<div class="row">
-    <div class="col-12">
-        <div class="card" style="margin-right: 23px;">
-            <div class="card-body">
-                <!-- Header Section -->
-                <div class="row mb-3">
-                    <div class="col-6 d-flex align-items-center">
-                        <h4 class="mb-0">Ticket</h4>
-                    </div>
-                    <div class="col-6 text-right">
-                        <a href="<?= base_url('ticket/list'); ?>" aria-label="Back to ticket list">
-                            <i class="fas fa-arrow-left" style="font-size: 17px;"></i>
-                        </a>
-                    </div>
+<style>
+.related-ticket-card 
+.related-ticket-card .card-header,
+.related-ticket-card .card-body {
+  background: #F5FFFF !important;
+  overflow-y:auto;
+  box-shadow: 0 1px 4px #000000;
+}
+</style>
+
+
+
+<div class="col-12">
+    <div class="card">
+        <div class="card-body">
+            
+            <!-- Title -->
+            <div class="row" id="notes-title" style="padding-bottom: 10px;">
+                <div class="col-6" style="align-self: center;">
+                    <h4 style="position: relative;">Ticket ID-<?php echo $master[0]['thz_id']; ?></h4>
                 </div>
+            </div>
 
-                <!-- Navigation Tabs -->
-                <ul class="nav nav-pills navtab-bg">
-                    <li class="nav-item">
-                        <a href="#general-tab" data-toggle="tab" class="nav-link px-2 py-1 active" id="general_tab"
-                            aria-expanded="true">
-                            <i class="mdi mdi-ticket-account"></i>
-                            <span class="d-none d-sm-inline-block">General</span>
-                        </a>
-                    </li>
-                    <li class="nav-item">
-                        <a href="#note-tab" data-toggle="tab" class="nav-link px-2 py-1" id="note_tab"
-                            aria-expanded="false">
-                            <i class="mdi mdi-note-text"></i>
-                            <span class="d-none d-sm-inline-block">Notes</span>
-                        </a>
-                    </li>
-                </ul>
+            <!-- Body -->
+            <div class="row" id="notes-body"> 
 
-                <!-- Tab Content -->
-                <div class="tab-content">
-                    <div class="tab-pane fade show active" id="general-tab">
-                        <div class="row">
-                            <div class="col-12">
-                                <div class="card-body">
-                                    <form role="form" class="parsley-examples" method="post" id="thz_form_data" onsubmit="submitTicket(event, this)" enctype="multipart/form-data">
-                                        <div class="form-group">
-
-                                            <h5>Ticket Master Details</h5>
-                                            <hr>
-
-                                            <div class="form-row">
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="name">Name<span class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="name" placeholder="Enter Name" name="name" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="mobile">Mobile<span class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="mobile" placeholder="Enter Mobile" name="mobile" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="email">Email Id<span class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="email" placeholder="Enter Email" name="Email" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="empcode">Employee code<span class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="empcode" placeholder="Enter Employee code" name="empcode" required>
-                                                        </div>
-                                                        <div class="form-group col-md-3">
-                                                            <label for="policy_no">Policy Number<span class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="policy_no" placeholder="Enter Policy Number" name="policy_no" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
-                                                            <select class="form-control" id="ticket_type" name="ticket_type" required>
-                                                                <option value="">Select Ticket Type</option>
-                                                                <option value="Sales">Sales</option>
-                                                                <option value="Service">Service</option>
-                                                            </select>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="modal_vehicle_no">Subject<span class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="subject" placeholder="Enter Subject" name="subject" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="message">Message<span class="text-danger">*</span></label>
-                                                            <input type="text" class="form-control" id="message" placeholder="Enter Message" name="message" required>
-                                                        </div>
-
-                                                        <div class="form-group col-md-3">
-                                                            <label for="status">Status<span class="text-danger">*</span></label>
-                                                            <select class="form-control" id="status" name="status" required>
-                                                                <option value="">Select Status</option>
-                                                                <option value="Open">Open</option>
-                                                                <option value="In Progress">In Progress</option>
-                                                                <option value="Resolved">Resolved</option>
-                                                                <option value="Closed">Closed</option>
-                                                            </select>
-                                                        </div>
-
-                                                        <div class="form-group col-md-6">
-                                                            <label for="assign_to">Assign To<span class="text-danger">*</span></label>
-                                                            <select class="form-control" id="Assign_to" name="assign_to" required>
-                                                                <option value="">Select Assignee</option>
-                                                                <?php if(isset($assignee)) { ?>
-                                                                    <?php foreach ($assignee as $value) { ?>
-                                                                        <option value="<?= $a['id']?>"><?= $a['emp_code'] ?> - <?= $a['first_name'] ?> <?= $a['last_name'] ?></option>
-                                                                    <?php } ?>
-                                                                <?php } ?>
-                                                            </select>
-                                                        </div>
-                                                        <input type="hidden" id="thz_id" name="thz_id">
-
-                                            </div>
-
-                                            <br><br>
-                                        </div>
-                                        <div class="form-group col-md-12 text-right m-b-0" style="margin-top: 29px;">
-                                            <button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Submit</button>
-                                        </div>
-                                    </form>
-                                </div>
+                <!-- Left Details -->
+                <div class="col-4" id="notes-body-left">
+                    <div class="card master-card" style="background:#F5FFFF;">
+                        <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
+                            <h5 class="mb-0">Details</h5>
+                            <a href="javascript:void(0);" 
+                                onclick="openEditTicket()">
+                                    <i class="mdi mdi-pencil" 
+                                    title="Edit"
+                                    style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
+                                    onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
+                                    onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
+                                    </i>
+                            </a>
+                        </div>
+                        <div class="card-body" style="padding-left: 27px !important; background:#F5FFFF;">
+                            <div class="row mb-2 ml-o">
+                                <div class="col-5">Ticket ID</div>
+                                <div class="col-7 text-end"><?= $master[0]['thz_id'];?></div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="tab-pane fade" id="note-tab">
-                        <div class="row">
-                            <div class="col-12">
-                                <div class="card-body">
-                                    <form role="form" class="parsley-examples" method="post" id="thz_note_form"
-                                        enctype="multipart/form-data">
-                                        <div class="form-group">
-                                            <div class="form-row">
-                                                <div class="form-group col-md-12">
-                                                    <label for="ticket_note">Add Notes</label>
-                                                    <textarea class="form-control" id="thz_notes" name="notes" rows="3"
-                                                        placeholder="Enter Text"><?= isset($thz_note['notes']) ? $thz_note['notes'] : '' ?></textarea>
-                                                </div>
-                                            </div>
-                                        </div><input type="hidden" id="thz_notes_id">
-                                        <input type="hidden" id="thz_master_id">
-                                        <div class="form-group text-right m-b-0">
-                                            <button type="submit" class="btn btn-primary" id="thz_note_submit">Submit</button>
-                                        </div>
-                                    </form>
+                            <div class="row mb-2">
+                                <div class="col-5">Name</div>
+                                <div class="col-7 text-end"><?= $master[0]['name'];?></div>
+                            </div>
+                            <div class="row mb-2">
+                                <div class="col-5">Mobile</div>
+                                <div class="col-7 text-end"><?= $master[0]['mobile'];?></div>
+                            </div>
+                            <div class="row mb-2">
+                                <div class="col-5">Policy Number</div>
+                                <div class="col-7 text-end"><?= $master[0]['policy_no'];?></div>
+                            </div>
+                            <div class="row mb-2">
+                                <div class="col-5">Assigned To</div>
+                                <div class="col-7 text-end"><?= $master[0]['assignee_name'];?></div>
+                            </div>
+                            <div class="row mb-2">
+                                <div class="col-5">Status</div>
+                                <div class="col-7 text-end"><?= $master[0]['status'];?></div>
+                            </div>
+                            <div class="row mb-2">
+                                <div class="col-5">Ticket Type</div>
+                                <div class="col-7 text-end"><?= $master[0]['ticket_type'];?></div>
+                            </div>
+                            <div class="row mb-2">
+                                <div class="col-5">Subject</div>
+                                <div class="col-7 text-end"><?= $master[0]['subject'];?></div>
+                            </div>
+                            <div class="row mb-2">
+                                <div class="col-5">Message</div>
+                                <div class="col-7 text-end"><?= $master[0]['message'];?></div>
+                            </div>
+                            <div class="row mb-2">
+                                <div class="col-5">Related Tickets</div>
+                                <div class="col-7 text-end">
+                                    <u class="text-warning">
+                                        <a href="javascript:void(0);" 
+                                        class="text-warning"
+                                        data-toggle="modal" 
+                                        data-target="#relatedTicketModal" 
+                                        data-id="<?= $master[0]['created_by']; ?>">
+                                        View
+                                        </a>
+                                    </u>
                                 </div>
-                            </div> <!-- end col-->
+
+                            </div>
+                            <!-- add more fields -->
                         </div>
                     </div>
                 </div>
-            </div>
-        </div>
-    </div>
-</div>
 
-<!-- <div class="modal fade" id="member_data_modal" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel"></h4>
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            </div>
-            <div class="modal-body">
-                <div class="form-row">
-                    <div class="form-group col-md-12">
-                        <label for="acm_id">Insured Member<span class="text-danger"></span></label>
-                        <select class="form-control" onchange="setMemberData(this)">
-                            <option value="0">Select Insured Member</option>
-                            <?php if (!empty($member_data)) : ?>
-                            <?php foreach ($member_data as $value) : ?>
-                            <option value="<?= isset($value['emp_code']) ? $value['emp_code'] : '' ?>"
-                                data-empID="<?= isset($value['emp_id']) ? $value['emp_id'] : '' ?>"
-                                data-empName="<?= isset($value['emp_name']) ? htmlspecialchars($value['emp_name'], ENT_QUOTES, 'UTF-8') : '' ?>"
-                                data-policyNo="<?= isset($value['policy_no']) ? $value['policy_no'] : '' ?>"
-                                data-tpaNo="<?= isset($value['tpa_no']) ? $value['tpa_no'] : '' ?>"
-                                data-relationship="<?= isset($value['emp_relationship']) ? htmlspecialchars($value['emp_relationship'], ENT_QUOTES, 'UTF-8') : '' ?>">
-                                <?= isset($value['emp_name']) && isset($value['emp_relationship']) 
-                                    ? htmlspecialchars($value['emp_name'] . ' - ' . $value['emp_relationship'], ENT_QUOTES, 'UTF-8') 
-                                    : 'Unknown Member' ?>
-                            </option>
+                <!-- Right Conversation -->
+                 
+                <div class="col-8">
+                    
+                    <!-- Conversation Card -->
+                    <div class="card mb-3 conversation-card">
+                         <div class="card-header border-0">
+                            <h5 class="mb-0">Conversation</h5>
+                            <hr/>
+                        </div>
+
+                        <div class="card-body pt-0">
+                          <?php if(!empty($notes)): ?>
+                            <?php foreach($notes as $i => $conv): ?>
+                                    
+                                    <!-- Top Row: Message + Badge -->
+                                    <div class="d-flex justify-content-between align-items-start">
+                                        <p class="mb-1 mr-4"><?= $conv['notes'] ?></p>
+                                        <?php if(!empty($conv['notes_by'])): ?>
+                                            <span class="badge bg-warning text-dark"><?= $conv['notes_by'] ?></span>
+                                        <?php endif; ?>
+                                    </div>
+                                    
+                                    <!-- Bottom Row: Name + Date -->
+                                    <div class="d-flex justify-content-between small text-muted">
+                                        <span><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
+                                        <span><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
+                                    </div>
+
+                                    <?php echo $i < count($notes)-1 ? '<hr/>' : ''; ?>
+
                             <?php endforeach; ?>
+                            <?php else: ?>
+                                <div class="d-flex justify-content-center align-items-center">
+                                        <p class="text-center"><i>No Data Found</i></p>
+                                </div>
                             <?php endif; ?>
-                        </select>
-
+                        </div>
                     </div>
+
+                    <!-- Input Card -->
+                    <div class="card">
+                            <div class="notes-box">
+                             <form id="conversationForm">
+                                <textarea class="form-control" id="notes" name="notes" placeholder="Write your notes here..."></textarea>
+                                <input type="hidden" id="notes_type" name="notes_type">
+                                <input type="hidden" id="thz_id" name="thz_id">
+                                <input type="hidden" id="notes_by" name="notes_by" value="Staff">
+                                <input type="hidden" id="created_by" name="created_by" value="<?= get_session_userid(); ?>">
+                                <div class="icon-buttons">
+                                    <button type="button" class="btn-icon" onclick="submitConverstionTicket('External')"><i class="mdi mdi-content-save"></i></button>
+                                    <button type="button" class="btn-icon" onclick="submitConverstionTicket('Internal')"><i class="mdi mdi-email"></i></button>
+                                </div>
+                            </form>
+                            </div>
+                    </div>
+
                 </div>
-            </div>
-            <div class="modal-footer">
-                <a class="btn btn-primary close" data-dismiss="modal" aria-label="Close">Submit</a>
-            </div>
+            </div> <!-- /notes-body -->
+
         </div>
     </div>
-</div> -->
-
-<div id="ticket_conversation_div">
-    <?php include("ticket_conversation.php") ?>
 </div>
 
-<?php //include("ticket_form_handler.php") ?>
+<div class="modal fade" id="EditModal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <form id="ticketForm">
+        <div class="modal-header">
+            <h4 class="modal-title" id="EditModalLabel">Update</h4>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        </div>
+
+        <div class="modal-body">    
+          <div class="form-row">
+            <input type="hidden" id="thz_id" name="thz_id">
+            <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
+            
+            <div class="form-group col-md-12">
+              <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
+              <select class="form-control" id="ticket_type" name="ticket_type" required>
+                <option value="">Select Ticket Type</option>
+                <option value="Sales">Sales</option>
+                <option value="Service">Service</option>
+              </select>
+            </div>
+
+
+            <div class="form-group col-md-12">
+              <label for="status">Status</label>
+              <select class="form-control" id="status" name="status">
+                <option value="">Select Status</option>
+                <option value="Open">Open</option>
+                <option value="In Progress">In Progress</option>
+                <option value="Resolved">Resolved</option>
+                <option value="Closed">Closed</option>
+              </select>
+            </div> 
+
+            <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu 
+                 // 2,3,4 dropdown data'va varannum but those role means hide it  --> 
+            <?php if(in_array(get_role_id(), [2,3,4]) ) { ?> 
+            <div class="form-group col-md-12">
+              <label for="assign_to">Assign To</label>
+              <select class="form-control" id="assign_to" name="assign_to">
+                <option value="">Select Assign To</option>
+                <?php if(isset($assignee)) { ?>
+                  <?php foreach ($assignee as $a) { ?>
+                    <option value="<?= $a['id']?>"><?= $a['emp_code'] ?> - <?= $a['first_name'] ?> <?= $a['last_name'] ?></option>
+                  <?php } ?>
+                <?php } ?>
+              </select>
+            </div>
+            <?php } ?> 
+
+
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-ternary btn-border-radius" onclick="submitTicket()">Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="relatedTicketModal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      
+        <div class="modal-header">
+            <h4 class="modal-title">Related Tickets</h4>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        </div>
+
+        <div class="modal-body">  
+            
+            <?php foreach($related_tickets as $j => $rt): ?>
+                <div class="card related-ticket-card mb-3">
+                        <div class="card-body">
+                            <div class="d-flex justify-content-between align-items-start">
+                                <h5 class="mb-1"><?php echo $rt['ticket_type']; ?></h5>
+                                <small>
+                                <?php if (!empty($rt['created_at'])):
+                                        $cdt = new DateTime($rt['created_at']); 
+                                        echo $cdt->format('d/m/Y') . "<span class='time'>" . $cdt->format('h:i a') . "</span>"; 
+                                        endif;
+                                ?></small>
+                            </div>
+                            <p class="mb-2"><?php echo $rt['subject']; ?></p>
+                            <small><span  style="color: green !important;">Status: </span><?php echo $rt['status']; ?></small>
+                        </div>
+                </div>
+            <?php endforeach; ?>  
+        </div>
+      
+    </div>
+  </div>
+</div>
+
+
 
 <script>
+
+    $(document).ready(function() {
+            // Initialize select2
+            $("#ticket_type").select2();
+            $("#status").select2();
+            $("#assign_to").select2();
+    });
+
+
+    function openEditTicket() {
+      
+      var form = document.getElementById('ticketForm');
+      form.reset(); 
+
+      var masterData = <?= json_encode($master[0]); ?>;
+    //   console.log("*****");
     
-function submitClaimForm(event, form) {
+    //   console.log(masterData);
+    
+        document.getElementById('EditModalLabel').innerText = "Update";
 
-    event.preventDefault();
+        document.getElementById('thz_id').value = masterData.thz_id;
+        document.getElementById('assign_to').value = masterData.assign_to;
+        document.getElementById('status').value = masterData.status;
+        document.getElementById('ticket_type').value = masterData.ticket_type;
 
-    var isValid = $('#ticket_form_data').parsley().validate();
+      
+      document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ;
 
-    if (!isValid) {
-        toastr.warning('Form validation failed. Please check the required fields.', 'WARNING');
-        return false;
+      var myModal = new bootstrap.Modal(document.getElementById('EditModal'));
+      myModal.show();
     }
 
-    const formAction = '<?= base_url("ticket/update"); ?>';
+    function submitTicket() {
+        
+        var form = document.getElementById("ticketForm"); // your form ID
+        var formData = new FormData(form);
 
-    // Show loader
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+            var id = form.querySelector("[name='thz_id']").value;
 
-    // Collect IDs and form data
-    const formData = new FormData(form);
-
-    // AJAX request
-    $.ajax({
-        data: formData,
-        url: formAction,
-        type: "POST",
-        dataType: 'json',
-        processData: false,
-        contentType: false,
-        success: function(response) {
-            // Hide loader
-
-            console.log('Form submitted response:', response);
-
-            if (response.status === true) {
-                location.reload();
-                toastr.success(response.message, 'SUCCESS');
-            } else {
-                toastr.error(response.message, 'ERROR');
-            }
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-        },
-        error: function(xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-
-            // Hide loader
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
-        }
-    });
-}
-
-function openFetchEmpDataodal() {
-    var myModal = new bootstrap.Modal(document.getElementById('member_data_modal'));
-    myModal.show();
-}
-
-function setMemberData(input) {is_head_approved
-
-    var selectedOption = $(input).find(':selected');
-
-    // Retrieve the data-* attributes
-    var empId = selectedOption.data('empid');
-    var empName = selectedOption.data('empname');
-    var policyNo = selectedOption.data('policyno');
-    var tpaNo = selectedOption.data('tpano');
-    var relationship = selectedOption.data('relationship');
-
-    $('#tpa_no').val(tpaNo);
-    $('#insured_emp_id').val(empId);
-    $('#insured_name').val(empName);
-    $('#policy_no').val(policyNo);
-
-    $('#relationship option').each(function() {
-        if ($(this).text() === relationship) {
-            $(this).prop('selected', true);
-        }
-    });
-}
-
-function showConfirmationModal(event) {
-    Swal.fire({
-        title: "Approve Claim Rejection",
-        // text: "Do you want to save this?",
-        icon: "warning",
-        showCancelButton: true,
-        showDenyButton: true, 
-        confirmButtonColor: "#3085d6",
-        cancelButtonColor: "#6c757d",
-        denyButtonColor: "#d33",
-        confirmButtonText: "Approve",
-        denyButtonText: "Reject",
-        cancelButtonText: "Cancel"
-    }).then((result) => {
-        if (result.isConfirmed) {
-            $('#is_head_approved').val(1);
-            console.log($('#ticket_form_data')[0])
-            submitClaimForm(event, $('#ticket_form_data')[0]); // Fixed selector
-        } else if (result.isDenied) {
-            // Show second Swal for rejection reason
-            Swal.fire({
-                title: "Rejection Reason",
-                text: "Please provide a reason for rejection",
-                input: "textarea",
-                inputPlaceholder: "Enter your reason here...",
-                icon: "info",
-                showCancelButton: true,
-                confirmButtonColor: "#3085d6",
-                cancelButtonColor: "#6c757d",
-                confirmButtonText: "Submit",
-                cancelButtonText: "Back"
-            }).then((reasonResult) => {
-                if (reasonResult.isConfirmed) {
-                    // Check if reason is not empty
-                    if (reasonResult.value && reasonResult.value.trim() !== "") {
-                        $('#is_head_approved').val(2);
-                        $('#rejection_reason').val(reasonResult.value.trim());
-                        console.log($('#ticket_form_data')[0]);
-                        $('#head_rejection_reason').val(reasonResult.value.trim());
-                        submitClaimForm(event, $('#ticket_form_data')[0]);
-                    } else {
-                        // Alert if reason is empty
-                        Swal.fire({
-                            title: "Error",
-                            text: "Rejection reason cannot be empty",
-                            icon: "error",
-                            confirmButtonColor: "#3085d6"
-                        }).then(() => {
-                            // Go back to the rejection reason dialog
-                            showConfirmationModal(event);
-                        });
-                    }
+        $.ajax({
+            url: "<?= base_url('ticketSave') ?>",
+            type: "POST",
+            data: formData,
+            processData: false,   
+            contentType: false,   
+            dataType: 'json',
+            success: function(response) {
+                if (response.status === "success") {
+                    toastr.success(response.message, 'success');
+                    $('#ticketModal').modal('hide');
+                    form.reset();
+                    window.location.href = "<?= base_url('ticketConversationList?return_type=web&notes_ticket_type=Internal&thz_id=') ?>" + id;
                 } else {
-                    // If canceled, go back to first Swal
-                    showConfirmationModal(event);
+                    toastr.error(response.message, 'error');
                 }
-            });
-        } else {
-            $('#is_head_approved').val(0);
-            return false;
-        }
-    });
-}
-
-</script>
-<script>
-$(document).ready(function() {
-        // Initialize select2
-        $("#ticket_type").select2();
-        $("#status").select2();
-        $("#assign_to").select2();
-    
-    url = '<?= base_url('ThzControllernote/1'); ?>';
-    data = { id : $('#thz_master_id').val(), is_auto_query : 0};
-    $.ajax({
-        url:url,
-        data:data,
-        type:'POST',
-        success: function(res) {
-            if (res.status == true){
-                $('#thz_master_id').val(res.data.thz_id);
-                $('#thz_notes').val(res.data.notes);
-                $('#thz_notes_id').val(res.data.id);
-                $('#thz_notes_by').val('Staff');
+            },
+            error: function(xhr) {
+                toastr.error("Something went wrong!", 'error');
+                console.error(xhr.responseText);
             }
-        },
-        error: function (xhr, status, error) {
-            console.error(xhr.responseText);
-            console.error(status, error);
-            setTimeout(function() {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                toastr.warning('Something Went Wrong!', 'warning');
-            }, 1000);
-        }
-    })
-
-    $("#ticket_note_form").submit(function(event) {
-
-        event.preventDefault();
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
-
-        var url = '<?= base_url("/ThzControllernote/2"); ?>';
-        var formData = $(this).serializeArray();
-        var ticket_id = $('#thz_master_id').val();
-        if (ticket_id != null && ticket_id != ''){
-            formData.push({ name: 'thz_id', value: ticket_id});
-        }
-        var primary_key = $('#thz_note_id').val();
-        if (primary_key != null && primary_key != ''){
-            formData.push({ name: 'id', value: primary_key});
-        }
-        console.log(formData);
-        sendAjaxRequestForGlobal(url, 'POST', formData, function(response) {
-            if (response.status == true) {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                toastr.success('Note Added Successfully','Success');
-                // console.log("Respone id is ")
-                // console.log(response.id);    
-                $('#note_id').val(response.id);
-                // console.log($('#'))
-
-
-            } else {
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-                let message = response.message;
-                toastr.error(message, 'ERROR');
-            }
-
-
-        }, function(xhr, status, error) {
-            console.error('Error fetching data:', error);
-            console.error(xhr.responseText);
-            toastr.error('An error occurred while fetching the report page.', 'ERROR');
-
-            $('.loader').fadeOut();
-            $('.loader-mask').delay(350).fadeOut('slow');
         });
-    });
+    }
 
-});
+    function submitConverstionTicket(notetype) {
+        
+            document.getElementById("notes_type").value = notetype;
+            const urlParams = new URLSearchParams(window.location.search);
+            document.getElementById("thz_id").value = urlParams.get('thz_id');
 
+            var form = document.getElementById("conversationForm");
+            var formData = new FormData(form);
+        
+        $.ajax({
+            url: "<?= base_url('ticketConversationSave') ?>",
+            type: "POST",
+            data: formData,
+            processData: false,   
+            contentType: false,   
+            dataType: 'json',
+            success: function(response) {
+                if (response.status === "success") {
+                    toastr.success(response.message, 'success');
+                    $('#ticketModal').modal('hide');
+                    form.reset();
+                    window.location.href = "<?= base_url('ticketConversationList?return_type=web&notes_ticket_type=Internal&thz_id=') ?>" + id;
+                } else {
+                    toastr.error(response.message, 'error');
+                }
+            },
+            error: function(xhr) {
+                toastr.error("Something went wrong!", 'error');
+                console.error(xhr.responseText);
+            }
+        });
+    }
 </script>
\ No newline at end of file

From 800486037748e62df9332489407f9662a43d1cab Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 16:52:22 +0530
Subject: [PATCH 19/54] CHANGE_TICKETING_SYSTEM - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 90e039f6..ba25efb8 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -109,7 +109,7 @@ class ThzController extends BaseController
 
             $data = $this->request->getPost();
 
-            $data['notes_type'] = $data['notes_ticket_type'] ?? 'External' ;
+            $data['notes_type'] = $data['notes_type'] ?? 'External' ;
 
             $result = $this->thzMasterNotesModel->insert($data);
 
@@ -161,12 +161,12 @@ class ThzController extends BaseController
     public function ticketConversationList(){   
 
             $data       = $this->request->getGet();
-            $data = $this->request->getGet();
+
             $returnType = strtolower($this->request->getGet('return_type') ?? 'api'); 
 
             $thz_id     = $data['thz_id'] ?? null;       
             
-            $ticketType = $data['notes_ticket_type'] ?? 'External' ;
+            $ticketType = $data['notes_type'] ?? 'External' ;
 
             if($thz_id){
                 $result['master'] = $this->thzMasterModel

From 944f4c1f81ecbfaad0981f1f5e661f9c1e937635 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Thu, 21 Aug 2025 16:53:25 +0530
Subject: [PATCH 20/54] FIX_TKT notes alignment

---
 app/Views/thz_notes.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index c558e88e..bd524ada 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -199,19 +199,19 @@
 
                     <!-- Input Card -->
                     <div class="card">
+                        <form id="conversationForm">
+                            <input type="hidden" id="notes_type" name="notes_type">
+                            <input type="hidden" id="thz_id" name="thz_id">
+                            <input type="hidden" id="notes_by" name="notes_by" value="Staff">
+                            <input type="hidden" id="created_by" name="created_by" value="<?= get_session_userid(); ?>">
                             <div class="notes-box">
-                             <form id="conversationForm">
-                                <textarea class="form-control" id="notes" name="notes" placeholder="Write your notes here..."></textarea>
-                                <input type="hidden" id="notes_type" name="notes_type">
-                                <input type="hidden" id="thz_id" name="thz_id">
-                                <input type="hidden" id="notes_by" name="notes_by" value="Staff">
-                                <input type="hidden" id="created_by" name="created_by" value="<?= get_session_userid(); ?>">
-                                <div class="icon-buttons">
-                                    <button type="button" class="btn-icon" onclick="submitConverstionTicket('External')"><i class="mdi mdi-content-save"></i></button>
-                                    <button type="button" class="btn-icon" onclick="submitConverstionTicket('Internal')"><i class="mdi mdi-email"></i></button>
-                                </div>
-                            </form>
+                                    <textarea class="form-control" id="notes" name="notes" placeholder="Write your notes here..."></textarea>
+                                    <div class="icon-buttons">
+                                        <button type="button" class="btn-icon" onclick="submitConverstionTicket('External')"><i class="mdi mdi-content-save"></i></button>
+                                        <button type="button" class="btn-icon" onclick="submitConverstionTicket('Internal')"><i class="mdi mdi-email"></i></button>
+                                    </div>
                             </div>
+                        </form>
                     </div>
 
                 </div>
@@ -403,7 +403,6 @@
             success: function(response) {
                 if (response.status === "success") {
                     toastr.success(response.message, 'success');
-                    $('#ticketModal').modal('hide');
                     form.reset();
                     window.location.href = "<?= base_url('ticketConversationList?return_type=web&notes_ticket_type=Internal&thz_id=') ?>" + id;
                 } else {

From 694bf4767e07da6b5b533a60e406db4beb0c5806 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Thu, 21 Aug 2025 17:16:16 +0530
Subject: [PATCH 21/54] BUG_in ticket fix

---
 app/Models/ThzMasterNotesModel.php |  3 ++-
 app/Views/thz_notes.php            | 16 ++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index 8654a936..d2a7191f 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -88,6 +88,7 @@ class ThzMasterNotesModel extends Model
             $ticketTypeFilter = "AND ( thz_master_notes.notes_type = 'External' OR thz_master_notes.notes_type = 'Internal' ) ";
         }
 
+        $integer_ticket_id = (int)$thz_id;
 
         $notes_sql = "SELECT 
                             thz_master_notes.*,
@@ -105,7 +106,7 @@ class ThzMasterNotesModel extends Model
                     LEFT JOIN thz_master 
                             ON thz_master.thz_id = thz_master_notes.thz_id 
                         AND LOWER(thz_master_notes.notes_by) = 'user'
-                    WHERE thz_master_notes.thz_id = '. (int)$thz_id .'
+                    WHERE thz_master_notes.thz_id = ". $integer_ticket_id ."
                     $ticketTypeFilter
                     ORDER BY thz_master_notes.created_at ASC";
 
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index bd524ada..7cc9747a 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -232,7 +232,7 @@
 
         <div class="modal-body">    
           <div class="form-row">
-            <input type="hidden" id="thz_id" name="thz_id">
+            <input type="hidden" id="edit_thz_id" name="thz_id">
             <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
             
             <div class="form-group col-md-12">
@@ -335,13 +335,10 @@
       form.reset(); 
 
       var masterData = <?= json_encode($master[0]); ?>;
-    //   console.log("*****");
-    
-    //   console.log(masterData);
     
         document.getElementById('EditModalLabel').innerText = "Update";
 
-        document.getElementById('thz_id').value = masterData.thz_id;
+        document.getElementById('edit_thz_id').value = masterData.thz_id;
         document.getElementById('assign_to').value = masterData.assign_to;
         document.getElementById('status').value = masterData.status;
         document.getElementById('ticket_type').value = masterData.ticket_type;
@@ -355,11 +352,10 @@
 
     function submitTicket() {
         
-        var form = document.getElementById("ticketForm"); // your form ID
+        var form = document.getElementById("ticketForm");
+        var id = form.querySelector("[name='thz_id']").value;
         var formData = new FormData(form);
-
-            var id = form.querySelector("[name='thz_id']").value;
-
+    
         $.ajax({
             url: "<?= base_url('ticketSave') ?>",
             type: "POST",
@@ -389,7 +385,7 @@
             document.getElementById("notes_type").value = notetype;
             const urlParams = new URLSearchParams(window.location.search);
             document.getElementById("thz_id").value = urlParams.get('thz_id');
-
+            var id = urlParams.get('thz_id');
             var form = document.getElementById("conversationForm");
             var formData = new FormData(form);
         

From 5776ec487b59737f619219e216c9e386fc8817d1 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 17:17:16 +0530
Subject: [PATCH 22/54] CHANGE_TICKETING_SYSTEM - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index ba25efb8..093d6b2c 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -272,9 +272,9 @@ class ThzController extends BaseController
 
         $data['subject'] = $this->findSubject($data['thz_id']);
 
-        $assignee_id = $this->findAssigneeId($data['thz_id']) ;
+        $assignee_id    = $this->findAssigneeId($data['thz_id']) ;
 
-        $user_email  = $data['email'] ?? '';
+        $user_email     =  $this->findUserEmail($data['thz_id']) ;
         
         $assignee_email = $this->findAssigneeEmail($assignee_id) ?? '';
 
@@ -310,6 +310,12 @@ class ThzController extends BaseController
         return $assigneeId ? $assigneeId : 0 ;
     }
 
+    private function findUserEmail($ticket_id){
+        $row = $this->thzMasterModel->where('thz_id', $ticket_id)->get()->getRow();
+        $email = $row ? $row->email : null;
+        return $email ? $email : " " ;
+    }
+
     private function findSubject($ticketId){
         $row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
         $subject = $row ? $row->subject : null;

From 5f95fa8399991399a1a25adaee2fad28a12eb248 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 21 Aug 2025 17:33:24 +0530
Subject: [PATCH 23/54] CHANGE_TICKETING_SYSTEM - VADIVEL J 2025-08-21

---
 app/Controllers/ThzController.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 093d6b2c..6dce2803 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -117,13 +117,18 @@ class ThzController extends BaseController
                 return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
             }
 
-            $emailNotificationResult = $this->ticketConversationSaveNotification($data);
+            if($data['notes_type'] == "External"){
+                $emailNotificationResult = $this->ticketConversationSaveNotification($data);
+            }else{
+                $emailNotificationResult = false ;
+            }
+            
 
             
             return $this->response->setJSON([ 
                 'status' => $result ? 'success' : 'error',
                 'message' => $result ? "Ticket Notes created successfully" : "Unable to create ticket notes. Please try again." ,
-                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed..!!'
+                'notification' => $emailNotificationResult ? 'Email Notification Success..!!' : 'Email Notification Failed Or No Need..!!'
                 ])->setStatusCode($result ? 200 : 400);
     
     }
@@ -184,6 +189,7 @@ class ThzController extends BaseController
             }else{
                 return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(404);
             }
+
             
         
             if ($returnType === 'api') {

From 659b6fd12227835a56e130de31a00631f4503758 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Thu, 21 Aug 2025 17:33:54 +0530
Subject: [PATCH 24/54] BUG_fix in ticket

---
 app/Controllers/ThzController.php  | 2 +-
 app/Models/ThzMasterNotesModel.php | 9 +++------
 app/Views/thz_list.php             | 2 +-
 app/Views/thz_notes.php            | 9 ++++++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 6dce2803..0141ef61 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -181,7 +181,7 @@ class ThzController extends BaseController
                         ->findAll();
 
                 if(!empty($result['master'])){
-                    $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $ticketType );
+                    $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType );
                     $result['notes'] = !empty($notes) ? $notes : [];
                 }else{
                     return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']))->setStatusCode(400);        
diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index d2a7191f..413781df 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -76,17 +76,14 @@ class ThzMasterNotesModel extends Model
 
     }
 
-    public function ticketConversationList($thz_id , $ticketType)
+    public function ticketConversationList($thz_id , $returnType)
     {
         $ticketTypeFilter = "";
 
-        if ($ticketType == 'External') {
+        if ($returnType == 'api') {
             //user only see his message
             $ticketTypeFilter = "AND thz_master_notes.notes_type = 'External' ";
-        } elseif ($ticketType == 'Internal') {
-            // internal team needs to see both the tickets
-            $ticketTypeFilter = "AND ( thz_master_notes.notes_type = 'External' OR thz_master_notes.notes_type = 'Internal' ) ";
-        }
+        } 
 
         $integer_ticket_id = (int)$thz_id;
 
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index eb16be9b..0decca6b 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -601,7 +601,7 @@ function viewTicket(ticket_id){
     // $('.loader').fadeIn();
     // $('.loader-mask').fadeIn();
 
-    let url = '<?= base_url('ticketConversationList?return_type=web&notes_ticket_type=Internal&thz_id='); ?>' + ticket_id;
+    let url = '<?= base_url('ticketConversationList?return_type=web&thz_id='); ?>' + ticket_id;
     window.location.href = url;
 
 
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 7cc9747a..c1134d52 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -175,8 +175,11 @@
                                     <!-- Top Row: Message + Badge -->
                                     <div class="d-flex justify-content-between align-items-start">
                                         <p class="mb-1 mr-4"><?= $conv['notes'] ?></p>
-                                        <?php if(!empty($conv['notes_by'])): ?>
+                                        <!-- <?php if(!empty($conv['notes_by'])): ?>
                                             <span class="badge bg-warning text-dark"><?= $conv['notes_by'] ?></span>
+                                        <?php endif; ?> -->
+                                        <?php if (!empty($conv['notes_type']) && $conv['notes_type'] === "Internal"): ?>
+                                            <span class="badge bg-warning text-dark"><?= $conv['notes_type'] ?></span>
                                         <?php endif; ?>
                                     </div>
                                     
@@ -368,7 +371,7 @@
                     toastr.success(response.message, 'success');
                     $('#ticketModal').modal('hide');
                     form.reset();
-                    window.location.href = "<?= base_url('ticketConversationList?return_type=web&notes_ticket_type=Internal&thz_id=') ?>" + id;
+                    window.location.href = "<?= base_url('ticketConversationList?return_type=web&thz_id=') ?>" + id;
                 } else {
                     toastr.error(response.message, 'error');
                 }
@@ -400,7 +403,7 @@
                 if (response.status === "success") {
                     toastr.success(response.message, 'success');
                     form.reset();
-                    window.location.href = "<?= base_url('ticketConversationList?return_type=web&notes_ticket_type=Internal&thz_id=') ?>" + id;
+                    window.location.href = "<?= base_url('ticketConversationList?return_type=web&thz_id=') ?>" + id;
                 } else {
                     toastr.error(response.message, 'error');
                 }

From 5d351eacb75effcf54ae21d6955304db9d2682ef Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Thu, 21 Aug 2025 18:40:11 +0530
Subject: [PATCH 25/54] BUG_fix in ticket

---
 app/Views/thz_list.php  | 23 +++++++++----------
 app/Views/thz_notes.php | 49 +++++++++++++++++++++++++++--------------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 0decca6b..10c3e72e 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -40,7 +40,7 @@ tbody td {
 
 /* Add shadow + spacing row "card" effect */
 tbody tr {
-    box-shadow: 0 2px 5px rgba(0,0,0,0.08);
+    /* box-shadow: 0 2px 5px rgba(0,0,0,0.08); */
 }
 
 /* Rounded corners for first + last cell of each row */
@@ -56,10 +56,10 @@ tbody tr td:last-child {
 /* Hover effect */
 #scroll-horizontal-datatable tbody tr:hover td {
     background-color: #e0e0e0;
-    border-top-left-radius: 15px !important;
-    border-bottom-left-radius: 15px !important;
+    
 }
 
+
 /* Search input with icon */
 .dataTables_filter {
     position: absolute;
@@ -110,9 +110,6 @@ tbody tr td:last-child {
     white-space: nowrap !important;
 } */
 
-#scroll-horizontal-datatable tbody tr:hover {
-    background-color: #e0e0e0;
-}
 
 td .text-muted {
     font-size: 0.85em;   /* smaller than default */
@@ -191,7 +188,7 @@ td .text-muted {
 </div>
 
 <div class="modal fade" id="ticketModal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered">
+  <div class="modal-dialog modal-dialog-centered modal-xl">
     <div class="modal-content">
       <form id="ticketForm">
         <!-- <div class="modal-header">
@@ -242,12 +239,12 @@ td .text-muted {
             <input type="hidden" id="policy_id" name="policy_id">
             <input type="hidden" id="created_by" name="created_by" value="<?= get_session_userid(); ?>">
 
-            <div class="form-group col-md-6">
+            <div class="form-group col-md-4">
               <label for="name">Name<span class="text-danger">*</span></label>
               <input type="text" class="form-control" id="name" name="name" placeholder="Enter Name" required>
             </div>
 
-            <div class="form-group col-md-6">
+            <div class="form-group col-md-4">
               <label for="email">Email Id<span class="text-danger">*</span></label>
               <input type="email" class="form-control" id="email" 
                      name="email" placeholder="Enter Email"
@@ -256,19 +253,19 @@ td .text-muted {
                      title="Please enter a valid email address">
             </div>
 
-            <div class="form-group col-md-6">
+            <div class="form-group col-md-4">
               <label for="empcode">Employee code</label>
               <input type="text" class="form-control" id="empcode" name="empcode" placeholder="Enter Employee code">
             </div>
 
-            <div class="form-group col-md-6">
+            <div class="form-group col-md-4">
               <label for="policy_no">Policy Number</label>
                 <select class="form-control" id="policy_no" name="policy_no" onchange="changevalue()">
                   <option value="" selected data-id="">Select Policy</option>
                 </select>
             </div>
 
-            <div class="form-group col-md-6">
+            <div class="form-group col-md-4">
               <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
               <select class="form-control" id="ticket_type" name="ticket_type" required>
                 <option value="">Select Ticket Type</option>
@@ -292,7 +289,7 @@ td .text-muted {
             <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu 
                  // 2,3,4 dropdown data'va varannum but those role means hide it  --> 
             <?php if(in_array(get_role_id(), [2,3,4]) ) { ?> 
-              <div class="form-group col-md-6">
+              <div class="form-group col-md-4">
                 <label for="assign_to">Assign To</label>
                 <select class="form-control" id="assign_to" name="assign_to">
                   <option value="">Select Assign To</option>
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index c1134d52..537134ad 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -1,7 +1,4 @@
 <style>
-.bg-staff {
-    background-color: #FFF5E5;
-}
 
 .notes-box {
   display: flex;
@@ -45,18 +42,26 @@
 
 .conversation-card{
     border-radius: 15px !important;
-    box-shadow: 0 1px 4px #000000;
+    box-shadow: 0 2px 4px 0 #00000040;
+      }
+.card-scroll{
+overflow-y:auto;
+height:440px;
+
+
 }
 
 .conversation-card,
 .conversation-card .card-header,
 .conversation-card .card-body {
   background: #F5FFFF !important;
-  overflow-y:auto;
+ 
 }
 .master-card{
     border-radius: 15px !important;
     box-shadow: 0 1px 4px #000000;
+    overflow-y:auto;
+    overflow-x:auto;
 }
 </style>
 <style>
@@ -162,7 +167,7 @@
                 <div class="col-8">
                     
                     <!-- Conversation Card -->
-                    <div class="card mb-3 conversation-card">
+                    <div class="card mb-3 conversation-card card-scroll">
                          <div class="card-header border-0">
                             <h5 class="mb-0">Conversation</h5>
                             <hr/>
@@ -210,8 +215,10 @@
                             <div class="notes-box">
                                     <textarea class="form-control" id="notes" name="notes" placeholder="Write your notes here..."></textarea>
                                     <div class="icon-buttons">
-                                        <button type="button" class="btn-icon" onclick="submitConverstionTicket('External')"><i class="mdi mdi-content-save"></i></button>
-                                        <button type="button" class="btn-icon" onclick="submitConverstionTicket('Internal')"><i class="mdi mdi-email"></i></button>
+                                        <!-- save btn means local - internal  -->
+                                        <button type="button" class="btn-icon" onclick="submitConverstionTicket('Internal')"><i class="mdi mdi-content-save"></i></button>
+                                        <!-- mail btn means notify - external  -->
+                                        <button type="button" class="btn-icon" onclick="submitConverstionTicket('External')"><i class="mdi mdi-email"></i></button>
                                     </div>
                             </div>
                         </form>
@@ -235,8 +242,8 @@
 
         <div class="modal-body">    
           <div class="form-row">
-            <input type="hidden" id="edit_thz_id" name="thz_id">
-            <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
+            <input type="text" id="edit_thz_id" name="thz_id">
+            <input type="text" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
             
             <div class="form-group col-md-12">
               <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
@@ -329,15 +336,11 @@
             $("#ticket_type").select2();
             $("#status").select2();
             $("#assign_to").select2();
-    });
-
-
-    function openEditTicket() {
-      
-      var form = document.getElementById('ticketForm');
+            var form = document.getElementById('ticketForm');
       form.reset(); 
 
       var masterData = <?= json_encode($master[0]); ?>;
+      console.log(masterData);
     
         document.getElementById('EditModalLabel').innerText = "Update";
 
@@ -347,6 +350,20 @@
         document.getElementById('ticket_type').value = masterData.ticket_type;
 
       
+      document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ;
+
+      var myModal = new bootstrap.Modal(document.getElementById('EditModal'));
+      myModal.show();
+    });
+
+
+    function openEditTicket() {
+      
+      
+
+      var masterData = <?= json_encode($master[0]); ?>;
+      console.log(masterData);
+
       document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ;
 
       var myModal = new bootstrap.Modal(document.getElementById('EditModal'));

From 2f3a195b43f4c65e78543d9831734d5b3fcef736 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Thu, 21 Aug 2025 19:35:19 +0530
Subject: [PATCH 26/54] BUG_css issues

---
 app/Views/thz_list.php  |  7 +++--
 app/Views/thz_notes.php | 68 ++++++++++++++++++++---------------------
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 10c3e72e..e711f27a 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -133,7 +133,7 @@ td .text-muted {
                 <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
                     <thead>
                         <tr>
-                            <th>Ticket Number</th>
+                            <th>Ticket No</th>
                             <th>Name</th>
                             <th>Policy Number</th>
                             <th>Ticket Type</th>
@@ -188,7 +188,7 @@ td .text-muted {
 </div>
 
 <div class="modal fade" id="ticketModal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered modal-xl">
+  <div class="modal-dialog modal-dialog-centered modal-xl" style="margin:5px auto!important;">
     <div class="modal-content">
       <form id="ticketForm">
         <!-- <div class="modal-header">
@@ -231,7 +231,8 @@ td .text-muted {
               </div>
         </div>
                 
-        <div class="modal-body">    
+        <div class="modal-body" style="padding-top: 15px !important;
+  padding-bottom: 10px !important;">    
           <div class="form-row">
             <input type="hidden" id="thz_id" name="thz_id">
             <input type="hidden" id="return_type" name="return_type">
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 537134ad..09dd2504 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -43,25 +43,31 @@
 .conversation-card{
     border-radius: 15px !important;
     box-shadow: 0 2px 4px 0 #00000040;
-      }
+}
+
 .card-scroll{
-overflow-y:auto;
-height:440px;
-
+    overflow-y:auto;
+    height:440px;
+}
+.recard-scroll{
+    overflow-y:auto;
+    height:295px;
+}
 
+.maincard{
+    margin-top:0 !important;
+    padding-top: 0 !important;
 }
 
 .conversation-card,
 .conversation-card .card-header,
 .conversation-card .card-body {
   background: #F5FFFF !important;
- 
 }
+
 .master-card{
     border-radius: 15px !important;
-    box-shadow: 0 1px 4px #000000;
-    overflow-y:auto;
-    overflow-x:auto;
+    box-shadow: 0 2px 4px 0 #00000040;
 }
 </style>
 <style>
@@ -70,15 +76,15 @@ height:440px;
 .related-ticket-card .card-body {
   background: #F5FFFF !important;
   overflow-y:auto;
-  box-shadow: 0 1px 4px #000000;
+  box-shadow: 0 2px 4px 0 #00000040;
 }
 </style>
 
 
 
 <div class="col-12">
-    <div class="card">
-        <div class="card-body">
+    <div class="card ">
+        <div class="card-body maincard">
             
             <!-- Title -->
             <div class="row" id="notes-title" style="padding-bottom: 10px;">
@@ -105,7 +111,7 @@ height:440px;
                                     </i>
                             </a>
                         </div>
-                        <div class="card-body" style="padding-left: 27px !important; background:#F5FFFF;">
+                        <div class="card-body card-scroll" style="padding-left: 27px !important; background:#F5FFFF;">
                             <div class="row mb-2 ml-o">
                                 <div class="col-5">Ticket ID</div>
                                 <div class="col-7 text-end"><?= $master[0]['thz_id'];?></div>
@@ -167,13 +173,13 @@ height:440px;
                 <div class="col-8">
                     
                     <!-- Conversation Card -->
-                    <div class="card mb-3 conversation-card card-scroll">
+                    <div class="card mb-3 conversation-card">
                          <div class="card-header border-0">
-                            <h5 class="mb-0">Conversation</h5>
+                            <h5 class="mb-0" style="font-size:15px;">Conversation</h5>
                             <hr/>
                         </div>
 
-                        <div class="card-body pt-0">
+                        <div class="card-body pt-0 recard-scroll">
                           <?php if(!empty($notes)): ?>
                             <?php foreach($notes as $i => $conv): ?>
                                     
@@ -295,18 +301,18 @@ height:440px;
 
 <div class="modal fade" id="relatedTicketModal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered">
-    <div class="modal-content">
+    <div class="modal-content" style="border-radius:15px;">
       
-        <div class="modal-header">
+        <div class="modal-header" style="border-bottom-width:0;">
             <h4 class="modal-title">Related Tickets</h4>
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
         </div>
 
-        <div class="modal-body">  
+        <div class="modal-body card-scroll" style="padding-top:5px!important;">  
             
             <?php foreach($related_tickets as $j => $rt): ?>
                 <div class="card related-ticket-card mb-3">
-                        <div class="card-body">
+                        <div class="card-body" style="border-radius: 20px; padding:27px !important;">
                             <div class="d-flex justify-content-between align-items-start">
                                 <h5 class="mb-1"><?php echo $rt['ticket_type']; ?></h5>
                                 <small>
@@ -337,30 +343,22 @@ height:440px;
             $("#status").select2();
             $("#assign_to").select2();
             var form = document.getElementById('ticketForm');
-      form.reset(); 
+            form.reset(); 
 
-      var masterData = <?= json_encode($master[0]); ?>;
-      console.log(masterData);
+            var masterData = <?= json_encode($master[0]); ?>;
     
-        document.getElementById('EditModalLabel').innerText = "Update";
+            document.getElementById('edit_thz_id').value = masterData.thz_id;
+            document.getElementById('assign_to').value = masterData.assign_to;
+            document.getElementById('status').value = masterData.status;
+            document.getElementById('ticket_type').value = masterData.ticket_type;
+  
+            document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ;
 
-        document.getElementById('edit_thz_id').value = masterData.thz_id;
-        document.getElementById('assign_to').value = masterData.assign_to;
-        document.getElementById('status').value = masterData.status;
-        document.getElementById('ticket_type').value = masterData.ticket_type;
-
-      
-      document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ;
-
-      var myModal = new bootstrap.Modal(document.getElementById('EditModal'));
-      myModal.show();
     });
 
 
     function openEditTicket() {
       
-      
-
       var masterData = <?= json_encode($master[0]); ?>;
       console.log(masterData);
 

From ab76c4d4265190f53e991ac8f843914d8cf19ab4 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Fri, 22 Aug 2025 08:50:10 +0530
Subject: [PATCH 27/54] FEAT_CLAIM_DUMP_UPLOAD : RV

---
 app/Config/Routes.php                         |    3 +
 app/Controllers/ClientController.php          |   48 +-
 app/Controllers/JobWorker.php                 |   12 +
 .../PolicyTransactionController.php           |   12 +-
 app/Controllers/TicketController.php          |  151 ++
 app/Controllers/TicketServiceController.php   | 1800 +++++++++++++++++
 app/Helpers/claim_dump_helper.php             |  179 ++
 app/Models/ClaimDumpFileModel.php             |   56 +
 app/Models/TicketMasterModel.php              |  197 +-
 app/Views/claim_dump_file_list.php            |  330 +++
 app/Views/employee_data_list.php              |  216 +-
 app/Views/layout/header.php                   |    3 +
 .../policy_transaction_inception_list.php     |   13 +-
 13 files changed, 2902 insertions(+), 118 deletions(-)
 create mode 100644 app/Controllers/TicketServiceController.php
 create mode 100644 app/Helpers/claim_dump_helper.php
 create mode 100644 app/Models/ClaimDumpFileModel.php
 create mode 100644 app/Views/claim_dump_file_list.php

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 2377fc38..8cde4f3a 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -369,6 +369,9 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get('viewHrAccessData', 'ClientController::viewHrAccessData');
     $routes->post('saveHrAccessData', 'ClientController::saveHrAccessData');
     $routes->get('removeLevelContacts', 'ClientController::removeLevelContacts');
+    $routes->get('getClaimDumpFileErrorData', 'TicketController::getClaimDumpFileErrorData');
+    $routes->get("claim_dump_excel_error/(:any)", "TicketController::getClaimDumpExcelFileErrors/$1");
+    $routes->get("download_claim_dump_file/(:any)", "TicketController::downloadClaimDumpFile/$1");
 });
 
 $routes->post("policy_tranction/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index d4bfa5d8..7126cd69 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -143,7 +143,11 @@ class ClientController extends AdminController
 
         // Perform the query
         $builder = $db->table($table);
-        $isDuplicate = $builder->where($field, $value)->where('is_active', 1)->countAllResults() > 0;
+        if(is_array($value)){
+            $isDuplicate = $builder->where($value)->where('is_active', 1)->countAllResults() > 0;
+        }else{
+            $isDuplicate = $builder->where($field, $value)->where('is_active', 1)->countAllResults() > 0;
+        }
 
         // Return the result
         return $this->response->setJSON(['isDuplicate' => $isDuplicate]);
@@ -5037,7 +5041,16 @@ class ClientController extends AdminController
 
         // $employeeController = new EmployeeController();
         // $employeeController->truncateFileData('633');
-        
+
+        // ---------- TICKET SERVICE CONTROLLER --------------------------------------------------------------------------------
+
+        $ticketServiceController = new TicketServiceController();
+        // $response = $ticketServiceController->claimDumpExcelFileFormatValidation(["file_id" => 3]);
+        // $response = $ticketServiceController->claimDumpExcelFileDataValidation(["file_id" => 3]);
+        // $response = $ticketServiceController->claimDumpOnBoardProcess(["file_id" => 3]);
+        // $response = $ticketServiceController->extractExcelData("claims_dump_form_client.xlsx");
+        // dd($response);
+
         // ---------- EMP SERVICE CONTROLLER --------------------------------------------------------------------------------
 
         $empServiceController = new EmployeeServiceController();
@@ -5054,18 +5067,18 @@ class ClientController extends AdminController
         // ---------- POLICY TRANSACTION CONTROLLER --------------------------------------------------------------------------------
 
         $policyTransactionController = new PolicyTransactionController();
-        // $res = $policyTransactionController->validateInsurerStatement(['file_id' => '17']);
+        // $res = $policyTransactionController->validateInsurerStatement(['file_id' => '57']);
         // $res = $policyTransactionController->updateInsurerStatement(['file_id' => '22']);
         // dd('-----', $res);
 
         // ----------EMP DATA SERVICE CONTROLLER--------------------------------------------------------------------------------
 
         $batch_data = [
-            'client_id' => 20,
-            'client_branch_id' => 72,
-            'client_policy_id' => 127,
+            'client_id' => 51,
+            'client_branch_id' => 40,
+            'client_policy_id' => 63,
             'insurer_or_tpa' => "insurer",
-            'event_type' => "deletion",
+            'event_type' => "correction",
             'actions' => "export",
             'file_name' => "deletion_enhancement_test_file.xlsx",
         ]; 
@@ -5132,25 +5145,30 @@ class ClientController extends AdminController
         // $EmpDataServiceController->cashDepositCalculationForDeletion($array);
 
         // $result = $this->employeePolicyModel->getInceptionEmployeeDataForExportExcel($batch_data);
+        // $result = $this->employeePolicyModel->getCorrectionEmployeesDataForExportExcel($batch_data);
         // dd(db_connect()->getLastQuery());
 
         // ------------- LEADS CONTROLLER ----------------------------------------------------------
 
         $LeadsController = new LeadsController();
-        // $RFQModel = new RFQModel();
+        $RFQModel        = new RFQModel();
 
-        // $data = $RFQModel->where('is_active', 1)->where('lead_id', 40)->first();
-        // // dd($data);
+        // $data = $RFQModel->where('is_active', 1)->where('lead_id', 323)->orderBy('id', 'desc')->first();
+        // $data = db_connect()->table('leads')->where('is_active', 1)->where('id', 326)->orderBy('id', 'desc')->get()->getResultArray();
+        // dd($data);
         // $policy_type = 2;
         // $proposel_name = "Proposal 2";
         // $insurer_name = "ICICI-P-ICICI002-V1";
         // $jsonArray = json_decode($data['json'], true);
-        // // dd($jsonArray);
+        // dd($jsonArray);
 
-        // $returndata = $LeadsController->convertQCRJsonToPolicyTerms($jsonArray, $policy_type, $proposel_name, $insurer_name);
-        // dd($returndata);
-
-        //  $LeadsController->handleMemberDataGPATotalSumInsurerFromExcel(['lead_id' => 169]);
+        // $res = $LeadsController->convertQCRJsonToPolicyTerms($jsonArray, $policy_type, $proposel_name, $insurer_name);
+        // $res = $LeadsController->handleMemberDataGPATotalSumInsurerFromExcel(['lead_id' => 169]);
+        // $res = $LeadsController->reorderProposalsByInsurerTotal($jsonArray);
+        // $res = $LeadsController->calculateMembersDemography(['lead_id' => 326]);
+        // $res = $LeadsController->generateDemographyDataTable(['lead_id' => 326]);
+        // echo $res;
+        // dd($res);
 
         // -----------BDS REPORT CONTROLLER---------------------------------------------------------------------------------
         
diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index 4cbf5350..7136c017 100755
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -143,6 +143,18 @@ class JobWorker extends AdminController
         'type' => 'CC', // Handler Category
         'handler' => 'App\Controllers\ClientController',
     ],
+    'claimDumpExcelFileFormatValidation' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\TicketServiceController',
+    ],
+    'claimDumpExcelFileDataValidation' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\TicketServiceController',
+    ],
+    'claimDumpOnBoardProcess' => [
+        'type' => 'CC', // Handler Category
+        'handler' => 'App\Controllers\TicketServiceController',
+    ],
 ];
 
     
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index d6bc5167..9f7d7341 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -995,8 +995,16 @@ class PolicyTransactionController extends BaseController
         if ($id) {
 
             $data['is_active']  = 0;
-            $this->policyTransactionModel->where('id', $id)->set($data)->update();
-            $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
+            $policy_transaction_data = $this->policyTransactionModel->where('id', $id)->first();
+            if($policy_transaction_data['policy_type_id'] > 7){
+                
+                $this->policyTransactionModel->where('id', $id)->set($data)->update();
+                $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
+                $this->clientPolicyModel->where('id', $policy_transaction_data['client_policy_id'])->set($data)->update();
+            }else{
+                $this->policyTransactionModel->where('id', $id)->set($data)->update();
+                $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
+            }
             return $this->respond(['status' => true, 'code' => 200, 'message' => 'Policy Transaction removed successfully'], 200);
         } else {
 
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 4c344c28..a50b55be 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -21,6 +21,7 @@ use App\Models\InsurerModel;
 use App\Models\EmployeeModel;
 use App\Models\TPAModel;
 use App\Models\ClaimFilesModel;
+use App\Models\ClaimDumpFileModel;
 
 use DOMDocument;
 use Psr\Log\LoggerInterface;
@@ -60,6 +61,7 @@ class TicketController extends BaseController
     protected $insurerModel;
     protected $TPAModel;
     protected $claimFilesModel;
+    protected $claimDumpFileModel;
 
     public function __construct()
     {
@@ -345,6 +347,7 @@ class TicketController extends BaseController
         $this->insurerModel = new InsurerModel();
         $this->TPAModel = new TPAModel();
         $this->claimFilesModel = new ClaimFilesModel();
+        $this->claimDumpFileModel = new ClaimDumpFileModel();
     }
 
     public function ticketList()
@@ -2445,6 +2448,154 @@ class TicketController extends BaseController
     }
 
 
+    // -------- CLAIM DUMP UPLOAD ----------------------------------------------------------------------------------------------
+
+    public function claimDumpUpload()
+    {   
+        $data['page_name'] = "Claim Dupm Upload";
+
+        if($this->request->is('get')){
+
+            $data['claim_dump_file_data'] = $this->claimDumpFileModel
+                ->select('
+                        claim_dump_files.id as file_id, 
+                        claim_dump_files.file_name, 
+                        claim_dump_files.status,
+                        claim_dump_files.created_at,
+                        up.first_name as user_name
+                ')
+                ->join('user_profiles as up', 'claim_dump_files.created_by = up.id', 'left')
+                ->where('claim_dump_files.is_active', 1)
+                ->findAll();
+
+            return $this->loadLayout('claim_dump_file_list', $data);
+
+        }else{
+
+            // print_r($this->request->getFile('claim_dump_list')); die;
+            $filename = '';
+            $fileSize = '';
+
+            //validate uploaded file
+            $validated = $this->validate([
+                'claim_dump_list' => [
+                    'uploaded[claim_dump_list]',
+                    'mime_in[claim_dump_list,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.oasis.opendocument.spreadsheet]',
+                    'max_size[claim_dump_list,16384]',
+                ],
+            ]);
+            
+            if ($validated) 
+            {
+                    $avatar = $this->request->getFile('claim_dump_list');
+                    if (!$avatar) {
+                        $this->myLogger->logme("error", 'File not found');
+                        return $this->respond(['status' => false, 'code' => 400, 'message' => 'File not found'], 400);
+                    }
+
+                    $is_moved = $avatar->move(WRITEPATH . 'uploads/claim_dump_excel/');
+
+                    if ($is_moved) {
+                        $filename = $avatar->getName();
+                        $fileSize = $avatar->getSize(); // File size in bytes
+                        $fileSize = $fileSize / (1024 * 1024); // Convert to MB
+
+                        $this->myLogger->logme("error", 'File move successful');
+                        
+                    } else {
+                        $this->myLogger->logme("error", 'File move failed');
+                        return $this->respond(['status' => false, 'code' => 500, 'message' => 'File move failed'], 500);
+                    }
+
+            } else {
+                $this->myLogger->logme("error", 'Upload failed Invalid file');
+                return $this->respond(['status' => false, 'code' => 404, 'message' => 'Invalid file'], 404);
+            }
+
+
+            $status = 'inprogress';
+            $insert_data = [
+                'file_name' => $filename, 
+                'status' => $status
+            ];
+            
+            $file_id = $this->claimDumpFileModel->insert($insert_data); 
+            $this->myLogger->logme("error", 'claim_dumb_file_id : {file_id}, uploaded success', ['file_id' => $file_id]);
+
+            //after file upload success than call the file formate validation in service controller
+            $ticketServiceController = new TicketServiceController();
+            // $response = $ticketServiceController->claimDumpExcelFileFormatValidation(["file_id" => $file_id]);
+            $r = Jobs::addJob(['job_name' => 'claimDumpExcelFileFormatValidation', 'payload' => ['file_id' => $file_id]]);
+
+            return $this->respond(['status' => true, 'code' => 200, 'message' => 'File uploaded successfully. File being validated'], 200);
+
+        }
+    }
+
+    public function getClaimDumpFileErrorData()
+    {
+        $file_id = $this->request->getGet('file_id');
+        $file = $this->claimDumpFileModel->where('id', $file_id)->first();
+        if (!isset($file)) {
+            return $this->respond(['status' => false, 'code' => 404, 'message' => 'No data found'], 200);
+        } else {
+            return $this->respond(['status' => true, 'code' => 200, 'data' => $file['reason']], 200);
+        }
+    }
+
+    public function getClaimDumpExcelFileErrors($file_id)
+    {
+        // $file_id = $this->request->getGet('file_id');
+        $ticketServiceController = new TicketServiceController();
+
+        // Render views and capture output
+        $result = $ticketServiceController->getClaimExcelErrorData($file_id) ?? [];
+        // dd($result);
+
+        if ($result != 0) {
+
+            $result['file_id'] = $file_id;
+            echo view('excel_errors', $result);
+        } else if ($result == 0) {
+
+            $data['message'] = 'File Not Found Physically';
+            return view('errors/404', $data);
+        } else {
+
+            echo view('errors/html/production');
+        }
+    }
+
+    public function downloadClaimDumpFile($file_id)
+    {
+         // $actionType = $this->request->getGet();
+        $file_data = $this->claimDumpFileModel->where('id', $file_id)->first();
+        $fileName = $file_data['file_name'];
+
+        $filePath = WRITEPATH . '/uploads/claim_dump_excel/' . $fileName;
+
+        try {
+
+            // Check if the file exists
+            if (file_exists($filePath)) {
+                // Set the appropriate MIME type
+                $mimeType = mime_content_type($filePath);
+
+                // Send the file to the client for download
+                return $this->response->download($filePath, null, $mimeType);
+            } else {
+
+                $data['message'] = 'The Physical File Not Found';
+                echo view('errors/404', $data);
+            }
+        } catch (\Exception $e) {
+            // Handle any exceptions
+            $errorMessage = $e->getMessage();
+            $this->myLogger->logme('error', $errorMessage);
+            // You can return an error response here
+            echo $errorMessage;
+        }
+    }
     
 
 }
diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
new file mode 100644
index 00000000..e6c137f4
--- /dev/null
+++ b/app/Controllers/TicketServiceController.php
@@ -0,0 +1,1800 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Controllers\BaseController;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\API\ResponseTrait;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use Kint\Kint;
+
+use App\Models\ClaimDumpFileModel;
+use App\Models\EmployeeModel;
+use App\Models\InsurerModel;
+use App\Models\TPAModel;
+use App\Models\ClientModel;
+use App\Models\TicketClaimStatusModel;
+use App\Models\ClientPolicyModel;
+
+use App\Helpers\ExcelSanitizeHelper;
+use App\Models\TicketMasterModel;
+
+class TicketServiceController extends BaseController
+{
+    use ResponseTrait;
+
+    protected $myLogger;
+    protected $claim_dump_excel_columns;
+    protected $tableHeaders;
+    protected $actualHeaders;
+
+    protected $claimDumpFileModel;
+    protected $clientModel;
+    protected $insurerModel;
+    protected $TPAModel;
+    protected $ticketClaimStatusModel;
+    protected $clientPolicyModel;
+
+
+    public function __construct()
+    {   
+        helper('excel_util_helper');
+        helper('claim_dump_helper');
+        $this->myLogger = \Config\Services::mylogger();
+        set_session_context('Ticket Service Controller');
+
+        $this->claimDumpFileModel = new ClaimDumpFileModel();
+        $this->clientModel = new ClientModel();
+        $this->insurerModel = new InsurerModel();
+        $this->TPAModel = new TPAModel();
+        $this->ticketClaimStatusModel = new TicketClaimStatusModel();
+        $this->clientPolicyModel = new ClientPolicyModel();
+
+        $this->claim_dump_excel_columns = [
+
+            // Mandatory Fields
+            'sno' => [
+                'col_idx' => 0,
+                'col_cell_name' => 'A',
+                'col_name' => 'S.No.',
+                'is_mandatory' => true,
+                'data_type' => 'int',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'policy_type' => [
+                'col_idx' => 1,
+                'col_cell_name' => 'B',
+                'col_name' => 'Policy Type',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => ['GMC', 'GPA', 'EDLI', 'GTLI']
+            ],
+            
+            'status' => [
+                'col_idx' => 2,
+                'col_cell_name' => 'C',
+                'col_name' => 'Status',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'client_short_name' => [
+                'col_idx' => 3,
+                'col_cell_name' => 'D',
+                'col_name' => 'Corporate Name',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'insurer' => [
+                'col_idx' => 4,
+                'col_cell_name' => 'E',
+                'col_name' => 'Insurer',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'tpa' => [
+                'col_idx' => 5,
+                'col_cell_name' => 'F',
+                'col_name' => 'TPA',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'policy_no' => [
+                'col_idx' => 6,
+                'col_cell_name' => 'G',
+                'col_name' => 'Policy No',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'employee_code' => [
+                'col_idx' => 7,
+                'col_cell_name' => 'H',
+                'col_name' => 'Employee Code',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'employee_name' => [
+                'col_idx' => 8,
+                'col_cell_name' => 'I',
+                'col_name' => 'Employee Name',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'insured_name' => [
+                'col_idx' => 9,
+                'col_cell_name' => 'J',
+                'col_name' => 'Insured Name',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'relationship' => [
+                'col_idx' => 10,
+                'col_cell_name' => 'K',
+                'col_name' => 'Relationship',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => ['Self', 'Spouse', 'Child', 'Parent', 'Other']
+            ],
+            
+            'mode_of_intimation' => [
+                'col_idx' => 11,
+                'col_cell_name' => 'L',
+                'col_name' => 'Mode of Intimation',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => ['Email', 'Phone', 'Portal', 'Physical']
+            ],
+            
+            'acm' => [
+                'col_idx' => 12,
+                'col_cell_name' => 'M',
+                'col_name' => 'ACM',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'claim_type' => [
+                'col_idx' => 13,
+                'col_cell_name' => 'N',
+                'col_name' => 'Claim Type',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'priority' => [
+                'col_idx' => 14,
+                'col_cell_name' => 'O',
+                'col_name' => 'Priority',
+                'is_mandatory' => true,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => ['Critical', 'Emergency', 'Urgent', 'High', 'Medium', 'Low']
+            ],
+            
+            // Common Fields
+            'date_of_birth' => [
+                'col_idx' => 15,
+                'col_cell_name' => 'P',
+                'col_name' => 'Date of Birth',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'employee_mobile' => [
+                'col_idx' => 16,
+                'col_cell_name' => 'Q',
+                'col_name' => 'Employee Mobile',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => '/^[0-9]{10}$/',
+                'allowed_values' => null
+            ],
+            
+            'employee_email' => [
+                'col_idx' => 17,
+                'col_cell_name' => 'R',
+                'col_name' => 'Employee Email',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => 'email',
+                'allowed_values' => null
+            ],
+            
+            'employee_personal_email' => [
+                'col_idx' => 18,
+                'col_cell_name' => 'S',
+                'col_name' => 'Employee Personal Email',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => 'email',
+                'allowed_values' => null
+            ],
+            
+            // GMC Specific Fields
+            'hospital_name' => [
+                'col_idx' => 19,
+                'col_cell_name' => 'T',
+                'col_name' => 'Hospital Name',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'doa' => [
+                'col_idx' => 20,
+                'col_cell_name' => 'U',
+                'col_name' => 'DOA (Date of Admission)',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'dod' => [
+                'col_idx' => 21,
+                'col_cell_name' => 'V',
+                'col_name' => 'DOD (Date of Discharge)',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'claim_amount' => [
+                'col_idx' => 22,
+                'col_cell_name' => 'W',
+                'col_name' => 'Claim Amount',
+                'is_mandatory' => false,
+                'data_type' => 'decimal',
+                'format' => '2',
+                'allowed_values' => null
+            ],
+            
+            'pod_no' => [
+                'col_idx' => 23,
+                'col_cell_name' => 'X',
+                'col_name' => 'POD No.',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'tpa_id' => [
+                'col_idx' => 24,
+                'col_cell_name' => 'Y',
+                'col_name' => 'TPA ID',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'claim_number' => [
+                'col_idx' => 25,
+                'col_cell_name' => 'Z',
+                'col_name' => 'Claim Number',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            // GPA Specific Fields
+            'sum_insured' => [
+                'col_idx' => 26,
+                'col_cell_name' => 'AA',
+                'col_name' => 'Sum Insured',
+                'is_mandatory' => false,
+                'data_type' => 'decimal',
+                'format' => '2',
+                'allowed_values' => null
+            ],
+            
+            'date_of_join' => [
+                'col_idx' => 27,
+                'col_cell_name' => 'AB',
+                'col_name' => 'Date of Join',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'date_of_inception' => [
+                'col_idx' => 28,
+                'col_cell_name' => 'AC',
+                'col_name' => 'Date of Inception',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'date_of_accident' => [
+                'col_idx' => 29,
+                'col_cell_name' => 'AD',
+                'col_name' => 'Date of Accident',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'date_of_death' => [
+                'col_idx' => 30,
+                'col_cell_name' => 'AE',
+                'col_name' => 'Date of Death',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'date_of_intimate' => [
+                'col_idx' => 31,
+                'col_cell_name' => 'AF',
+                'col_name' => 'Date of Intimate',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            // Status Wise Column Mandatory
+            'raised_date' => [
+                'col_idx' => 32,
+                'col_cell_name' => 'AG',
+                'col_name' => 'Raised Date',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'registration_date' => [
+                'col_idx' => 33,
+                'col_cell_name' => 'AH',
+                'col_name' => 'Registration Date',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'query_received_date' => [
+                'col_idx' => 34,
+                'col_cell_name' => 'AI',
+                'col_name' => 'Query Received Date',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'payment_initiate_date' => [
+                'col_idx' => 35,
+                'col_cell_name' => 'AJ',
+                'col_name' => 'Payment Initiate Date',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'denial_reason' => [
+                'col_idx' => 36,
+                'col_cell_name' => 'AK',
+                'col_name' => 'Denial Reason',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'denial_date' => [
+                'col_idx' => 37,
+                'col_cell_name' => 'AL',
+                'col_name' => 'Denial Date',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'approved_date' => [
+                'col_idx' => 38,
+                'col_cell_name' => 'AM',
+                'col_name' => 'Approved Date',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'approved_letter' => [
+                'col_idx' => 39,
+                'col_cell_name' => 'AN',
+                'col_name' => 'Approved Letter',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'approved_amount' => [
+                'col_idx' => 40,
+                'col_cell_name' => 'AO',
+                'col_name' => 'Approved Amount',
+                'is_mandatory' => false,
+                'data_type' => 'decimal',
+                'format' => '2',
+                'allowed_values' => null
+            ],
+            
+            'approved_description' => [
+                'col_idx' => 41,
+                'col_cell_name' => 'AP',
+                'col_name' => 'Approved Description',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'utr_details' => [
+                'col_idx' => 42,
+                'col_cell_name' => 'AQ',
+                'col_name' => 'UTR Details',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'settle_letter' => [
+                'col_idx' => 43,
+                'col_cell_name' => 'AR',
+                'col_name' => 'Settle Letter',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'settled_date' => [
+                'col_idx' => 44,
+                'col_cell_name' => 'AS',
+                'col_name' => 'Settled Date',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'd-m-Y',
+                'allowed_values' => null
+            ],
+            
+            'return_remark' => [
+                'col_idx' => 45,
+                'col_cell_name' => 'AT',
+                'col_name' => 'Return Remark',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'cancel_remark' => [
+                'col_idx' => 46,
+                'col_cell_name' => 'AU',
+                'col_name' => 'Cancel Remark',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'awb_courier' => [
+                'col_idx' => 47,
+                'col_cell_name' => 'AV',
+                'col_name' => 'AWB No. and Courier Name',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            
+            'non_id_reason' => [
+                'col_idx' => 48,
+                'col_cell_name' => 'AW',
+                'col_name' => 'Non ID Reason',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ]
+        ];
+
+        $this->tableHeaders = [
+            "S NO",
+            "POLICY #",
+            "Status",
+            "Account manager",
+            "Insurer",
+            "TPA",
+            "Corporate",
+            "Emp ID",
+            "TPA ID",
+            "Claim ID",
+            "Employee Name",
+            "Insured Name",
+            "Relationship",
+            "Emp. Mobile",
+            "Emp mail id",
+            "Claim Collection",
+            "Source Detail",
+            "Claim Type",
+            "Hospital",
+            "DOA",
+            "DOD",
+            "Claim Amount",
+            "Date of Claim Receipt",
+            "Date sent to TPA",
+            "Date of Claim Registration",
+            "Date - Latest Query Raise",
+            "Date - Latest Query Resolution",
+            "Approved Amt",
+            "Date of Approval",
+            "UTR - Settlement",
+            "Date of Settlement",
+            "Reason",
+            "Remarks",
+            "Approval Letter",
+            "Settlement Letter",
+            "Denial Letter",
+        ];
+
+        $this->actualHeaders = [
+            
+            "sno" => [
+                'col_idx' => 0,
+                'col_cell_name' => 'A',
+                'col_name' => 'S NO',
+                'is_mandatory' => true,
+                'data_type' => 'int',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "corporate" => [
+                'col_idx' => 6,
+                'col_cell_name' => 'G',
+                'col_name' => 'Corporate',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null,
+                'custom' => 'check_client',
+                'params' => ['client_excel_name']
+            ],
+            "policy_no" => [
+                'col_idx' => 1,
+                'col_cell_name' => 'B',
+                'col_name' => 'POLICY #',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null,
+            ],
+            "status" => [
+                'col_idx' => 2,
+                'col_cell_name' => 'C',
+                'col_name' => 'Status',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null,
+                'custom' => 'check_status',
+                'params' => ['excel_status_data']
+            ],
+            "acm" => [
+                'col_idx' => 3,
+                'col_cell_name' => 'D',
+                'col_name' => 'Account manager',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "insurer" => [
+                'col_idx' => 4,
+                'col_cell_name' => 'E',
+                'col_name' => 'Insurer',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null,
+                'custom' => 'check_insurer',
+                'params' => ['insurer_excel_name']
+            ],
+            "tpa" => [
+                'col_idx' => 5,
+                'col_cell_name' => 'F',
+                'col_name' => 'TPA',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null,
+                'custom' => 'check_tpa',
+                'params' => ['tpa_excel_name']
+            ],
+            "emp_id" => [
+                'col_idx' => 7,
+                'col_cell_name' => 'H',
+                'col_name' => 'Emp ID',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "tpa_id" => [
+                'col_idx' => 8,
+                'col_cell_name' => 'I',
+                'col_name' => 'TPA ID',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "claim_id" => [
+                'col_idx' => 9,
+                'col_cell_name' => 'J',
+                'col_name' => 'Claim ID',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "employee_name" => [
+                'col_idx' => 10,
+                'col_cell_name' => 'K',
+                'col_name' => 'Employee Name',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "insured_name" => [
+                'col_idx' => 11,
+                'col_cell_name' => 'L',
+                'col_name' => 'Insured Name',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "relationship" => [
+                'col_idx' => 12,
+                'col_cell_name' => 'M',
+                'col_name' => 'Relationship',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => ['self', 'spouse', 'son', 'daughter', 'father', 'mother', 'father-in-law', 'mother-in-law']
+            ],
+            "emp_mobile" => [
+                'col_idx' => 13,
+                'col_cell_name' => 'N',
+                'col_name' => 'Emp. Mobile',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => 'phone',
+                'allowed_values' => null
+            ],
+            "emp_email" => [
+                'col_idx' => 14,
+                'col_cell_name' => 'O',
+                'col_name' => 'Emp mail id',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => 'email',
+                'allowed_values' => null
+            ],
+            "claim_collection" => [
+                'col_idx' => 15,
+                'col_cell_name' => 'P',
+                'col_name' => 'Claim Collection',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => ["In Person", "Courier", "Online Mode - Email", "Smart Service Desk", "Direct to TPA"]
+            ],
+            "source_detail" => [
+                'col_idx' => 16,
+                'col_cell_name' => 'Q',
+                'col_name' => 'Source Detail',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "claim_type" => [
+                'col_idx' => 17,
+                'col_cell_name' => 'R',
+                'col_name' => 'Claim Type',
+                'is_mandatory' => true,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => ["Claim", "Main Hospitalization", "Pre / Post", "OPD", "ReOpen", "TTD", "PTD", "PPD", "Death"]
+            ],
+            "hospital" => [
+                'col_idx' => 18,
+                'col_cell_name' => 'S',
+                'col_name' => 'Hospital',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "doa" => [
+                'col_idx' => 19,
+                'col_cell_name' => 'T',
+                'col_name' => 'DOA',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'm/d/Y',
+                'allowed_values' => null
+            ],
+            "dod" => [
+                'col_idx' => 20,
+                'col_cell_name' => 'U',
+                'col_name' => 'DOD',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'm/d/Y',
+                'allowed_values' => null
+            ],
+            "claim_amount" => [
+                'col_idx' => 21,
+                'col_cell_name' => 'V',
+                'col_name' => 'Claim Amount',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "date_claim_receipt" => [
+                'col_idx' => 22,
+                'col_cell_name' => 'W',
+                'col_name' => 'Date of Claim Receipt',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'm/d/Y',
+                'allowed_values' => null
+            ],
+            "date_claim_registration" => [
+                'col_idx' => 24,
+                'col_cell_name' => 'Y',
+                'col_name' => 'Date of Claim Registration',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'm/d/Y',
+                'allowed_values' => null
+            ],
+            "date_latest_query_raise" => [
+                'col_idx' => 25,
+                'col_cell_name' => 'Z',
+                'col_name' => 'Date - Latest Query Raise',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'm/d/Y',
+                'allowed_values' => null
+            ],
+            "date_latest_query_resolution" => [
+                'col_idx' => 26,
+                'col_cell_name' => 'AA',
+                'col_name' => 'Date - Latest Query Resolution',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'm/d/Y',
+                'allowed_values' => null
+            ],
+            "approved_amt" => [
+                'col_idx' => 27,
+                'col_cell_name' => 'AB',
+                'col_name' => 'Approved Amt',
+                'is_mandatory' => false,
+                'data_type' => 'str',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "date_approval" => [
+                'col_idx' => 28,
+                'col_cell_name' => 'AC',
+                'col_name' => 'Date of Approval',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'm/d/Y',
+                'allowed_values' => null
+            ],
+            "utr_settlement" => [
+                'col_idx' => 29,
+                'col_cell_name' => 'AD',
+                'col_name' => 'UTR - Settlement',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "date_settlement" => [
+                'col_idx' => 30,
+                'col_cell_name' => 'AE',
+                'col_name' => 'Date of Settlement',
+                'is_mandatory' => false,
+                'data_type' => 'date',
+                'format' => 'm/d/Y',
+                'allowed_values' => null
+            ],
+            "reason" => [
+                'col_idx' => 31,
+                'col_cell_name' => 'AF',
+                'col_name' => 'Reason',
+                'is_mandatory' => false,
+                'data_type' => 'text',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "remarks" => [
+                'col_idx' => 32,
+                'col_cell_name' => 'AG',
+                'col_name' => 'Remarks',
+                'is_mandatory' => false,
+                'data_type' => 'text',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "approval_letter" => [
+                'col_idx' => 33,
+                'col_cell_name' => 'AH',
+                'col_name' => 'Approval Letter',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "settlement_letter" => [
+                'col_idx' => 34,
+                'col_cell_name' => 'AI',
+                'col_name' => 'Settlement Letter',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ],
+            "denial_letter" => [
+                'col_idx' => 35,
+                'col_cell_name' => 'AJ',
+                'col_name' => 'Denial Letter',
+                'is_mandatory' => false,
+                'data_type' => 'string',
+                'format' => null,
+                'allowed_values' => null
+            ]
+        ];
+
+    }
+
+    //create a sample excel for development
+    public function createSampleClaimDumpExcelFileWithHeaderOnly()
+    {
+
+        // create a sample file
+        $headers = [];
+        foreach ($this->claim_dump_excel_columns as $key => $value) {
+            $headers[] = $value['col_name'];
+        }
+        generateExcelWithHeader($headers, 'claim_dump_sample.xlsx');
+        dd($headers);
+    }
+
+    // ---------------------------------------------------------------------------------------------------------
+
+    public function claimDumpExcelFileFormatValidation($params)
+    {   
+        $file_id = $params['file_id'];
+        $file = $this->claimDumpFileModel->where("id", $file_id)->first();
+        $this->myLogger->logme('error', "Start the claim dump file format validataion with the file id : " . $file_id);
+        // dd($file);
+
+        $return = [];
+        if (empty($file)) {
+            return array('status' => false, 'message' => 'File not found in Database');
+        }
+
+        $file_name_with_path = WRITEPATH . "/uploads/claim_dump_excel/" . $file['file_name'];
+
+        //check physical file exist
+        if (!file_exists($file_name_with_path)) {
+
+            $message = "Physcial file not found";
+            $this->myLogger->logme('error', ($message . ' for file id : ' . $file_id));
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            return  array('error_summary' => [5], 'error_data' => $message);
+        }
+
+        //Read the excel file
+        try {
+            $excel_data_and_headers = $this->extractExcelData($file['file_name']);
+            $excel_data = $excel_data_and_headers['excel_data'];
+        } catch (\Exception $e) {
+            $errorDetails = [
+                'error_message' => $e->getMessage(),
+                'file'          => $e->getFile(),
+                'line'          => $e->getLine(),
+                'stack_trace'   => $e->getTraceAsString(),
+            ];
+            $message = "Contact system admin";
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            $this->myLogger->logme("error", 'Excel data extraction failed due to : ' . json_encode($errorDetails ?? []));
+            return $errorDetails;
+        }
+        // dd($excel_data_and_headers); 
+
+        //Claim dump excel colums
+        $columns_to_check = $excel_data_and_headers['claim_dump_excel_columns'];
+        // dd($columns_to_check);  
+
+        $client_data = $this->clientModel->where('is_active', 1)->where('client_type', 1)->findAll();
+        $insurer_data = $this->insurerModel->where('is_active', 1)->findAll();
+        $tpa_data = $this->TPAModel->where('is_active', 1)->findAll();
+        $claim_status_data = $this->ticketClaimStatusModel->select('id, claim_status')->where('is_active', 1)->orderBy('id', 'asc')->groupBy('claim_status')->findAll();
+
+
+        //Store the error data by this structure
+        $result = ['error_type' => 1, 'error_summary' => [], 'error_data' => []];
+
+        //excel data is empty than through the error
+        if(count($excel_data ?? []) <= 1){
+            $message = "Uploaded file is empty";
+            return  array('error_summary' => [5], 'error_data' => $message);
+        }
+
+        //check no of columns in excel
+        $excel_columns = ($excel_data[0]);
+        // $keys = array_keys($columns_to_check);
+
+        //check columns order in excel
+        $column_count_res = check_columns_name($columns_to_check, $excel_columns);
+        // dd($column_count_res);
+
+        if (isset($column_count_res) && count($column_count_res)) {
+            //columns count mismatch
+            $message = implode("\n", $column_count_res);
+            $this->myLogger->logme('error', ($message . ' for file id ' . $file_id));
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([6]), 'error_data' => $message])])->update();
+            return  array('error_summary' => [6], 'error_data' => $message);
+        }
+
+        //remove header
+        unset($excel_data[0]);
+
+        try {
+            foreach ($excel_data as $row_key => $row) {
+
+                //avoid empty rows
+                if (check_row_is_empty_or_null($row)) {
+                    break;
+                }
+
+                //iterate each row for columns validations
+                foreach ($row as $col_key => $col) {
+
+                    if (!isset($columns_to_check[$col_key])) {
+                        continue;
+                    }
+
+                    $is_mandatory = $columns_to_check[$col_key]['is_mandatory'];
+                    $format = $columns_to_check[$col_key]['format'];
+                    $allowed_values = $columns_to_check[$col_key]['allowed_values'];
+                    $custom_function = isset($columns_to_check[$col_key]['custom']) ? $columns_to_check[$col_key]['custom'] : null;
+                    $binding_params = isset($columns_to_check[$col_key]['params']) ? $columns_to_check[$col_key]['params'] : null;
+
+
+                    $column_dispaly_name = $columns_to_check[$col_key]['col_name'];
+                    $column_index = $columns_to_check[$col_key]['col_idx'];
+                    $column_cell = $columns_to_check[$col_key]['col_cell_name'];
+
+
+                    if ($column_dispaly_name == "Corporate") {
+                        $client_excel_name = ["client_name" => $col, "client_data" => $client_data];
+                    }
+
+                    if ($column_dispaly_name == "Insurer") {
+                        $insurer_excel_name = ["insurer_name" => $col, "insurer_data" => $insurer_data];
+                    }
+
+                    if ($column_dispaly_name == "TPA") {
+                        $tpa_excel_name = ["tpa_name" => $col, "tpa_data" => $tpa_data];
+                    }
+
+                    if ($column_dispaly_name == "Status") {
+                        $excel_status_data = ["value" => $col, "data" => $claim_status_data];
+                    }
+
+                    //mandatory check
+                    if (is_bool($is_mandatory) && $is_mandatory === true) {
+                        if ($col == "" || $col == NULL) {
+                            array_push($result['error_summary'], 1); //push error code for summary
+                            $result['error_data'][$row_key][$col_key]['col_name'] = $column_dispaly_name; //push column name
+                            $result['error_data'][$row_key][$col_key]['col_idx'] = $column_index; //push column index
+                            $result['error_data'][$row_key][$col_key]['error'][] = 'Value is mandatory'; //push exact error desc
+                        }
+                    }
+
+                    //format check
+                    if (isset($format)) {
+                        $format_error = dynamic_check_excel_date_format($col, $format);
+                        if (!$format_error['status']) {
+                            array_push($result['error_summary'], 2);
+                            $result['error_data'][$row_key][$col_key]['col_name'] = $column_dispaly_name; //push column name
+                            $result['error_data'][$row_key][$col_key]['col_idx'] = $column_index; //push column index
+                            $result['error_data'][$row_key][$col_key]['error'][] = $format_error['error'];
+                        }
+                    }
+
+                    //allowed values check
+                    if (($is_mandatory === true && isset($allowed_values) && is_array($allowed_values)) || (is_array($is_mandatory) && (isset($allowed_values) && is_array($allowed_values)))) {
+                        if (!in_array((trim($col)), $allowed_values)) {
+                            array_push($result['error_summary'], 3);
+                            $result['error_data'][$row_key][$col_key]['col_name'] = $column_dispaly_name; //push column name
+                            $result['error_data'][$row_key][$col_key]['col_idx'] = $column_index; //push column index
+                            $result['error_data'][$row_key][$col_key]['error'][] = "Value not allowed: Expected " . implode(",", $allowed_values) . " and received $col";
+                        }
+                    }
+
+                    //custom function check
+                    if (isset($custom_function)) {
+
+                        // convert string params into PHP variables
+                        // Create an array of variables to pass custom helper funcitons 
+                        $param_values = [];
+                        foreach ($binding_params as $bkey => $bparam) {
+                            $param_values[] = ($$bparam);
+                        }
+
+                        $res = call_user_func_array($custom_function, $param_values);
+
+                        if ($res['status'] === false) {
+                            array_push($result['error_summary'], 4);
+                            $result['error_data'][$row_key][$col_key]['col_name'] = $column_dispaly_name; //push column name
+                            $result['error_data'][$row_key][$col_key]['col_idx'] = $column_index; //push column index
+                            $result['error_data'][$row_key][$col_key]['error'][] = $res['error'];
+                        }
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+            $errorDetails = [
+                'error_message' => $e->getMessage(),
+                'file'          => $e->getFile(),
+                'line'          => $e->getLine(),
+                'stack_trace'   => $e->getTraceAsString(),
+            ];
+            $message = "Contact system admin";
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            $this->myLogger->logme("error", 'Claim dump file format validation failed due to : ' . json_encode($errorDetails ?? []));
+            return $errorDetails;
+        }
+
+        if (isset($result['error_summary']) && count($result['error_summary'])) {
+            $result['error_summary'] = array_count_values($result['error_summary']);
+            $status = 'failed';
+            $failure_reason = ((json_encode($result)));
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => $status, 'reason' => $failure_reason])->update();
+            $this->myLogger->logme("error", '{file_id} uploaded failed', ['file_id' => $file_id]);
+        } else { //trigger next data validation via job queue server
+            //proceed next data level validation in JOB queue
+            $r = Jobs::addJob(['job_name' => 'claimDumpExcelFileDataValidation', 'payload' => ['file_id' => $file_id]]);
+            // $response = $this->claimDumpExcelFileDataValidation(['file_id' => $file_id]);
+        }
+
+        return $result;
+    }
+
+    public function claimDumpExcelFileDataValidation($params)
+    {
+        //get file name
+        $file_id = $params['file_id'];
+        $file = $this->claimDumpFileModel->find($file_id);
+        $this->myLogger->logme('error', "Start the claim dump File Data Validataion with the file id : " . $file_id);
+        // dd($file);
+
+        if (!isset($file)) {
+            return array('status' => false, 'message' => 'File not found in Database');
+        }
+
+        $file_name_with_path = WRITEPATH . "/uploads/claim_dump_excel/" . $file['file_name'];
+
+        //check physical file
+        if (!file_exists($file_name_with_path)) {
+            $message = "Physical file not found";
+            $this->myLogger->logme('error', ($message . ' for file id ' . $file_id));
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            return  array('error_summary' => [5], 'error_data' => $message);
+        }
+
+        //Read the excel file
+        try {
+            $excel_data_and_headers = $this->extractExcelData($file['file_name'], "modified_column");
+            $excel_data = $excel_data_and_headers['excel_data'];
+        } catch (\Exception $e) {
+            $errorDetails = [
+                'error_message' => $e->getMessage(),
+                'file'          => $e->getFile(),
+                'line'          => $e->getLine(),
+                'stack_trace'   => $e->getTraceAsString(),
+            ];
+            $message = "Contact system admin";
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            $this->myLogger->logme("error", 'Excel data extraction failed due to : ' . json_encode($errorDetails ?? []));
+            return $errorDetails;
+        }
+        // dd($excel_data_and_headers); 
+        // print_rr($excel_data);
+
+        //Claim dump excel colums
+        $columns_to_check = $excel_data_and_headers['claim_dump_excel_columns'];
+        // dd($columns_to_check);  
+
+        $result = ['error_type' => 2, 'error_summary' => [], 'error_data' => []];
+
+        //remove header
+        unset($excel_data[0]);
+
+        try {
+            foreach ($excel_data as $row_key => $row) {
+
+                //avoid empty rows
+                if (check_row_is_empty_or_null($row)) {
+                    break;
+                }
+
+                $client_column_index = $columns_to_check['corporate']['col_idx'];
+                $policy_no_column_index = $columns_to_check['policy_no']['col_idx'];
+                $insurer_column_index = $columns_to_check['insurer']['col_idx'];
+                $tpa_column_index = $columns_to_check['tpa']['col_idx'];
+
+                $emp_id_column_index       = $columns_to_check['emp_id']['col_idx'];
+                $emp_name_column_index     = $columns_to_check['employee_name']['col_idx'];
+                $insured_name_column_index = $columns_to_check['insured_name']['col_idx'];
+                $claim_no_column_index     = $columns_to_check['claim_id']['col_idx'];
+                $tpa_no_column_index       = $columns_to_check['tpa_id']['col_idx'];
+                $relation_column_index     = $columns_to_check['relationship']['col_idx'];
+                $acm_column_index          = $columns_to_check['acm']['col_idx'];
+
+                //excel file Account Manager Details like Name and Mobile Number
+                $excel_acm_data = $row[$acm_column_index] ?? null;
+
+                $acm_name = null;
+                $acm_mobile = null;
+
+                //seperate the Account Manager Name and Mobile No
+                if (!empty($excel_acm_data)) {
+                    $parts = array_map('trim', explode('-', $excel_acm_data, 2));
+                    $acm_name   = $parts[0] ?? null;
+                    $acm_mobile = $parts[1] ?? null;
+                }
+
+                $params = [
+                    'client_name' => $row[$client_column_index] ?? null,
+                    'policy_no' => $row[$policy_no_column_index] ?? null,
+                    'insurer_short_name' => $row[$insurer_column_index] ?? null,
+                    'tpa_short_name' => $row[$tpa_column_index] ?? null,
+                    'emp_code' => $row[$emp_id_column_index] ?? null,
+                    'emp_name' => $row[$emp_name_column_index] ?? null,
+                    'insured_name' => $row[$insured_name_column_index] ?? null,
+                    'claim_no' => $row[$claim_no_column_index] ?? null,
+                    'tpa_no' => $row[$tpa_no_column_index] ?? null,
+                    'relationship' => $row[$relation_column_index] ?? null,
+                    'acm_mobile' => $acm_mobile ?? null,
+                    'acm_name' => $acm_name ?? null,
+                ];
+
+                $ticketMasterModal = new TicketMasterModel();
+
+                //check the Claim
+                $claim_data = $ticketMasterModal->getTheClaimDetails($params);
+                // dd($claim_data);
+                if (count($claim_data) != 0) {
+
+                    array_push($result['error_summary'], 7);
+                    $result['error_data'][$row_key][$policy_no_column_index]['col_name'] = $columns_to_check['policy_no']['col_name']; //push column name
+                    $result['error_data'][$row_key][$policy_no_column_index]['col_idx'] = $policy_no_column_index; //push column index
+                    $result['error_data'][$row_key][$policy_no_column_index]['error'][] = "This claim already exist in the system";
+
+                } else {
+
+                    //check the policy
+                    $policy_data = $ticketMasterModal->getPolicyData($params);
+                    // dd($policy_data);
+                    if (count($policy_data) == 0) {
+
+                        array_push($result['error_summary'], 8);
+                        $result['error_data'][$row_key][$policy_no_column_index]['col_name'] = $columns_to_check['policy_no']['col_name']; //push column name
+                        $result['error_data'][$row_key][$policy_no_column_index]['col_idx'] = $policy_no_column_index; //push column index
+                        $result['error_data'][$row_key][$policy_no_column_index]['error'][] = "The combination of Client, Insurer, TPA and Policy No. does not exist in the system";
+
+                    } else {
+
+                        //check the employee and insured
+                        $employee_data = $ticketMasterModal->getEmployeeAndEmployeePolicyDetails($params) ?? [];
+                        // dd($employee_data);
+                        if (count($employee_data) == 0) {
+                            array_push($result['error_summary'], 9);
+                            $result['error_data'][$row_key][$emp_name_column_index]['col_name'] = $columns_to_check['employee_name']['col_name']; //push column name
+                            $result['error_data'][$row_key][$emp_name_column_index]['col_idx'] = $emp_name_column_index; //push column index
+                            $result['error_data'][$row_key][$emp_name_column_index]['error'][] = "This employee not exist in the system";
+                        }
+                    }
+
+                    //check the Account Manager exist
+                    $acm_data = $ticketMasterModal->getAcmUserDetails($params) ?? [];
+                    // dd($acm_data);
+                    if (count($acm_data) == 0) {
+                        array_push($result['error_summary'], 10);
+                        $result['error_data'][$row_key][$emp_name_column_index]['col_name'] = $columns_to_check['employee_name']['col_name']; //push column name
+                        $result['error_data'][$row_key][$emp_name_column_index]['col_idx'] = $emp_name_column_index; //push column index
+                        $result['error_data'][$row_key][$emp_name_column_index]['error'][] = "This Acount Manager not exist in the system";
+                    }
+                }
+
+            }
+        } catch (\Exception $e) {
+            $errorDetails = [
+                'error_message' => $e->getMessage(),
+                'file'          => $e->getFile(),
+                'line'          => $e->getLine(),
+                'stack_trace'   => $e->getTraceAsString(),
+            ];
+            $message = "Contact system admin";
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            $this->myLogger->logme("error", 'Claim dump file data validation failed due to : ' . json_encode($errorDetails ?? []));
+            return $errorDetails;
+        }
+
+        if (isset($result['error_summary']) && count($result['error_summary'])) {
+
+            $result['error_summary'] = array_count_values($result['error_summary']);
+            $status = 'failed';
+            $failure_reason = ((json_encode($result)));
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => $status, 'reason' => $failure_reason])->update();
+            $this->myLogger->logme("error", '{file_id} uploaded failed', ['file_id' => $file_id]);
+
+        } else {
+            $r = Jobs::addJob(['job_name' => 'claimDumpOnBoardProcess', 'payload' => ['file_id' => $file_id]]);
+        }
+
+        return $result;
+    }
+
+    public function claimDumpOnBoardProcess($params)
+    {
+        //get file name
+        $file_id = $params['file_id'];
+        $file = $this->claimDumpFileModel->find($file_id);
+        $this->myLogger->logme('error', "Start the claim dump OnBoard Process with the file id : " . $file_id);
+        // dd($file);
+
+        if (!isset($file)) {
+            return array('status' => false, 'message' => 'File not found in Database');
+        }
+
+        $file_name_with_path = WRITEPATH . "/uploads/claim_dump_excel/" . $file['file_name'];
+
+        //check physical file
+        if (!file_exists($file_name_with_path)) {
+            $message = "Physical file not found";
+            $this->myLogger->logme('error', ($message . ' for file id ' . $file_id));
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            return  array('error_summary' => [5], 'error_data' => $message);
+        }
+
+        //Read the excel file
+        try {
+            $excel_data_and_headers = $this->extractExcelData($file['file_name'],  "modified_column");
+            $excel_data = $excel_data_and_headers['excel_data'];
+            unset($excel_data[0]); //remove header
+        } catch (\Exception $e) {
+            $errorDetails = [
+                'error_message' => $e->getMessage(),
+                'file'          => $e->getFile(),
+                'line'          => $e->getLine(),
+                'stack_trace'   => $e->getTraceAsString(),
+            ];
+            $message = "Contact system admin";
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            $this->myLogger->logme("error", 'Excel data extraction failed due to : ' . json_encode($errorDetails ?? []));
+            return $errorDetails;
+        }
+        // dd($excel_data_and_headers); 
+
+        //Claim dump excel colums
+        $columns_to_check = $excel_data_and_headers['claim_dump_excel_columns'];
+
+        //create the instance of the ticket master modal
+        $ticketMasterModal = new TicketMasterModel();
+
+        $inserted_claim_list = [];
+        //loop the excel data to be insert the ticket master modal
+
+        try{
+            foreach ($excel_data as $row_key => $row) {
+
+                //avoid empty rows
+                if (check_row_is_empty_or_null($row)) {
+                    break;
+                }
+
+                $client_column_index       = $columns_to_check['corporate']['col_idx'];
+                $policy_no_column_index    = $columns_to_check['policy_no']['col_idx'];
+                $insurer_column_index      = $columns_to_check['insurer']['col_idx'];
+                $tpa_column_index          = $columns_to_check['tpa']['col_idx'];
+                $emp_id_column_index       = $columns_to_check['emp_id']['col_idx'];
+                $emp_name_column_index     = $columns_to_check['employee_name']['col_idx'];
+                $insured_name_column_index = $columns_to_check['insured_name']['col_idx'];
+                $claim_no_column_index     = $columns_to_check['claim_id']['col_idx'];
+                $tpa_no_column_index       = $columns_to_check['tpa_id']['col_idx'];
+                $relation_column_index     = $columns_to_check['relationship']['col_idx'];
+
+                $params = [
+                    'client_name' => $row[$client_column_index] ?? null,
+                    'policy_no' => $row[$policy_no_column_index] ?? null,
+                    'insurer_short_name' => $row[$insurer_column_index] ?? null,
+                    'tpa_short_name' => $row[$tpa_column_index] ?? null,
+                    'emp_code' => $row[$emp_id_column_index] ?? null,
+                    'emp_name' => $row[$emp_name_column_index] ?? null,
+                    'insured_name' => $row[$insured_name_column_index] ?? null,
+                    'claim_no' => $row[$claim_no_column_index] ?? null,
+                    'tpa_no' => $row[$tpa_no_column_index] ?? null,
+                    'relationship' => $row[$relation_column_index] ?? null,
+                ];
+
+                // get the policy data
+                $policy_data = $ticketMasterModal->getEmployeeAndEmployeePolicyDetails($params);
+                // dd($policy_data);
+
+                //construct the claim data to be insert
+                $data = $this->constructClaimData($row, $policy_data, $columns_to_check);
+                // dd($data);
+
+                if(!empty($data)){
+
+                    $data['file_id'] = $file_id;
+                    //insert the claim data to ticket master table
+                    $insert = $ticketMasterModal->insert($data);
+                    $inserted_claim_list[] = $insert;
+
+                    $str = implode(', ', array_map(fn($k, $v) => "$k=$v", array_keys($params), $params)) ?? "";
+                    $this->myLogger->logme("error",'Claim insert success --- :' . $str);
+
+                }else{
+                    $str = implode(', ', array_map(fn($k, $v) => "$k=$v", array_keys($params), $params)) ?? "";
+                    $this->myLogger->logme("error",'This employee claim dose not insert --- :' . $str);
+                }
+
+
+            }
+        }catch(\Exception $e){
+            $errorDetails = [
+                'error_message' => $e->getMessage(),
+                'file'          => $e->getFile(),
+                'line'          => $e->getLine(),
+                'stack_trace'   => $e->getTraceAsString(),
+            ];
+            $message = "Contact system admin";
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            $this->myLogger->logme("error", 'Claim dump file Onboard Process failed due to : ' . json_encode( $errorDetails ?? []));
+            return $errorDetails;
+        }
+
+        $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'success','reason' => ''])->update();
+        $this->myLogger->logme("error",'{file_id} claim dump uploaded success',['file_id' => $file_id]);
+        return $inserted_claim_list;
+    }
+
+    public function extractExcelData($file_name, $returnType = null)
+    {
+        // $file_name = "claims_dump_form_client.xlsx";
+        // Load the Excel file
+        $file_name_with_path = WRITEPATH . "/uploads/claim_dump_excel/" . $file_name;
+        $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($file_name_with_path);
+        $worksheet = $spreadsheet->getActiveSheet();
+
+        // Get the highest row and column numbers
+        $highestRow = $worksheet->getHighestDataRow();
+        $highestColumn = $worksheet->getHighestDataColumn();
+        // dd($highestRow, $highestColumn);
+
+        // Get header row (assuming headers are in row 1)
+        // $headerRow = $worksheet->rangeToArray('A1:' . $highestColumn . '1', null, true, false)[0];
+        $excel_data = $worksheet->rangeToArray('A1:' . $highestColumn . $highestRow);
+        // print_rr($excel_data); die;
+
+        $header_with_column_index = $this->getTheColumnIndex($excel_data[0], $this->actualHeaders, $returnType);
+
+        //Sanitize the excel data
+        // $excel_data = ExcelSanitizeHelper::sanitizeArrayData($excel_data);
+
+        $data = [
+            'claim_dump_excel_columns' => $header_with_column_index,
+            'excel_data' => $excel_data,
+        ];
+
+        // dd($data);
+        return $data;
+    }
+
+    private function getTheColumnIndex($headerRow, $definedColumns, $returnType = null)
+    {   
+        $result = [];
+        foreach ($definedColumns as $key => $value) {
+            foreach ($headerRow as $col_index => $col_name) {
+
+                if($returnType == null){
+                    if(trim($col_name) == trim($value['col_name'])){
+                        $columnLetter = Coordinate::stringFromColumnIndex(($col_index + 1));
+                        $result[$col_index] = $value;
+                        $result[$col_index]["col_idx"] = $col_index;
+                        $result[$col_index]["col_cell_name"] = $columnLetter;
+                    }
+                }else{
+                     if(trim($col_name) == trim($value['col_name'])){
+                        $columnLetter = Coordinate::stringFromColumnIndex(($col_index + 1));
+                        $definedColumns[$key]["col_idx"] = $col_index;
+                        $definedColumns[$key]["col_cell_name"] = $columnLetter;
+                    }
+                }
+            }
+        }
+
+        // dd($result);
+        if($returnType == null){
+            return $result;
+        }
+
+        return $definedColumns;
+
+    }
+
+    private function constructClaimData($excel_data, $db_data, $columns_to_check)
+    {
+        $client_column_index       = $columns_to_check['corporate']['col_idx'];
+        $policy_no_column_index    = $columns_to_check['policy_no']['col_idx'];
+        $insurer_column_index      = $columns_to_check['insurer']['col_idx'];
+        $tpa_column_index          = $columns_to_check['tpa']['col_idx'];
+
+        $emp_id_column_index       = $columns_to_check['emp_id']['col_idx'];
+        $emp_name_column_index     = $columns_to_check['employee_name']['col_idx'];
+        $insured_name_column_index = $columns_to_check['insured_name']['col_idx'];
+        $claim_no_column_index     = $columns_to_check['claim_id']['col_idx'];
+        $tpa_no_column_index       = $columns_to_check['tpa_id']['col_idx'];
+        $relation_column_index     = $columns_to_check['relationship']['col_idx'];
+
+        $status_column_index                  = $columns_to_check['status']['col_idx'];
+        $acm_column_index                     = $columns_to_check['acm']['col_idx'];
+        $tpa_id_column_index                  = $columns_to_check['tpa_id']['col_idx'];
+        $claim_id_column_index                = $columns_to_check['claim_id']['col_idx'];
+        $emp_mobile_column_index              = $columns_to_check['emp_mobile']['col_idx'];
+        $emp_email_column_index               = $columns_to_check['emp_email']['col_idx'];
+        $claim_collection_column_index        = $columns_to_check['claim_collection']['col_idx'];
+        $source_detail_column_index           = $columns_to_check['source_detail']['col_idx'];
+        $claim_type_column_index              = $columns_to_check['claim_type']['col_idx'];
+        $hospital_column_index                = $columns_to_check['hospital']['col_idx'];
+        $doa_column_index                     = $columns_to_check['doa']['col_idx'];
+        $dod_column_index                     = $columns_to_check['dod']['col_idx'];
+        $claim_amount_column_index            = $columns_to_check['claim_amount']['col_idx'];
+        $date_claim_receipt_column_index      = $columns_to_check['date_claim_receipt']['col_idx'];
+        $date_claim_registration_column_index = $columns_to_check['date_claim_registration']['col_idx'];
+        $date_latest_query_raise_column_index = $columns_to_check['date_latest_query_raise']['col_idx'];
+        $date_latest_query_resolution_index   = $columns_to_check['date_latest_query_resolution']['col_idx'];
+        $approved_amt_column_index            = $columns_to_check['approved_amt']['col_idx'];
+        $date_approval_column_index           = $columns_to_check['date_approval']['col_idx'];
+        $utr_settlement_column_index          = $columns_to_check['utr_settlement']['col_idx'];
+        $date_settlement_column_index         = $columns_to_check['date_settlement']['col_idx'];
+        $reason_column_index                  = $columns_to_check['reason']['col_idx'];
+        $remarks_column_index                 = $columns_to_check['remarks']['col_idx'];
+        $approval_letter_column_index         = $columns_to_check['approval_letter']['col_idx'];
+        $settlement_letter_column_index       = $columns_to_check['settlement_letter']['col_idx'];
+        $denial_letter_column_index           = $columns_to_check['denial_letter']['col_idx'];
+
+        $excel_status_data                  = $excel_data[$status_column_index] ?? null;
+        $excel_relationship_data            = $excel_data[$relation_column_index] ?? null;
+        $excel_acm_data                     = $excel_data[$acm_column_index] ?? null;
+        $excel_tpa_id_data                  = $excel_data[$tpa_id_column_index] ?? null;
+        $excel_claim_id_data                = $excel_data[$claim_id_column_index] ?? null;
+        $excel_emp_mobile_data              = $excel_data[$emp_mobile_column_index] ?? null;
+        $excel_emp_email_data               = $excel_data[$emp_email_column_index] ?? null;
+        $excel_claim_collection_data        = $excel_data[$claim_collection_column_index] ?? null;
+        $excel_source_detail_data           = $excel_data[$source_detail_column_index] ?? null;
+        $excel_claim_type_data              = $excel_data[$claim_type_column_index] ?? null;
+        $excel_hospital_data                = $excel_data[$hospital_column_index] ?? null;
+        $excel_doa_data                     = $excel_data[$doa_column_index] ?? null;
+        $excel_dod_data                     = $excel_data[$dod_column_index] ?? null;
+        $excel_claim_amount_data            = $excel_data[$claim_amount_column_index] ?? null;
+        $excel_date_claim_receipt_data      = $excel_data[$date_claim_receipt_column_index] ?? null;
+        $excel_date_claim_registration_data = $excel_data[$date_claim_registration_column_index] ?? null;
+        $excel_date_latest_query_raise_data = $excel_data[$date_latest_query_raise_column_index] ?? null;
+        $excel_date_latest_query_resolution_data = $excel_data[$date_latest_query_resolution_index] ?? null;
+        $excel_approved_amt_data            = $excel_data[$approved_amt_column_index] ?? null;
+        $excel_date_approval_data           = $excel_data[$date_approval_column_index] ?? null;
+        $excel_utr_settlement_data          = $excel_data[$utr_settlement_column_index] ?? null;
+        $excel_date_settlement_data         = $excel_data[$date_settlement_column_index] ?? null;
+        $excel_reason_data                  = $excel_data[$reason_column_index] ?? null;
+        $excel_remarks_data                 = $excel_data[$remarks_column_index] ?? null;
+        $excel_approval_letter_data         = $excel_data[$approval_letter_column_index] ?? null;
+        $excel_settlement_letter_data       = $excel_data[$settlement_letter_column_index] ?? null;
+        $excel_denial_letter_data           = $excel_data[$denial_letter_column_index] ?? null;
+
+
+        //create the instance of the ticket master modal
+        $ticketMasterModal = new TicketMasterModel();
+    
+        //excel file Account Manager Details like Name and Mobile Number
+        $excel_acm_data = $excel_data[$acm_column_index] ?? null;
+
+        $acm_name = null;
+        $acm_mobile = null;
+
+        //seperate the Account Manager Name and Mobile No
+        if (!empty($excel_acm_data)) {
+            $parts = array_map('trim', explode('-', $excel_acm_data, 2));
+            $acm_name   = $parts[0] ?? null;
+            $acm_mobile = $parts[1] ?? null;
+        }
+
+        $params = [
+            "acm_name" => $acm_name,
+            "acm_mobile" => $acm_mobile,
+        ];
+
+        //get the acountmanager data
+        $acm_data = $ticketMasterModal->getAcmUserDetails($params) ?? [];
+
+        //get the claim status id from the database
+        $claim_status_data = $this->ticketClaimStatusModel
+                            ->select('id, claim_status')
+                            ->where('is_active', 1)
+                            ->where('ticket_type', $db_data['ticket_type_id'])
+                            ->where('LOWER(claim_status)', strtolower($excel_status_data))
+                            ->first();
+
+        $claim_status_id = $claim_status_data['id'] ?? null;
+
+        //initialize Ticket controller for the other data
+        $ticketController = new TicketController();
+        $mode_of_intimation = array_flip($ticketController->modeOFIntimate);
+
+        //handle the Claim Type data key
+        $cliam_type_id = 1;
+        if(isset($db_data['ticket_type_id'])){
+            if($db_data['ticket_type_id'] == 2){
+                $claim_type = array_flip($ticketController->claimType[1]);
+                $cliam_type_id = $claim_type[$excel_claim_type_data] ?? 1;
+            }else{
+                $claim_type = array_flip($ticketController->claimType[2]);
+                $cliam_type_id = $claim_type[$excel_claim_type_data] ?? 1;
+            }
+        }
+
+        $db_data['insured_name'] = $db_data['insured_emp_id'] ?? null;
+        //get Insured emp name and Insured emp id
+        $insured_data = $ticketMasterModal->getInsuredDetails($db_data);
+
+        //handle remarks based on the status
+        $return_remarks = null;
+        $cancel_remarks = null;
+        $denial_reason = null;
+        if(strtolower($excel_status_data) == strtolower('RETURNED')){
+            $return_remarks = $excel_remarks_data ?? null;
+        }else if(strtolower($excel_status_data) == strtolower('CANCELLED')){
+            $cancel_remarks = $excel_remarks_data ?? null;
+        }else if(strtolower($excel_status_data) == strtolower('REJECTED')){
+            $denial_reason = $excel_reason_data ?? null;
+        }
+
+        $ticketMaster = [
+            'ticket_type_id'         => $db_data['ticket_type_id'] ?? null,
+            'claim_status_id'        => $claim_status_id ?? null,
+            'acm_id'                 => $acm_data['id'] ?? null,
+            'insurer_id'             => $db_data['insurer_id'] ?? null,
+            'tpa_id'                 => $excel_tpa_id_data ?? $db_data['tpa_id'] ?? null,
+            'client_id'              => $db_data['client_id'] ?? null,
+            'emp_id'                 => $db_data['emp_id'] ?? null,
+            'client_policy_id'       => $db_data['client_policy_id'] ?? null,
+            'policy_no'              => $db_data['policy_no'] ?? null,
+            'emp_code'               => $db_data['emp_code'] ?? null,
+            'tpa_no'                 => $db_data['tpa_no'] ?? null,
+            'emp_name'               => $db_data['emp_name'] ?? null,
+            'relationship'           => $excel_relationship_data ?? null,
+            'emp_mobile'             => $excel_emp_mobile_data ?? $db_data['emp_mobile'] ?? null,
+            'emp_mail'               => $excel_emp_email_data ?? $db_data['emp_mail'] ?? null,
+
+            'mode_of_intimation'     => $mode_of_intimation[$excel_claim_collection_data] ?? null,
+            'claim_type'             => $cliam_type_id ?? null,
+
+            'insured_emp_id'         => $insured_data['emp_id'] ?? null,
+            'insured_name'           => $insured_data['name'] ?? $db_data['insured_emp_id'] ?? null,
+
+            'hospital_name'          => $excel_hospital_data ?? null,
+            'claim_amount'           => $excel_claim_amount_data ?? null,
+            'claim_number'           => $excel_claim_id_data ?? null,
+            'approved_letter'        => $excel_approval_letter_data ?? null,
+            'approved_amount'        => $excel_approved_amt_data ?? null,
+            'utr_details'            => $excel_utr_settlement_data ?? null,
+            'settle_letter'          => $excel_settlement_letter_data ?? null,
+            'return_remark'          => $return_remarks,
+            'cancel_remark'          => $cancel_remarks,
+            'denial_reason'          => $denial_reason ?? null,
+
+            'doa'                    => normalizeDate($excel_doa_data),
+            'dod'                    => normalizeDate($excel_dod_data),
+            'raised_date'            => normalizeDate($excel_date_latest_query_raise_data),
+            'registration_date'      => normalizeDate($excel_date_claim_registration_data),
+            'query_received_date'    => normalizeDate($excel_date_latest_query_resolution_data),
+            'approved_date'          => normalizeDate($excel_date_approval_data),
+            'settled_date'           => normalizeDate($excel_date_settlement_data),
+
+            'priority'               => null,
+            'emp_personal_mail'      => null,
+            'pod_no'                 => null,
+            'dob'                    => null,
+            'date_of_join'           => null,
+            'date_of_incep'          => null,
+            'date_of_accident'       => null,
+            'date_of_death'          => null,
+            'date_of_intimat'        => null,
+            'si_amt'                 => null,
+            'denial_date'            => null,
+            'awb_no_courier_name'    => null,
+            'non_id_reason'          => null,
+            'pay_initiate_date'      => null,
+            'approved_description'   => null
+        ];
+
+        return  $ticketMaster;
+    }
+
+    public function getClaimExcelErrorData($file_id)
+    {
+        try {
+
+            $file = $this->claimDumpFileModel->where('id', $file_id)->first();
+            $error_data = json_decode($file['reason']);
+            // dd($error_data);
+
+            $file_name_with_path = WRITEPATH . "/uploads/claim_dump_excel/" . $file['file_name'];
+
+            //check the file exist or not
+            if (!file_exists($file_name_with_path)) {
+                $error_message = "File not found";
+                $this->myLogger->logme('error', ($error_message . ' for file id ' . $file_id));
+                return 0;
+            }
+
+            $excel_data_and_headers = $this->extractExcelData($file['file_name']);
+            $excel_data = $excel_data_and_headers['excel_data'];
+            $excelErrorData['excel_header'] = $excel_data[0];
+            unset($excel_data[0]);
+
+            // Kint::dump($excel_data);
+            if ($error_data->error_type == 1) {
+
+                $finalArray = [];
+                foreach ($error_data->error_data as $key => $value) {
+                    foreach ($value as $key2 => $value2) {
+                        $error_data = $value2->error;
+                        $data = ['value' => $excel_data[$key][$value2->col_idx], 'error' => $error_data,];
+                        $excel_data[$key][$value2->col_idx] = $data;
+                    }
+                    array_push($finalArray, $excel_data[$key]);
+                }
+
+                foreach ($finalArray as $fkey => $value) {
+                    foreach ($value as $vkey => $arrayData) {
+                        if (!is_array($arrayData)) {
+                            $data = ['value' => $arrayData];
+                            $finalArray[$fkey][$vkey] =  $data;
+                        }
+                    }
+                }
+
+                $excelErrorData['excel_data'] = $finalArray;
+                return $excelErrorData;
+            } else if ($error_data->error_type == 2) {
+
+
+                $allErrors = [];
+                $typeTowArray = [];
+
+                foreach ($error_data->error_data as $index => $item) {
+
+                    foreach ($item as $field) {
+                        if (!isset($allErrors[$index])) {
+                            $allErrors[$index] = [];
+                        }
+                        $allErrors[$index] = array_merge($allErrors[$index], $field->error);
+                    }
+                }
+
+                // dd(array_keys($allErrors));
+                foreach ($allErrors as $key => $value) {
+                    // echo $key;
+                    // print_r($value);
+                    foreach ($excel_data as $excel_data_index => $excel_data_value) {
+                        if ($excel_data_value[0] == $key) {
+                            $data = ['value' => $excel_data[$excel_data_index][1], 'error' => $value,];
+                            $excel_data[$excel_data_index][1] = $data;
+                            array_push($typeTowArray, $excel_data[$excel_data_index]);
+                            break;
+                        }
+                    }
+                }
+                // dd($data);
+                foreach ($typeTowArray as $fkey => $value) {
+                    foreach ($value as $vkey => $arrayData) {
+                        if (!is_array($arrayData)) {
+                            $data = ['value' => $arrayData];
+                            $typeTowArray[$fkey][$vkey] =  $data;
+                        }
+                    }
+                }
+
+                $excelErrorData['excel_data'] = $typeTowArray;
+                return $excelErrorData;
+            }
+        } catch (\Exception $e) {
+            // Handle any exceptions
+            $errorMessage = $e->getMessage(); //die();
+            $this->myLogger->logme('error', $errorMessage);
+            return false; // You can return an error response here
+        }
+    }
+
+    public function truncateClaimDumpFile($file_id)
+    {
+
+    }
+   
+}
diff --git a/app/Helpers/claim_dump_helper.php b/app/Helpers/claim_dump_helper.php
new file mode 100644
index 00000000..6f740e8a
--- /dev/null
+++ b/app/Helpers/claim_dump_helper.php
@@ -0,0 +1,179 @@
+<?php
+use App\Models\EmployeeModel;
+use App\Models\InsurerModel;
+use App\Models\TPAModel;
+use Kint\Kint;
+
+if (!function_exists('check_client')) {
+    function check_client($params)
+    {   
+        $client_data = $params['client_data'] ?? [];
+        $client_name = $params['client_name'] ?? "";
+        // Kint::dump($client_name);
+
+        if (!empty($client_data)) {
+            foreach ($client_data as $key => $value) {
+                // Kint::dump($value['client_name'], $client_name);
+                if(trim($value['client_name']) === trim($client_name)){
+                    return array('status' => true, 'client_id' => $value['id'], 'error' => '');
+                }
+            }
+        }
+
+        return array('status' => false, 'error' => 'This Client Name does not exist in the system');
+    }
+}
+
+if (!function_exists('check_insurer')) {
+    function check_insurer($params)
+    {
+        $insurer_data = $params['insurer_data'] ?? [];
+        $insurer_name = $params['insurer_name'] ?? "";
+        if (!empty($insurer_data)) {
+            foreach ($insurer_data as $key => $value) {
+                if(trim($value['short_name']) === trim($insurer_name)){
+                    return array('status' => true, 'insuer_id' => $value['id'], 'error' => '');
+                }
+            }
+        }
+
+        return array('status' => false, 'error' => 'This Insurer does not exist in the system');
+
+    }
+}
+
+if (!function_exists('check_tpa')) {
+    function check_tpa($params)
+    {
+        $tpa_data = $params['tpa_data'] ?? [];
+        $tpa_name = $params['tpa_name'] ?? "";
+        if (!empty($tpa_data)) {
+            foreach ($tpa_data as $key => $value) {
+                if(trim($value['short_name']) === trim($tpa_name)){
+                    return array('status' => true, 'tpa_id' => $value['id'], 'error' => '');
+                }
+            }
+        }
+
+        return array('status' => false, 'error' => 'This TPA does not exist in the system');
+    }
+}
+
+if (!function_exists('check_status')) {
+    function check_status($params)
+    {
+        $data = $params['data'] ?? [];
+        $check_value = $params['value'] ?? "";
+        if (!empty($data)) {
+            foreach ($data as $key => $value) {
+                // Kint::dump(strtolower(trim($value['claim_status'])), strtolower(trim($check_value)));
+                if(strtolower(trim($value['claim_status'])) === strtolower(trim($check_value))){
+                    return array('status' => true, 'status_id' => $value['id'], 'error' => '');
+                }
+            }
+        }
+
+        return array('status' => false, 'error'  => "This Status ('{$check_value}') does not exist in the system");
+    }
+}
+
+if (!function_exists('check_policy')) {
+    function check_policy($params)
+    {   
+        $data = $params['data'] ?? [];
+        $client_id = $params['client_id'] ?? "";
+        $check_value = $params['value'] ?? "";
+        if (!empty($data)) {
+            foreach ($data as $key => $value) {
+                if($value['client_id'] === $client_id && trim($value['policy_no']) === trim($check_value)){
+                    return array('status' => true, 'status_id' => $value['id'], 'error' => '');
+                }
+            }
+        }
+
+        return array('status' => false, 'error'  => "This Policy Number does not exist in the Client");
+    }
+}
+
+if (!function_exists('check_emp_and_insured')) {
+    function check_emp_and_insured($params)
+    {
+
+        $employee_modal = new EmployeeModel();
+        $tpa_data = $employee_modal
+            ->join('employee_polices', 'employees.id = employee_polices.employee_id')
+            ->where('employees.client', $params['client_id'])
+            ->where('employees.name', $params['emp_name'])
+            ->where('employees.emp_code', $params['emp_code'])
+            ->where('employees.is_active', 1)
+            ->where('employees.emp_status !=', "truncated")
+            ->where('employee_polices.is_active', 1)
+            ->where('employees.status !=', "truncated")
+            ->first();
+
+        if (empty($tpa_data)) {
+            return false;
+        }
+
+        return $tpa_data['id'];
+    }
+}
+
+if (!function_exists('dynamic_check_excel_date_format')) {
+
+    function dynamic_check_excel_date_format($dateString, $format = 'd/m/Y')
+    {
+
+        if ($dateString == "") {
+            return array('status' => true);
+        }
+        $date = DateTime::createFromFormat($format, $dateString);
+
+        if ($date && $date->format($format) == $dateString) {
+            return array('status' => true);
+        } else {
+
+            $res = validate_date_flexible($dateString, $format);
+            if (!$res) {
+                return array('status' => false, 'error' => "wrong date format: Expected {$format}({$res}) and received $dateString");
+            } else {
+                return array('status' => true);
+            }
+        }
+    }
+}
+
+if (!function_exists('validate_date_flexible')) {
+    function validate_date_flexible($date, $format = 'm/d/Y')
+    {
+        // Create a DateTime from the given format
+        $d = DateTime::createFromFormat($format, $date);
+        if (!$d) return false;
+
+        // Compare normalized values (remove leading zeros)
+        $original   = preg_replace('/\b0+/', '', $date);
+        $normalized = preg_replace('/\b0+/', '', $d->format($format));
+
+        return $original === $normalized;
+    }
+}
+
+if (!function_exists('normalizeDate')) {
+    function normalizeDate($dateString, $formats = ['d-m-Y', 'd/m/Y', 'm-d-Y', 'm/d/Y', 'Y-m-d'])
+    {
+        if (empty($dateString)) {
+            return null; // keep null if no value
+        }
+
+        foreach ($formats as $format) {
+            $dt = DateTime::createFromFormat($format, trim($dateString));
+            if ($dt && $dt->format($format) === trim($dateString)) {
+                return $dt->format('Y-m-d'); // ✅ return in DB format
+            }
+        }
+
+        return null; // if no valid format found
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/app/Models/ClaimDumpFileModel.php b/app/Models/ClaimDumpFileModel.php
new file mode 100644
index 00000000..224adafc
--- /dev/null
+++ b/app/Models/ClaimDumpFileModel.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class ClaimDumpFileModel extends Model
+{
+    protected $table            = 'claim_dump_files';
+    protected $primaryKey       = 'id';
+    protected $allowedFields    = [
+        "id",
+        "file_name",
+        "status",
+        "reason",
+        "created_by",
+        "created_at",
+        "updated_by",
+        "updated_at",
+        "is_active",
+    ];
+
+    // Callbacks
+    protected $allowCallbacks       = true;
+    protected $beforeInsert         = ["checkAndADDCreatedByValue"];
+    protected $afterInsert          = [];
+    protected $beforeUpdate         = ["checkAndUpdateUpdatedByValue"];
+    protected $afterUpdate          = [];
+    protected $beforeFind           = [];
+    protected $afterFind            = [];
+    protected $beforeDelete         = [];
+    protected $afterDelete          = [];
+
+    protected function checkAndADDCreatedByValue(array $data)
+    {
+        // Check if 'updated_by' value is null or empty
+        if (empty($data['data']['created_by'])) {
+            // Set 'updated_by' value to the current session user ID
+            $data['data']['created_by'] = get_session_userid();
+        }
+
+        return $data;
+    }
+
+    protected function checkAndUpdateUpdatedByValue(array $data)
+    {
+        // Check if 'updated_by' value is null or empty
+        if (empty($data['data']['updated_by'])) {
+            // Set 'updated_by' value to the current session user ID
+            $data['data']['updated_by'] = get_session_userid();
+        }
+
+        return $data;
+    }
+
+}
diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index 3a7c191a..013e5ad7 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -76,7 +76,9 @@ class TicketMasterModel extends Model
         'emp_personal_mail',
         'client_policy_id',
 
-        'approved_description'
+        'approved_description',
+        'file_id',
+        'denial_letter',
 
     ];
 
@@ -883,8 +885,6 @@ class TicketMasterModel extends Model
         return $finalResults;
     }
 
-
-
     public function getNotSettledbutApprovedCount($ticket_type)
     {
         // Fetch the approved and settled claim_status IDs
@@ -975,7 +975,198 @@ class TicketMasterModel extends Model
         return json_encode(['policy_terms' => null]);
     }
 
+    // ---------- CLAIM DUMP UPLOAD-------------------------------------------------------------------------------------------
+
+    public function getPolicyData($params)
+    {
+        $client_name = $params['client_name'] ?? null;
+        $insurer_short_name = $params['insurer_short_name'] ?? null;
+        $tpa_short_name = $params['tpa_short_name'] ?? null;
+        $policy_no = $params['policy_no'] ?? null;
 
 
+        $builder = $this->db->table('client_policy');
+        $builder->select('client_policy.*');
+        $builder->join('clients c', 'client_policy.client_id = c.id');
+        $builder->join('insurers i', 'client_policy.insurer_id = i.id');
+        $builder->join('tpa', 'client_policy.tpa_id = tpa.id and tpa.is_active = 1', 'left');
+        $builder->where('c.is_active', 1);
+        $builder->where('client_policy.is_active', 1);
+        $builder->where('i.is_active', 1);
+        $builder->where('c.client_name', trim($client_name));
+        $builder->where('i.short_name', trim($insurer_short_name));
+        if(!empty($tpa_short_name)){
+            $builder->where('tpa.short_name',  trim($tpa_short_name));
+        }
+        $builder->where('client_policy.policy_no', trim($policy_no));
+
+        $query = $builder->get();
+        $result = $query->getResultArray();
+        // dd($this->db->getLastQuery());
+        return $result;
+    }
+
+    public function getTheClaimDetails($params)
+    {   
+        $client_name        = $params['client_name'] ?? null;
+        $policy_no          = $params['policy_no'] ?? null;
+        $insurer_short_name = $params['insurer_short_name'] ?? null;
+        $tpa_short_name     = $params['tpa_short_name'] ?? null;
+        $emp_code           = $params['emp_code'] ?? null;
+        $emp_name           = $params['emp_name'] ?? null;
+        $insured_name       = $params['insured_name'] ?? null;
+        $claim_no           = $params['claim_no'] ?? null;
+        $tpa_no             = $params['tpa_no'] ?? null;
+        $relationship       = $params['relationship'] ?? null;
+
+        $builder = $this->table('ticket_master');
+        $builder->select('ticket_master.*');
+        $builder->join('clients c', 'ticket_master.client_id = c.id');
+        $builder->join('insurers i', 'ticket_master.insurer_id = i.id');
+        $builder->join('tpa', 'ticket_master.tpa_id = tpa.id', 'left');
+        $builder->where('c.is_active', 1);
+        $builder->where('i.is_active', 1);
+        $builder->where('tpa.is_active', 1);
+        $builder->where('ticket_master.is_active', 1);
+
+        $builder->where('c.client_name', trim($client_name));
+        $builder->where('i.short_name', trim($insurer_short_name));
+        $builder->where('ticket_master.policy_no', trim($policy_no));
+        $builder->where('ticket_master.emp_code', trim($emp_code));
+        $builder->where('ticket_master.emp_name', trim($emp_name));
+        $builder->where('ticket_master.insured_name', trim($insured_name));
+        $builder->where('ticket_master.tpa_no', trim($tpa_no));
+        $builder->where('ticket_master.claim_number', trim($claim_no));
+        $builder->where('ticket_master.relationship', trim($relationship));
+
+        if(!empty($tpa_short_name)){
+            $builder->where('tpa.short_name',  trim($tpa_short_name));
+        }
+
+        $query = $builder->get();
+        $result = $query->getResultArray();
+
+        return $result;
+
+    } 
+
+    public function getEmployeeAndEmployeePolicyDetails($params)
+    {   
+        $client_name  = $params['client_name'] ?? null;
+        $emp_code     = $params['emp_code'] ?? null;
+        $emp_name     = $params['emp_name'] ?? null;
+        $policy_no    = $params['policy_no'] ?? null;
+        $relationship = $params['relationship'] ?? null;
+        $insured_name = $params['insured_name'] ?? null;
+
+        $client_name  = "6-Eleven";
+        $emp_code     = "EMP0020K12";
+        $emp_name     = "Lokesh";
+        $policy_no    = "GMC-1999/2000/2021/2022";
+
+
+        $builder = $this->db->table('employees e');
+        $builder->select("
+            e.id as emp_id,
+            e.client_id,
+            e.client_branch_id,
+            e.emp_code,
+            e.name as emp_name,
+            e.mobile as emp_mobile,
+            e.email_corporate as emp_mail,
+            e.email_personal as emp_mail_personal,
+
+            ep.id as emp_policy_id,
+            ep.tpa_id as tpa_no,
+
+            cp.id as client_policy_id,
+            cp.insurer_id,
+            cp.tpa_id,
+            cp.policy_no,
+            CASE 
+                WHEN cp.policy_type_id = 2 THEN 1
+                WHEN cp.policy_type_id = 1 THEN 2
+                WHEN cp.policy_type_id = 6 THEN 3
+                WHEN cp.policy_type_id = 7 THEN 4
+                ELSE NULL
+            END AS ticket_type_id
+        ", false);
+        $builder->join('employee_polices ep', 'e.id = ep.employee_id');
+        $builder->join('clients c', 'e.client_id = c.id');
+        $builder->join('client_policy cp', 'ep.client_policy_id = cp.id');
+
+        $builder->where('e.is_active', 1);
+        $builder->where('ep.is_active', 1);
+        $builder->where('c.is_active', 1);
+        $builder->where('cp.is_active', 1);
+        $builder->where('e.emp_code', trim($emp_code));
+        $builder->where('e.name', trim($emp_name));
+        $builder->where('c.client_name', trim($client_name));
+        $builder->where('cp.policy_no', trim($policy_no));
+        $builder->where('LOWER(e.relationship)', strtolower('self'));
+
+        $query = $builder->get();
+        $result = $query->getResultArray();
+
+        return $result;
+    }
+
+    public function getAcmUserDetails($params)
+    {
+        $acm_name   = $params['acm_name'] ?? null;
+        $acm_mobile = $params['acm_mobile'] ?? null;
+
+        if ($acm_mobile != null) {
+
+            $builder = $this->db->table('user_profiles');
+            $builder->select("user_profiles.*");
+            $builder->where('user_profiles.is_active', 1);
+            $builder->where('user_profiles.mobile',  trim($acm_mobile));
+            $query = $builder->get();
+            $result = $query->getResultArray();
+
+            return $result;
+        }
+
+        return [];
+    }
+
+    public function getInsuredDetails($params)
+    {
+        $client_id  = $params['client_id'] ?? null;
+        $emp_code     = $params['emp_code'] ?? null;
+        $policy_id  = $params['client_policy_id'] ?? null;
+        $insured_name = $params['insured_name'] ?? null;
+
+        $builder = $this->db->table('employees e');
+        $builder->select("
+            e.id as emp_id,
+            e.client_id,
+            e.client_branch_id,
+            e.emp_code,
+            e.name as emp_name,
+            e.mobile as emp_mobile,
+            e.email_corporate as emp_mail,
+            e.email_personal as emp_mail_personal,
+
+            ep.id as emp_policy_id,
+            ep.tpa_id as tpa_no,
+        ");
+        $builder->join('employee_polices ep', 'e.id = ep.employee_id');
+        $builder->where('e.is_active', 1);
+        $builder->where('ep.is_active', 1);
+        $builder->where('e.emp_code', trim($emp_code));
+        $builder->where('e.name', trim($insured_name));
+        $builder->where('e.client_id', trim($client_id));
+        $builder->where('ep.client_policy_id', trim($policy_id));
+
+        $query = $builder->get();
+        $result = $query->getResultArray();
+
+        return $result;
+
+    }
+
+    // -----------------------------------------------------------------------------------------------------
 
 }
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
new file mode 100644
index 00000000..3caeb6a5
--- /dev/null
+++ b/app/Views/claim_dump_file_list.php
@@ -0,0 +1,330 @@
+<style>
+    .reload:hover {
+        cursor: pointer;
+    }
+</style>
+
+<div class="row">
+    <div class="col-xl-12" style="margin-left: 14px;max-width: 98%;">
+        <div id="accordion1" class="mb-3">
+            <div class="card mb-1">
+                <h5 class="m-1">
+                    <a id="toggleIcon1" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
+                        aria-expanded="true">
+                        <i id="icon1" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                    </a>
+                </h5>
+                <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion1">
+                    <div class="card-body">
+                        <form class="parsley-examples" id="claim-upload-form" enctype="multipart/form-data">
+                            <div class="form-group">
+                                <div class="form-row" id="file_upload">
+                                    <div class="form-group col-md-4">
+                                        <label>Upload file</label>
+                                        <!-- &nbsp;[ <a href="#" id="excel_download" data-toggle="tooltip" data-placement="top" title="Download Sample Excel">Sample Excel</a> ] -->
+                                        <input type="file" name="claim_dump_list" id="claim_dump_list" accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet" required>
+                                    </div>
+                                    <div class="d-flex align-items-center justify-content-start">
+                                        <div class="form-group col-md-11">
+                                            <div class="col-md-3">
+                                                <button id="claim_form_submit_button" type="submit" class="btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="col-12">
+    <div class="card">
+        <div class="card-body">
+            <div class="row" style="padding-bottom: 10px;">
+                <div class="col-6" style="align-self: center;">
+                    <h4 style="position: relative;">Files</h4>
+                </div>
+
+            </div>
+            <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0" id="tickets-table">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="font-weight-medium">SNO</th>
+                        <th class="font-weight-medium">File name</th>
+                        <th class="font-weight-medium">User/Time</th>
+                        <th class="font-weight-medium">Status</th>
+                        <th class="font-weight-medium">Action</th>
+                    </tr>
+                </thead>
+
+                <tbody class="font-12">
+                    <?php
+                    if (isset($claim_dump_file_data)) {
+                        foreach ($claim_dump_file_data as $key => $file) {
+                    ?>
+
+                            <tr>
+                                <td><b><?php echo ($key + 1) ?></b></td>
+                                <td style="overflow: hidden;" class="reload truncate" data-toggle="tooltip" data-placement="top" title="<?php echo $file['file_name'] ?>">
+                                    <?php echo $file['file_name'] ?>
+                                </td>
+                                <td><?php echo change_date_format($file['created_at'], 'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $file['user_name'] . '</strong>' ?> </td>
+                                <td>
+                                    <?php if ($file['status'] == "failed") { ?>
+                                        <?= $file['status'] ?> <span class='col-xl-3 col-lg-4 col-sm-6'> 
+                                            <!-- <a href="<?= base_url('util/claim_dump_excel_error/') . $file['file_id'] ?>" target="_blank" class='fe-alert-circle' data-err="<?= $file['file_id'] ?>"></a> -->
+                                            <a href="#" class='fe-alert-circle' onclick="fetchFileError(<?= $file['file_id'] ?>)"></a>
+                                        </span>
+                                    <?php } else if ($file['status'] == "inprogress") { ?>
+                                        <a data-id="<?= $file['status'] ?>" class="reload" href="#"><?= $file['status'] ?></a>
+                                    <?php } else { ?>
+                                        <?= $file['status'] ?>
+                                    <?php } ?>
+                                </td>
+                                <td>
+                                    <div class="btn-group dropdown">
+                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm"
+                                            data-toggle="dropdown" aria-expanded="false"><i
+                                                class="mdi mdi-dots-horizontal"></i></a>
+                                        <div class="dropdown-menu dropdown-menu-right">
+                                            <a target="_blank" class="dropdown-item" href="<?= base_url("util/download_claim_dump_file/") . $file['file_id']; ?>"><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
+                                            <!-- <a data-id="<?php echo $file['file_id'] ?>" data-toggle="modal" data-target="#full-width-modal-emp-list" class="dropdown-item view_emp_list" href="#"><i class="mdi mdi-eye mr-2 text-muted font-18 vertical-middle"></i>View</a> -->
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+                    <?php }
+                    } ?>
+
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div><!-- end col -->
+
+<!-- Center modal content -->
+<div class="modal fade" id="cliam-dump-file-err-modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myCenterModalLabel">File Rejected Reason</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div id="modal_body" class="modal-body">
+                <div class="spinner-border text-primary" role="status" style="position: relative; left: 200px;"></div>
+            </div>
+        </div>
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<script>
+
+    $(document).ready(function() {
+
+        // AJAX Form Submit Function
+        $('#claim-upload-form').on('submit', function(e) {
+            e.preventDefault(); // Prevent default form submission
+
+            // Get form data
+            var formData = new FormData(this);
+            var fileInput = $('#claim_dump_list')[0];
+
+            // Validate file type
+            var allowedTypes = [
+                'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                'application/vnd.ms-excel',
+                'application/vnd.oasis.opendocument.spreadsheet'
+            ];
+
+            var selectedFile = fileInput.files[0];
+            if (!allowedTypes.includes(selectedFile.type)) {
+                alert('Please upload a valid Excel file (.xlsx, .xls, .ods)');
+                return false;
+            }
+
+            //form submit url;
+            let url = `<?php echo base_url('ticket/claim-upload');  ?>`;
+
+            // Show loading state
+            var submitButton = $('#claim_form_submit_button');
+            var originalText = submitButton.text();
+            submitButton.prop('disabled', true).text('Uploading...');
+
+
+            // AJAX request
+            $.ajax({
+                url: url, // Your route URL
+                type: 'POST',
+                data: formData,
+                processData: false, // CRITICAL: Don't process the data
+                contentType: false, // CRITICAL: Don't set content-type header
+                cache: false,
+                success: function(response) {
+
+                    // Handle successful response
+                    console.log('Upload successful:', response);
+
+                    if (response.status == true) {
+                        toastr.success(response.message, "SUCCESS");
+                    } else {
+                        toastr.error(response.message, "ERROR");
+                    }
+
+                    // Reset form
+                    $('#claim-upload-form')[0].reset();
+                    window.location.reload();
+
+                },
+                error: function(xhr, status, error) {
+                    // Handle error response
+                    console.error('Upload failed:', error);
+                    console.error('Upload failed:', error);
+                },
+                complete: function() {
+                    // Reset button state
+                    submitButton.prop('disabled', false).text(originalText);
+                }
+            });
+        });
+
+        // File input change event for additional validation
+        $('#claim_dump_list').on('change', function() {
+            var fileInput = this;
+            var file = fileInput.files[0];
+
+            if (file) {
+                // Check file size (optional - set max size as needed, e.g., 10MB)
+                var maxSize = 10 * 1024 * 1024; // 10MB in bytes
+                if (file.size > maxSize) {
+                    toastr.warning('File size should not exceed 10MB');
+                    $(this).val(''); // Clear the input
+                    return false;
+                }
+
+                // Display selected file name
+                var fileName = file.name;
+                if ($('#selected-file').length === 0) {
+                    $('<div id="selected-file" class="mt-2 text-muted"><small>Selected file: <span id="file-name"></span></small></div>')
+                        .insertAfter('#claim_dump_list');
+                }
+                $('#file-name').text(fileName);
+            }
+        });
+
+        $('body').on('click', '.reload', function() {
+            status = this.getAttribute('data-id')
+            console.log(status);
+            if (status == 'inprogress') {
+                window.location.reload(true);
+            }
+        })
+
+    });
+
+    function fetchFileError(file_id) {
+
+        var url = '<?php echo base_url('util/getClaimDumpFileErrorData/'); ?>';
+        let requestData = { file_id: file_id };
+
+        var myModal = new bootstrap.Modal(document.getElementById('cliam-dump-file-err-modal'));
+        myModal.show();
+
+        sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+            console.log('Data fetched successfully:', response);
+
+            $('#modal_body').empty();
+            if (response.status === true) {
+
+                var file_error_data = (JSON.parse(response.data));
+                var file_error_html = "";
+
+                for (var key in file_error_data['error_summary']) {
+                    var err_id = parseInt(key);
+                    var err_count = file_error_data['error_summary'][key];
+                    switch (err_id) {
+                        case 0:
+                            file_error_html += "<strong>" + file_error_data['error_data'] + "</strong>";
+                            break;
+                        case 1:
+                            file_error_html += "<strong>Mandatory values missing</strong> <span class='badge badge-danger float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                        case 2:
+                            file_error_html += "<strong>Values not in expected format</strong> <span class='badge badge-danger float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                        case 3:
+                            file_error_html += "<strong>Field contains not allowed values</strong> <span class='badge badge-danger float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                        case 4:
+                            file_error_html += "<strong>Rule Conflict</strong> <span class='badge badge-danger float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                        case 5:
+                            file_error_html += "<strong>" + (file_error_data['error_data'] || 'Error data not available') + "</strong>";
+                            break;
+                        case 6:
+                            file_error_html += "<strong>" + (file_error_data['error_data'] || 'Error data not available') + "</strong>";
+                            break;
+                        case 7:
+                            file_error_html += "<strong>Claim already exist</strong> <span class='badge badge-danger float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                        case 8:
+                            file_error_html += "<strong>Policy not found</strong> <span class='badge badge-warning float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                        case 9:
+                            file_error_html += "<strong>Employee not found</strong> <span class='badge badge-danger float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                        case 10:
+                            file_error_html += "<strong>ACM not found</strong> <span class='badge badge-danger float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                        default:
+                            file_error_html += "<strong>Unknown error type</strong> <span class='badge badge-secondary float-right'>" + 
+                                            err_count + "</span><br>";
+                            break;
+                    }
+
+                }
+                if (err_id != 5 && err_id != 6 && err_id != 0) {
+                    file_error_html += (file_error_html != "" ?
+                        "<a href ='<?php echo base_url('util/claim_dump_excel_error/') ?>" + file_id +
+                        "' target=_blank>click here to more details...</a>" : "");
+                }
+
+                // console.log(file_error_html);
+                $('#modal_body').append(file_error_html);
+
+            } else {
+                console.log('Response status was false');
+                $('#modal_body').append('<div class="alert alert-warning">No error data available.</div>');
+            }
+
+        }, function(xhr, status, error) {
+           console.error('Error fetching data:', error);
+            console.error('Status:', status);
+            console.error('Response:', xhr.responseText);
+            
+            // Show error message to user
+            $('#modal_body').empty().append(
+                '<div class="alert alert-danger">Failed to fetch error data. Please try again.</div>'
+            );
+        });
+
+    }
+
+    $('.close').click(function(){
+        $('#modal_body').empty()
+        let html = `<div class="spinner-border text-primary" role="status" style="position: relative; left: 200px;"></div>`
+        $('#modal_body').append(html);
+    });
+    
+</script>
\ No newline at end of file
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index feefb665..08d47835 100755
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -287,12 +287,12 @@
 
                             <div class="form-group col-md-12">
                                 <label for="email">Email<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="email_corporate" placeholder="Enter Email" name="email_corporate" data-parsley-trigger="change" data-parsley-type="email" onchange="validateInput(this, 'employees', 'email_corporate')" required>
+                                <input type="text" class="form-control" id="email_corporate" placeholder="Enter Email" name="email_corporate" data-parsley-trigger="change" data-parsley-type="email" onkeyup="validateInput(this, 'employees', 'email_corporate')" required>
                             </div>
 
                             <div class="form-group col-md-12">
                                 <label for="mobile">Mobile Number<span class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="mobile" placeholder="Enter Mobile Number" name="mobile" onkeypress = "return onlyNumbers(event)" maxlength="10" minlength="10" onchange="validateInput(this, 'employees', 'mobile')" required>
+                                <input type="text" class="form-control" id="mobile" placeholder="Enter Mobile Number" name="mobile" onkeypress = "return onlyNumbers(event)" maxlength="10" minlength="10" onkeyup="validateInput(this, 'employees', 'mobile')" required>
                             </div>
 
                         </div> 
@@ -570,21 +570,53 @@
         });
     }
     
-    function validateInput(input, table, field){
+    // function validateInput(input, table, field){
+
+    //     let value = $(input).val();
+    //     let label = $(input).closest('.form-group').find('label').text().replace('*', '').trim();
+
+    //     let message = "Value is duplicate!";
+    //     if(label){
+    //         message = label + " already exists!";
+    //     }
+
+    //     checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
+    //         if (isDuplicate) {
+    //             toastr.warning(message, 'WARNING');
+    //             $(input).val('')
+    //         } 
+    //     });
+
+    // }
+
+    function validateInput(input, table, field) {
+
+        let emp_code = $('#emp_code_for_edit').val();
+        let client_id = $('#clients').val();
+        console.log("emp_code", emp_code);
+        console.log("client_id", client_id);
 
         let value = $(input).val();
         let label = $(input).closest('.form-group').find('label').text().replace('*', '').trim();
 
         let message = "Value is duplicate!";
-        if(label){
+        if (label) {
             message = label + " already exists!";
         }
 
-        checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) {
+        let data = {};
+        data["emp_code !="] = emp_code;
+        data[field] = value;
+
+        console.log(data);
+
+        checkDuplicateTableFieldValue(table, field, data, function(isDuplicate) {
             if (isDuplicate) {
                 toastr.warning(message, 'WARNING');
-                $(input).val('')
-            } 
+                $("#btnSubmit").prop('disabled', true);
+            }else{
+                $("#btnSubmit").prop('disabled', false);
+            }
         });
 
     }
@@ -597,108 +629,106 @@
     }
     var modalInstance; // Store the modal instance globally
 
-function showModal() {
-    var myModalEl = document.getElementById('emp_history_modal');
-    modalInstance = new bootstrap.Modal(myModalEl, {
-        backdrop: true,   // Ensures the backdrop is shown
-        keyboard: true     // Allows closing with the Escape key
-    });
-    modalInstance.show();
-}
-
-function closeModal() {
-    if (modalInstance) {
-        modalInstance.hide();  // Hide the modal and its backdrop
-        // Manually remove backdrop if it's still visible
-        setTimeout(function () {
-            document.querySelector('.modal-backdrop').classList.remove('show');
-        }, 150);  // Wait for animation to finish
+    function showModal() {
+        var myModalEl = document.getElementById('emp_history_modal');
+        modalInstance = new bootstrap.Modal(myModalEl, {
+            backdrop: true,   // Ensures the backdrop is shown
+            keyboard: true     // Allows closing with the Escape key
+        });
+        modalInstance.show();
     }
-}
-
 
+    function closeModal() {
+        if (modalInstance) {
+            modalInstance.hide();  // Hide the modal and its backdrop
+            // Manually remove backdrop if it's still visible
+            setTimeout(function () {
+                document.querySelector('.modal-backdrop').classList.remove('show');
+            }, 150);  // Wait for animation to finish
+        }
+    }
 
     function get_emp_history(input, emp_id) {
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
 
-    let url = '<?= base_url("employee/get_emp_history")?>';
-    let requestData = { emp_id: emp_id };
+        let url = '<?= base_url("employee/get_emp_history")?>';
+        let requestData = { emp_id: emp_id };
 
-    sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
+        sendAjaxRequestForGlobal(url, 'POST', requestData, function(response) {
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
 
-        if (response.status === true) {
-            console.log('response data length', response.data.emp_history.length);
+            if (response.status === true) {
+                console.log('response data length', response.data.emp_history.length);
 
-            // **Clear old data**
-            $('#emp_history_content').html('');
+                // **Clear old data**
+                $('#emp_history_content').html('');
 
-            // **Check if data exists**
-            if (response.data.emp_history.length > 0) {
-                let historyTable = `
-                    <div class="card-body">
-                        <div class="table-responsive">
-                            <table class="table w-100">
-                                <thead class="bg-light">
-                                    <tr>
-                                        <th>Field</th>
-                                        <th>Change</th>
-                                        <th>User</th>
-                                        <th>Date/Time</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                `;
-
-                // **Loop through the data dynamically**
-                response.data.emp_history.forEach(row => {
-                    historyTable += `
-                        <tr>
-                            <td>${row.field_name}</td>
-                            <td>${row.old_value} => ${row.new_value}</td>
-                            <td>${row.created_by}</td>
-                            <td>${row.created_at}</td>
-                        </tr>
+                // **Check if data exists**
+                if (response.data.emp_history.length > 0) {
+                    let historyTable = `
+                        <div class="card-body">
+                            <div class="table-responsive">
+                                <table class="table w-100">
+                                    <thead class="bg-light">
+                                        <tr>
+                                            <th>Field</th>
+                                            <th>Change</th>
+                                            <th>User</th>
+                                            <th>Date/Time</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
                     `;
-                });
 
-                historyTable += `
-                                </tbody>
-                            </table>
+                    // **Loop through the data dynamically**
+                    response.data.emp_history.forEach(row => {
+                        historyTable += `
+                            <tr>
+                                <td>${row.field_name}</td>
+                                <td>${row.old_value} => ${row.new_value}</td>
+                                <td>${row.created_by}</td>
+                                <td>${row.created_at}</td>
+                            </tr>
+                        `;
+                    });
+
+                    historyTable += `
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
-                    </div>
-                `;
+                    `;
 
-                // **Append to modal**
-                $('#emp_history_content').append(historyTable);
+                    // **Append to modal**
+                    $('#emp_history_content').append(historyTable);
+                } else {
+                    $('#emp_history_content').html('<p class="text-center text-muted">No history available.</p>');
+                }
+
+                // **Show the modal**
+                showModal();
             } else {
-                $('#emp_history_content').html('<p class="text-center text-muted">No history available.</p>');
+                let message = response.message;
+                toastr.error(message, 'ERROR');
             }
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
+            console.error(xhr.responseText);
+            toastr.error('An error occurred while fetching the report page.', 'ERROR');
 
-            // **Show the modal**
-            showModal();
-        } else {
-            let message = response.message;
-            toastr.error(message, 'ERROR');
-        }
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetching the report page.', 'ERROR');
+            $('.loader').fadeOut();
+            $('.loader-mask').delay(350).fadeOut('slow');
+        });
+    }
 
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-    });
-}
-
-// function closeModal(){
-//     var myModalEl = document.getElementById('emp_history_modal');
-//     var modalInstance = bootstrap.Modal.getInstance(myModalEl); 
-//     if (modalInstance) {
-//         modalInstance.hide();
-//     }
-// }
+    // function closeModal(){
+    //     var myModalEl = document.getElementById('emp_history_modal');
+    //     var modalInstance = bootstrap.Modal.getInstance(myModalEl); 
+    //     if (modalInstance) {
+    //         modalInstance.hide();
+    //     }
+    // }
 
 </script>
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 6ac2e4ee..4df21f21 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -689,6 +689,9 @@
                                     <li>
                                         <a href="<?= base_url('/ticket/feedback-list') ?>">Claim Feedback List</a>
                                     </li>
+                                    <li>
+                                        <a href="<?= base_url('/ticket/claim-upload') ?>">Claim Dump Upload</a>
+                                    </li>
                                 </ul>
                             </div>
                         </li>
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index cec7a681..c2cf5253 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -321,7 +321,7 @@ table.dataTable tbody td {
                                             <a class="dropdown-item btnEdit" data-id="<?= $row['id'];?>" onclick="getPolicyTransactionDataForEdit('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
                                                 <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
                                             </a>
-                                            <a class="dropdown-item delete" data-id="<?= $row['id'];?>" onclick="removePolicyTransaction(this, '<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
+                                            <a class="dropdown-item delete" data-id="<?= $row['id'];?>" onclick="removePolicyTransaction(this, '<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>', <?= $row['policy_type_id'] ?>)">
                                                 <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
                                             </a>
                                         </div>
@@ -1668,9 +1668,14 @@ function hideDateField(input = null)
     }
 }
 
-function removePolicyTransaction(input, pt_id) {
+function removePolicyTransaction(input, pt_id, policy_type_id) {
 
-    confirmActionSweertAlert("Do you want to delete this transaction?", "Yes, Proceed!", "No, Cancel").then((confirmed) => {
+    let string = "Do you want to delete this transaction?";
+    if(policy_type_id > 7){
+        string = "Do you want to delete this transaction? Deleting this will also remove the linked CRM policy entry.";
+    }
+
+    confirmActionSweertAlert(string, "Yes, Proceed!", "No, Cancel").then((confirmed) => {
         if (confirmed) {
             let url = '<?= base_url('policy_tranction/inception/removePolicyTransaction/') ?>' + pt_id;
 
@@ -1694,6 +1699,4 @@ function removePolicyTransaction(input, pt_id) {
     });
 }
 
-
-
 </script>
\ No newline at end of file

From 8a20d137a682824a180dc96e62983778a4d133d0 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Fri, 22 Aug 2025 10:40:13 +0530
Subject: [PATCH 28/54] FIX_LIVE_ISSUE : RV

---
 app/Controllers/TicketController.php | 15 +++++++++------
 app/Views/layout/header.php          |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index a50b55be..800f464b 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -2386,17 +2386,20 @@ class TicketController extends BaseController
         }
 
         // 5. Merge the Sum Insured value if the multiple sum insured exists
-        if(isset($data['multiple_sum_insured'])){
-            if(isset($data['sumInsured2'])){
-                $data['sumInsured2'] = $data['sumInsured2'] . ", " . implode(", ", $data['multiple_sum_insured']);
-            }else{
-                $data['sum_insured'] = $data['sum_insured'] . ", " . implode(", ", $data['multiple_sum_insured']);
+        if (isset($data['multiple_sum_insured'])) {
+
+            $multipleSumInsured = is_array($data['multiple_sum_insured']) ? $data['multiple_sum_insured'] : [$data['multiple_sum_insured']]; // force into array if string
+
+            if (isset($data['sumInsured2'])) {
+                $data['sumInsured2'] .= ", " . implode(", ", $multipleSumInsured);
+            } else {
+                $data['sum_insured'] .= ", " . implode(", ", $multipleSumInsured);
             }
+
             unset($data['multiple_sum_insured']);
         }
 
         // 6. Add the special condition to key value pair
-
         if(!empty($data['special_condition_label'])){
             foreach ($data['special_condition_label'] as $key => $value) {
                 if($value != "" && $value != null) {
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 712a44f1..dc34b27d 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -537,7 +537,7 @@
     .show > .btn-ternary:dropdown-toggle:focus {
       box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
 
-    .btn-border-radius{ .border-radius: 10px !important; }
+    .btn-border-radius{ border-radius: 10px !important; }
 
 
 

From 938279db0364f2ab329a9a0d58cd629cfe63f3a7 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Fri, 22 Aug 2025 12:04:42 +0530
Subject: [PATCH 29/54] BUG_Mentioned issues fixes

---
 app/Models/ThzMasterNotesModel.php |  2 +-
 app/Views/thz_list.php             | 74 ++++++++++++++++++++----------
 app/Views/thz_notes.php            | 53 ++++++++++-----------
 3 files changed, 78 insertions(+), 51 deletions(-)

diff --git a/app/Models/ThzMasterNotesModel.php b/app/Models/ThzMasterNotesModel.php
index 413781df..ac970b67 100644
--- a/app/Models/ThzMasterNotesModel.php
+++ b/app/Models/ThzMasterNotesModel.php
@@ -105,7 +105,7 @@ class ThzMasterNotesModel extends Model
                         AND LOWER(thz_master_notes.notes_by) = 'user'
                     WHERE thz_master_notes.thz_id = ". $integer_ticket_id ."
                     $ticketTypeFilter
-                    ORDER BY thz_master_notes.created_at ASC";
+                    ORDER BY thz_master_notes.created_at DESC";
 
         $result = $this->db->query($notes_sql)->getResultArray();
 
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index e711f27a..b56b45fd 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -80,6 +80,11 @@ tbody tr td:last-child {
     white-space: nowrap !important;
 }
 
+.maincard{
+    margin-top:0 !important;
+    padding-top: 0 !important;
+}
+
 .col-12 {
 
     max-width: 98% !important;
@@ -122,8 +127,8 @@ td .text-muted {
 
 <div class="col-12">
     <div class="card">
-        <div class="card-body">
-            <div class="row" style="padding-bottom: 10px;">
+        <div class="card-body maincard">
+            <div class="row" style="padding-bottom: 10px;" >
                 <div class="col-6" style="align-self: center;">
                     <h4 style="position: relative;">Ticket List </h4>
                 </div>
@@ -155,7 +160,10 @@ td .text-muted {
                                         <span class="text-muted"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
                                         <span class="text-muted"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
                                     </td>
-                                    <td><?php echo $row['policy_no']; ?></td>
+                                    <td><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
+                                              ? $row['policy_no'] 
+                                              : 'N/A'; ?>
+                                    </td>
                                     <td><?php echo $row['ticket_type']; ?></td>
                                     <td><?php echo $row['subject']; ?></td>
                                     <td><?php echo $row['status']; ?></td>
@@ -259,22 +267,23 @@ td .text-muted {
               <input type="text" class="form-control" id="empcode" name="empcode" placeholder="Enter Employee code">
             </div>
 
+
             <div class="form-group col-md-4">
+              <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
+              <select class="form-control" id="ticket_type" name="ticket_type" required onchange="hideandshowpolicy()">
+                <option value="">Select Ticket Type</option>
+                <option value="Sales" selected >Sales</option>
+                <option value="Service">Service</option>
+              </select>
+            </div>
+
+            <div class="form-group col-md-4" id="policy_container">
               <label for="policy_no">Policy Number</label>
                 <select class="form-control" id="policy_no" name="policy_no" onchange="changevalue()">
                   <option value="" selected data-id="">Select Policy</option>
                 </select>
             </div>
 
-            <div class="form-group col-md-4">
-              <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
-              <select class="form-control" id="ticket_type" name="ticket_type" required>
-                <option value="">Select Ticket Type</option>
-                <option value="Sales">Sales</option>
-                <option value="Service">Service</option>
-              </select>
-            </div>
-
 
             <!-- <div class="form-group col-md-6">
               <label for="status">Status</label>
@@ -287,9 +296,9 @@ td .text-muted {
               </select>
             </div> -->
 
-            <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu 
-                 // 2,3,4 dropdown data'va varannum but those role means hide it  --> 
-            <?php if(in_array(get_role_id(), [2,3,4]) ) { ?> 
+            <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu. but dropdown display aganum
+                 // 2,3,4 dropdown data'va varannum but dropdown hide pannanum  --> 
+            <?php if(in_array(get_role_id(), [1,5]) ) { ?> 
               <div class="form-group col-md-4">
                 <label for="assign_to">Assign To</label>
                 <select class="form-control" id="assign_to" name="assign_to">
@@ -304,19 +313,20 @@ td .text-muted {
             <?php } ?>
 
             <div class="form-group col-md-12">
-              <label for="subject">Subject</label>
-              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject">
+              <label for="subject">Subject<span class="text-danger">*</span></label>
+              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject" required>
             </div>
 
             <div class="form-group col-md-12">
-              <label for="message">Message</label>
+              <label for="message">Message<span class="text-danger">*</span></label>
               <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
-              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4"></textarea>
+              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4" required></textarea>
             </div>
 
           </div>
         </div>
         <div class="modal-footer">
+          <button type="button" class="btn btn-primary btn-border-radius mr-2 text-white" onclick="resetTicket()">Reset</button>
           <button type="button" class="btn btn-ternary btn-border-radius" onclick="submitTicket()">Save</button>
         </div>
       </form>
@@ -368,6 +378,11 @@ td .text-muted {
         myModal.show();
     }
 
+    function resetTicket(){
+        var form = document.getElementById('ticketForm');
+        form.reset(); 
+    }
+
     function submitTicket() {
         var form = document.getElementById('ticketForm');
 
@@ -512,6 +527,19 @@ td .text-muted {
       var policyId = selectedOption.getAttribute("data-id");
       document.getElementById('policy_id').value = policyId || "";
   }
+
+  function hideandshowpolicy() {
+    var select = document.getElementById('ticket_type').value;
+    var policyContainer = document.getElementById('policy_container');
+
+    if (select === 'Service') {
+      policyContainer.style.display = "block"; // show
+    } else {
+      policyContainer.style.display = "none";  // hide
+      document.getElementById('policy_no').value = "";
+      document.getElementById('policy_id').value = "";
+    }
+  }
 </script>
 
 <script>
@@ -536,10 +564,7 @@ $(document).ready(function() {
     $("#assign_to").select2();
     $("#policy_no").select2();
     $("#modal_assignee").select2();
-});
-
-// Datatable document ready
-$(document).ready(function() {
+    hideandshowpolicy();
 
     var ticketsTable = $('#scroll-horizontal-datatable');
     $('#scroll-horizontal-datatable_filter').prepend('<i class="mdi mdi-magnify"></i>');
@@ -554,7 +579,7 @@ $(document).ready(function() {
           buttons: [
               {
                   text: '<i class="mdi mdi-plus"></i> Create New Ticket',
-                  className: 'btn btn-ternary btn-border-radius text-white mr-2',
+                  className: 'btn btn-primary btn-border-radius text-white mr-2',
                   attr:  { style: "color:#fff !important;" },
                   action: function(e, dt, node, config) { 
                       openTicket();
@@ -563,6 +588,7 @@ $(document).ready(function() {
               {
                   extend: 'collection',
                   text: ' Export <i class="mdi mdi-menu-down"></i>',
+                  className: 'btn btn-ternary btn-border-radius text-white',
                   buttons: [
                       {
                           extend: 'csv',
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 09dd2504..be63f5e7 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -89,7 +89,7 @@
             <!-- Title -->
             <div class="row" id="notes-title" style="padding-bottom: 10px;">
                 <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Ticket ID-<?php echo $master[0]['thz_id']; ?></h4>
+                    <h4 style="position: relative;"><span onclick="history.back()"><i class="mdi mdi-chevron-left"></i></span> Ticket ID-<?php echo $master[0]['thz_id']; ?></h4>
                 </div>
             </div>
 
@@ -126,7 +126,10 @@
                             </div>
                             <div class="row mb-2">
                                 <div class="col-5">Policy Number</div>
-                                <div class="col-7 text-end"><?= $master[0]['policy_no'];?></div>
+                                <div class="col-7 text-end"><?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
+                                                                    ? $master[0]['policy_no'] 
+                                                                    : 'N/A'; ?>
+                                 </div>
                             </div>
                             <div class="row mb-2">
                                 <div class="col-5">Assigned To</div>
@@ -248,8 +251,8 @@
 
         <div class="modal-body">    
           <div class="form-row">
-            <input type="text" id="edit_thz_id" name="thz_id">
-            <input type="text" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
+            <input type="hidden" id="edit_thz_id" name="thz_id">
+            <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
             
             <div class="form-group col-md-12">
               <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
@@ -272,9 +275,9 @@
               </select>
             </div> 
 
-            <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu 
-                 // 2,3,4 dropdown data'va varannum but those role means hide it  --> 
-            <?php if(in_array(get_role_id(), [2,3,4]) ) { ?> 
+            <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu. but dropdown display aganum
+                 // 2,3,4 dropdown data'va varannum but dropdown hide pannanum  --> 
+            <?php if(in_array(get_role_id(), [1,5]) ) { ?> 
             <div class="form-group col-md-12">
               <label for="assign_to">Assign To</label>
               <select class="form-control" id="assign_to" name="assign_to">
@@ -314,11 +317,11 @@
                 <div class="card related-ticket-card mb-3">
                         <div class="card-body" style="border-radius: 20px; padding:27px !important;">
                             <div class="d-flex justify-content-between align-items-start">
-                                <h5 class="mb-1"><?php echo $rt['ticket_type']; ?></h5>
+                                <h5 class="mb-1"><?php echo '# '.$rt['thz_id']." / ".$rt['ticket_type']; ?></h5>
                                 <small>
                                 <?php if (!empty($rt['created_at'])):
                                         $cdt = new DateTime($rt['created_at']); 
-                                        echo $cdt->format('d/m/Y') . "<span class='time'>" . $cdt->format('h:i a') . "</span>"; 
+                                        echo $cdt->format('d/m/Y') . "<span class='time'> " . $cdt->format('h:i a') . "</span>"; 
                                         endif;
                                 ?></small>
                             </div>
@@ -342,32 +345,30 @@
             $("#ticket_type").select2();
             $("#status").select2();
             $("#assign_to").select2();
-            var form = document.getElementById('ticketForm');
-            form.reset(); 
-
-            var masterData = <?= json_encode($master[0]); ?>;
-    
-            document.getElementById('edit_thz_id').value = masterData.thz_id;
-            document.getElementById('assign_to').value = masterData.assign_to;
-            document.getElementById('status').value = masterData.status;
-            document.getElementById('ticket_type').value = masterData.ticket_type;
-  
-            document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ;
+            
 
     });
 
 
     function openEditTicket() {
-      
-      var masterData = <?= json_encode($master[0]); ?>;
-      console.log(masterData);
+            var form = document.getElementById('ticketForm');
+            form.reset(); 
 
-      document.getElementById('EditModalLabel').innerText = "Update Ticket: " + masterData.thz_id ;
+            var masterData = <?= json_encode($master[0]); ?>;
+            console.log(masterData);
 
-      var myModal = new bootstrap.Modal(document.getElementById('EditModal'));
-      myModal.show();
+            $("#edit_thz_id").val(masterData.thz_id);
+            $("#ticket_type").val(masterData.ticket_type).trigger("change"); 
+            $("#status").val(masterData.status).trigger("change");
+            $("#assign_to").val(masterData.assign_to).trigger("change");
+
+            $("#EditModalLabel").text("Update #" + masterData.thz_id);
+            
+            var myModal = new bootstrap.Modal(document.getElementById('EditModal'));
+            myModal.show();
     }
 
+
     function submitTicket() {
         
         var form = document.getElementById("ticketForm");

From 020e436470026a0fce8f23f5aafec96ccdc5d1b5 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Fri, 22 Aug 2025 13:04:14 +0530
Subject: [PATCH 30/54] CHANGES_Ticket policy

---
 app/Controllers/ThzController.php | 29 ++++++++++++++++++---
 app/Views/thz_list.php            |  4 +--
 app/Views/thz_notes.php           | 42 +++++++++++++++++++++++++++----
 3 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 0141ef61..059ebfce 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -96,6 +96,7 @@ class ThzController extends BaseController
             $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3','4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
                                                                                                                      // 2,3,4 remain person varannum. 
             $data['client_list'] = $this->clientModel->getCreatedByUserName();
+            
             return $this->loadLayout('thz_list', $data);
         }       
 
@@ -149,7 +150,7 @@ class ThzController extends BaseController
 
                     $policyIds = array_column($details, 'policy_id');
                     $policyIds = array_filter($policyIds);
-                    $clientPolicy = $this->clientPolicyModel->whereIn('policy_id', $policyIds)->where('is_active', 1)->get()->getResultArray();
+                    $clientPolicy = $this->clientPolicyModel->whereIn('id', $policyIds)->where('is_active', 1)->get()->getResultArray();
                     $result['client_details'] = $details;
                     $result['policy_details'] = empty($clientPolicy)  ? [] : $clientPolicy ;
 
@@ -195,14 +196,19 @@ class ThzController extends BaseController
             if ($returnType === 'api') {
                 return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
             }else{
-                $toGetRelated = $result['master'][0]['created_by'];
+                $toGetCreatedBy = $result['master'][0]['created_by'];
+                $toGetPolicyId =  (!empty($result['master'][0]['policy_id']) && strtolower($result['master'][0]['policy_id']) !== 'null') 
+                                   ? $result['master'][0]['policy_id'] 
+                                   : ''; 
+
                 $result['related_tickets'] = $this->thzMasterModel
                                         ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
                                         ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                                        ->where('thz_master.created_by', $toGetRelated)
+                                        ->where('thz_master.created_by', $toGetCreatedBy)
                                         ->findAll();
                 $result['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3','4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
                                                                                                                            // 2,3,4 remain person varannum. 
+                $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';                                                                                                           
                 return $this->loadLayout('thz_notes', $result);
             }       
 
@@ -449,6 +455,23 @@ class ThzController extends BaseController
     }
 
 
+    public function getPolicyTerms($client_policy_id)
+    {
+        $policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $client_policy_id)->first();
+        
+        $policy_terms = [];
+        if(isset($policy_data['policy_terms']) && !empty($policy_data['policy_terms'])){
+            
+             $raw_terms = json_decode($policy_data['policy_terms'] ?? [] , true) ?? [];
+
+             $ticketController = new TicketController();
+             $policy_terms = $ticketController->convertTermsToDisplay($raw_terms);
+        }
+
+        $data['policy_terms'] = $policy_terms;
+        return view('view_policy_terms', $data);
+    }
+
 
 }
 
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index b56b45fd..986c4594 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -498,14 +498,14 @@ td .text-muted {
                           let opt = document.createElement("option");
                           opt.value = p.policy_no;
                           opt.text  = p.policy_no;
-                          opt.setAttribute("data-id", p.policy_id);
+                          opt.setAttribute("data-id", p.id);
                           policySelect.appendChild(opt);
                       });
 
                       // If you want to auto-select the first real policy instead of "Select Policy"
                       policySelect.value = policies[0].policy_no;
                       document.getElementById('policy_no').value = policies[0].policy_no || "";
-                      document.getElementById('policy_id').value = policies[0].policy_id;
+                      document.getElementById('policy_id').value = policies[0].id;
                 }
             } else {
                 toastr.warning(response.message || "No details found.", 'warning');
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index be63f5e7..070d88d8 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -126,10 +126,19 @@
                             </div>
                             <div class="row mb-2">
                                 <div class="col-5">Policy Number</div>
-                                <div class="col-7 text-end"><?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
-                                                                    ? $master[0]['policy_no'] 
-                                                                    : 'N/A'; ?>
-                                 </div>
+                                <div class="col-7 text-end">
+                                    <?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
+                                        ? '<u class="text-warning">
+                                                <a href="javascript:void(0);" 
+                                                class="text-warning"
+                                                data-toggle="modal" 
+                                                data-target="#PolicyModal" 
+                                                data-id="'.$master[0]['policy_id'].'">'
+                                                .$master[0]['policy_no'].'
+                                                </a>
+                                        </u>'
+                                        : 'N/A'; ?>
+                                </div>
                             </div>
                             <div class="row mb-2">
                                 <div class="col-5">Assigned To</div>
@@ -207,7 +216,7 @@
 
                             <?php endforeach; ?>
                             <?php else: ?>
-                                <div class="d-flex justify-content-center align-items-center">
+                                <div class="d-flex justify-content-center align-items-center" style="height: 100%;">
                                         <p class="text-center"><i>No Data Found</i></p>
                                 </div>
                             <?php endif; ?>
@@ -336,6 +345,29 @@
   </div>
 </div>
 
+<div class="modal fade" id="PolicyModal" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content" style="border-radius:15px;">
+      
+        <div class="modal-header" style="border-bottom-width:0;">
+            <h4 class="modal-title">Policy Terms</h4>
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        </div>
+
+        <div class="modal-body card-scroll" style="padding-top:5px!important;">  
+                            <?php if(!empty($policy_terms)): 
+                                    echo $policy_terms;
+                                  else: ?>
+                                    <div class="d-flex justify-content-center align-items-center" style="height: 100%;">
+                                                    <p class="text-center"><i>No Data Found</i></p>
+                                    </div>
+                            <?php endif; ?>
+        </div>
+      
+    </div>
+  </div>
+</div>
+
 
 
 <script>

From 6b33b1cab893ec14e88d04ab94cdd2dd2ecb4d91 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Fri, 22 Aug 2025 14:17:34 +0530
Subject: [PATCH 31/54] FIX_icon size

---
 app/Views/thz_notes.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 070d88d8..6bffa681 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -26,7 +26,6 @@
 .btn-icon {
   background: #008b8b;
   border: none;
-  color: white;
   border-radius: 50%;
   width: 32px;
   height: 32px;
@@ -37,6 +36,7 @@
 }
 
 .btn-icon i {
+  color: #ffffff !important;
   font-size: 18px;
 }
 
@@ -88,9 +88,15 @@
             
             <!-- Title -->
             <div class="row" id="notes-title" style="padding-bottom: 10px;">
-                <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;"><span onclick="history.back()"><i class="mdi mdi-chevron-left"></i></span> Ticket ID-<?php echo $master[0]['thz_id']; ?></h4>
-                </div>
+                <!-- <div class="col-6" style="align-self: center;">
+                    <h4 style="position: relative;"><span onclick="history.back()"><i class="mdi mdi-chevron-left" style="font-size: 24px;"></i></span> Ticket ID-<?php echo $master[0]['thz_id']; ?></h4>
+                </div> -->
+                <h4 class="d-flex align-items-center" style="gap: 8px;">
+                    <span onclick="history.back()" style="cursor: pointer;">
+                        <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
+                    </span>
+                    Ticket ID-<?= $master[0]['thz_id']; ?>
+                </h4>
             </div>
 
             <!-- Body -->

From ca4101af9162dab97368e509ed5b276b528d3b21 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Fri, 22 Aug 2025 14:32:50 +0530
Subject: [PATCH 32/54] CHANGE_ hr file upload : GWM

---
 app/Config/Routes.php                      |  11 +
 app/Controllers/EmployeeRestController.php | 231 +++++++++++++
 app/Models/HrFileUploadModel.php           |  34 ++
 app/Views/hr_file_upload.php               | 383 +++++++++++++++++++++
 app/Views/import_export.php                |  12 +
 5 files changed, 671 insertions(+)
 create mode 100644 app/Models/HrFileUploadModel.php
 create mode 100644 app/Views/hr_file_upload.php

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 2377fc38..599236aa 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -182,6 +182,8 @@ $routes->group("/employee", ["filter" => "authMVC"], function ($routes) {
     $routes->post('get_emp_history','EmployeeController::getEmpHistory');
 });
 
+
+
 $routes->group("/master", ["filter" => "authMVC"], function ($routes) {
 
     $routes->group("insurer", ["filter" => "authMVC"], function ($routes) {
@@ -550,7 +552,16 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
     $routes->get("claimView", "EmployeeRestController::claimView");
     $routes->get("exportCashDepositData", "EmployeeRestController::exportCashDepositData");
 
+    //hr file upload api's
+    $routes->get("hrFileList", "EmployeeRestController::hrFileList");
+    $routes->get("hrFileUploadMasters", "EmployeeRestController::hrFileUploadMasters");
+    $routes->get("hrFileDownload", "EmployeeRestController::hrFileDownload");
+    $routes->post("hrFileUpload", "EmployeeRestController::hrFileUpload");
+    $routes->post("updateHrFileUploadData", "EmployeeRestController::updateHrFileUploadData");
+
 });
+$routes->get("hrFileUploadMasters", "EmployeeRestController::hrFileUploadMasters");
+$routes->post("hrFileList", "EmployeeRestController::hrFileList");
 $routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy");
 $routes->get("sendPushNotification", "EmployeeRestController::sendPushNotification");
 $routes->post("sendEmail", "EmployeeRestController::send_email");
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index d8ec8b0e..6fc764b3 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -34,6 +34,7 @@ use App\Models\TicketMasterModel;
 use App\Models\TicketMessageModel;
 use App\Models\HRAccessControlModel;
 use App\Models\InsurerModel;
+use App\Models\HrFileUploadModel;
 
 
 
@@ -87,6 +88,7 @@ class EmployeeRestController extends AdminController
     protected $ticketController;
     protected $hrAccessControlModel;
     protected $insurerModel;
+    protected $hrFileUploadModel;
     
     
     public function __construct()
@@ -118,6 +120,7 @@ class EmployeeRestController extends AdminController
         $this->ticketController = new TicketController();
         $this->hrAccessControlModel    = new HRAccessControlModel();
         $this->insurerModel    = new InsurerModel();
+        $this->hrFileUploadModel = new HrFileUploadModel();
         
     }
 
@@ -3781,4 +3784,232 @@ class EmployeeRestController extends AdminController
         return $response->getBody();
     }
 
+
+
+      //--------------------------------------------------------------------------------------------
+      public function hrFileUpload()
+      {
+          try {
+              // Check file
+              $file = $this->request->getFile('file_name');
+              if (!$file) {
+                  return $this->response->setJSON([
+                      'status' => false,
+                      'message' => "Invalid file or file not uploaded.",
+                      'data'    => "No Data"
+                  ]);
+              }
+  
+              // Upload folder path
+              $uploadPath = WRITEPATH . 'uploads/hr_files/';
+  
+              // If directory not exists, create it
+              if (!is_dir($uploadPath)) {
+                  mkdir($uploadPath, 0777, true);
+              }
+  
+              // New file name with timestamp
+              $newFileName = time() . '_' . $file->getRandomName();
+  
+              // Move file
+              $file->move($uploadPath, $newFileName);
+  
+              // Prepare data
+              $data = [
+                  'client_id'        => $this->request->getPost('client_id'),
+                  'client_branch_id' => $this->request->getPost('client_branch_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'),
+              ];
+  
+              // Save into DB
+              $this->hrFileUploadModel->insert($data);
+  
+              return $this->respondCreated([
+                  'status'  => true,
+                  'message' => 'File uploaded successfully',
+                  'data'    => $data
+              ]);
+  
+          } catch (\Exception $e) {
+              return $this->failServerError($e->getMessage());
+          }
+  
+      }
+
+      public function updateHrFileUploadData()
+      {
+          try {
+              $id = $this->request->getPost('id');
+      
+              if (!$id) {
+                  return $this->failValidationErrors('ID is required for update.');
+              }
+      
+              // Prepare data
+              $data = [
+                  'client_id'        => $this->request->getPost('client_id'),
+                  'client_branch_id' => $this->request->getPost('client_branch_id'),
+                  'policy_no'        => $this->request->getPost('policy_no'),
+                  'file_action'      => $this->request->getPost('file_action'),
+                  'status'           => $this->request->getPost('status'),
+                  'updated_by'       => $this->request->getPost('updated_by'),
+              ];
+      
+              // Check if record exists
+              $record = $this->hrFileUploadModel->find($id);
+              if (!$record) {
+                  return $this->failNotFound("Record with ID {$id} not found.");
+              }
+      
+              // Update record
+              $this->hrFileUploadModel->update($id, $data);
+      
+              return $this->respond([
+                  'status'  => true,
+                  'message' => 'File record updated successfully',
+                  'data'    => $data
+              ], 200);
+      
+          } catch (\Exception $e) {
+              return $this->failServerError($e->getMessage());
+          }
+      }
+      
+  
+      public function hrFileDownload($id = null)
+      {
+          try {
+  
+            $file_id = $this->request->getGet('id') ?? $id;
+    
+            // Find record
+            $record = $this->hrFileUploadModel->where('id',$file_id)->find();
+            
+            // print_rr( $record);die;
+
+            if (!$record) {
+                return $this->failNotFound("File record not found");
+            }
+
+            $uploadPath = WRITEPATH . 'uploads/hr_files/';
+            $filePath   = $uploadPath . $record[0]['file_name'];
+
+            if (!file_exists($filePath)) {
+                return $this->failNotFound("File not found on server");
+            }
+
+            // Force file download
+            return $this->response->download($filePath, null)
+                                ->setFileName($record[0]['file_name']);
+          } catch (\Exception $e) {
+              return $this->failServerError($e->getMessage());
+          }
+      }
+  
+    //   public function hrFileList()
+    //   {
+    //       try {
+    //           $request = service('request');
+    //           $builder = $this->hrFileUploadModel
+    //           ->select('hr_file_upload.* , c.short_name , cb.branch_name , lc.name as first_name ');
+  
+    //           // Allowed filter keys
+    //           $filters = [
+    //               'client_id',
+    //               'client_branch_id',
+    //               'policy_no',
+    //               'file_action',
+    //               'status',
+    //               'created_by'
+    //           ];
+  
+    //           // Apply filters dynamically
+    //           foreach ($filters as $key) {
+    //               $value = $request->getGetPost($key); // supports both GET and POST
+    //               if (!empty($value)) {
+    //                   $builder->where($key, $value);
+    //               }
+    //           }
+  
+    //           // Fetch results
+    //           $builder->join('clients c', 'c.id = hr_file_upload.client_id AND c.is_active = 1', 'left');
+    //           $builder->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left');
+    //           $builder->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left');
+    //           $data = $builder->findAll();
+  
+    //           return $this->respond([
+    //               'status'  => true,
+    //               'message' => 'File list fetched successfully',
+    //               'data'    => $data
+    //           ]);
+    //       } catch (\Exception $e) {
+    //           return $this->failServerError($e->getMessage());
+    //       }
+    //   }
+
+    public function hrFileList()
+    {
+        try {
+            $request = service('request');
+
+            // Start builder from model
+            $builder = $this->hrFileUploadModel
+                ->select('hr_file_upload.* , c.short_name , cb.branch_name , lc.name as first_name')
+                ->join('clients c', 'c.id = hr_file_upload.client_id AND c.is_active = 1', 'left')
+                ->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left')
+                ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left');
+
+            // Allowed filter keys
+            $filters = [
+                'client_id',
+                'client_branch_id',
+                'policy_no',
+                'file_action',
+                'status',
+                'created_by'
+            ];
+
+            // Apply filters dynamically
+            foreach ($filters as $key) {
+                $value = $request->getGetPost($key); // supports both GET and POST
+                if (!empty($value)) {
+                    $builder->where("hr_file_upload.$key", $value);
+                }
+            }
+
+            // Execute query
+            $data = $builder->get()->getResultArray();
+
+            return $this->respond([
+                'status'  => "success",
+                'message' => 'File list fetched successfully',
+                'data'    => $data
+            ]);
+        } catch (\Exception $e) {
+            return $this->failServerError($e->getMessage());
+        }
+    }
+
+  
+      public function hrFileUploadMasters()
+      {
+          try {
+              //for inception upload
+              $data['actions'] = ['inception' => 'Inception (Employee + Dependents)', 'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
+  
+              return $this->respond([
+                  'status'  => true,
+                  'message' => 'File inception upload masters',
+                  'data'    => $data
+              ]);
+          } catch (\Exception $e) {
+              return $this->failServerError($e->getMessage());
+          }
+      }
+
 }
\ No newline at end of file
diff --git a/app/Models/HrFileUploadModel.php b/app/Models/HrFileUploadModel.php
new file mode 100644
index 00000000..e5e2a22b
--- /dev/null
+++ b/app/Models/HrFileUploadModel.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class HrFileUploadModel extends Model
+{
+    protected $table            = 'hr_file_upload';
+    protected $primaryKey       = 'id';
+    protected $useAutoIncrement = true;
+
+    // Allowed fields
+    protected $allowedFields    = [
+        'client_id',
+        'client_branch_id',
+        'policy_no',
+        'file_name',
+        'file_action',
+        'status',
+        'created_by',
+        'created_at',
+        'updated_by',
+        'updated_at'
+    ];
+
+    // Automatically set timestamps
+    protected $useTimestamps = true;
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+
+    // Return type
+    protected $returnType = 'array';
+}
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
new file mode 100644
index 00000000..e9dce959
--- /dev/null
+++ b/app/Views/hr_file_upload.php
@@ -0,0 +1,383 @@
+<style>
+    .select2-container .select2-selection--multiple .select2-selection__choice {
+        padding: 5px 7px 5px 0 !important;
+        color: #000000;
+    }
+</style>
+
+<div class="tab-pane fade" id="HR-DOC-tab">
+    <div class="row">
+        <div class="col-xl-12">
+            <div id="accordion" class="mb-3">
+                <div class="card mb-1">
+                    <h5 class="m-1">
+                        <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseOne" aria-expanded="true">
+                            <i id="icon" class="mdi mdi-chevron-down mr-1 text-primary" style="font-size: 28px;"></i>
+                        </a>
+                    </h5>
+                    <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                        <div class="card-body">
+                            <!-- <div class="text-center"> -->
+                            <form class="parsley-examples" id="hr_file_upload_search" >
+                                <input type="hidden" name="<?= csrf_token() ?>" value="<?= csrf_hash() ?>" id="csrf_token">
+                               
+                                <div class="form-group">
+                                    <div class="form-row">
+                                        <div class="form-group col-md-4">
+                                            <label>Client</label> <br />
+                                            <select name="client_id" class="form-control" id="client2" >
+                                                <option value="">Select</option>
+                                            </select>
+                                        </div>
+
+                                        <div class="form-group col-md-4">
+                                            <label>Branch</label> <br />
+                                            <select name="client_branch_id" class="form-control" id="client_branch_id2" >
+                                                <option value="0">Select</option>
+                                            </select>
+                                        </div>
+
+                                        <div class="form-group col-md-4">
+                                            <label>Policy</label> <br />
+                                            <select name="client_policy_id" class="form-control" id="policy2"  >
+                                                <option value="">Select</option>
+                                            </select>
+                                        </div>
+
+                                    </div>
+
+                                    <div class="form-row">
+
+                                        <div class="form-group col-md-4">
+                                            <label>Event<span class="text-danger">*</span></label> <br />
+                                            <select name="file_action" class="form-control" id="event_type" required>
+                                                <option value="">Select</option>
+                                                <?php
+                                                if (isset($events) && count($events)) {
+                                                    foreach ($events as $key => $action) {
+                                                        echo "<option value='$key'" . ($key == "si_enhancement" ? " class='si-enhancement-option'" : "") . ">$action</option>";
+                                                    }
+                                                }
+                                                ?>
+                                            </select>
+                                        </div>
+
+                                        
+
+                                    </div>
+
+                                   
+
+                                    <div class="form-row" id="">
+                                        <div class="d-flex align-items-center justify-content-start" style="margin-top: 18px;">
+                                            <div class="form-group col-md-3">
+                                                <button  type="submit" class="btn btn-primary waves-effect waves-light justify-content-end">Search</button>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <!-- end page title -->
+    <div class="row" id="hr_file_list">
+    <div class="col-12">
+    <div class="card">
+        <div class="card-body">
+            <div class="row" style="padding-bottom: 10px;">
+                <div class="col-6" style="align-self: center;">
+                    <h4 style="position: relative;">Files</h4>
+                </div>
+
+            </div>
+            <table class="table table-hover m-0 table-centered dt-responsive w-100" cellspacing="0"
+                id="hr_tickets_table">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="font-weight-medium">SNO</th>
+                        <th class="font-weight-medium">File name</th>
+                        <th class="font-weight-medium">Client</th>
+                        <th class="font-weight-medium">Client Branch</th>
+                        <th class="font-weight-medium">Policy</th>
+                        <th class="font-weight-medium">Event</th>
+                        <th class="font-weight-medium">User/Time</th>
+                        <th class="font-weight-medium">Status</th>
+                        <th class="font-weight-medium">Action</th>
+                    </tr>
+                </thead>
+
+                <tbody class="font-12">
+                    <?php
+                    if (isset($HRfileList)) { foreach ($fileList as $key => $file) {  ?>
+
+                    <tr>
+                        <td><b><?php echo ($key + 1) ?></b></td>
+                        <td  title="<?php echo $file['file_name'] ?>">
+                            <?php echo $file['file_name']?>
+                        </td>
+                        <td><?php echo $file['short_name'] ?></td>
+                        <td><?php echo $file['branch_name'] ?></td>
+                        <td><?php echo $file['policy_no'] ?></td>
+                        <td><?php echo $file['file_action'] ?></td>
+                        <td><?php echo change_date_format($file['created_at'],'Y-m-d H:i:s', 'd M Y h:i a') . ' by <strong>' . $file['first_name'] . '</strong>' ?></td>
+                        <td><?php echo $file['status']; ?> </td>
+                        <td> </td>
+                    </tr>
+                    <?php }
+                    } ?>
+
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div><!-- end col -->
+
+    </div>
+    <!-- end row -->
+</div>
+
+
+<script>
+
+    var client_list = ''; // local variable for storing the client branch list
+    var branch_list = ''; // local variable for storing the client branch list
+    var policy_list = ''; // local variable for storing the client policy list
+    var branch_policy = '';
+
+    $(document).ready(function(){
+
+        //initialize the get client, branch, and policy
+        getClientAndBranchAndPolicy();
+
+        //client change to get the Client Branch
+        $('#client2').change(function(){
+            let client_id = $(this).val();
+            console.log('client_id', client_id);
+
+            if(branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = branch_list[client_id];
+                appendBranch3(data);
+            }
+        })
+
+        //change the client branch than change the client policy
+        $('#client_branch_id2').change(function(){
+
+            let branch_id = $(this).val();
+            console.log("branch_id", branch_id);
+
+            if(policy_list != '' && branch_id != '') {
+                let data = policy_list[branch_id];
+                appendPolicy3(data);
+            }
+        });
+    })
+
+    $(document).ready(function() {
+        // Initialize select2
+        $("#client2").select2();
+        $("#policy2").select2();
+        $("#client_branch_id2").select2();
+        
+       // Form submit event
+       $("#hr_file_upload_search").on("submit", function (e) {
+
+        e.preventDefault(); // stop normal form submit
+
+        let formData = $(this).serialize(); // serialize form with csrf
+      
+        $.ajax({
+            url: "<?= base_url('hrFileList') ?>", 
+            type: "POST",
+            data: formData,
+            dataType: "json",
+            beforeSend: function () {
+                // optional loader
+                $("#hr_tickets_table tbody").html(
+                    "<tr><td colspan='9' class='text-center'>Loading...</td></tr>"
+                );
+            },
+            success: function (res) {
+                let tbody = "";
+
+                if (res.status === "success" && res.data.length > 0) {
+                    $.each(res.data, function (index, file) {
+                        tbody += `
+                            <tr>
+                                <td><b>${index + 1}</b></td>
+                                <td id="${file.id}" class="reload truncate" title="${file.file_name}">${file.file_name}</td>
+                                <td>${file.short_name ?? ""}</td>
+                                <td>${file.branch_name ?? ""}</td>
+                                <td>${file.policy_no ?? ""}</td>
+                                <td>${file.file_action ?? ""}</td>
+                                <td>${file.created_at} by <strong>${file.first_name ?? ""}</strong></td>
+                                <td>${file.status}</td>
+                                <td>
+                                
+                                </td>
+                            </tr>
+                        `;
+                    });
+                } else {
+                    tbody = `<tr><td colspan="9" class="text-center">No records found</td></tr>`;
+                }
+
+                $("#hr_tickets_table tbody").html(tbody);
+            },
+            error: function (xhr, status, error) {
+                console.error("Error:", error);
+                $("#hr_tickets_table tbody").html(
+                    `<tr><td colspan="9" class="text-center text-danger">Something went wrong</td></tr>`
+                );
+            },
+        });
+        });
+    });
+
+   //  <div class="btn-group dropdown">
+//     <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm"
+//         data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+    
+//     <div class="dropdown-menu dropdown-menu-right">
+//             <a href="${baseUrl}/hrFileUploadMasters?id=${file.id}" class="dropdown-item" style="color: #000;" aria-hidden="true" target="_blank" ><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
+//     </div>
+//  </div>
+
+    //featch client and branch and policy
+    function getClientAndBranchAndPolicy()
+    {   
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+                if(res.status == true){
+                    client_list = res.client_data;
+                    branch_list = res.branch_data;
+                    policy_list = res.policy_data;
+                    vehicle_list = res.vehicle_data;
+                    unit_list = res.unit_data;
+                    appendClients3(res.client_data);
+                }else{
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+    // ------------ Append Functions are Below ----------------------------------------------------------------------------------
+
+    function appendClients3(data) 
+    {
+        $('#client2').empty();
+
+        $('#client2').append($('<option>', {
+            value: '',
+            text: 'Select Client'
+        }));
+
+        $.each(data, function(index, item) {
+
+            let client_show_name = item.client_name;
+            if (item.client_type == 2) {
+                client_show_name = item.client_name +  (item.dob ? ('- (' + item.dob + ' )' ) : '') + (item.pan ? ('- ' + item.pan ) : '');
+                // console.log(client_show_name);
+            }
+
+            var option = $('<option>', {
+                value: item.id,
+                text: client_show_name,
+                'data-cn': item.client_name,
+                'data-ct': item.client_type,
+            });
+
+            $('#client2').append(option);
+        });
+    }
+
+    function appendBranch3(data) 
+    {
+
+        $('#client_branch_id2').empty();
+        $('#client_branch_id2').append($('<option>', {
+            value: '',
+            text: 'Select Branch'
+        }));
+
+        $.each(data, function(index, item) {
+
+            var option = $('<option>', {
+                value: item.id,
+                text: item.branch_name 
+            });
+            $('#client_branch_id2').append(option);
+        });
+    }
+
+    function appendPolicy3(data)
+    {
+        console.log('policy2', data);
+        console.log('policy2', $('#policy2'));
+        
+        $('#policy2').empty();
+        $('#policy2').append($('<option>', {
+            value: '',
+            text: 'Select Policy',
+        }));
+
+        $.each(data, function(index, item) {
+            var option = $('<option>', {
+                value: item.policy_no,
+                text: item.policy_type + '-' + item.policy_no,
+            });
+            $('#policy2').append(option);
+        });
+    }
+
+    // ----------------------------------------------------------------------------------------------
+
+
+    $(document).ready(function() {
+        $('#hr_tickets_table').DataTable({
+            dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
+                "<'row'<'col-sm-12'tr>>" +
+                "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+            "buttons": [{
+                "extend": 'csv',
+                "text": 'CSV',
+                "title": 'Employee-Upload-List',
+                "className": 'my_class',
+                "exportOptions": {
+                    "columns": ':not(:last-child)'
+                },
+            }],
+            "initComplete": function(settings, json) {
+                $('.my_class').css({
+                    "position": "relative",
+                    "left": "79px"
+                });
+            },
+            language: {
+                search: "_INPUT_",
+                searchPlaceholder: "Search..."
+            },
+            paging: true,
+        });
+    });
+
+</script>
\ No newline at end of file
diff --git a/app/Views/import_export.php b/app/Views/import_export.php
index 7f2bc15d..65a30b3c 100755
--- a/app/Views/import_export.php
+++ b/app/Views/import_export.php
@@ -25,10 +25,17 @@
                         <span class="d-none d-sm-inline-block">Insurer or TPA Data</span>
                     </a>
                 </li>
+                <li class="nav-item">
+                    <a href="#HR-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="hr_tab">
+                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="d-none d-sm-inline-block">HR Uploaded Files</span>
+                    </a>
+                </li>
             </ul>
             <div class="tab-content">
                 <?php include('employee_upload.php'); ?>
                 <?php include('insurer_or_tpa_data.php'); ?>
+                <?php include('hr_file_upload.php'); ?>
             </div>
         </div>
     </div>
@@ -45,6 +52,11 @@
             $('#kyc_tab').click();
         }
 
+        if (window.location.hash === '#HR-DOC-tab') {
+            console.log('url hash :', window.location.hash)
+            $('#hr_tab').click();
+        }
+
     })
 
 

From 39d7efd7322f896bbd1da0c2b5de78b40130c413 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Fri, 22 Aug 2025 15:06:18 +0530
Subject: [PATCH 33/54] CHANGE_UI_FIX - VADIVEL J 2025-08-22

---
 app/Helpers/header.php                        |   2 +-
 app/Views/UserList.php                        |   4 +-
 app/Views/client_branch.php                   |   4 +-
 app/Views/client_policy.php                   |   2 +-
 app/Views/client_rm.php                       |   2 +-
 app/Views/endorsement_list.php                |   2 +-
 app/Views/hr_access_controll.php              |   4 +-
 app/Views/insurer_branch.php                  |   4 +-
 app/Views/kyc_docs.php                        |   4 +-
 app/Views/layout/header_old.php               |   2 +-
 app/Views/policies.php                        |   4 +-
 .../policy_transaction_endorsement_form.php   |   2 +-
 .../policy_transaction_inception_form.php     |   4 +-
 app/Views/rfq/gmc.php                         |   2 +-
 app/Views/ticket_form_gmc.php                 |   2 +-
 app/Views/ticket_form_gpa.php                 |   2 +-
 app/Views/ticket_list.php                     |   2 +-
 app/Views/tpa_branch.php                      |   4 +-
 test.http                                     | 100 ++++++++++++++++++
 19 files changed, 126 insertions(+), 26 deletions(-)
 create mode 100644 test.http

diff --git a/app/Helpers/header.php b/app/Helpers/header.php
index dc193798..fb9e215c 100755
--- a/app/Helpers/header.php
+++ b/app/Helpers/header.php
@@ -615,7 +615,7 @@
                     </li>
                     <li>
                         <a id="app_content_management" href="#sidebarDashboardsmenu" data-toggle="collapse" class="waves-effect" style="color: grey;">
-                        <i class="fa fa-info-circle" aria-hidden="true"></i>
+                        <i class="mdi mdi-information-outline" aria-hidden="true"></i>
                         <span class="badge badge-success badge-pill float-right">2</span>
                             <span> App Content Management </span>
                         </a>
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 5f8d59f2..088b15d0 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -344,7 +344,7 @@ table.dataTable tbody td {
                     <div class="form-row">
                         <div class="form-group col-md-12">
                             <label for="emp_code">User Role<span class="text-danger">*</span>
-                                <span class="tooltip-trigger fa fa-info-circle" id="roleAccessMatrixTrigger"></span>
+                                <span class="tooltip-trigger mdi mdi-information-outline" id="roleAccessMatrixTrigger"></span>
                             </label>
                             <select class="form-control" id="role" name="role" required>
                                 <option value="">Select Role</option>
@@ -357,7 +357,7 @@ table.dataTable tbody td {
                     <div class="form-row">
                         <div class="form-group col-md-12">
                             <label for="profile">User Team<span class="text-danger">*</span>  
-                                <span class="tooltip-trigger fa fa-info-circle" id="accessMatrixTrigger"></span>
+                                <span class="tooltip-trigger mdi mdi-information-outline" id="accessMatrixTrigger"></span>
                             </label>
                             <select hidden class="form-control" id="team" name="team[]" multiple required>
                                 <?php foreach($teamData as $value) { ?>
diff --git a/app/Views/client_branch.php b/app/Views/client_branch.php
index b8f4cd05..da759709 100755
--- a/app/Views/client_branch.php
+++ b/app/Views/client_branch.php
@@ -49,7 +49,7 @@
     <input type="hidden" id="client_id_for_client_branch" value="<?= isset($client['id']) ? $client['id'] : '' ?>" />
     <div class="row float-right" style="padding-bottom: 10px;position: relative;right: 13px;">
         <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span
-                class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</button>
+                class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</button>
     </div>
 
     <div class="table-responsive" id="branch_table">
@@ -72,7 +72,7 @@
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
                     <button type="button" id="btnBranchBack"
-                        class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list"
+                        class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="mdi mdi-format-list-bulleted"
                             aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>
                 </div>
 
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index 4d5503ec..972c96ef 100755
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -51,7 +51,7 @@
             <div class="card-body">
 
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                    <button type="button" id="btnPolicyBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack btn-sm"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>
+                    <button type="button" id="btnPolicyBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack btn-sm"><span class="mdi mdi-format-list-bulleted" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>
                 </div>
 
                 <hr>
diff --git a/app/Views/client_rm.php b/app/Views/client_rm.php
index c235351f..7611c2d0 100755
--- a/app/Views/client_rm.php
+++ b/app/Views/client_rm.php
@@ -180,7 +180,7 @@ $(document).ready(function(){
             }).prop('disabled', false);
 
             $('#client_rm_btnSubmit').show();
-            $(this).html('<span id="rm_icons" class="fa fa-times-circle"></span> Close Edit '); 
+            $(this).html('<span id="rm_icons" class="mdi mdi-close-circle-outline"></span> Close Edit '); 
         } else {
             $('#account_manager').select2({
                 placeholder: "Select Account Manager"
diff --git a/app/Views/endorsement_list.php b/app/Views/endorsement_list.php
index 29702c71..6ee6ff14 100755
--- a/app/Views/endorsement_list.php
+++ b/app/Views/endorsement_list.php
@@ -138,7 +138,7 @@
                                         }
                                         ?>
                                     </td>
-                                    <td class="text-center"><a href="#" data-id="<?php echo $employee['id'] ?>" class="fa fa-eye emp_data_model" aria-hidden="true" data-toggle="modal" data-target="#centermodal"></a>
+                                    <td class="text-center"><a href="#" data-id="<?php echo $employee['id'] ?>" class="mdi mdi-eye emp_data_model" aria-hidden="true" data-toggle="modal" data-target="#centermodal"></a>
                                     </td>
                                 </tr>
                         <?php }
diff --git a/app/Views/hr_access_controll.php b/app/Views/hr_access_controll.php
index 7d262a17..f3c3a5e4 100644
--- a/app/Views/hr_access_controll.php
+++ b/app/Views/hr_access_controll.php
@@ -19,7 +19,7 @@
                             <div class="card-header" onclick="toggleAccordion(this)">
                                 <div class="user-info">
                                     <h5 class="mb-0"><?= $value['hr_name'] ?> 
-                                        <!-- <i class="fa fa-info-circle" aria-hidden="true" data-id="<?= (!empty($value['pre_hr_id']) ? $value['pre_hr_id'] : 0) . '-' . (!empty($value['post_hr_id']) ? $value['post_hr_id'] : 0) ?>"></i> -->
+                                        <!-- <i class="mdi mdi-information-outline" aria-hidden="true" data-id="<?= (!empty($value['pre_hr_id']) ? $value['pre_hr_id'] : 0) . '-' . (!empty($value['post_hr_id']) ? $value['post_hr_id'] : 0) ?>"></i> -->
                                     </h5>
                                     <p class="user-email"><?= $value['hr_mail'] ?></p>
                                 </div>
@@ -173,7 +173,7 @@
                 </form>
 
             <?php } else {  ?>
-                    <div class="submit-container"><b>There is no HR data</b></div>
+                    <div class="submit-container"> <p align="center"> <b>There is no HR data</b></p> </div>
             <?php } ?>
         </div>
     </div>
diff --git a/app/Views/insurer_branch.php b/app/Views/insurer_branch.php
index 9001fec1..915114f3 100755
--- a/app/Views/insurer_branch.php
+++ b/app/Views/insurer_branch.php
@@ -1,7 +1,7 @@
 <div class="tab-pane fade" id="branch-tab">
     
     <div class="row float-right" style="padding-bottom: 10px;position: relative;right: 13px;">
-            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</button>                
+            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</button>                
     </div>
 
     <div class="table-responsive" id="branch_table" >
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="mdi mdi-format-list-bulleted" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/kyc_docs.php b/app/Views/kyc_docs.php
index 56a0bac9..9bb1ab5a 100755
--- a/app/Views/kyc_docs.php
+++ b/app/Views/kyc_docs.php
@@ -1,7 +1,7 @@
 <div class="tab-pane fade" id="branch-tab">
     
     <div class="row float-right" style="padding-bottom: 10px;position: relative;right: 13px;">
-            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add KYC Docs</button>                
+            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add KYC Docs</button>                
     </div>
 
     <div class="table-responsive" id="branch_table" >
@@ -22,7 +22,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="mdi mdi-format-list-bulleted" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/layout/header_old.php b/app/Views/layout/header_old.php
index def757d5..3b1cf061 100644
--- a/app/Views/layout/header_old.php
+++ b/app/Views/layout/header_old.php
@@ -875,7 +875,7 @@
                     <?php } ?>
                     <li>
                         <a id="user_manual" href="<?= base_url("autobookstackLogin") ?>" class="waves-effect" target="_blank" rel="noopener noreferrer">
-                            <i class="fa fa-info-circle" aria-hidden="true"></i>
+                            <i class="mdi mdi-information-outline" aria-hidden="true"></i>
                             <span>User Manual</span>
                         </a>
                     </li>
diff --git a/app/Views/policies.php b/app/Views/policies.php
index 02f81ef5..08e8059f 100755
--- a/app/Views/policies.php
+++ b/app/Views/policies.php
@@ -1,7 +1,7 @@
 <div class="tab-pane fade" id="branch-tab">
     
     <div class="row float-right" style="padding-bottom: 10px;position: relative;right: 13px;">
-            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policies</button>                
+            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policies</button>                
     </div>
 
     <div class="table-responsive" id="branch_table" >
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="mdi mdi-format-list-bulleted" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 82f39443..11711048 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -317,7 +317,7 @@
                                                             <span class="slider round" style="height: 27px;"></span>
                                                         </label>
 
-                                                        <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;">Make Entry in CD &nbsp;&nbsp; <i class="fa fa-info-circle" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i></label>
+                                                        <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;">Make Entry in CD &nbsp;&nbsp; <i class="mdi mdi-information-outline" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i></label>
                                                     </div>
 
                                                 </div>
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index f4752614..12478554 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -446,7 +446,7 @@
                                                             <span class="slider round" style="height: 27px;"></span>
                                                         </label>
 
-                                                        <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;"> Make Entry in CD  &nbsp;&nbsp; <i class="fa fa-info-circle info-icon" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i>
+                                                        <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;"> Make Entry in CD  &nbsp;&nbsp; <i class="mdi mdi-information-outline info-icon" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i>
                                                         </label>
                                                     </div>
 
@@ -532,7 +532,7 @@
                                                     </div>
 
                                                     <div class="form-group col-md-3">
-                                                        <label for="installment">Installment &nbsp; <i id="infoIcon" class="fas fa-info-circle info-icon" data-toggle="tooltip" title="Click for Installment details" style="margin-left: 5px;"></i></label>
+                                                        <label for="installment">Installment &nbsp; <i id="infoIcon" class="mdi mdi-information-outline info-icon" data-toggle="tooltip" title="Click for Installment details" style="margin-left: 5px;"></i></label>
                                                         <input id="installment" value="" type="text" class="form-control" name="installment">
                                                     </div>
 
diff --git a/app/Views/rfq/gmc.php b/app/Views/rfq/gmc.php
index fe9b7c2d..82cedab9 100644
--- a/app/Views/rfq/gmc.php
+++ b/app/Views/rfq/gmc.php
@@ -75,7 +75,7 @@
 
       <div class="form-group col-md-3 renewalFields" style="display: none;">
         <span class="info-icon-wrapper">
-            <i class="fa fa-info-circle text-primary"></i>
+            <i class="mdi mdi-information-outline text-primary"></i>
             <div class="info-tooltip">
                 <strong>Formulas:</strong><br>
                 1. Incurred Claims      = Paid Claims + Outstanding Claims<br>
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index 2d8c2aa2..ebb7d4b1 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -184,7 +184,7 @@
                         <div style="display: flex; align-items: center; gap: 10px;">
                             <h5 style="margin: 0;">
                                 Claim Details 
-                                <i id="infoIcon" class="fas fa-info-circle info-icon" title="Click for more details" style="margin-left: 5px;"></i>
+                                <i id="infoIcon" class="mdi mdi-information-outline info-icon" title="Click for more details" style="margin-left: 5px;"></i>
                                 <?= isset($ticket_data['claim_number']) && !empty($ticket_data['claim_number']) ? '( Claim No : ' . $ticket_data['claim_number'] . ' )' : '' ?>
                             </h5>
                         </div>
diff --git a/app/Views/ticket_form_gpa.php b/app/Views/ticket_form_gpa.php
index a25d03e7..3bc32c42 100644
--- a/app/Views/ticket_form_gpa.php
+++ b/app/Views/ticket_form_gpa.php
@@ -142,7 +142,7 @@
                         <!-- end first_data_points -->
 
                         <br><br>
-                        <h5>Claim Details <span><i id="infoIcon" class="fas fa-info-circle info-icon" title="Click for more details"></i></span></h5>
+                        <h5>Claim Details <span><i id="infoIcon" class="mdi mdi-information-outline info-icon" title="Click for more details"></i></span></h5>
                         <hr>
 
                         <!-- second_data_points -->
diff --git a/app/Views/ticket_list.php b/app/Views/ticket_list.php
index 5674bd08..07868b35 100644
--- a/app/Views/ticket_list.php
+++ b/app/Views/ticket_list.php
@@ -150,7 +150,7 @@ table.dataTable tbody td {
                                                     } elseif ($row['is_head_approved'] == 1) {
                                                         echo $row['status'] . '&nbsp;<i class="mdi mdi-check-circle" style="color:green;" aria-hidden="true"></i>';
                                                     } elseif ($row['is_head_approved'] == 2) {
-                                                        echo $row['status'] . '&nbsp;<i class="fa fa-times-circle" style="color:red;" aria-hidden="true"></i>';
+                                                        echo $row['status'] . '&nbsp;<i class="mdi mdi-close-circle-outline" style="color:red;" aria-hidden="true"></i>';
                                                     } else {
                                                         echo $row['status'];
                                                     }
diff --git a/app/Views/tpa_branch.php b/app/Views/tpa_branch.php
index 1f850f69..6f5c38b1 100755
--- a/app/Views/tpa_branch.php
+++ b/app/Views/tpa_branch.php
@@ -1,7 +1,7 @@
 <div class="tab-pane fade" id="branch-tab">
     
     <div class="row float-right" style="padding-bottom: 10px;position: relative;right: 13px;">
-            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="fa fa-plus-square" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</button>                
+            <button type="button" id="btnBranchAdd" class="btn btn-primary waves-effect waves-light btn-sm"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Branch</button>                
     </div>
 
     <div class="table-responsive" id="branch_table" >
@@ -23,7 +23,7 @@
         <div class="col-12">
             <div class="card-body">
                 <div class="row float-right" style="position: relative; bottom: 20px; right: 13px;">
-                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="fa fa-list" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
+                        <button type="button" id="btnBranchBack" class="btn btn-primary waves-effect waves-light btn-sm btnBack"><span class="mdi mdi-format-list-bulleted" aria-hidden="true" style="padding: 5px 10px;"></span>Back To List</button>                
                 </div>
                 
                 <hr>
diff --git a/test.http b/test.http
new file mode 100644
index 00000000..a3e3125a
--- /dev/null
+++ b/test.http
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+POST https://testtips.vidalhealthtpa.com:7443/mobilerest/vidalbrokerservices/submitClaim
+Authorization: Basic dmlkYWxicm9rZXJsb2dpbjp2aWRhbHN0YWdlQDEyMw==
+Cookie: JSESSIONID=678ofNbsfB8svK1lyV6rON3w.worker1
+Content-Type: multipart/form-data; boundary=WebApiBoundary
+
+--WebApiBoundary
+Content-Disposition: form-data; name="username"
+
+Web_api
+--WebApiBoundary
+Content-Disposition: form-data; name="password"
+
+Web@api
+--WebApiBoundary
+Content-Disposition: form-data; name="policyNo"
+
+CI/TEST/POLICY/123456
+--WebApiBoundary
+Content-Disposition: form-data; name="enrollmentId"
+
+BLR-RG-H0351-043-0000002-A
+--WebApiBoundary
+Content-Disposition: form-data; name="typeOfClaim"
+
+Main hospitalization claim
+--WebApiBoundary
+Content-Disposition: form-data; name="claimSubType"
+
+Hospitalization
+--WebApiBoundary
+Content-Disposition: form-data; name="requestedAmount"
+
+4500
+--WebApiBoundary
+Content-Disposition: form-data; name="ailmentType"
+
+Non covid
+--WebApiBoundary
+Content-Disposition: form-data; name="admissionDate"
+
+20-03-2025
+--WebApiBoundary
+Content-Disposition: form-data; name="dischargeDate"
+
+23-03-2025
+--WebApiBoundary
+Content-Disposition: form-data; name="hospitalName"
+
+A G  HOSPITAL NEW
+--WebApiBoundary
+Content-Disposition: form-data; name="empanelmentNo"
+
+HOS-PON-010427
+--WebApiBoundary
+Content-Disposition: form-data; name="documentType"
+
+Claim
+--WebApiBoundary
+Content-Disposition: form-data; name="ailmentName"
+
+Cold
+--WebApiBoundary
+Content-Disposition: form-data; name="hospitalAddress"
+
+abc
+--WebApiBoundary
+Content-Disposition: form-data; name="hospitalState"
+
+karnataka
+--WebApiBoundary
+Content-Disposition: form-data; name="hospitalCity"
+
+bangalore
+--WebApiBoundary
+Content-Disposition: form-data; name="hospitalPinCode"
+
+560036
+--WebApiBoundary
+Content-Disposition: form-data; name="hospitalPhoneNo"
+
+7656879899
+--WebApiBoundary
+Content-Disposition: form-data; name="File"; filename="tracker.pdf"
+Content-Type: application/pdf
+
+< ./C:\Users\jvadi\Downloads\Tickets - Business Show_ Chennai (India) (06_11_2025 14_00_00) - vadivel.pdf
+--WebApiBoundary--
+
+
+// claim 
+

From 2f121b34e3047ae11fc7914be633a7fb4c789c84 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Fri, 22 Aug 2025 15:49:39 +0530
Subject: [PATCH 34/54] CHANGE_ added policy_id in hr file upload table : GWM

---
 app/Controllers/EmployeeRestController.php | 3 +++
 app/Models/HrFileUploadModel.php           | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 6fc764b3..f911e85a 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -3818,6 +3818,7 @@ class EmployeeRestController extends AdminController
               $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'),
@@ -3854,6 +3855,7 @@ class EmployeeRestController extends AdminController
               $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_action'      => $this->request->getPost('file_action'),
                   'status'           => $this->request->getPost('status'),
@@ -3968,6 +3970,7 @@ class EmployeeRestController extends AdminController
             $filters = [
                 'client_id',
                 'client_branch_id',
+                'policy_id',
                 'policy_no',
                 'file_action',
                 'status',
diff --git a/app/Models/HrFileUploadModel.php b/app/Models/HrFileUploadModel.php
index e5e2a22b..c7d9b945 100644
--- a/app/Models/HrFileUploadModel.php
+++ b/app/Models/HrFileUploadModel.php
@@ -14,6 +14,7 @@ class HrFileUploadModel extends Model
     protected $allowedFields    = [
         'client_id',
         'client_branch_id',
+        'policy_id',
         'policy_no',
         'file_name',
         'file_action',

From 99987910e9c45cb7d45ce79c54b0c69fad019b88 Mon Sep 17 00:00:00 2001
From: Gowtham M <gowtham.m@venbainfotech.com>
Date: Fri, 22 Aug 2025 16:48:53 +0530
Subject: [PATCH 35/54] CHANGE : file download : GWM

---
 app/Config/Routes.php                      |  2 +-
 app/Controllers/EmployeeRestController.php |  2 +-
 app/Views/hr_file_upload.php               | 24 ++++++++++++----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index b9cd244a..75b95c76 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -570,7 +570,7 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
     $routes->post("updateHrFileUploadData", "EmployeeRestController::updateHrFileUploadData");
 
 });
-$routes->get("hrFileUploadMasters", "EmployeeRestController::hrFileUploadMasters");
+$routes->get("hrFileDownload", "EmployeeRestController::hrFileDownload");
 $routes->post("hrFileList", "EmployeeRestController::hrFileList");
 $routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy");
 $routes->get("sendPushNotification", "EmployeeRestController::sendPushNotification");
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index f911e85a..91833826 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -4003,7 +4003,7 @@ class EmployeeRestController extends AdminController
       {
           try {
               //for inception upload
-              $data['actions'] = ['inception' => 'Inception (Employee + Dependents)', 'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
+              $data['actions'] = ['addition' => 'Addition (Employee + Dependents)',  'missed_inception' => 'Missed Inception (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
   
               return $this->respond([
                   'status'  => true,
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index e9dce959..73d44b7f 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -39,7 +39,7 @@
 
                                         <div class="form-group col-md-4">
                                             <label>Policy</label> <br />
-                                            <select name="client_policy_id" class="form-control" id="policy2"  >
+                                            <select name="policy_id" class="form-control" id="policy2"  >
                                                 <option value="">Select</option>
                                             </select>
                                         </div>
@@ -193,7 +193,7 @@
         e.preventDefault(); // stop normal form submit
 
         let formData = $(this).serialize(); // serialize form with csrf
-      
+        var baseurl = `<?= base_url() ?>`;
         $.ajax({
             url: "<?= base_url('hrFileList') ?>", 
             type: "POST",
@@ -221,6 +221,16 @@
                                 <td>${file.created_at} by <strong>${file.first_name ?? ""}</strong></td>
                                 <td>${file.status}</td>
                                 <td>
+
+
+                                <div class="btn-group dropdown">
+                                    <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm"
+                                        data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                    
+                                    <div class="dropdown-menu dropdown-menu-right">
+                                            <a href="${baseurl}/hrFileDownload?id=${file.id}" class="dropdown-item" style="color: #000;" aria-hidden="true" target="_blank" ><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
+                                    </div>
+                                </div>
                                 
                                 </td>
                             </tr>
@@ -242,14 +252,6 @@
         });
     });
 
-   //  <div class="btn-group dropdown">
-//     <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm"
-//         data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
-    
-//     <div class="dropdown-menu dropdown-menu-right">
-//             <a href="${baseUrl}/hrFileUploadMasters?id=${file.id}" class="dropdown-item" style="color: #000;" aria-hidden="true" target="_blank" ><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
-//     </div>
-//  </div>
 
     //featch client and branch and policy
     function getClientAndBranchAndPolicy()
@@ -342,7 +344,7 @@
 
         $.each(data, function(index, item) {
             var option = $('<option>', {
-                value: item.policy_no,
+                value: item.policy_id,
                 text: item.policy_type + '-' + item.policy_no,
             });
             $('#policy2').append(option);

From 79c5e8f5615d1e69e02383571e8c2684ae9a77e7 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Fri, 22 Aug 2025 17:57:37 +0530
Subject: [PATCH 36/54] FIX_UI ticket

---
 app/Controllers/ThzController.php |  11 ++--
 app/Models/ThzMasterModel.php     |   2 +-
 app/Views/layout/header.php       | 104 ++++++++++++++++++++++--------
 app/Views/thz_notes.php           |  27 +++++---
 4 files changed, 100 insertions(+), 44 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 059ebfce..d679a42a 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -91,7 +91,7 @@ class ThzController extends BaseController
             }
         }else{
           
-            $data['page_name'] = "Ticket List";
+            $data['page_name'] = "Tickets";
             $data['ticket_data'] = $tickets;
             $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3','4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
                                                                                                                      // 2,3,4 remain person varannum. 
@@ -197,17 +197,14 @@ class ThzController extends BaseController
                 return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
             }else{
                 $toGetCreatedBy = $result['master'][0]['created_by'];
+                $toGetMobile = $result['master'][0]['mobile'];
                 $toGetPolicyId =  (!empty($result['master'][0]['policy_id']) && strtolower($result['master'][0]['policy_id']) !== 'null') 
                                    ? $result['master'][0]['policy_id'] 
                                    : ''; 
 
-                $result['related_tickets'] = $this->thzMasterModel
-                                        ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
-                                        ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                                        ->where('thz_master.created_by', $toGetCreatedBy)
-                                        ->findAll();
+                $result['related_tickets'] = $this->thzMasterModel->where('mobile', $toGetMobile)->where('thz_id !=', $thz_id)->findAll();
                 $result['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3','4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
-                                                                                                                           // 2,3,4 remain person varannum. 
+                $result['page_name'] = "Tickets";                                                                          // 2,3,4 remain person varannum. 
                 $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';                                                                                                           
                 return $this->loadLayout('thz_notes', $result);
             }       
diff --git a/app/Models/ThzMasterModel.php b/app/Models/ThzMasterModel.php
index aa33fc32..b6a6140e 100644
--- a/app/Models/ThzMasterModel.php
+++ b/app/Models/ThzMasterModel.php
@@ -43,7 +43,7 @@ class ThzMasterModel extends Model
     public function ticketAutoFetchDetails($client_id ,$mobile){
 
         $result = $this->db->table('employees e')
-                        ->select('e.id, e.email_personal, e.client_id, e.client_branch_id as branch_id, e.mobile, e.emp_code, e.name, ep.client_policy_id as policy_id')
+                        ->select('e.id, e.email_personal,e.email_corporate, e.client_id, e.client_branch_id as branch_id, e.mobile, e.emp_code, e.name, ep.client_policy_id as policy_id')
                         ->join('employee_polices ep', 'ep.employee_id = e.id AND ep.is_active = 1', 'left')
                         ->whereIn('e.emp_status', ['active', 'draft', 'enrolled'])
                         ->where('e.is_active', 1)
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index dc34b27d..8e9ff0a7 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -249,7 +249,7 @@
 
         /* Force all text across the entire app to black */
         html, body, * {
-            color: #000 !important;
+             color: #000 !important;
         }
 
 
@@ -511,33 +511,73 @@
             font-weight: 600!important;
         }
 
-  .btn-ternary {
-    color: #fff !important;
-    background-color: #E26728;
-    border-color: #E26728; }
-  .btn-ternary:hover {
-    color: #fff !important;
-    background-color: #B9501F;
-    border-color: #A6471C; }
-  .btn-ternary:focus, .btn-ternary.focus {
-    color: #fff !important;
-    background-color: #B9501F;
-    border-color: #A6471C;
-    box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
-  .btn-ternary.disabled, .btn-ternary:disabled {
-    color: #fff !important;
-    background-color: #E26728;
-    border-color: #E26728; }
-  .btn-ternary:not(:disabled):not(.disabled):active, .btn-ternary:not(:disabled):not(.disabled).active,
-  .show > .btn-ternary.dropdown-toggle {
-    color: #fff !important;
-    background-color: #A6471C;
-    border-color: #933E19; }
-    .btn-ternary:not(:disabled):not(.disabled):active:focus, .btn-ternary:not(:disabled):not(.disabled).active:focus,
-    .show > .btn-ternary:dropdown-toggle:focus {
-      box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
+/*
+#E26728   (base)
+#B8521F   (darker 1)
+#9C461B   (darker 2)
+#803A16   (darker 3)
+rgba(226, 103, 40, 0.5)  (transparent)
 
-    .btn-border-radius{ border-radius: 10px !important; }
+#00999E   (base)
+#007A7E   (darker 1)
+#006C70   (darker 2)
+#005D61   (darker 3)
+rgba(0, 153, 158, 0.5)  (transparent)
+*/
+
+.btn-app-primary {
+  color: #fff !important;
+  background-color: #00999E;
+  border-color: #00999E; }  
+.btn-app-primary:hover {
+    color: #fff !important;
+    background-color: #007A7E; 
+    border-color: #006C70; } 
+.btn-app-primary:focus, .btn-app-primary.focus {
+    color: #fff !important;
+    background-color: #007A7E; 
+    border-color: #006C70; 
+    box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5); }
+.btn-app-primary.disabled, .btn-app-primary:disabled {
+    color: #fff !important;
+    background-color: #00999E;
+    border-color: #00999E; } 
+.btn-app-primary:not(:disabled):not(.disabled):active, .btn-app-primary:not(:disabled):not(.disabled).active,
+  .show > .btn-app-primary.dropdown-toggle {
+    color: #fff !important;
+    background-color: #006C70; 
+    border-color: #005D61; } 
+.btn-app-primary:not(:disabled):not(.disabled):active:focus, .btn-app-primary:not(:disabled):not(.disabled).active:focus,
+    .show > .btn-app-primary.dropdown-toggle:focus {
+      box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5); }
+
+.btn-app-ternary {
+  color: #fff !important;
+  background-color: #E26728;
+  border-color: #E26728; }  
+.btn-app-ternary:hover {
+    color: #fff !important;
+    background-color: #B8521F; 
+    border-color: #9C461B; } 
+.btn-app-ternary:focus, .btn-app-ternary.focus {
+    color: #fff !important;
+    background-color: #B8521F; 
+    border-color: #9C461B; 
+    box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
+.btn-app-ternary.disabled, .btn-app-ternary:disabled {
+    color: #fff !important;
+    background-color: #E26728; 
+    border-color: #E26728; } 
+.btn-app-ternary:not(:disabled):not(.disabled):active, .btn-app-ternary:not(:disabled):not(.disabled).active,
+  .show > .btn-app-ternary.dropdown-toggle {
+    color: #fff !important;
+    background-color: #9C461B; 
+    border-color: #803A16; } 
+.btn-app-ternary:not(:disabled):not(.disabled):active:focus, .btn-app-ternary:not(:disabled):not(.disabled).active:focus,
+    .show > .btn-app-ternary.dropdown-toggle:focus {
+      box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }  
+
+.btn-border-radius{ border-radius: 10px !important; }
 
 
 
@@ -728,7 +768,15 @@
                                 </a>
                             </li>
                         <?php } ?>
-
+                        <!-- Tickets -->
+                        <?php if (in_array(get_role_id(), [1,2,3,5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
+                        <li>
+                            <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive-not-working">
+                                    <img src="<?= base_url() . "public"; ?>/assets/images/user_manual_sb.png" alt="Logo" height="20">
+                                <span>Tickets</span>
+                            </a>
+                        </li>
+                        <?php } ?>
                         <!-- BDS -->
                         <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
                             <li>
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 6bffa681..71e303f1 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -237,7 +237,7 @@
                             <input type="hidden" id="notes_by" name="notes_by" value="Staff">
                             <input type="hidden" id="created_by" name="created_by" value="<?= get_session_userid(); ?>">
                             <div class="notes-box">
-                                    <textarea class="form-control" id="notes" name="notes" placeholder="Write your notes here..."></textarea>
+                                    <textarea class="form-control" id="notes" name="notes" placeholder="Write your notes here..." required></textarea>
                                     <div class="icon-buttons">
                                         <!-- save btn means local - internal  -->
                                         <button type="button" class="btn-icon" onclick="submitConverstionTicket('Internal')"><i class="mdi mdi-content-save"></i></button>
@@ -310,7 +310,7 @@
           </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-ternary btn-border-radius" onclick="submitTicket()">Save</button>
+          <button type="button" class="btn btn-app-ternary btn-border-radius" onclick="submitTicket()">Save</button>
         </div>
       </form>
     </div>
@@ -422,16 +422,16 @@
             dataType: 'json',
             success: function(response) {
                 if (response.status === "success") {
-                    toastr.success(response.message, 'success');
+                    toastr.success(response.message, 'Success');
                     $('#ticketModal').modal('hide');
                     form.reset();
                     window.location.href = "<?= base_url('ticketConversationList?return_type=web&thz_id=') ?>" + id;
                 } else {
-                    toastr.error(response.message, 'error');
+                    toastr.error(response.message, 'Error');
                 }
             },
             error: function(xhr) {
-                toastr.error("Something went wrong!", 'error');
+                toastr.error("Something went wrong!", 'Error');
                 console.error(xhr.responseText);
             }
         });
@@ -444,6 +444,17 @@
             document.getElementById("thz_id").value = urlParams.get('thz_id');
             var id = urlParams.get('thz_id');
             var form = document.getElementById("conversationForm");
+            // reset any old error styles
+            form.classList.remove('was-validated');
+
+            var notes  = document.getElementById('notes').value.trim();
+            
+            if (notes === "") {
+                toastr.warning('Please enter notes', 'Warning');
+                form.classList.add('was-validated');
+                return;
+            }
+
             var formData = new FormData(form);
         
         $.ajax({
@@ -455,15 +466,15 @@
             dataType: 'json',
             success: function(response) {
                 if (response.status === "success") {
-                    toastr.success(response.message, 'success');
+                    toastr.success(response.message, 'Success');
                     form.reset();
                     window.location.href = "<?= base_url('ticketConversationList?return_type=web&thz_id=') ?>" + id;
                 } else {
-                    toastr.error(response.message, 'error');
+                    toastr.error(response.message, 'Error');
                 }
             },
             error: function(xhr) {
-                toastr.error("Something went wrong!", 'error');
+                toastr.error("Something went wrong!", 'Error');
                 console.error(xhr.responseText);
             }
         });

From 11f5f0be3ec3a507884a482fdaabca658c6680f6 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Fri, 22 Aug 2025 23:03:09 +0530
Subject: [PATCH 37/54] CHANGE_UI_FIX - VADIVEL J 2025-08-22

---
 app/Controllers/ThzController.php | 21 +++++++++++++++------
 app/Views/thz_notes.php           | 25 ++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 059ebfce..1c0f9535 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -196,19 +196,28 @@ class ThzController extends BaseController
             if ($returnType === 'api') {
                 return $this->response->setJSON((['status' => 'success', 'data' => $result]))->setStatusCode(200);
             }else{
-                $toGetCreatedBy = $result['master'][0]['created_by'];
+
+                $assign_to = $result['master'][0]['assign_to'];
+                $mobile    = $result['master'][0]['mobile'];
+
                 $toGetPolicyId =  (!empty($result['master'][0]['policy_id']) && strtolower($result['master'][0]['policy_id']) !== 'null') 
                                    ? $result['master'][0]['policy_id'] 
                                    : ''; 
 
                 $result['related_tickets'] = $this->thzMasterModel
-                                        ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
-                                        ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
-                                        ->where('thz_master.created_by', $toGetCreatedBy)
-                                        ->findAll();
+                                            ->select('thz_master.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as assignee_name')
+                                            ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+                                            ->where('thz_master.assign_to', $assign_to)
+                                            ->where('thz_master.mobile',$mobile)
+                                            ->where('thz_master.thz_id !=',$thz_id)
+                                            ->where('thz_master.status !=','Closed')
+                                            ->where('thz_master.status !=','Resolved')
+                                            ->findAll();
+                                            
                 $result['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3','4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
                                                                                                                            // 2,3,4 remain person varannum. 
-                $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';                                                                                                           
+                $result['policy_terms'] = $toGetPolicyId ? $this->getPolicyTerms($toGetPolicyId) : '';
+                                                                                                                           
                 return $this->loadLayout('thz_notes', $result);
             }       
 
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 6bffa681..52dfb006 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -327,9 +327,17 @@
         </div>
 
         <div class="modal-body card-scroll" style="padding-top:5px!important;">  
+
+           <?php if(  !isset($related_tickets) || empty($related_tickets) ) { ?>
+                <div class="d-flex justify-content-center align-items-center">
+                    <div>
+                        <p> No Related Tickets Found </p>
+                    </div>
+                </div>
+           <?php }  ?>
             
             <?php foreach($related_tickets as $j => $rt): ?>
-                <div class="card related-ticket-card mb-3">
+                <div class="card related-ticket-card mb-3" data-related-ticket-id="<?=$rt['thz_id']?>">
                         <div class="card-body" style="border-radius: 20px; padding:27px !important;">
                             <div class="d-flex justify-content-between align-items-start">
                                 <h5 class="mb-1"><?php echo '# '.$rt['thz_id']." / ".$rt['ticket_type']; ?></h5>
@@ -468,4 +476,19 @@
             }
         });
     }
+</script>
+
+<script>
+$(document).ready(function(){
+    // attach click event to the div
+    $(document).on('click', '.related-ticket-card', function(){
+
+        let relatedId = $(this).data('related-ticket-id'); 
+        console.log("Related Ticket ID:", relatedId);
+
+       window.open("<?php echo base_url('/ticketConversationList?return_type=web&thz_id=')?>"+relatedId,"_blank");
+
+
+    });
+});
 </script>
\ No newline at end of file

From c01c2724117b9da8123c8c18c70262eaf257d034 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Sat, 23 Aug 2025 00:29:14 +0530
Subject: [PATCH 38/54] CHANGE_UI_FIX - VADIVEL J 2025-08-23

---
 app/Views/thz_notes.php | 43 ++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index c19695d0..c70ce982 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -51,7 +51,7 @@
 }
 .recard-scroll{
     overflow-y:auto;
-    height:295px;
+    height:350px;
 }
 
 .maincard{
@@ -62,6 +62,7 @@
 .conversation-card,
 .conversation-card .card-header,
 .conversation-card .card-body {
+  
   background: #F5FFFF !important;
 }
 
@@ -78,6 +79,13 @@
   overflow-y:auto;
   box-shadow: 0 2px 4px 0 #00000040;
 }
+
+hr{
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+
 </style>
 
 
@@ -192,33 +200,36 @@
                     
                     <!-- Conversation Card -->
                     <div class="card mb-3 conversation-card">
-                         <div class="card-header border-0">
-                            <h5 class="mb-0" style="font-size:15px;">Conversation</h5>
-                            <hr/>
+                         <div class="card-header border-0 p-2 ">
+                            <h5 class="mb-2" style="font-size:15px;">Conversation</h5>
+                            <hr>
                         </div>
 
-                        <div class="card-body pt-0 recard-scroll">
+                        <div class="card-body pt-0 recard-scroll" style="padding-left: 15px !important;">
                           <?php if(!empty($notes)): ?>
                             <?php foreach($notes as $i => $conv): ?>
                                     
                                     <!-- Top Row: Message + Badge -->
-                                    <div class="d-flex justify-content-between align-items-start">
-                                        <p class="mb-1 mr-4"><?= $conv['notes'] ?></p>
-                                        <!-- <?php if(!empty($conv['notes_by'])): ?>
-                                            <span class="badge bg-warning text-dark"><?= $conv['notes_by'] ?></span>
-                                        <?php endif; ?> -->
-                                        <?php if (!empty($conv['notes_type']) && $conv['notes_type'] === "Internal"): ?>
-                                            <span class="badge bg-warning text-dark"><?= $conv['notes_type'] ?></span>
-                                        <?php endif; ?>
-                                    </div>
+                                <div class="d-flex justify-content-between align-items-start mb-2">
+                                    <div class="flex-grow-1 text-break">
+                                        <span class="mb-1 mr-4"><?= $conv['notes'] ?></span>
+                                    </div>                                       
+
+                                    <?php if (!empty($conv['notes_type']) && $conv['notes_type'] === "Internal"): ?>
+                                        <div>
+                                            <span class="badge" style="background-color:#E26828 ;color: white!important;"><?= $conv['notes_type'] ?></span>
+                                        </div>
+                                    <?php endif; ?>
+                                </div>
+
                                     
                                     <!-- Bottom Row: Name + Date -->
-                                    <div class="d-flex justify-content-between small text-muted">
+                                    <div class="d-flex justify-content-between small text-muted mb-1">
                                         <span><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
                                         <span><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
                                     </div>
 
-                                    <?php echo $i < count($notes)-1 ? '<hr/>' : ''; ?>
+                                    <?php echo $i < count($notes)-1 ? '<hr>' : ''; ?>
 
                             <?php endforeach; ?>
                             <?php else: ?>

From 45cdf71db3087179147cb09dff05aec526335f45 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 25 Aug 2025 10:37:44 +0530
Subject: [PATCH 39/54] 
 FEAT_HR_FILE_UPLOAD_STATUS_CHANGE_AND_REUPLOAD_THE_FILE_TO_THE_FILES_TABLE :
 RV

---
 app/Controllers/ClientController.php          |  26 ++-
 app/Controllers/EmployeeController.php        |   3 +-
 app/Controllers/EmployeeRestController.php    |  39 +++-
 .../PolicyTransactionController.php           |   2 +-
 app/Models/FileModel.php                      |   3 +-
 app/Views/claim_dump_file_list.php            |  91 +++++++-
 app/Views/employee_upload.php                 | 214 +++++++-----------
 app/Views/hr_file_upload.php                  | 162 +++++++++----
 app/Views/import_export.php                   |  58 ++++-
 app/Views/insurer_or_tpa_data.php             | 199 +++++++---------
 app/Views/layout/footer.php                   |   2 +-
 11 files changed, 490 insertions(+), 309 deletions(-)

diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 7126cd69..98b2a821 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -4055,10 +4055,25 @@ class ClientController extends AdminController
     {
         // ---------for client-----------------------------------------------------------------------------
 
+        $role_id = get_role_id();
+        $user_id = get_session_userid();
+
+
+        if ($role_id == 2 || $role_id == 3) {
+
             $clients = $this->clientModel
-            ->select("*, DATE_FORMAT(dob, '%d-%m-%Y') as dob")
-            ->where('is_active', 1)
-            ->findAll();
+                ->select("clients.*, DATE_FORMAT(clients.dob, '%d-%m-%Y') as dob")
+                ->join('client_rm', 'client_rm.client_id = clients.id')
+                ->where('client_rm.user_id', $user_id)
+                ->where('clients.is_active', 1)
+                ->findAll();
+        } else {
+
+            $clients = $this->clientModel
+                ->select("*, DATE_FORMAT(dob, '%d-%m-%Y') as dob")
+                ->where('is_active', 1)
+                ->findAll();
+        }
 
         $clientIds = array_column($clients, 'id');
 
@@ -5064,6 +5079,10 @@ class ClientController extends AdminController
         // $res = $empServiceController->employeesCorrectionProcess(['file_id' => '1681']); 
         // dd( $res); 
 
+        // $EmployeeMultiEventServiceController = new EmployeeMultiEventServiceController();
+        // $res = $EmployeeMultiEventServiceController->constructMultiEventData(['file_id' => '1056']); 
+        // dd($res);
+
         // ---------- POLICY TRANSACTION CONTROLLER --------------------------------------------------------------------------------
 
         $policyTransactionController = new PolicyTransactionController();
@@ -5181,6 +5200,7 @@ class ClientController extends AdminController
         // $data['data'] = $BDSReportController->getBAPClientData();
         // return $this->loadLayout('irda_bap_client_report_list', $data);
 
+
         // $data['data'] = $BDSReportController->getClientData(1);
         // return $this->loadLayout('irda_client_report_list', $data);
 
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index dd80cd05..40e8af2b 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -270,10 +270,11 @@ class EmployeeController extends AdminController
             $client_id = $this->request->getPost('client_id');
             $policy_id = $this->request->getPost('policy_id');
             $branch_id = $this->request->getPost('branch_id');
+            $hr_file_id = $this->request->getPost('hr_file_id') ?? null;
             $action = $this->request->getPost('upload-action-type');
             $status = 'inprogress';
 
-            $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $loggedInUserID, 'status' => $status, 'action' => $action, 'client_branch_id' => $branch_id,'uploaded_by' => 1]); //here field policy_id have client_policy_id and not policy id from policy master
+            $file_id = $this->fileModel->insert(['file_name' => $filename, 'client_id' => $client_id, 'policy_id' => $policy_id, 'created_by' => $loggedInUserID, 'status' => $status, 'action' => $action, 'client_branch_id' => $branch_id,'uploaded_by' => 1, 'hr_file_id' => $hr_file_id]); //here field policy_id have client_policy_id and not policy id from policy master
             $this->myLogger->logme("error", '{file_id} uploaded success', ['file_id' => $file_id]);
 
             //start validation process
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 91833826..f307a351 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -3960,11 +3960,46 @@ class EmployeeRestController extends AdminController
             $request = service('request');
 
             // Start builder from model
+            // $builder = $this->hrFileUploadModel
+            //     ->select('hr_file_upload.* , c.short_name , cb.branch_name , lc.name as first_name')
+            //     ->join('clients c', 'c.id = hr_file_upload.client_id AND c.is_active = 1', 'left')
+            //     ->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left')
+            //     ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left');
+
             $builder = $this->hrFileUploadModel
-                ->select('hr_file_upload.* , c.short_name , cb.branch_name , lc.name as first_name')
+                ->select('
+                    hr_file_upload.id, 
+                    hr_file_upload.client_id, 
+                    hr_file_upload.client_branch_id, 
+                    hr_file_upload.policy_id, 
+                    hr_file_upload.policy_no, 
+                    hr_file_upload.file_name, 
+                    hr_file_upload.file_action, 
+                    hr_file_upload.created_at, 
+                    hr_file_upload.created_by, 
+                    hr_file_upload.updated_at, 
+                    hr_file_upload.updated_by,
+                    c.short_name, 
+                    cb.branch_name, 
+                    lc.name as first_name,
+                    CASE 
+                        WHEN f.status IS NULL 
+                        THEN hr_file_upload.status 
+                        ELSE CONCAT(UCASE(LEFT(f.status, 1)), LCASE(SUBSTRING(f.status, 2))) 
+                    END AS status
+                ', false)
                 ->join('clients c', 'c.id = hr_file_upload.client_id AND c.is_active = 1', 'left')
                 ->join('client_branch cb', 'cb.id = hr_file_upload.client_branch_id AND cb.is_active = 1', 'left')
-                ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left');
+                ->join('level_contacts lc', 'lc.id = hr_file_upload.created_by AND lc.contact_type = "client" AND lc.is_active = 1', 'left')
+                ->join(
+                    '(SELECT f1.* 
+                    FROM files f1 
+                    WHERE f1.is_active = 1 
+                    ORDER BY f1.id DESC 
+                    LIMIT 1) f', 
+                    'f.hr_file_id = hr_file_upload.id', 
+                    'left'
+            );
 
             // Allowed filter keys
             $filters = [
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 9f7d7341..f7e75acf 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -997,10 +997,10 @@ class PolicyTransactionController extends BaseController
             $data['is_active']  = 0;
             $policy_transaction_data = $this->policyTransactionModel->where('id', $id)->first();
             if($policy_transaction_data['policy_type_id'] > 7){
-                
                 $this->policyTransactionModel->where('id', $id)->set($data)->update();
                 $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
                 $this->clientPolicyModel->where('id', $policy_transaction_data['client_policy_id'])->set($data)->update();
+                $this->policyTransactionModel->where('client_policy_id', $policy_transaction_data['client_policy_id'])->set($data)->update();
             }else{
                 $this->policyTransactionModel->where('id', $id)->set($data)->update();
                 $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
diff --git a/app/Models/FileModel.php b/app/Models/FileModel.php
index 5b27a7d4..ff4f584e 100755
--- a/app/Models/FileModel.php
+++ b/app/Models/FileModel.php
@@ -20,7 +20,8 @@ class FileModel extends Model
         "policy_id",
         "client_branch_id",
         "uploaded_by",
-        "updated_by"
+        "updated_by",
+        "hr_file_id",
     ];
 
 
diff --git a/app/Views/claim_dump_file_list.php b/app/Views/claim_dump_file_list.php
index 3caeb6a5..52918801 100644
--- a/app/Views/claim_dump_file_list.php
+++ b/app/Views/claim_dump_file_list.php
@@ -1,10 +1,29 @@
 <style>
+
     .reload:hover {
         cursor: pointer;
     }
+
+    .table th,
+    .table td {
+        padding: 8px;
+    }
+
+    table.dataTable tbody td {
+        padding: 4px 4px !important;
+    }
+
+    .addbtnStyle{
+        margin-left: 20px !important;
+    }
+
+    .dataTables_filter {
+        position: absolute;
+    }
+
 </style>
 
-<div class="row">
+<!-- <div class="row">
     <div class="col-xl-12" style="margin-left: 14px;max-width: 98%;">
         <div id="accordion1" class="mb-3">
             <div class="card mb-1">
@@ -21,7 +40,6 @@
                                 <div class="form-row" id="file_upload">
                                     <div class="form-group col-md-4">
                                         <label>Upload file</label>
-                                        <!-- &nbsp;[ <a href="#" id="excel_download" data-toggle="tooltip" data-placement="top" title="Download Sample Excel">Sample Excel</a> ] -->
                                         <input type="file" name="claim_dump_list" id="claim_dump_list" accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet" required>
                                     </div>
                                     <div class="d-flex align-items-center justify-content-start">
@@ -39,7 +57,7 @@
             </div>
         </div>
     </div>
-</div>
+</div> -->
 
 <div class="col-12">
     <div class="card">
@@ -121,6 +139,34 @@
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
+<!-- Center modal content for upload file-->
+<div class="modal fade" id="claim-file-upload-modal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myCenterModalLabel">Claim Dump Upload</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <form class="parsley-examples" id="claim-upload-form" enctype="multipart/form-data">
+                    <div class="form-group">
+                        <div class="form-row" id="file_upload">
+                            <div class="form-group col-md-9">
+                                <label>Upload file</label>
+                                <!-- &nbsp;[ <a href="#" id="excel_download" data-toggle="tooltip" data-placement="top" title="Download Sample Excel">Sample Excel</a> ] -->
+                                <input type="file" name="claim_dump_list" id="claim_dump_list" accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet" required>
+                            </div>
+                            <div class="form-group col-md-3" style="margin-top: 18px;">
+                                <button id="claim_form_submit_button" type="submit" class="btn btn-primary waves-effect waves-light justify-content-end">Upload</button>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
 <script>
 
     $(document).ready(function() {
@@ -176,6 +222,7 @@
 
                     // Reset form
                     $('#claim-upload-form')[0].reset();
+                    $('.close').click();
                     window.location.reload();
 
                 },
@@ -225,6 +272,38 @@
 
     });
 
+    // Datatable document ready
+    $(document).ready(function() {
+
+        var ticketsTable = $('#tickets-table');
+
+        if (ticketsTable.length) {
+            ticketsTable.DataTable({
+                scrollX: true,
+                dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right
+                    "<'row'<'col-sm-12'tr>>" +
+                    "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+                buttons: [
+                    {
+                        text: 'Add',
+                        className: 'buttons-html5 addbtnStyle',
+                        action: function (e, dt, node, config) {
+                            openDumpUploadModal();
+                        }
+                    }
+                ],
+                language: {
+                    search: "_INPUT_",
+                    searchPlaceholder: "Search..."
+                },
+                paging: true, // Enable pagination
+                pageLength: 15, // Set default number of rows per page (optional)
+            });
+        } else {
+            console.error("Table not found.");
+        }
+    });
+
     function fetchFileError(file_id) {
 
         var url = '<?php echo base_url('util/getClaimDumpFileErrorData/'); ?>';
@@ -326,5 +405,11 @@
         let html = `<div class="spinner-border text-primary" role="status" style="position: relative; left: 200px;"></div>`
         $('#modal_body').append(html);
     });
+
+    function openDumpUploadModal() {
+
+        var myModal = new bootstrap.Modal(document.getElementById('claim-file-upload-modal'));
+        myModal.show();
+    }
     
 </script>
\ No newline at end of file
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index 7f1ae499..ab566571 100755
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -129,7 +129,6 @@ option:disabled {
 
 </div>
 
-
 <div id="full-width-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="fullWidthModalLabel"
     aria-hidden="true">
     <div class="modal-dialog modal-full-width">
@@ -148,8 +147,6 @@ option:disabled {
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
-
-
 <!-- Center modal content -->
 <div class="modal fade" id="file-err-modal" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered">
@@ -167,6 +164,11 @@ option:disabled {
 
 
 <script>
+
+var client_id_param = 0;
+var client_branch_id_param = 0;
+var client_policy_param = 0;
+
 $('#file_upload').hide();
 
 $(document).ready(function() {
@@ -181,15 +183,6 @@ $(document).ready(function() {
 
 });
 
-// Declare a global variable to store API response data
-var clientPolicies = [];
-var clientPoliciesWithBranch = {
-    policies: []
-};
-var client_id_param = 0;
-var client_branch_id_param = 0;
-var client_policy_param = 0;
-
 $(document).ready(function() {
 
     // console.log("document loaded");
@@ -330,8 +323,6 @@ $(document).ready(function() {
 $(window).on("load", function() {
 
     console.log("window loaded");
-    fetchClientPolicies();
-
     // Get the current page URL
     const url = window.location.href;
 
@@ -368,87 +359,88 @@ $(window).on("load", function() {
 });
 
 
-function fetchClientPolicies() {
-    $('#loader').show();
-    var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies';
-    // console.log('fetchClientPolicies');
-    // console.log(apiURL);
-    $.ajax({
-        url: apiURL,
-        method: 'GET',
-        headers: {
-            "Content-Type": "application/json",
-            "X-Requested-With": "XMLHttpRequest"
-        },
-        success: function(response) {
+// function fetchClientPolicies() {
 
-            console.log(response);
-            // console.log(response.dataStatus);
-            // console.log(response.data);
+//     $('#loader').show();
+//     var apiURL = '<?php echo base_url();?>' + 'util/clients-with-policies';
+//     // console.log('fetchClientPolicies');
+//     // console.log(apiURL);
+//     $.ajax({
+//         url: apiURL,
+//         method: 'GET',
+//         headers: {
+//             "Content-Type": "application/json",
+//             "X-Requested-With": "XMLHttpRequest"
+//         },
+//         success: function(response) {
 
-            if (response.code === 200 && response.dataStatus === true && response.data !== "") {
-                try {
-                    clientPolicies = (response.data)                    
-                    // console.log(clientPolicies);
+//             console.log(response);
+//             // console.log(response.dataStatus);
+//             // console.log(response.data);
 
-                    response.data.forEach(policy => {
-                        // console.log('policies', policy.policies);
-                        policy.policies.forEach(p => {
-                            clientPoliciesWithBranch.policies.push(p);
-                        });
-                    });
+//             if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+//                 try {
+//                     clientPolicies = (response.data)                    
+//                     // console.log(clientPolicies);
 
-                    // console.log(clientPoliciesWithBranch);
+//                     response.data.forEach(policy => {
+//                         // console.log('policies', policy.policies);
+//                         policy.policies.forEach(p => {
+//                             clientPoliciesWithBranch.policies.push(p);
+//                         });
+//                     });
 
-                    appendClients(clientPolicies);
+//                     // console.log(clientPoliciesWithBranch);
+
+//                     appendClients(clientPolicies);
 
 
-                    setTimeout(function() {
-                        if (client_id_param != null ) {
-                            var foundPolicies = clientPolicies.find(function(item) {
-                                // console.log(typeof item.id)
-                                return item.id == client_id_param;
-                            });
-                            appendBranch(foundPolicies.branchs);
-                        }
-                    }, 500);
+//                     setTimeout(function() {
+//                         if (client_id_param != null ) {
+//                             var foundPolicies = clientPolicies.find(function(item) {
+//                                 // console.log(typeof item.id)
+//                                 return item.id == client_id_param;
+//                             });
+//                             appendBranch(foundPolicies.branchs);
+//                         }
+//                     }, 500);
 
 
-                    setTimeout(function() {
-                        if (client_branch_id_param != null ) {
-                            var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
-                                // console.log('item', item);
-                                return item.branch_id === client_branch_id_param;
-                            });
+//                     setTimeout(function() {
+//                         if (client_branch_id_param != null ) {
+//                             var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
+//                                 // console.log('item', item);
+//                                 return item.branch_id === client_branch_id_param;
+//                             });
 
 
-                            if (foundPolicies) {
-                                // console.log('foundPolicies', foundPolicies);
-                                appendPolicies(foundPolicies);
-                            } else {
-                                console.log('No policies found for the selected client');
-                            }
-                        }
-                    }, 500);
+//                             if (foundPolicies) {
+//                                 // console.log('foundPolicies', foundPolicies);
+//                                 appendPolicies(foundPolicies);
+//                             } else {
+//                                 console.log('No policies found for the selected client');
+//                             }
+//                         }
+//                     }, 500);
 
 
-                } catch (error) {
-                    console.error('Error parsing API response data:', error);
-                }
-            } else if (response.code === 404 && response.dataStatus === false) {
-                console.error('no data found', response);
-            } else {
-                console.error('Something went wrong!');
-            }
-        },
-        error: function(xhr, status, error) {
-            console.error('Error fetching data from API:', error);
-            console.error(xhr.responseText);
-        }
-    });
+//                 } catch (error) {
+//                     console.error('Error parsing API response data:', error);
+//                 }
+//             } else if (response.code === 404 && response.dataStatus === false) {
+//                 console.error('no data found', response);
+//             } else {
+//                 console.error('Something went wrong!');
+//             }
+//         },
+//         error: function(xhr, status, error) {
+//             console.error('Error fetching data from API:', error);
+//             console.error(xhr.responseText);
+//         }
+//     });
 
-    $('#loader').hide();
-}
+//     $('#loader').hide();
+// }
 
 
 function fetchFileError(file_id) {
@@ -593,7 +585,6 @@ function fetchFileError(file_id) {
     $('#loader').hide();
 }
 
-
 function appendClients(data) {
 
     // console.log('client_id_param', client_id_param)
@@ -610,7 +601,6 @@ function appendClients(data) {
     });
 }
 
-
 function appendBranch(data) {
 
     $('#branch_id').empty();
@@ -630,7 +620,6 @@ function appendBranch(data) {
     });
 }
 
-
 function appendPolicies(data) {
 
     // console.log(data)
@@ -645,14 +634,11 @@ function appendPolicies(data) {
 
     $.each(data, function(index, item) {
 
-        // console.log(item)
-
         var option = $('<option>', {
-            value: item.client_policy_id,
-            // text:`${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
+            value: item.id,
             text:`${item.policy_type ?? ''} - ${item.policy_no ?? ''}`
         });
-        if (client_policy_param == item.client_policy_id) {
+        if (client_policy_param == item.id) {
             option.attr('selected', true);
         }
         $('#policy_id').append(option);
@@ -664,51 +650,25 @@ $(document).ready(function() {
 
     $('#client_id').on('change', function() {
 
-        $('#policy_id').empty();
+        let client_id = $(this).val();
+        console.log('client_id', client_id);
 
-        $('#policy_id').append($('<option>', {
-            value: '',
-            text: 'Select'
-        }));
-
-        var selectedClient = $(this).val();
-
-        // console.log('selectedClient', selectedClient);
-        // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
-
-        // Check if the selected option exists in apiData
-        var foundPolicies = clientPolicies.find(function(item) {
-            return item.id === selectedClient;
-        });
-        console.log('foundPolicies.branchs', foundPolicies.branchs);
-        appendBranch(foundPolicies.branchs);
+        if(branch_list != '') {
+            // console.log(branch_list[client_id]);
+            let data = branch_list[client_id];
+            appendBranch(data);
+        }
 
     });
 
-});
-
-$(document).ready(function() {
-
     $('#branch_id').on('change', function() {
-        var selectedClient = $(this).val();
 
-        // console.log('selectedBranch', selectedClient);
-        // console.log('clientPolicies', clientPoliciesWithBranch);
+        let branch_id = $(this).val();
+        console.log("branch_id", branch_id);
 
-        var foundPolicies = clientPoliciesWithBranch.policies.filter(function(item) {
-            // console.log('item', item);
-            return item.branch_id === selectedClient;
-        });
-
-
-        if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
-            
-            appendPolicies(foundPolicies);
-            toastr.warning('No policies found for the selected client branch.');
-
-        } else {
-            // console.log('foundPolicies', foundPolicies);
-            appendPolicies(foundPolicies);
+        if(policy_list != '' && branch_id != '') {
+            let data = policy_list[branch_id];
+            appendPolicies(data);
         }
     });
 
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 73d44b7f..7d6ed59d 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -55,7 +55,9 @@
                                                 <?php
                                                 if (isset($events) && count($events)) {
                                                     foreach ($events as $key => $action) {
-                                                        echo "<option value='$key'" . ($key == "si_enhancement" ? " class='si-enhancement-option'" : "") . ">$action</option>";
+                                                        if($key != "inception"){
+                                                            echo "<option value='$key'" . ($key == "si_enhancement" ? " class='si-enhancement-option'" : "") . ">$action</option>";
+                                                        }
                                                     }
                                                 }
                                                 ?>
@@ -143,19 +145,35 @@
     <!-- end row -->
 </div>
 
+<!-- Center modal content for reupload file-->
+<div class="modal fade" id="hr-file-upload-modal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h4 class="modal-title" id="myCenterModalLabel">Endorsement Upload</h4>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <form class="parsley-examples" id="hrUploadForm" enctype="multipart/form-data">
+                    <input type="hidden" id="hr_file_client_id" name="client_id">
+                    <input type="hidden" id="hr_file_policy_id" name="policy_id">
+                    <input type="hidden" id="hr_file_branch_id" name="branch_id">
+                    <input type="hidden" id="hr_file_hr_file_id" name="hr_file_id">
+                    <input type="hidden" id="hr_file_upload_actions" name="upload-action-type">
+                    <input type="file" id="fileInput" name="emplist" required
+                        accept=" application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,application/vnd.oasis.opendocument.spreadsheet">
+                    <button type="submit" class="btn btn-primary">Upload</button>
+                </form>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
 
 <script>
 
-    var client_list = ''; // local variable for storing the client branch list
-    var branch_list = ''; // local variable for storing the client branch list
-    var policy_list = ''; // local variable for storing the client policy list
-    var branch_policy = '';
-
     $(document).ready(function(){
 
-        //initialize the get client, branch, and policy
-        getClientAndBranchAndPolicy();
-
         //client change to get the Client Branch
         $('#client2').change(function(){
             let client_id = $(this).val();
@@ -217,18 +235,18 @@
                                 <td>${file.short_name ?? ""}</td>
                                 <td>${file.branch_name ?? ""}</td>
                                 <td>${file.policy_no ?? ""}</td>
-                                <td>${file.file_action ?? ""}</td>
+                                <td>${formatTextToCamelCase(file.file_action) ?? ""}</td>
                                 <td>${file.created_at} by <strong>${file.first_name ?? ""}</strong></td>
                                 <td>${file.status}</td>
                                 <td>
 
-
                                 <div class="btn-group dropdown">
                                     <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm"
                                         data-toggle="dropdown" aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
                                     
                                     <div class="dropdown-menu dropdown-menu-right">
-                                            <a href="${baseurl}/hrFileDownload?id=${file.id}" class="dropdown-item" style="color: #000;" aria-hidden="true" target="_blank" ><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
+                                        <a href="${baseurl}/hrFileDownload?id=${file.id}" class="dropdown-item" style="color: #000;" aria-hidden="true" target="_blank" ><i class="mdi mdi-download mr-2 text-muted font-18 vertical-middle"></i>Download</a>
+                                        <a class="dropdown-item" onclick="uploadEndorsementFile(${file.client_id}, ${file.client_branch_id}, ${file.policy_id}, ${file.id}, '${file.file_action}')" style="color: #000;" aria-hidden="true"><i class="mdi mdi-upload mr-2 text-muted font-18 vertical-middle"></i>Initiate Endorsement</a>
                                     </div>
                                 </div>
                                 
@@ -252,36 +270,6 @@
         });
     });
 
-
-    //featch client and branch and policy
-    function getClientAndBranchAndPolicy()
-    {   
-        $.ajax({
-            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
-            type: "GET",
-            dataType: 'json',
-            success: function(res) {
-
-                console.log('getClientAndBranchAndPolicy', res);
-                if(res.status == true){
-                    client_list = res.client_data;
-                    branch_list = res.branch_data;
-                    policy_list = res.policy_data;
-                    vehicle_list = res.vehicle_data;
-                    unit_list = res.unit_data;
-                    appendClients3(res.client_data);
-                }else{
-                    console.log('No data found');
-                }
-
-            },
-            error: function(xhr, status, error) {
-                console.error(xhr.responseText);
-                console.error(status, error);
-            }
-        });
-    }
-
     // ------------ Append Functions are Below ----------------------------------------------------------------------------------
 
     function appendClients3(data) 
@@ -332,10 +320,7 @@
     }
 
     function appendPolicy3(data)
-    {
-        console.log('policy2', data);
-        console.log('policy2', $('#policy2'));
-        
+    {        
         $('#policy2').empty();
         $('#policy2').append($('<option>', {
             value: '',
@@ -344,7 +329,7 @@
 
         $.each(data, function(index, item) {
             var option = $('<option>', {
-                value: item.policy_id,
+                value: item.id,
                 text: item.policy_type + '-' + item.policy_no,
             });
             $('#policy2').append(option);
@@ -353,7 +338,7 @@
 
     // ----------------------------------------------------------------------------------------------
 
-
+    // for datatable 
     $(document).ready(function() {
         $('#hr_tickets_table').DataTable({
             dom: "<'row'<'col-sm-0'f><'col-sm-9 text-right'B>>" +
@@ -382,4 +367,85 @@
         });
     });
 
+    //for initialize the file upload for the files table
+    function uploadEndorsementFile(client_id, branch_id, policy_id, file_id, event){
+
+        console.log(client_id, branch_id, policy_id, file_id, event);
+
+        $('#hr_file_client_id').val(client_id);
+        $('#hr_file_branch_id').val(branch_id);
+        $('#hr_file_policy_id').val(policy_id);
+        $('#hr_file_upload_actions').val(event);
+        $('#hr_file_hr_file_id').val(file_id);
+
+        var myModal = new bootstrap.Modal(document.getElementById('hr-file-upload-modal'));
+        myModal.show();
+    }
+
+    //hr file upload reupload to the files table
+    $('#hrUploadForm').submit(function(e) {
+
+        e.preventDefault();
+
+        var isValid = $('#hrUploadForm').parsley().validate();
+        if (!isValid) {
+            console.log('Form is Empty', 'Warning');
+            return;
+        }
+
+        // Create FormData object
+        var formData = new FormData($(this)[0]);
+        for (var pair of formData.entries()) {
+            console.log(pair[0] + ', ' + pair[1]);
+        }
+
+        // return false;
+        $.ajax({
+            url: `<?= base_url('employee/upload') ?>`,
+            type: "POST",
+            data: formData,
+            processData: false, // Prevent jQuery from automatically processing the data
+            contentType: false, // Let jQuery handle the content type
+            headers: {
+                // "Content-Type":"multipart/form-data",
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            success: function(response) {
+
+                console.log(response);
+                $('#hrUploadForm')[0].reset();
+
+                if (response.code === 200 && response.dataStatus === true && response
+                    .data !== "") {
+                    toastr.success(
+                        'File upload successs, Data validation is in-progress',
+                        'success');
+                    $('.close').click()
+                    window.location.reload(true);
+                } else if (response.code === 404 && response.dataStatus === false) {
+                    console.error('no data found', response);
+                    // alert(response.message);
+                    toastr.error(response.message, 'Failed');
+                    window.location.reload(true);
+                } else {
+                    console.error('Something went wrong!');
+                    // alert('Something went wrong! Try later');
+                    toastr.error('Something went wrong! Try later', 'Error');
+                    window.location.reload(true);
+                }
+
+                $('.close').click();
+
+            },
+            error: function(xhr, status, error) {
+                // Request failed, handle error
+                console.error("Request failed:", status, error);
+                toastr.error('Something went wrong! Try later', 'Error');
+                $('#hrUploadForm')[0].reset();
+                $('.close').click();
+                window.location.reload(true);
+            }
+        });
+    })
+
 </script>
\ No newline at end of file
diff --git a/app/Views/import_export.php b/app/Views/import_export.php
index 0879c988..e6194c79 100755
--- a/app/Views/import_export.php
+++ b/app/Views/import_export.php
@@ -9,6 +9,51 @@
     }
 </style>
 
+<script>
+
+    var client_list = ''; // local variable for storing the client branch list
+    var branch_list = ''; // local variable for storing the client branch list
+    var policy_list = ''; // local variable for storing the client policy list
+    var branch_policy = '';
+
+    $(document).ready(function(){
+        getClientAndBranchAndPolicy();
+    })
+
+    //featch client and branch and policy
+    function getClientAndBranchAndPolicy()
+    {   
+        $.ajax({
+            url: '<?= base_url("/util/getClientAndBranchAndPolicy") ?>',
+            type: "GET",
+            dataType: 'json',
+            success: function(res) {
+
+                console.log('getClientAndBranchAndPolicy', res);
+                if(res.status == true){
+
+                    client_list = res.client_data;
+                    branch_list = res.branch_data;
+                    policy_list = res.policy_data;
+
+                    appendClients(res.client_data);
+                    appendClients2(res.client_data);
+                    appendClients3(res.client_data);
+                    
+                }else{
+                    console.log('No data found');
+                }
+
+            },
+            error: function(xhr, status, error) {
+                console.error(xhr.responseText);
+                console.error(status, error);
+            }
+        });
+    }
+
+</script>
+
 <div class="row" id="client_add" style="position: relative; bottom: 25px;">
     <div class="col-12">
         <div class="card-body">
@@ -27,7 +72,7 @@
                 </li>
                 <li class="nav-item">
                     <a href="#HR-DOC-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-2" id="hr_tab">
-                        <span class="mr-1"><i class="fa fa-file"></i></span>
+                        <span class="mr-1"><i class="mdi mdi-file"></i></span>
                         <span class="d-none d-sm-inline-block">HR Uploaded Files</span>
                     </a>
                 </li>
@@ -41,9 +86,6 @@
     </div>
 </div>
 
-
-
-
 <script>
     $(document).ready(function() {
 
@@ -59,6 +101,10 @@
 
     })
 
-
-
+    function formatTextToCamelCase(str) {
+        return str
+            .replace(/_/g, ' ') // replace underscores with spaces
+            .toLowerCase()      // convert everything to lowercase
+            .replace(/\b\w/g, char => char.toUpperCase()); // capitalize each word
+    }
 </script>
\ No newline at end of file
diff --git a/app/Views/insurer_or_tpa_data.php b/app/Views/insurer_or_tpa_data.php
index 0f05c651..6c22b23c 100755
--- a/app/Views/insurer_or_tpa_data.php
+++ b/app/Views/insurer_or_tpa_data.php
@@ -131,6 +131,11 @@
 
 
 <script>
+
+    var client_id_param2 = 0;
+    var client_branch_id_param2 = 0;
+    var client_policy_param2 = 0;
+
     $(document).ready(function() {
         // Initialize select2
         $("#client").select2();
@@ -139,16 +144,6 @@
         
     });
 
-    // Declare a global variable to store API response data
-    var clientPolicies = [];
-    var clientPoliciesWithBranch2 = {
-        policies: []
-    };
-
-    var client_id_param2 = 0;
-    var client_branch_id_param2 = 0;
-    var client_policy_param2 = 0;
-
     $(document).ready(function() {
 
         <?php if (session()->has('error')) : ?>
@@ -231,9 +226,7 @@
     });
 
     $(window).on("load", function() {
-
-        fetchClientPolicies2();
-
+        
         // Get the current page URL
         const url = window.location.href;
 
@@ -284,82 +277,82 @@
 
     });
 
-    function fetchClientPolicies2() {
+    // function fetchClientPolicies2() {
 
-        $('#loader').show();
+    //     $('#loader').show();
 
-        var apiURL = '<?php echo base_url(); ?>' + 'util/clients-with-policies';
-        $.ajax({
-            url: apiURL,
-            method: 'GET',
-            headers: {
-                "Content-Type": "application/json",
-                "X-Requested-With": "XMLHttpRequest"
-            },
-            success: function(response) {
-                // console.log(response.code);
-                // console.log(response.dataStatus);
-                // console.log(response.data);
-                if (response.code === 200 && response.dataStatus === true && response.data !== "") {
-                    try {
-                        clientPolicies = (response.data);
-                        // console.log(clientPolicies);
+    //     var apiURL = '<?php echo base_url(); ?>' + 'util/clients-with-policies';
+    //     $.ajax({
+    //         url: apiURL,
+    //         method: 'GET',
+    //         headers: {
+    //             "Content-Type": "application/json",
+    //             "X-Requested-With": "XMLHttpRequest"
+    //         },
+    //         success: function(response) {
+    //             // console.log(response.code);
+    //             // console.log(response.dataStatus);
+    //             // console.log(response.data);
+    //             if (response.code === 200 && response.dataStatus === true && response.data !== "") {
+    //                 try {
+    //                     clientPolicies = (response.data);
+    //                     // console.log(clientPolicies);
 
 
-                        response.data.forEach(policy => {
-                            // console.log('policies', policy.policies);
-                            policy.policies.forEach(p => {
-                                clientPoliciesWithBranch2.policies.push(p);
-                            });
-                        });
+    //                     response.data.forEach(policy => {
+    //                         // console.log('policies', policy.policies);
+    //                         policy.policies.forEach(p => {
+    //                             clientPoliciesWithBranch2.policies.push(p);
+    //                         });
+    //                     });
 
 
-                        appendClients2(clientPolicies);
+    //                     appendClients2(clientPolicies);
 
-                        setTimeout(function() {
-                            if (client_branch_id_param2 != null) {
-                                var foundPolicies = clientPolicies.find(function(item) {
-                                    // console.log(typeof item.id)
-                                    return item.id == client_id_param2;
-                                });
-                                appendBranch2(foundPolicies.branchs);
-                            }
-                        }, 500); 
+    //                     setTimeout(function() {
+    //                         if (client_branch_id_param2 != null) {
+    //                             var foundPolicies = clientPolicies.find(function(item) {
+    //                                 // console.log(typeof item.id)
+    //                                 return item.id == client_id_param2;
+    //                             });
+    //                             appendBranch2(foundPolicies.branchs);
+    //                         }
+    //                     }, 500); 
                         
-                        setTimeout(function() {
-                            if (client_id_param2 != null) {
+    //                     setTimeout(function() {
+    //                         if (client_id_param2 != null) {
 
-                                var foundPolicies = clientPoliciesWithBranch2.policies.filter(function(item) {
-                                    // console.log('item', item);
-                                    return item.branch_id === client_branch_id_param2;
-                                });
+    //                             var foundPolicies = clientPoliciesWithBranch2.policies.filter(function(item) {
+    //                                 // console.log('item', item);
+    //                                 return item.branch_id === client_branch_id_param2;
+    //                             });
 
 
-                                if (foundPolicies) {
-                                    // console.log('foundPolicies', foundPolicies);
-                                    appendPolicies2(foundPolicies);
-                                } else {
-                                    console.log('No policies found for the selected client');
-                                }
-                            }
-                        }, 500);
+    //                             if (foundPolicies) {
+    //                                 // console.log('foundPolicies', foundPolicies);
+    //                                 appendPolicies2(foundPolicies);
+    //                             } else {
+    //                                 console.log('No policies found for the selected client');
+    //                             }
+    //                         }
+    //                     }, 500);
 
-                    } catch (error) {
-                        console.error('Error parsing API response data:', error);
-                    }
-                } else if (response.code === 404 && response.dataStatus === false) {
-                    console.error('no data found', response);
-                } else {
-                    // console.error('Something went wrong!');
-                }
-            },
-            error: function(xhr, status, error) {
-                console.error('Error fetching data from API:', error);
-            }
-        });
+    //                 } catch (error) {
+    //                     console.error('Error parsing API response data:', error);
+    //                 }
+    //             } else if (response.code === 404 && response.dataStatus === false) {
+    //                 console.error('no data found', response);
+    //             } else {
+    //                 // console.error('Something went wrong!');
+    //             }
+    //         },
+    //         error: function(xhr, status, error) {
+    //             console.error('Error fetching data from API:', error);
+    //         }
+    //     });
 
-        $('#loader').hide();
-    }
+    //     $('#loader').hide();
+    // }
 
     function appendClients2(data) {
 
@@ -408,11 +401,10 @@
 
         $.each(data, function(index, item) {
             var option = $('<option>', {
-                value: item.client_policy_id,
-                // text: `${item.name ?? ''} - ${item.policy_no ?? ''} - ${item.policy_type ?? ''}`
+                value: item.id,
                 text:`${item.policy_type ?? ''} - ${item.policy_no ?? ''}`            
             });
-            if (client_policy_param2 == item.client_policy_id) {
+            if (client_policy_param2 == item.id) {
                 option.attr('selected', true);
             }
             $('#policy').append(option);
@@ -423,50 +415,25 @@
 
         $('#client').on('change', function() {
 
-            $('#policy').empty();
-            $('#policy').append($('<option>', {
-                value: '0',
-                text: 'Select'
-            }));
+            let client_id = $(this).val();
+            console.log('client_id', client_id);
 
-            var selectedClient = $(this).val();
-            // console.log(selectedClient);
-            // $('#selectedOptionInfo').text('Selected option: ' + selectedOption);
-
-            // Check if the selected option exists in apiData
-            var foundPolicies = clientPolicies.find(function(item) {
-                return item.id === selectedClient;
-            });
-            // console.log(foundPolicies.branchs);
-            appendBranch2(foundPolicies.branchs);
+            if(branch_list != '') {
+                // console.log(branch_list[client_id]);
+                let data = branch_list[client_id];
+                appendBranch2(data);
+            }
 
         });
 
-    });
-
-    $(document).ready(function() {
-
         $('#client_branch_id').on('change', function() {
 
-            var selectedClient = $(this).val();
+            let branch_id = $(this).val();
+            console.log("branch_id", branch_id);
 
-            // console.log('selectedBranch', selectedClient);
-            // console.log('clientPolicies', clientPoliciesWithBranch2);
-
-            var foundPolicies = clientPoliciesWithBranch2.policies.filter(function(item) {
-                return item.branch_id === selectedClient;
-            });
-
-        
-            if (Array.isArray(foundPolicies) && foundPolicies.length === 0) {
-
-                appendPolicies2(foundPolicies);
-                toastr.warning('No policies found for the selected client branch.');
-
-            } else {
-
-                // console.log('foundPolicies', foundPolicies);
-                appendPolicies2(foundPolicies);
+            if(policy_list != '' && branch_id != '') {
+                let data = policy_list[branch_id];
+                appendPolicies2(data);
             }
         });
 
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 25e94877..a809ab18 100755
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -791,7 +791,7 @@
             });
         }
 
-        fetchPendingAction()
+        // fetchPendingAction()
 
         $('#messages-list-2').on('click', 'li', function(event) {
 

From ee971cd0d7f68d0e09eb0b5efe2ec1e5a8341894 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 25 Aug 2025 15:43:58 +0530
Subject: [PATCH 40/54] FIX_EMAIL_ERRORR : RV

---
 app/Controllers/TicketServiceController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index e6c137f4..1c399b3f 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -727,9 +727,9 @@ class TicketServiceController extends BaseController
                 'col_idx' => 14,
                 'col_cell_name' => 'O',
                 'col_name' => 'Emp mail id',
-                'is_mandatory' => false,
+                'is_mandatory' => true,
                 'data_type' => 'string',
-                'format' => 'email',
+                'format' => null,
                 'allowed_values' => null
             ],
             "claim_collection" => [

From b8c4183aa19cabb518c59616d204688889d44297 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 25 Aug 2025 15:50:22 +0530
Subject: [PATCH 41/54] FIX_DUMP_LIST_DESC : RV

---
 app/Controllers/TicketController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 800f464b..53ab6586 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -2469,6 +2469,7 @@ class TicketController extends BaseController
                 ')
                 ->join('user_profiles as up', 'claim_dump_files.created_by = up.id', 'left')
                 ->where('claim_dump_files.is_active', 1)
+                ->orderBy('claim_dump_files.id', 'desc')
                 ->findAll();
 
             return $this->loadLayout('claim_dump_file_list', $data);

From 356a379890b3a6c0ba8b3419dcf51bcb580fdb49 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 25 Aug 2025 16:42:55 +0530
Subject: [PATCH 42/54] FIX_ACM_ERROR_DISPLAY : RV

---
 app/Controllers/TicketServiceController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index 1c399b3f..916f9f3c 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -1274,9 +1274,9 @@ class TicketServiceController extends BaseController
                     // dd($acm_data);
                     if (count($acm_data) == 0) {
                         array_push($result['error_summary'], 10);
-                        $result['error_data'][$row_key][$emp_name_column_index]['col_name'] = $columns_to_check['employee_name']['col_name']; //push column name
-                        $result['error_data'][$row_key][$emp_name_column_index]['col_idx'] = $emp_name_column_index; //push column index
-                        $result['error_data'][$row_key][$emp_name_column_index]['error'][] = "This Acount Manager not exist in the system";
+                        $result['error_data'][$row_key][$acm_column_index]['col_name'] = $columns_to_check['employee_name']['col_name']; //push column name
+                        $result['error_data'][$row_key][$acm_column_index]['col_idx'] = $acm_column_index; //push column index
+                        $result['error_data'][$row_key][$acm_column_index]['error'][] = "This Acount Manager not exist in the system";
                     }
                 }
 

From 424bf7c39546f402f33fbb6cfea382e64c2c2458 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Mon, 25 Aug 2025 17:14:53 +0530
Subject: [PATCH 43/54] CHANGE_UI Fixes

---
 app/Views/layout/header.php     | 127 ++++++++++++---
 app/Views/thz_list.php          | 265 ++++++++++++++++++++++++--------
 app/Views/thz_notes.php         | 235 +++++++++++++++++-----------
 public/assets/images/ticket.png | Bin 0 -> 2412 bytes
 4 files changed, 451 insertions(+), 176 deletions(-)
 create mode 100644 public/assets/images/ticket.png

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 8e9ff0a7..3cf615cd 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -525,59 +525,144 @@ rgba(226, 103, 40, 0.5)  (transparent)
 rgba(0, 153, 158, 0.5)  (transparent)
 */
 
-.btn-app-primary {
+.app-field-grey {
+    background-color: #ECECEC !important;
+}
+
+.app-font-family {
+    font-family: 'Poppins', sans-serif !important;
+}
+
+.app-title     { font-size: 18px; }
+.app-heading   { font-size: 16px; }
+.app-subtitle  { font-size: 14px; }
+.app-text      { font-size: 12px; }
+
+
+.title-text {
+    font-weight: 500;       
+    font-style: normal;     
+    font-size: 30px;
+    line-height: 1;         
+    letter-spacing: 0;      
+}
+.sub-title-text {
+    font-weight: 500;       
+    font-style: normal;     
+    font-size: 18px;
+    line-height: 1;         
+    letter-spacing: 0;      
+}
+
+.app-text-left {
+  text-align: left !important; }
+
+.app-text-right {
+  text-align: right !important; }
+
+.app-text-center {
+  text-align: center !important; }
+
+.app-text-white {
+  color: #ffffff !important; }
+
+.app-text-black {
+  color: #000000 !important; }
+
+.app-text-grey {
+  color: #5D5D5D !important; }
+
+.app-text-primary {
+  color: #00999E !important; }
+.app-text-secondary {
+  color: #E26728 !important; }
+
+.app-text-success {
+  color: #1abc9c !important; }
+
+
+a.app-text-primary:hover, a.app-text-primary:focus {
+  color: rgba(0, 153, 158, 0.5); !important; }
+
+a.app-text-secondary:hover, a.app-text-secondary:focus {
+  color: rgba(226, 103, 40, 0.5) !important; }
+
+a.app-text-success:hover, a.app-text-success:focus {
+  color: #117964 !important; }
+
+.app-btn-primary {
   color: #fff !important;
   background-color: #00999E;
   border-color: #00999E; }  
-.btn-app-primary:hover {
+.app-btn-primary:hover {
     color: #fff !important;
     background-color: #007A7E; 
     border-color: #006C70; } 
-.btn-app-primary:focus, .btn-app-primary.focus {
+.app-btn-primary:focus, .app-btn-primary.focus {
     color: #fff !important;
     background-color: #007A7E; 
     border-color: #006C70; 
     box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5); }
-.btn-app-primary.disabled, .btn-app-primary:disabled {
+.app-btn-primary.disabled, .app-btn-primary:disabled {
     color: #fff !important;
     background-color: #00999E;
     border-color: #00999E; } 
-.btn-app-primary:not(:disabled):not(.disabled):active, .btn-app-primary:not(:disabled):not(.disabled).active,
-  .show > .btn-app-primary.dropdown-toggle {
+.app-btn-primary:not(:disabled):not(.disabled):active, .app-btn-primary:not(:disabled):not(.disabled).active,
+  .show > .app-btn-primary.dropdown-toggle {
     color: #fff !important;
     background-color: #006C70; 
     border-color: #005D61; } 
-.btn-app-primary:not(:disabled):not(.disabled):active:focus, .btn-app-primary:not(:disabled):not(.disabled).active:focus,
-    .show > .btn-app-primary.dropdown-toggle:focus {
+.app-btn-primary:not(:disabled):not(.disabled):active:focus, .app-btn-primary:not(:disabled):not(.disabled).active:focus,
+    .show > .app-btn-primary.dropdown-toggle:focus {
       box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5); }
 
-.btn-app-ternary {
+.app-btn-secondary {
   color: #fff !important;
   background-color: #E26728;
   border-color: #E26728; }  
-.btn-app-ternary:hover {
+.app-btn-secondary:hover {
     color: #fff !important;
     background-color: #B8521F; 
     border-color: #9C461B; } 
-.btn-app-ternary:focus, .btn-app-ternary.focus {
+.app-btn-secondary:focus, .app-btn-secondary.focus {
     color: #fff !important;
-    background-color: #B8521F; 
+    background-color: #E26728; 
     border-color: #9C461B; 
     box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
-.btn-app-ternary.disabled, .btn-app-ternary:disabled {
+.app-btn-secondary.disabled, .app-btn-secondary:disabled {
     color: #fff !important;
     background-color: #E26728; 
     border-color: #E26728; } 
-.btn-app-ternary:not(:disabled):not(.disabled):active, .btn-app-ternary:not(:disabled):not(.disabled).active,
-  .show > .btn-app-ternary.dropdown-toggle {
+.app-btn-secondary:not(:disabled):not(.disabled):active, .app-btn-secondary:not(:disabled):not(.disabled).active,
+  .show > .app-btn-secondary.dropdown-toggle {
     color: #fff !important;
     background-color: #9C461B; 
     border-color: #803A16; } 
-.btn-app-ternary:not(:disabled):not(.disabled):active:focus, .btn-app-ternary:not(:disabled):not(.disabled).active:focus,
-    .show > .btn-app-ternary.dropdown-toggle:focus {
+.app-btn-secondary:not(:disabled):not(.disabled):active:focus, .app-btn-secondary:not(:disabled):not(.disabled).active:focus,
+    .show > .app-btn-secondary.dropdown-toggle:focus {
       box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }  
 
-.btn-border-radius{ border-radius: 10px !important; }
+.app-btn-border-radius{ border-radius: 10px !important; }
+
+.app-badge-primary {
+  color: #ffffff;
+  background-color: #00999E; }
+a.app-badge-primary:hover, a.app-badge-primary:focus {
+    color: #ffffff;
+    background-color: #007A7E; }
+a.app-badge-primary:focus, a.app-badge-primary.focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.15rem rgba(0, 153, 158, 0.5); }
+
+.app-badge-secondary {
+  color: #ffffff;
+  background-color: #E26728; }
+a.app-badge-secondary:hover, a.app-badge-secondary:focus {
+    color: #ffffff;
+    background-color: #B8521F; }
+a.app-badge-secondary:focus, a.app-badge-secondary.focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.15rem rgba(226, 103, 40, 0.5); }
 
 
 
@@ -750,9 +835,9 @@ rgba(0, 153, 158, 0.5)  (transparent)
                                         <li>
                                             <a href="<?= base_url('/ticket/claim-upload') ?>">Claim Dump Upload</a>
                                         </li>
-                                        <li>
+                                        <!-- <li>
                                             <a href="<?= base_url('/ticketList?return_type=web') ?>">Ticket List</a>
-                                        </li>
+                                        </li> -->
                                     </ul>
                                 </div>
                             </li>
@@ -772,7 +857,7 @@ rgba(0, 153, 158, 0.5)  (transparent)
                         <?php if (in_array(get_role_id(), [1,2,3,5]) || in_array(CLAIMS_TEAM_ID, user_team())) { ?>
                         <li>
                             <a id="tickets" href="<?= base_url('/ticketList?return_type=web') ?>" class="waves-effect img-inactive-not-working">
-                                    <img src="<?= base_url() . "public"; ?>/assets/images/user_manual_sb.png" alt="Logo" height="20">
+                                    <img src="<?= base_url() . "public"; ?>/assets/images/ticket.png" alt="Logo" height="20">
                                 <span>Tickets</span>
                             </a>
                         </li>
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 986c4594..0c17c4c0 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -73,8 +73,8 @@ tbody tr td:last-child {
 /* Optional: control first column width */
 .table th:nth-child(1),
 .table td:nth-child(1) {
-    max-width: 200px !important; 
-    min-width: 100px !important;
+    max-width: 50px !important; 
+    min-width: 50px !important;
     overflow: hidden !important;
     text-overflow: ellipsis !important;
     white-space: nowrap !important;
@@ -104,6 +104,14 @@ tbody tr td:last-child {
     text-align: right;
 }
 
+.text-custom {
+    font-weight: 400;            
+    font-style: normal;          
+    font-size: 11px;
+    line-height: 1.44;           
+    letter-spacing: -0.02em;     
+}
+
 </style>
 <style>
 /* .table th:nth-child(1),
@@ -116,10 +124,119 @@ tbody tr td:last-child {
 } */
 
 
-td .text-muted {
-    font-size: 0.85em;   /* smaller than default */
-    color: #6c757d !important; /* Bootstrap muted grey */
+.text-custom-black{
+  color: #000000 !important; 
 }
+.text-custom-grey{
+  font-size: 0.85em; 
+  color: #6c757d !important; 
+}
+
+table.dataTable td.wrap {
+    white-space: normal !important; 
+    word-break: break-word; 
+}
+
+table thead th {
+    text-align: center;
+    vertical-align: middle;
+}
+
+.btn-custom {
+    font-weight: 500;       
+    font-style: normal;     
+    font-size: 12px;
+    line-height: 1;         
+    letter-spacing: 0;      
+    text-align: center;
+}
+
+.table-custom th {
+    font-family: 'Poppins', sans-serif !important;
+    font-weight: 700;       
+    font-style: normal;     
+    font-size: 13px;
+    line-height: 1.44;       
+    letter-spacing: -0.02em; 
+    text-align: center;      
+    color: #000;             
+    padding: 10px 12px;      
+}
+
+
+/* Remove borders from all pagination buttons */
+/* Pagination (p) */
+.dataTables_wrapper .dataTables_paginate .paginate_button,
+.dataTables_wrapper .dataTables_paginate .paginate_button:active,
+.dataTables_wrapper .dataTables_paginate .paginate_button:focus,
+.dataTables_wrapper .dataTables_paginate .paginate_button:hover,
+.dataTables_wrapper .dataTables_paginate .paginate_button.current {
+    padding: 2px 6px !important;
+    font-size: 12px !important;
+    background: transparent !important;
+    border-radius: 13px !important;
+    border: none !important;
+}
+
+.dataTables_wrapper .dataTables_paginate .page-item.previous .page-link,
+.dataTables_wrapper .dataTables_paginate .page-item.next .page-link {
+    /* box-shadow: 0 0 0 0.15rem rgba(0,153,158,0.5) !important;
+    background: rgba(0,153,158,0.8) !important;*/
+    border-radius: 13px !important;
+    background-color: #F5FFFF; 
+    border: none !important;
+    box-shadow: 0 0 0 0.15rem #F5FFFF;
+}
+
+
+
+/* Active page number */
+.dataTables_wrapper .dataTables_paginate .page-item.active .page-link {
+    color: #fff !important;
+    border-radius: 13px !important;
+}
+
+/* Inactive (not active) page numbers */
+.dataTables_wrapper .dataTables_paginate .page-item:not(.active) .page-link {
+    border: 1px solid #fff !important;
+    border-radius: 13px !important;
+}
+
+
+
+/* Info text (i) */
+.dataTables_info {
+    font-size: 12px;
+}
+
+.form-control {
+    background-color: #ECECEC !important;
+    border: 1px solid #ccc;   /* optional */
+    color: #000;              /* keep text readable */
+}
+
+.form-control:focus {
+    background-color: #ECECEC !important; /* keep same color on focus */
+    box-shadow: none;                     /* remove blue glow */
+}
+
+/* Select2 box */
+.select2-container .select2-selection--single {
+    background-color: #ECECEC !important;
+    border: 1px solid #ccc !important;
+    height: 38px !important;
+}
+
+/* Text inside */
+.select2-container .select2-selection__rendered {
+    color: #000 !important;
+    line-height: 36px !important;
+}
+
+.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
+  background-color: #ECECEC !important;
+}
+
 
 
 </style>
@@ -128,14 +245,13 @@ td .text-muted {
 <div class="col-12">
     <div class="card">
         <div class="card-body maincard">
-            <div class="row" style="padding-bottom: 10px;" >
+            <div class="row">
                 <div class="col-6" style="align-self: center;">
-                    <h4 style="position: relative;">Ticket List </h4>
+                    <p class="title-text app-font-family" style="position: relative;">Tickets </p>
                 </div>
-
             </div>
-            <div class="table-responsive">
-                <table id="scroll-horizontal-datatable" class="table w-100 nowrap">
+            <div>
+                <table id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-font-family">
                     <thead>
                         <tr>
                             <th>Ticket No</th>
@@ -154,28 +270,35 @@ td .text-muted {
                             <?php foreach($ticket_data as $index => $row){ ?>
 
                                     <tr data-id="<?= $row['thz_id']; ?>" style="cursor: pointer;">
-                                    <td><?php echo $row['thz_id']; ?></td>
-                                    <td>
+                                    <td class="app-text-right"><?php echo $row['thz_id']; ?></td>
+                                    <td class="app-text-left">
                                         <?php echo $row['name']; ?> 
-                                        <span class="text-muted"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
-                                        <span class="text-muted"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
+                                        <span class="text-custom-grey"><?php if (!empty($row['empcode'])): echo '('.$row['empcode'].')'; endif; ?></span><br>
+                                        <span class="text-custom-grey"><?php if (!empty($row['mobile'])): echo $row['mobile']; endif; ?></span>
                                     </td>
-                                    <td><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
+                                    <td class="app-text-center"><?php echo (!empty($row['policy_no']) && strtolower($row['policy_no']) !== 'null') 
                                               ? $row['policy_no'] 
                                               : 'N/A'; ?>
                                     </td>
-                                    <td><?php echo $row['ticket_type']; ?></td>
-                                    <td><?php echo $row['subject']; ?></td>
-                                    <td><?php echo $row['status']; ?></td>
-                                    <td><?php echo $row['assignee_name']; ?></td>        
-                                    <td>
+                                    <td class="app-text-center"><?php echo $row['ticket_type']  ? $row['ticket_type'] : '-'; ?></td>
+                                    <td class="app-text-center wrap" title="<?php echo htmlspecialchars($row['subject']); ?>">
+                                      <?php 
+                                          $subject = $row['subject'] ? $row['subject'] : 'N/A';
+                                          echo (strlen($subject) > 50) 
+                                              ? htmlspecialchars(substr($subject, 0, 50)) . "..." 
+                                              : htmlspecialchars($subject);
+                                      ?>
+                                    </td>
+                                    <td class="app-text-center"><?php echo $row['status'] ? $row['status'] : '-' ; ?></td>
+                                    <td class="app-text-left"><?php echo $row['assignee_name'] ? $row['assignee_name'] : '-'; ?></td>        
+                                    <td class="app-text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cdt = new DateTime($row['created_at']); 
                                         echo $cdt->format('d/m/Y') . "<br><span class='time'>" . $cdt->format('h:i a') . "</span>"; 
                                         endif;
                                     ?>
                                     </td>
-                                    <td>
+                                    <td class="app-text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $udt = new DateTime($row['updated_at']); 
                                         echo $udt->format('d/m/Y') . "<br><span class='time'>" . $udt->format('h:i a') . "</span>"; 
@@ -207,15 +330,15 @@ td .text-muted {
 
               <!-- first row -->
               <div class="d-flex w-100 justify-content-between align-items-center">
-                <h4 class="modal-title mb-0" id="modalLabel">New Ticket</h4>
+                <h4 class="modal-title app-font-family mb-0" id="modalLabel">New Ticket</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
               </div>
 
               <!-- second row -->
               <div class="form-row mt-3 w-100">
-                <div class="form-group col-md-6">
+                <div class="form-group col-md-6 app-font-family">
                   <label for="client_id">Client</label>
-                  <select class="form-control" id="client_id" name="client_id">
+                  <select class="form-control app-field-grey" id="client_id" name="client_id">
                     <option value="">Select Client</option>
                     <?php if(isset($client_list)) { ?>
                     <?php foreach ($client_list as $c) { ?>
@@ -225,22 +348,21 @@ td .text-muted {
                   </select>
                 </div>
 
-                <div class="form-group col-md-5">
+                <div class="form-group col-md-5 app-font-family">
                   <label for="mobile">Mobile<span class="text-danger">*</span></label>
-                  <input type="text" class="form-control" id="mobile" 
-                        name="mobile" placeholder="Enter Mobile"
-                        pattern="^[0-9]{10}$" required
+                  <input type="text" class="form-control app-field-grey" id="mobile" placeholder="Enter Mobile Number"
+                        name="mobile" 
+                        pattern="^[0-9]{10}$" required maxlength="10"
                         title="Please enter a valid 10-digit mobile number">
                 </div>
 
-                <div class="form-group col-md-1" style="padding:27.5px 0 0 0;">
-                  <button type="button" class="btn btn-primary" style="padding: 0 10px !important; border-radius:13px;" onclick="getAutoFetchDetails()"><i class="mdi mdi-cached" style="font-size:24px; color:#fff !important;"></i></button>
+                <div class="form-group col-md-1" style="padding:32.5px 0 0 18px;">
+                  <button type="button" class="btn-custom app-btn-primary app-font-family" style="padding: 0 10px !important; border-radius:13px;" onclick="getAutoFetchDetails()"><i class="mdi mdi-cached app-text-white" style="font-size:24px;"></i></button>
                 </div>
               </div>
         </div>
                 
-        <div class="modal-body" style="padding-top: 15px !important;
-  padding-bottom: 10px !important;">    
+        <div class="modal-body" style="padding: 15px !important;">    
           <div class="form-row">
             <input type="hidden" id="thz_id" name="thz_id">
             <input type="hidden" id="return_type" name="return_type">
@@ -248,12 +370,12 @@ td .text-muted {
             <input type="hidden" id="policy_id" name="policy_id">
             <input type="hidden" id="created_by" name="created_by" value="<?= get_session_userid(); ?>">
 
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-4 app-font-family">
               <label for="name">Name<span class="text-danger">*</span></label>
               <input type="text" class="form-control" id="name" name="name" placeholder="Enter Name" required>
             </div>
 
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-4 app-font-family">
               <label for="email">Email Id<span class="text-danger">*</span></label>
               <input type="email" class="form-control" id="email" 
                      name="email" placeholder="Enter Email"
@@ -262,13 +384,13 @@ td .text-muted {
                      title="Please enter a valid email address">
             </div>
 
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-4 app-font-family">
               <label for="empcode">Employee code</label>
               <input type="text" class="form-control" id="empcode" name="empcode" placeholder="Enter Employee code">
             </div>
 
 
-            <div class="form-group col-md-4">
+            <div class="form-group col-md-4 app-font-family">
               <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
               <select class="form-control" id="ticket_type" name="ticket_type" required onchange="hideandshowpolicy()">
                 <option value="">Select Ticket Type</option>
@@ -277,7 +399,7 @@ td .text-muted {
               </select>
             </div>
 
-            <div class="form-group col-md-4" id="policy_container">
+            <div class="form-group col-md-4 app-font-family" id="policy_container">
               <label for="policy_no">Policy Number</label>
                 <select class="form-control" id="policy_no" name="policy_no" onchange="changevalue()">
                   <option value="" selected data-id="">Select Policy</option>
@@ -312,12 +434,12 @@ td .text-muted {
               </div>
             <?php } ?>
 
-            <div class="form-group col-md-12">
+            <div class="form-group col-md-12 app-font-family">
               <label for="subject">Subject<span class="text-danger">*</span></label>
               <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject" required>
             </div>
 
-            <div class="form-group col-md-12">
+            <div class="form-group col-md-12 app-font-family">
               <label for="message">Message<span class="text-danger">*</span></label>
               <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
               <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4" required></textarea>
@@ -326,8 +448,8 @@ td .text-muted {
           </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-primary btn-border-radius mr-2 text-white" onclick="resetTicket()">Reset</button>
-          <button type="button" class="btn btn-ternary btn-border-radius" onclick="submitTicket()">Save</button>
+          <button type="button" class="btn app-btn-primary app-btn-border-radius mr-2 app-text-white" onclick="resetTicket()">Reset</button>
+          <button type="button" class="btn app-btn-secondary app-btn-border-radius" onclick="submitTicket()">Save</button>
         </div>
       </form>
     </div>
@@ -359,7 +481,7 @@ td .text-muted {
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-ternary btn-border-radius" onclick="updateAssignTo()">Save</button>
+        <button type="button" class="btn-custom app-btn-secondary app-btn-border-radius app-font-family" onclick="updateAssignTo()">Save</button>
       </div>
     </div>
   </div>
@@ -392,25 +514,39 @@ td .text-muted {
         var name       = document.getElementById('name').value.trim();
         var mobile     = document.getElementById('mobile').value.trim();
         var email      = document.getElementById('email').value.trim();
+        var message    = document.getElementById('message').value.trim();
+        var subject    = document.getElementById('subject').value.trim();
         var ticketType = document.getElementById('ticket_type').value.trim();
 
         // Validation checks
         if (name === "" || mobile === "" || email === "" || ticketType === "") {
-            toastr.warning('Please fill all required fields.', 'warning');
+            toastr.warning('Please fill all required fields.', 'Warning');
             form.classList.add('was-validated');
             return;
         }
 
+        if (message.length > 1500) {
+          toastr.error('Message cannot exceed 1500 characters', 'Warning');
+          form.classList.add('was-validated');
+          return;
+        }
+
+        if (subject.length > 150) {
+          toastr.error('Subject cannot exceed 150 characters', 'Warning');
+          form.classList.add('was-validated');
+          return;
+        }
+
         var mobilePattern = /^[0-9]{10}$/;
         if (!mobilePattern.test(mobile)) {
-            toastr.warning('Please enter a valid 10-digit mobile number.', 'warning');
+            toastr.warning('Please enter a valid 10-digit mobile number.', 'Warning');
             document.getElementById('mobile').focus();
             return;
         }
 
         var emailPattern = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
         if (!emailPattern.test(email)) {
-            toastr.warning('Please enter a valid email address.', 'warning');
+            toastr.warning('Please enter a valid email address.', 'Warning');
             document.getElementById('email').focus();
             return;
         }
@@ -427,16 +563,16 @@ td .text-muted {
             dataType: 'json',
             success: function(response) {
                 if (response.status === "success") {
-                    toastr.success(response.message, 'success');
+                    toastr.success(response.message, 'Success');
                     $('#ticketModal').modal('hide');
                     form.reset();
                     window.location.href = "<?= base_url('ticketList?return_type=web') ?>";
                 } else {
-                    toastr.error(response.message, 'error');
+                    toastr.error(response.message, 'Error');
                 }
             },
             error: function(xhr) {
-                toastr.error("Something went wrong!", 'error');
+                toastr.error("Something went wrong!", 'Error');
                 console.error(xhr.responseText);
             }
         });
@@ -462,18 +598,18 @@ td .text-muted {
     policySelect.innerHTML = '<option value="" data-id="">Select Policy</option>';
 
     if (client_id === "") {
-        toastr.warning('Please Select Client.', 'warning');
+        toastr.warning('Please Select Client.', 'Warning');
         return;
     }
 
     if (mobile === "") {
-        toastr.warning('Please Enter a mobile number.', 'warning');
+        toastr.warning('Please Enter a mobile number.', 'Warning');
         return;
     }
 
     var mobilePattern = /^[0-9]{10}$/;
     if (!mobilePattern.test(mobile)) {
-        toastr.warning('Please enter a valid 10-digit mobile number.', 'warning');
+        toastr.warning('Please enter a valid 10-digit mobile number.', 'Warning');
         document.getElementById('mobile').focus();
         return;
     }
@@ -489,7 +625,7 @@ td .text-muted {
                 let policies = response.data.policy_details; 
 
                 document.getElementById('name').value    = client.name || "";
-                document.getElementById('email').value   = client.email_personal || "";
+                document.getElementById('email').value   = client.email_corporate || "";
                 document.getElementById('empcode').value = client.emp_code || "";
                 document.getElementById('branch_id').value = client.branch_id || "";
 
@@ -508,11 +644,11 @@ td .text-muted {
                       document.getElementById('policy_id').value = policies[0].id;
                 }
             } else {
-                toastr.warning(response.message || "No details found.", 'warning');
+                toastr.warning(response.message || "No details found.", 'Warning');
             }
         },
         error: function(xhr) {
-            toastr.error("Something went wrong!", 'error');
+            toastr.error("Something went wrong!", 'Error');
             console.error(xhr.responseText);
         }
     });
@@ -578,17 +714,16 @@ $(document).ready(function() {
               "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
           buttons: [
               {
-                  text: '<i class="mdi mdi-plus"></i> Create New Ticket',
-                  className: 'btn btn-primary btn-border-radius text-white mr-2',
-                  attr:  { style: "color:#fff !important;" },
+                  text: '<i class="mdi mdi-plus app-text-white" ></i><span class="app-text-white">  Create New Ticket </span>',
+                  className: 'btn app-btn-primary app-btn-border-radius app-text-white mr-2',
                   action: function(e, dt, node, config) { 
                       openTicket();
                   }
               },
               {
                   extend: 'collection',
-                  text: ' Export <i class="mdi mdi-menu-down"></i>',
-                  className: 'btn btn-ternary btn-border-radius text-white',
+                  text: '<span class="app-text-white"> Export </span><i class="mdi mdi-menu-down app-text-white"></i>',
+                  className: 'btn app-btn-secondary app-btn-border-radius app-text-white',
                   buttons: [
                       {
                           extend: 'csv',
@@ -607,8 +742,12 @@ $(document).ready(function() {
               }
           ],
           language: {
-              search: "_INPUT_",
-              searchPlaceholder: "Search..."
+            search: "_INPUT_",
+            searchPlaceholder: "Search...",
+            paginate: {
+                previous: "◄",
+                next: "►"
+            }
           },
           paging: true,
           pageLength: 25,
@@ -644,10 +783,10 @@ function removeticket(input, ticket_id) {
                 console.log('Data fetched successfully:', response);
 
                 if (response.status === true) {
-                    toastr.success(response.message, 'SUCCESS');
+                    toastr.success(response.message, 'Success');
                     window.location.reload();
                 } else {
-                    toastr.warning(response.message, 'WARNING');
+                    toastr.warning(response.message, 'Warning');
                 }
             }, function(xhr, status, error) {
                 console.error('Error fetching data:', error);
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index c70ce982..c0371037 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -47,11 +47,26 @@
 
 .card-scroll{
     overflow-y:auto;
-    height:440px;
+    min-height:380px;
+    max-height:380px;
 }
 .recard-scroll{
     overflow-y:auto;
-    height:350px;
+    min-height:295px;
+    max-height:295px;
+}
+
+.edit-icon {
+  font-size: 17px;        /* keep fixed size */
+  color: #555 !important;
+  cursor: pointer;
+  transition: transform 0.2s, color 0.2s; /* smooth hover effect */
+  display: inline-block;  /* important for transform */
+}
+
+.edit-icon:hover {
+  color: #00999E  !important;
+  transform: scale(1.5); 
 }
 
 .maincard{
@@ -86,6 +101,37 @@ hr{
 }
 
 
+.related-ticket-card {
+    margin-bottom: 6px; 
+}
+.related-ticket-card .card-body {
+    border-radius: 15px;
+    padding: 6px 15px !important; 
+}
+.related-ticket-card h5,
+.related-ticket-card p,
+.related-ticket-card small {
+    margin: 0 !important;
+} 
+
+</style>
+<style>
+/* Select2 box */
+.select2-container .select2-selection--single {
+    background-color: #ECECEC !important;
+    border: 1px solid #ccc !important;
+    height: 38px !important;
+}
+
+/* Text inside */
+.select2-container .select2-selection__rendered {
+    color: #000 !important;
+    line-height: 36px !important;
+}
+
+.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
+  background-color: #ECECEC !important;
+}
 </style>
 
 
@@ -103,7 +149,7 @@ hr{
                     <span onclick="history.back()" style="cursor: pointer;">
                         <i class="mdi mdi-chevron-left" style="font-size: 43px;"></i>
                     </span>
-                    Ticket ID-<?= $master[0]['thz_id']; ?>
+                    <span class="title-text app-font-family">Ticket ID-<?= $master[0]['thz_id']; ?></span>
                 </h4>
             </div>
 
@@ -114,39 +160,40 @@ hr{
                 <div class="col-4" id="notes-body-left">
                     <div class="card master-card" style="background:#F5FFFF;">
                         <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
-                            <h5 class="mb-0">Details</h5>
-                            <a href="javascript:void(0);" 
-                                onclick="openEditTicket()">
-                                    <i class="mdi mdi-pencil" 
-                                    title="Edit"
-                                    style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
-                                    onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
-                                    onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
-                                    </i>
+                            <p class="sub-title-text app-font-family mb-0">Details</p>
+                            <a href="javascript:void(0);" onclick="openEditTicket()">
+                                <i class="mdi mdi-pencil edit-icon" title="Edit"></i>
+                                <!-- <i class="mdi mdi-pencil"
+                                title="Edit"
+                                style="font-size:15px; color:#555; cursor:pointer; transition:0.2s;"
+                                onmouseover="this.style.color='#02a8b5'; this.style.fontSize='17px';"
+                                onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
+                                </i> -->
                             </a>
                         </div>
-                        <div class="card-body card-scroll" style="padding-left: 27px !important; background:#F5FFFF;">
+                        <div class="card-body card-scroll sub-title-text app-font-family" style="padding:0 27px !important; background:#F5FFFF;">
                             <div class="row mb-2 ml-o">
-                                <div class="col-5">Ticket ID</div>
-                                <div class="col-7 text-end"><?= $master[0]['thz_id'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey">Ticket ID</div>
+                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['thz_id'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Name</div>
-                                <div class="col-7 text-end"><?= $master[0]['name'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey">Name</div>
+                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['name'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Mobile</div>
-                                <div class="col-7 text-end"><?= $master[0]['mobile'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey">Mobile</div>
+                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['mobile'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Policy Number</div>
-                                <div class="col-7 text-end">
+                                <div class="col-5 app-subtitle app-text-grey">Policy Number</div>
+                                <div class="col-7 app-text text-end">
                                     <?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
-                                        ? '<u class="text-warning">
+                                        ? '<u class="app-text-black">
                                                 <a href="javascript:void(0);" 
-                                                class="text-warning"
+                                                class="app-text-black"
                                                 data-toggle="modal" 
                                                 data-target="#PolicyModal" 
+                                                title="Click to view Policy Terms"
                                                 data-id="'.$master[0]['policy_id'].'">'
                                                 .$master[0]['policy_no'].'
                                                 </a>
@@ -155,33 +202,34 @@ hr{
                                 </div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Assigned To</div>
-                                <div class="col-7 text-end"><?= $master[0]['assignee_name'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey">Assigned To</div>
+                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['assignee_name'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Status</div>
-                                <div class="col-7 text-end"><?= $master[0]['status'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey">Status</div>
+                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['status'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Ticket Type</div>
-                                <div class="col-7 text-end"><?= $master[0]['ticket_type'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey">Ticket Type</div>
+                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['ticket_type'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Subject</div>
-                                <div class="col-7 text-end"><?= $master[0]['subject'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey">Subject</div>
+                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['subject'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Message</div>
-                                <div class="col-7 text-end"><?= $master[0]['message'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey">Message</div>
+                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['message'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5">Related Tickets</div>
-                                <div class="col-7 text-end">
+                                <div class="col-5 app-subtitle app-text-grey">Related Tickets</div>
+                                <div class="col-7 app-text text-end">
                                     <u class="text-warning">
                                         <a href="javascript:void(0);" 
                                         class="text-warning"
                                         data-toggle="modal" 
                                         data-target="#relatedTicketModal" 
+                                        title="<?= empty($master[0]['created_by']) ? 'No related tickets' : 'Click to view related tickets'; ?>"
                                         data-id="<?= $master[0]['created_by']; ?>">
                                         View
                                         </a>
@@ -200,41 +248,40 @@ hr{
                     
                     <!-- Conversation Card -->
                     <div class="card mb-3 conversation-card">
-                         <div class="card-header border-0 p-2 ">
-                            <h5 class="mb-2" style="font-size:15px;">Conversation</h5>
-                            <hr>
+                         <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none; padding-bottom: 0px;">
+                            <p class="sub-title-text app-font-family" >Conversation</p>
                         </div>
-
-                        <div class="card-body pt-0 recard-scroll" style="padding-left: 15px !important;">
+                        <div class="card-body recard-scroll" style="padding:0 27px !important; margin:0 !important; background:#F5FFFF;">
                           <?php if(!empty($notes)): ?>
                             <?php foreach($notes as $i => $conv): ?>
-                                    
-                                    <!-- Top Row: Message + Badge -->
-                                <div class="d-flex justify-content-between align-items-start mb-2">
-                                    <div class="flex-grow-1 text-break">
-                                        <span class="mb-1 mr-4"><?= $conv['notes'] ?></span>
-                                    </div>                                       
-
-                                    <?php if (!empty($conv['notes_type']) && $conv['notes_type'] === "Internal"): ?>
-                                        <div>
-                                            <span class="badge" style="background-color:#E26828 ;color: white!important;"><?= $conv['notes_type'] ?></span>
+                                
+                                <div style="border:none; padding: 0px; margin: 0px;">
+                                        <hr/>
+                                        <!-- Top Row: Message + Badge -->
+                                        <div class="d-flex justify-content-between align-items-start app-text app-text-black">
+                                            <p class="mb-1 ml-0 mr-0 "><?= $conv['notes'] ?></p>
+                                            <!-- <?php if(!empty($conv['notes_by'])): ?>
+                                                <span class="badge bg-warning text-dark"><?= $conv['notes_by'] ?></span>
+                                            <?php endif; ?> -->
+                                            <?php if (!empty($conv['notes_type']) && $conv['notes_type'] === "Internal"): ?>
+                                                <span class="badge app-badge-secondary app-text-white" style="font-size:10px;"><?= $conv['notes_type'] ?></span>
+                                            <?php endif; ?>
                                         </div>
-                                    <?php endif; ?>
+                                        
+                                        <!-- Bottom Row: Name + Date -->
+                                        <div class="d-flex justify-content-between small text-muted" style="padding-top: 5px;">
+                                            <span><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
+                                            <span style="font-size:9px;"><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
+                                        </div>
+
+                                        <!-- <?php echo $i < count($notes)-1 ? '<hr/>' : ''; ?> -->
                                 </div>
 
-                                    
-                                    <!-- Bottom Row: Name + Date -->
-                                    <div class="d-flex justify-content-between small text-muted mb-1">
-                                        <span><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
-                                        <span><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
-                                    </div>
-
-                                    <?php echo $i < count($notes)-1 ? '<hr>' : ''; ?>
-
                             <?php endforeach; ?>
                             <?php else: ?>
-                                <div class="d-flex justify-content-center align-items-center" style="height: 100%;">
-                                        <p class="text-center"><i>No Data Found</i></p>
+                                <div class="d-flex justify-content-center align-items-center" 
+                                    style="height: 45vh; width:100%;">
+                                    <p class="text-center"><i>No Data Found</i></p>
                                 </div>
                             <?php endif; ?>
                         </div>
@@ -266,12 +313,12 @@ hr{
     </div>
 </div>
 
-<div class="modal fade" id="EditModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade app-text-black" id="EditModal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content">
       <form id="ticketForm">
         <div class="modal-header">
-            <h4 class="modal-title" id="EditModalLabel">Update</h4>
+            <h4 class="modal-title title-text  app-font-family" id="EditModalLabel">Update</h4>
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
         </div>
 
@@ -281,7 +328,7 @@ hr{
             <input type="hidden" id="updated_by" name="updated_by" value="<?= get_session_userid(); ?>">
             
             <div class="form-group col-md-12">
-              <label for="ticket_type">Ticket Type<span class="text-danger">*</span></label>
+              <label for="ticket_type" class="sub-title-text app-font-family">Ticket Type<span class="text-danger">*</span></label>
               <select class="form-control" id="ticket_type" name="ticket_type" required>
                 <option value="">Select Ticket Type</option>
                 <option value="Sales">Sales</option>
@@ -291,7 +338,7 @@ hr{
 
 
             <div class="form-group col-md-12">
-              <label for="status">Status</label>
+              <label for="status" class="sub-title-text app-font-family">Status</label>
               <select class="form-control" id="status" name="status">
                 <option value="">Select Status</option>
                 <option value="Open">Open</option>
@@ -305,7 +352,7 @@ hr{
                  // 2,3,4 dropdown data'va varannum but dropdown hide pannanum  --> 
             <?php if(in_array(get_role_id(), [1,5]) ) { ?> 
             <div class="form-group col-md-12">
-              <label for="assign_to">Assign To</label>
+              <label for="assign_to" class="sub-title-text app-font-family">Assign To</label>
               <select class="form-control" id="assign_to" name="assign_to">
                 <option value="">Select Assign To</option>
                 <?php if(isset($assignee)) { ?>
@@ -321,7 +368,7 @@ hr{
           </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-app-ternary btn-border-radius" onclick="submitTicket()">Save</button>
+          <button type="button" class="btn app-btn-secondary app-btn-border-radius" onclick="submitTicket()">Save</button>
         </div>
       </form>
     </div>
@@ -333,37 +380,40 @@ hr{
     <div class="modal-content" style="border-radius:15px;">
       
         <div class="modal-header" style="border-bottom-width:0;">
-            <h4 class="modal-title">Related Tickets</h4>
+            <h4 class="modal-title title-text  app-font-family">Related Tickets</h4>
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
         </div>
 
         <div class="modal-body card-scroll" style="padding-top:5px!important;">  
 
-           <?php if(  !isset($related_tickets) || empty($related_tickets) ) { ?>
-                <div class="d-flex justify-content-center align-items-center">
-                    <div>
-                        <p> No Related Tickets Found </p>
-                    </div>
-                </div>
-           <?php }  ?>
-            
-            <?php foreach($related_tickets as $j => $rt): ?>
-                <div class="card related-ticket-card mb-3" data-related-ticket-id="<?=$rt['thz_id']?>">
-                        <div class="card-body" style="border-radius: 20px; padding:27px !important;">
-                            <div class="d-flex justify-content-between align-items-start">
-                                <h5 class="mb-1"><?php echo '# '.$rt['thz_id']." / ".$rt['ticket_type']; ?></h5>
-                                <small>
-                                <?php if (!empty($rt['created_at'])):
+            <?php if(!empty($related_tickets)):  foreach($related_tickets as $j => $rt): ?>
+                <div class="card related-ticket-card app-font-family app-text" 
+                style="cursor: pointer;"
+                onclick="window.location='<?= base_url().'ticketConversationList?return_type=web&thz_id='.$rt['thz_id'] ?>'">
+                        <div class="card-body">
+                            <div class="d-flex justify-content-between align-items-center" style="margin-bottom: 10px !important;">
+                                <h5 class="app-font-family app-text"><?php echo '# '.$rt['thz_id']." / ".$rt['ticket_type']; ?></h5>
+                                <small classs="app-font-family" style="font-size:7px;">
+                                    <?php if (!empty($rt['created_at'])):
                                         $cdt = new DateTime($rt['created_at']); 
                                         echo $cdt->format('d/m/Y') . "<span class='time'> " . $cdt->format('h:i a') . "</span>"; 
-                                        endif;
-                                ?></small>
+                                    endif; ?>
+                                </small>
                             </div>
-                            <p class="mb-2"><?php echo $rt['subject']; ?></p>
-                            <small><span  style="color: green !important;">Status: </span><?php echo $rt['status']; ?></small>
+                            <p class="mt-1 app-font-family" 
+                                style="font-size:9px; font-weight:400; margin:4px;">
+                                <?= $rt['subject'] ? $rt['subject'] : "&nbsp;"; ?>
+                            </p>
+                            <small class="app-font-family" style="font-size:7px;"><span style="color: green !important; font-weight: 500;">Status: </span><?php echo $rt['status']; ?></small>
                         </div>
                 </div>
-            <?php endforeach; ?>  
+            <?php endforeach; 
+            else: ?>
+                <div class="d-flex justify-content-center align-items-center" 
+                    style="height: 50vh; width:100%;">
+                    <p class="text-center"><i>No Data Found</i></p>
+                </div>
+            <?php endif; ?>
         </div>
       
     </div>
@@ -375,7 +425,7 @@ hr{
     <div class="modal-content" style="border-radius:15px;">
       
         <div class="modal-header" style="border-bottom-width:0;">
-            <h4 class="modal-title">Policy Terms</h4>
+            <h4 class="modal-title title-text  app-font-family">Policy Terms</h4>
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
         </div>
 
@@ -383,8 +433,9 @@ hr{
                             <?php if(!empty($policy_terms)): 
                                     echo $policy_terms;
                                   else: ?>
-                                    <div class="d-flex justify-content-center align-items-center" style="height: 100%;">
-                                                    <p class="text-center"><i>No Data Found</i></p>
+                                    <div class="d-flex justify-content-center align-items-center" 
+                                        style="height: 50vh; width:100%;">
+                                        <p class="text-center"><i>No Data Found</i></p>
                                     </div>
                             <?php endif; ?>
         </div>
diff --git a/public/assets/images/ticket.png b/public/assets/images/ticket.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e8ce85bd4dbf74aa0e6cd8b2bdb11e64e2feba4
GIT binary patch
literal 2412
zcmV-y36u7TP)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH2?0q&K~#7F<y~2f
zR7Dg$Gl1+a;DUk#5Q&7SBq%Dx4MZbql*H(l5kFKAjbHv4V+_G9Q4@Fk-~&UV2{G;w
zH$;{Y1(gUcAxK0NQAA`>6lSKaGgX(auC89D`&GU7nw#8oPrvu7?mczuR=r!dYT6Kv
z+7uV8?;{jnsCb&<@ruVNK2C9e#eEbXR(weDUy6TIyh-tD#cLFAR@`CAfmQBNNdm$k
z#d8#YqqqwilxBFF;suINv+8NXQ9`z|mqCL{P`aGYX1L2LXNTh1roMKxIMBV!=S_<D
zLj%x><^iq7EMLH0VCru<pat0T6z_vpn0~Slkvmar%v&9~a!q0_YoV2k4QwTgrt3Hf
zIksl;wUbZ;HVOZl6iY+THS*@lnnl>hpp`g`>;UUpGe1`vd3z%VBtou0>1dv1rZw+&
z<j*9DaGdyO%_Y<WGJ6``S|;6v2qoa=1z4L88zx1!<n}7p*y{9WpC~>H`JMg<sGLf6
zAY<<0apcG6*5fWV7`;-T!qHk8n4w^;0B*t3Wj-PT?5l|2%2X$FU8+eUz;uhF6>o>u
zGbs7MW2LK&Fd@KY`E11h6t7pj3OYQ=(B(ynrzjo_-M~p(8o{N}Y&3P)A=M~E0YbS3
z@#TLgzNCg6<DkKpSwIL^!5~p8zW4x=S4zse-_%iSMk2GD>E^jZ3Cklcupg?=q!J}o
zbR&|t7ExvfdLATaLkvMUke4E|75|MevE19yxFQ639Ex2#DVe0K0f+!HE4Ua)On6&~
z@2om(lCC*H@hruYt>4=`@-0O2jZgWWMkFiVh%nZB2Fm>$72;re&~yL2<{tYQe(!}M
zC`rjieg8!S8VDpNw9Pv_brGl;=DItWN&`PzLC&`j=EaB8!(dj-g6AU4wCtG*b@F<p
z;E{lQI!cx1_vs1CD004!z_bZrEaNIqT{ojXrI&i19TGrBaxga`Z)y_|hG?ZDQM5!_
z=Zrd@<NXsozaK;x>Z^FT;$IMeMj?z<RGYWf>Mgv!!6R#^v4T7o0f?jXWQ3tURj$<<
zP^j?Bo@Y)$7-D_bArQTYa8}Wb<&)e&?yi9K?nEH^6xoUS3b?dXU%X;VKv{zgblVX|
z;GVL~i5W(8!KEuZGlC4qAYr25$0B`_IWhhAKPU}^Q$||tDufS^_d~)&;rk<9BDf5Z
ziuKqa((e-7CD18Rp%-3*V3DT(CAgc79PX?`ViC`qdt=Bs!jVB5w5iwV(5a@?z+G!(
zaF?d!Z;3s`GJ;_!r#GQ9@<|Q#paVb@;eG5AS}b`T;-?G@ML9_Z=?4|$tw}q8XbQMo
z3EUr{XBDyCS6`IVW^+vj;z{QBy4}Wl0ELv;XAN7CPMTH+{ItuuN2ZbwnQL`f^I`yn
zl-MWW&Xi=?1wZ*>*6dmDnCn$j8#q$0LAI!Xbm)7}Z(Of)0hA@Jnb31{T7E@K=FO{-
z9{FAz(gJvy=eIFc?kC7o&2yco;FH-pTaX^T0Bt2gdles#bm(=@Z_{c#Lr||&{IKE&
zs@+Jx7kk9cT2i5p*4FWyyhm_$;dK>kg-0@|aLk7O5`L;T*+m9IZzer|JTZXadE#qO
z9(x|s!!kJ7twa@KQeI3e&QgzYi2y&^po}HE0ott3*@_n-ZmyO)$T7{IX;!f!d<2BE
zfSI0ad!SQldxA%YdG2KQf)o<_-QOpC>{oa0-fwrX7~5o-=fjh=$%181Ml9ugqwcSf
z>ZYFS;HPD190$%Syi;F6TyAQ0fXTyAo&zUY@68(82`tMlyvr1R3nC^Zr$jWM_n;F^
zx~$&`%#$c$(I~N;`}pZAgagkU#2M_kkZFeqImmqhy*w0(WRD2-ll4AW-^Bu(1(<`K
zFTRZ55yuZ#n#9L&Pt2L~xu+!w*FV6mU~qzkXOa2F<;$cb*z&TKq;XAgeXTDWvQ>zd
z$zJ1HuWT9q9L@V)m#%PsVCb^Yf-LTc(L-NS%N>F0UFNn{Ct7a?LASuQKBi;w{0KV+
zO|Tgrl`uilx^J}$9E;Wim#?k_cQneu?QQ<vY3>W5`%qa9k@;@{DeZm?K(f!;XSuSa
z_A7)vtfOQW@dH{XCQR^nh8wNd1y2m<Rg|8;7K*#6SKvxw0?W^jj9$GffcuoWFEqGv
z(n|N{>}Co|+w$#0@vb&HxjwZ$GPvZuQu%8QD8x^WzKc+5J+WEpWgeUOQ+FH@OMb<X
zKQwO>0ru6XRIYKC54+zD&>K=<l%cPC*W44suXUmLO3U>$32^%cD*<-{;>Wu`X2nA)
zC?MaN%EV&`+|*9nN~HTSf%!Qkd+Mqymz4Q7^y{rFi!EQ9(T|3a#*t)PcIw_3XbVoi
z!4Z}xk5t<!gepprxIJ|_ie0!-<?O~{r0sf?M#Fq0mORHio7O3Xmr{st6@RAqHk2lP
zBsm}EME_33A3`q))l!((|AgM4!-S6UC|y6SB%1`x8SMTErLH6m=9*q==b^E8ut86S
zc0YU}V0Z4@^P-LbOMkl<#YRdCST^h)v;c`Uvr(RaRxZXMTMxi5A;%;xVx;0XP*f^Q
zZ=$1+)35^<Dw%A@E|?XIwV8wZ&&U{6N@8ZPgeL*q1D%U2C!}P}T3u#PzuS7VWWwy~
z+~vc8j*Ep{zH+CD6h6z{j=hNo?hQo7h_e7mw#$1&Zz?hzS7$~|Ue75O=GNp)_A;4|
zQ^>5I4_}Mf`|d`Di6EbYqOf@aS7iPg87FqH2a)}mLN$;xJ^vNq82-$wKc0w;gDj&k
zQ}WXc)-=iskpq%JkCvP#cR@LKBPS#v&xaO1PqT|b$O%a(@&ahV^Wv9hA!orJvE~(s
z3$$HNy>5#4Ek_PXKt3BfVnt;_4T2J-V*(3bf4Mp_4|<+!16c|5D97f8BI$ZOwU7ru
z*HX4#w#(r02G^Q;e1}G#3w@|xwc{6tA?GAYb9I?9Vq4ipz~+K4S0V(MdjIhsqi6KF
zoL1Tc@w`?^^b<X(6gM&Qb(=9+u59!CcZNR+f@D<kta=9QnUBZBYo5o$lVA2Dng6Z9
eHAb#}U;aM<__E?pav-q)0000<MNUMnLSTaY*mnB>

literal 0
HcmV?d00001


From 293718d9dc87f4151dba3da6b48453f671cd9f1b Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Mon, 25 Aug 2025 17:24:52 +0530
Subject: [PATCH 44/54] FIX_app-font-family

---
 app/Views/layout/header.php |  2 +-
 app/Views/thz_notes.php     | 54 ++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 3cf615cd..6624b4c0 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -530,7 +530,7 @@ rgba(0, 153, 158, 0.5)  (transparent)
 }
 
 .app-font-family {
-    font-family: 'Poppins', sans-serif !important;
+    font-family: 'Poppins' !important;
 }
 
 .app-title     { font-size: 18px; }
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index c0371037..11ce9466 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -173,20 +173,20 @@ hr{
                         </div>
                         <div class="card-body card-scroll sub-title-text app-font-family" style="padding:0 27px !important; background:#F5FFFF;">
                             <div class="row mb-2 ml-o">
-                                <div class="col-5 app-subtitle app-text-grey">Ticket ID</div>
-                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['thz_id'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Ticket ID</div>
+                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['thz_id'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Name</div>
-                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['name'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Name</div>
+                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['name'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Mobile</div>
-                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['mobile'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Mobile</div>
+                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['mobile'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Policy Number</div>
-                                <div class="col-7 app-text text-end">
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Policy Number</div>
+                                <div class="col-7 app-text text-end app-font-family">
                                     <?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
                                         ? '<u class="app-text-black">
                                                 <a href="javascript:void(0);" 
@@ -202,28 +202,28 @@ hr{
                                 </div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Assigned To</div>
-                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['assignee_name'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Assigned To</div>
+                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['assignee_name'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Status</div>
-                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['status'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Status</div>
+                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['status'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Ticket Type</div>
-                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['ticket_type'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Ticket Type</div>
+                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['ticket_type'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Subject</div>
-                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['subject'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Subject</div>
+                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['subject'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Message</div>
-                                <div class="col-7 app-text app-text-black text-end"><?= $master[0]['message'];?></div>
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Message</div>
+                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['message'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey">Related Tickets</div>
-                                <div class="col-7 app-text text-end">
+                                <div class="col-5 app-subtitle app-text-grey app-font-family">Related Tickets</div>
+                                <div class="col-7 app-text text-end app-font-family">
                                     <u class="text-warning">
                                         <a href="javascript:void(0);" 
                                         class="text-warning"
@@ -258,20 +258,20 @@ hr{
                                 <div style="border:none; padding: 0px; margin: 0px;">
                                         <hr/>
                                         <!-- Top Row: Message + Badge -->
-                                        <div class="d-flex justify-content-between align-items-start app-text app-text-black">
-                                            <p class="mb-1 ml-0 mr-0 "><?= $conv['notes'] ?></p>
+                                        <div class="d-flex justify-content-between align-items-start app-text app-text-black app-font-family">
+                                            <p class="mb-1 ml-0 mr-0 app-font-family"><?= $conv['notes'] ?></p>
                                             <!-- <?php if(!empty($conv['notes_by'])): ?>
                                                 <span class="badge bg-warning text-dark"><?= $conv['notes_by'] ?></span>
                                             <?php endif; ?> -->
                                             <?php if (!empty($conv['notes_type']) && $conv['notes_type'] === "Internal"): ?>
-                                                <span class="badge app-badge-secondary app-text-white" style="font-size:10px;"><?= $conv['notes_type'] ?></span>
+                                                <span class="badge app-badge-secondary app-text-white app-font-family" style="font-size:10px;"><?= $conv['notes_type'] ?></span>
                                             <?php endif; ?>
                                         </div>
                                         
                                         <!-- Bottom Row: Name + Date -->
                                         <div class="d-flex justify-content-between small text-muted" style="padding-top: 5px;">
-                                            <span><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
-                                            <span style="font-size:9px;"><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
+                                            <span class="app-font-family"><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
+                                            <span style="font-size:9px; app-font-family"><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
                                         </div>
 
                                         <!-- <?php echo $i < count($notes)-1 ? '<hr/>' : ''; ?> -->
@@ -279,9 +279,9 @@ hr{
 
                             <?php endforeach; ?>
                             <?php else: ?>
-                                <div class="d-flex justify-content-center align-items-center" 
+                                <div class="d-flex justify-content-center align-items-center app-font-family" 
                                     style="height: 45vh; width:100%;">
-                                    <p class="text-center"><i>No Data Found</i></p>
+                                    <p class="text-center app-font-family"><i>No Data Found</i></p>
                                 </div>
                             <?php endif; ?>
                         </div>

From 6c8cbbdf819868a43dd9b4444688bd1cefd1b67b Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 25 Aug 2025 18:02:52 +0530
Subject: [PATCH 45/54] FIX_CLAIM_DUMP_BUGS : RV

---
 app/Controllers/TicketServiceController.php | 22 +++++++++++++++------
 app/Models/TicketMasterModel.php            | 16 +++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index 916f9f3c..3bf4f628 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -1206,6 +1206,7 @@ class TicketServiceController extends BaseController
 
                 //excel file Account Manager Details like Name and Mobile Number
                 $excel_acm_data = $row[$acm_column_index] ?? null;
+                // var_dump($excel_acm_data); die;
 
                 $acm_name = null;
                 $acm_mobile = null;
@@ -1217,6 +1218,8 @@ class TicketServiceController extends BaseController
                     $acm_mobile = $parts[1] ?? null;
                 }
 
+                // dd($acm_name, $acm_mobile);
+
                 $params = [
                     'client_name' => $row[$client_column_index] ?? null,
                     'policy_no' => $row[$policy_no_column_index] ?? null,
@@ -1274,7 +1277,7 @@ class TicketServiceController extends BaseController
                     // dd($acm_data);
                     if (count($acm_data) == 0) {
                         array_push($result['error_summary'], 10);
-                        $result['error_data'][$row_key][$acm_column_index]['col_name'] = $columns_to_check['employee_name']['col_name']; //push column name
+                        $result['error_data'][$row_key][$acm_column_index]['col_name'] = $columns_to_check['acm']['col_name']; //push column name
                         $result['error_data'][$row_key][$acm_column_index]['col_idx'] = $acm_column_index; //push column index
                         $result['error_data'][$row_key][$acm_column_index]['error'][] = "This Acount Manager not exist in the system";
                     }
@@ -1455,7 +1458,8 @@ class TicketServiceController extends BaseController
         $header_with_column_index = $this->getTheColumnIndex($excel_data[0], $this->actualHeaders, $returnType);
 
         //Sanitize the excel data
-        // $excel_data = ExcelSanitizeHelper::sanitizeArrayData($excel_data);
+        $excel_data = ExcelSanitizeHelper::sanitizeArrayData($excel_data);
+        // dd($excel_data);
 
         $data = [
             'claim_dump_excel_columns' => $header_with_column_index,
@@ -1499,7 +1503,8 @@ class TicketServiceController extends BaseController
     }
 
     private function constructClaimData($excel_data, $db_data, $columns_to_check)
-    {
+    {   
+        // dd($db_data);
         $client_column_index       = $columns_to_check['corporate']['col_idx'];
         $policy_no_column_index    = $columns_to_check['policy_no']['col_idx'];
         $insurer_column_index      = $columns_to_check['insurer']['col_idx'];
@@ -1591,15 +1596,18 @@ class TicketServiceController extends BaseController
 
         //get the acountmanager data
         $acm_data = $ticketMasterModal->getAcmUserDetails($params) ?? [];
+        // dd($acm_data);
 
         //get the claim status id from the database
         $claim_status_data = $this->ticketClaimStatusModel
-                            ->select('id, claim_status')
+                            ->select('id, claim_status, ticket_type')
                             ->where('is_active', 1)
                             ->where('ticket_type', $db_data['ticket_type_id'])
                             ->where('LOWER(claim_status)', strtolower($excel_status_data))
                             ->first();
 
+        // dd($claim_status_data);
+
         $claim_status_id = $claim_status_data['id'] ?? null;
 
         //initialize Ticket controller for the other data
@@ -1618,9 +1626,10 @@ class TicketServiceController extends BaseController
             }
         }
 
-        $db_data['insured_name'] = $db_data['insured_emp_id'] ?? null;
+        $db_data['insured_name'] = $excel_data[$insured_name_column_index] ?? null;
         //get Insured emp name and Insured emp id
         $insured_data = $ticketMasterModal->getInsuredDetails($db_data);
+        // dd($insured_data);
 
         //handle remarks based on the status
         $return_remarks = null;
@@ -1655,7 +1664,7 @@ class TicketServiceController extends BaseController
             'claim_type'             => $cliam_type_id ?? null,
 
             'insured_emp_id'         => $insured_data['emp_id'] ?? null,
-            'insured_name'           => $insured_data['name'] ?? $db_data['insured_emp_id'] ?? null,
+            'insured_name'           => $insured_data['name'] ?? $excel_data[$insured_name_column_index] ?? null,
 
             'hospital_name'          => $excel_hospital_data ?? null,
             'claim_amount'           => $excel_claim_amount_data ?? null,
@@ -1693,6 +1702,7 @@ class TicketServiceController extends BaseController
             'approved_description'   => null
         ];
 
+        // dd($ticketMaster);
         return  $ticketMaster;
     }
 
diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index 013e5ad7..ab733a4b 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -1059,10 +1059,10 @@ class TicketMasterModel extends Model
         $relationship = $params['relationship'] ?? null;
         $insured_name = $params['insured_name'] ?? null;
 
-        $client_name  = "6-Eleven";
-        $emp_code     = "EMP0020K12";
-        $emp_name     = "Lokesh";
-        $policy_no    = "GMC-1999/2000/2021/2022";
+        // $client_name  = "6-Eleven";
+        // $emp_code     = "EMP0020K12";
+        // $emp_name     = "Lokesh";
+        // $policy_no    = "GMC-1999/2000/2021/2022";
 
 
         $builder = $this->db->table('employees e');
@@ -1106,7 +1106,7 @@ class TicketMasterModel extends Model
         $builder->where('LOWER(e.relationship)', strtolower('self'));
 
         $query = $builder->get();
-        $result = $query->getResultArray();
+        $result = $query->getRowArray();
 
         return $result;
     }
@@ -1123,7 +1123,7 @@ class TicketMasterModel extends Model
             $builder->where('user_profiles.is_active', 1);
             $builder->where('user_profiles.mobile',  trim($acm_mobile));
             $query = $builder->get();
-            $result = $query->getResultArray();
+            $result = $query->getRowArray();
 
             return $result;
         }
@@ -1161,8 +1161,8 @@ class TicketMasterModel extends Model
         $builder->where('ep.client_policy_id', trim($policy_id));
 
         $query = $builder->get();
-        $result = $query->getResultArray();
-
+        $result = $query->getRowArray();
+        // dd($this->db->getLastQuery());
         return $result;
 
     }

From 14605542f4e87a303443d0336ea3541a6e4bf482 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 26 Aug 2025 10:22:33 +0530
Subject: [PATCH 46/54] FIX_LIVE_ISSUE : RV

---
 app/Views/policy_transaction_endorsement_form.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 11711048..3400d1a2 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -652,9 +652,9 @@ $(document).ready(function(){
                     if(res.status == true){
                         if(res.data.length > 0){
 
-                            $('#ct_type').val(2)
-                            $('#cd_ac_pk').val(res.is_copay_yes.cd_ac_pk);
-                            $('#cd_ac_no').val(res.cd_master_data.cd_ac_no ?? "");
+                            $('#ct_type').val(2);
+                            $('#cd_ac_pk').val(res?.is_copay_yes?.cd_ac_pk || "");
+                            $('#cd_ac_no').val(res?.cd_master_data?.cd_ac_no || "");
                             $('#bro_payable_by').val(res.data[0].bro_payable_by);
 
                             if(res.is_copay_yes && res.is_copay_yes.co_share == 1){

From deaa6d96e3c2940072e550a46cc9964e4b4c7b0f Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Tue, 26 Aug 2025 10:22:57 +0530
Subject: [PATCH 47/54] FIX_mentioned Issues

---
 app/Views/thz_list.php  | 73 +++++++++++++++++++++++++++++++----------
 app/Views/thz_notes.php | 71 ++++++++++++++++-----------------------
 2 files changed, 83 insertions(+), 61 deletions(-)

diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 0c17c4c0..5045453a 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -255,7 +255,7 @@ table thead th {
                     <thead>
                         <tr>
                             <th>Ticket No</th>
-                            <th>Name</th>
+                            <th class="app-text-left">Name</th>
                             <th>Policy Number</th>
                             <th>Ticket Type</th>
                             <th>Subject</th>
@@ -294,14 +294,14 @@ table thead th {
                                     <td class="app-text-left">
                                     <?php if (!empty($row['created_at'])):
                                         $cdt = new DateTime($row['created_at']); 
-                                        echo $cdt->format('d/m/Y') . "<br><span class='time'>" . $cdt->format('h:i a') . "</span>"; 
+                                        echo $cdt->format('d/m/Y') . "<br><span class='time'> " . $cdt->format('h:i a') . "</span>"; 
                                         endif;
                                     ?>
                                     </td>
                                     <td class="app-text-left">
                                     <?php if (!empty($row['updated_at'])):
                                         $udt = new DateTime($row['updated_at']); 
-                                        echo $udt->format('d/m/Y') . "<br><span class='time'>" . $udt->format('h:i a') . "</span>"; 
+                                        echo $udt->format('d/m/Y') . "<br><span class='time'> " . $udt->format('h:i a') . "</span>"; 
                                         endif;
                                     ?>
                                     </td>
@@ -436,13 +436,15 @@ table thead th {
 
             <div class="form-group col-md-12 app-font-family">
               <label for="subject">Subject<span class="text-danger">*</span></label>
-              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject" required>
+              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject" required maxlength="150">
+              <small id="subjectCounter" class="form-text text-muted app-text-right">0/150</small>
             </div>
 
             <div class="form-group col-md-12 app-font-family">
               <label for="message">Message<span class="text-danger">*</span></label>
               <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
-              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4" required></textarea>
+              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4" required maxlength="1500"></textarea>
+              <small id="messageCounter" class="form-text text-muted text-end app-text-right">0/1500</small>
             </div>
 
           </div>
@@ -725,19 +727,21 @@ $(document).ready(function() {
                   text: '<span class="app-text-white"> Export </span><i class="mdi mdi-menu-down app-text-white"></i>',
                   className: 'btn app-btn-secondary app-btn-border-radius app-text-white',
                   buttons: [
-                      {
-                          extend: 'csv',
-                          text: 'CSV',
-                          title: 'ticket-List'
-                      },
-                      {
-                          extend: 'excel',
-                          text: ' Excel',
-                          title: 'ticket-List',
-                          exportOptions: {
-                              orthogonal: 'sort'
-                          }
-                      }
+                            {
+                                extend: 'csv',
+                                text: '<i class="mdi mdi-file-delimited app-text-white" ></i><span class="app-text-white">  CSV </span>',
+                                title: 'Tickets',
+                                className: 'app-btn-primary app-text-white',
+                            },
+                            {
+                                extend: 'excel',
+                                text: '<i class="mdi mdi-file-excel app-text-white" ></i><span class="app-text-white">  EXCEL </span>',
+                                title: 'Tickets',
+                                exportOptions: {
+                                    orthogonal: 'sort'
+                                },
+                                className: 'app-btn-primary app-text-white',
+                            }
                   ]
               }
           ],
@@ -757,6 +761,39 @@ $(document).ready(function() {
     } else {
         console.error("Table Not found.");
     }
+
+    const subjectInput = document.getElementById("subject");
+    const subjectCounter = document.getElementById("subjectCounter");
+
+    subjectInput.addEventListener("input", function () {
+      const subjectLength = subjectInput.value.length;
+      subjectCounter.textContent = `${subjectLength}/150`;
+
+      if (subjectLength > 150) {
+        toastr.error('Subject cannot exceed 150 characters', 'Warning');
+        subjectInput.classList.add('is-invalid');
+      } else {
+        subjectInput.classList.remove('is-invalid');
+      }
+    });
+
+
+    const messageInput = document.getElementById("message");
+    const messageCounter = document.getElementById("messageCounter");
+
+    messageInput.addEventListener("input", function () {
+      const messageLength = messageInput.value.length;
+      messageCounter.textContent = `${messageLength}/1500`;
+
+      if (messageLength > 1500) {
+        toastr.error('Message cannot exceed 1500 characters', 'Warning');
+        messageInput.classList.add('is-invalid');
+      } else {
+        messageInput.classList.remove('is-invalid');
+      }
+    });
+
+
 });
 
 function viewTicket(ticket_id){
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index 11ce9466..f3a53b7c 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -157,7 +157,7 @@ hr{
             <div class="row" id="notes-body"> 
 
                 <!-- Left Details -->
-                <div class="col-4" id="notes-body-left">
+                <div class="col-5" id="notes-body-left">
                     <div class="card master-card" style="background:#F5FFFF;">
                         <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
                             <p class="sub-title-text app-font-family mb-0">Details</p>
@@ -173,20 +173,20 @@ hr{
                         </div>
                         <div class="card-body card-scroll sub-title-text app-font-family" style="padding:0 27px !important; background:#F5FFFF;">
                             <div class="row mb-2 ml-o">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Ticket ID</div>
-                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['thz_id'];?></div>
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Ticket ID</div>
+                                <div class="col-8 app-text app-text-black text-end app-font-family" style="font-weight: 500 !important;"><?= $master[0]['thz_id'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Name</div>
-                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['name'];?></div>
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Name</div>
+                                <div class="col-8 app-text app-text-black text-end app-font-family" style="font-weight: 500 !important;"><?= $master[0]['name'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Mobile</div>
-                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['mobile'];?></div>
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Mobile</div>
+                                <div class="col-8 app-text app-text-black text-end app-font-family" style="font-weight: 500 !important;"><?= $master[0]['mobile'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Policy Number</div>
-                                <div class="col-7 app-text text-end app-font-family">
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Policy Number</div>
+                                <div class="col-8 app-text text-end app-font-family" style="font-weight: 500 !important;">
                                     <?= (!empty($master[0]['policy_no']) && strtolower($master[0]['policy_no']) !== 'null') 
                                         ? '<u class="app-text-black">
                                                 <a href="javascript:void(0);" 
@@ -202,28 +202,28 @@ hr{
                                 </div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Assigned To</div>
-                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['assignee_name'];?></div>
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Assigned To</div>
+                                <div class="col-8 app-text app-text-black text-end app-font-family" style="font-weight: 500 !important;"><?= $master[0]['assignee_name'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Status</div>
-                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['status'];?></div>
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Status</div>
+                                <div class="col-8 app-text app-text-black text-end app-font-family" style="font-weight: 500 !important;"><?= $master[0]['status'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Ticket Type</div>
-                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['ticket_type'];?></div>
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Ticket Type</div>
+                                <div class="col-8 app-text app-text-black text-end app-font-family" style="font-weight: 500 !important;"><?= $master[0]['ticket_type'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Subject</div>
-                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['subject'];?></div>
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Subject</div>
+                                <div class="col-8 app-text app-text-black text-end app-font-family" style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['subject'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Message</div>
-                                <div class="col-7 app-text app-text-black text-end app-font-family"><?= $master[0]['message'];?></div>
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Message</div>
+                                <div class="col-8 app-text app-text-black text-end app-font-family" style="font-weight: 500 !important; text-align: justify;"><?= $master[0]['message'];?></div>
                             </div>
                             <div class="row mb-2">
-                                <div class="col-5 app-subtitle app-text-grey app-font-family">Related Tickets</div>
-                                <div class="col-7 app-text text-end app-font-family">
+                                <div class="col-4 app-subtitle app-text-grey app-font-family">Related Tickets</div>
+                                <div class="col-8 app-text text-end app-font-family" style="font-weight: 500 !important;">
                                     <u class="text-warning">
                                         <a href="javascript:void(0);" 
                                         class="text-warning"
@@ -244,7 +244,7 @@ hr{
 
                 <!-- Right Conversation -->
                  
-                <div class="col-8">
+                <div class="col-7">
                     
                     <!-- Conversation Card -->
                     <div class="card mb-3 conversation-card">
@@ -259,7 +259,7 @@ hr{
                                         <hr/>
                                         <!-- Top Row: Message + Badge -->
                                         <div class="d-flex justify-content-between align-items-start app-text app-text-black app-font-family">
-                                            <p class="mb-1 ml-0 mr-0 app-font-family"><?= $conv['notes'] ?></p>
+                                            <p class="mb-1 ml-0 mr-0 app-font-family" style="font-weight: 400 !important;"><?= $conv['notes'] ?></p>
                                             <!-- <?php if(!empty($conv['notes_by'])): ?>
                                                 <span class="badge bg-warning text-dark"><?= $conv['notes_by'] ?></span>
                                             <?php endif; ?> -->
@@ -270,8 +270,8 @@ hr{
                                         
                                         <!-- Bottom Row: Name + Date -->
                                         <div class="d-flex justify-content-between small text-muted" style="padding-top: 5px;">
-                                            <span class="app-font-family"><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
-                                            <span style="font-size:9px; app-font-family"><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
+                                            <span class="app-font-family" style="font-weight: 400 !important;"><i class="mdi mdi-account"></i> <?= $conv['name'] ?></span>
+                                            <span style="font-size:9px; font-weight: 400 !important;" class="app-font-family"><?= date("j F Y h:i a", strtotime($conv['created_at'])) ?></span>
                                         </div>
 
                                         <!-- <?php echo $i < count($notes)-1 ? '<hr/>' : ''; ?> -->
@@ -388,9 +388,9 @@ hr{
 
             <?php if(!empty($related_tickets)):  foreach($related_tickets as $j => $rt): ?>
                 <div class="card related-ticket-card app-font-family app-text" 
-                style="cursor: pointer;"
-                onclick="window.location='<?= base_url().'ticketConversationList?return_type=web&thz_id='.$rt['thz_id'] ?>'">
-                        <div class="card-body">
+                    style="cursor: pointer;"
+                    onclick="window.location='<?= base_url().'/ticketConversationList?return_type=web&thz_id='.$rt['thz_id']; ?>'">
+                    <div class="card-body">
                             <div class="d-flex justify-content-between align-items-center" style="margin-bottom: 10px !important;">
                                 <h5 class="app-font-family app-text"><?php echo '# '.$rt['thz_id']." / ".$rt['ticket_type']; ?></h5>
                                 <small classs="app-font-family" style="font-size:7px;">
@@ -549,19 +549,4 @@ hr{
             }
         });
     }
-</script>
-
-<script>
-$(document).ready(function(){
-    // attach click event to the div
-    $(document).on('click', '.related-ticket-card', function(){
-
-        let relatedId = $(this).data('related-ticket-id'); 
-        console.log("Related Ticket ID:", relatedId);
-
-       window.open("<?php echo base_url('/ticketConversationList?return_type=web&thz_id=')?>"+relatedId,"_blank");
-
-
-    });
-});
 </script>
\ No newline at end of file

From 437bfde3c10635f253246f4150e3c95b90402e4a Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Tue, 26 Aug 2025 10:53:06 +0530
Subject: [PATCH 48/54] FIX_mentioned issues 2

---
 app/Views/layout/header.php |  5 +++--
 app/Views/thz_list.php      |  6 +++---
 app/Views/thz_notes.php     | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index 6624b4c0..b1ca7453 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -529,8 +529,9 @@ rgba(0, 153, 158, 0.5)  (transparent)
     background-color: #ECECEC !important;
 }
 
-.app-font-family {
-    font-family: 'Poppins' !important;
+.app-font-family,
+.app-font-family *:not(.mdi):not(.fa):not(.material-icons) {
+  font-family: 'Poppins' !important;
 }
 
 .app-title     { font-size: 18px; }
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 5045453a..3824473b 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -318,7 +318,7 @@ table thead th {
     </div>
 </div>
 
-<div class="modal fade" id="ticketModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade app-font-family" id="ticketModal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered modal-xl" style="margin:5px auto!important;">
     <div class="modal-content">
       <form id="ticketForm">
@@ -330,7 +330,7 @@ table thead th {
 
               <!-- first row -->
               <div class="d-flex w-100 justify-content-between align-items-center">
-                <h4 class="modal-title app-font-family mb-0" id="modalLabel">New Ticket</h4>
+                <h4 class="modal-title app-font-family mb-0" id="modalLabel" style="font-size:27px !important">New Ticket</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
               </div>
 
@@ -459,7 +459,7 @@ table thead th {
 </div>
 
 
-<div class="modal fade" id="AssignModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade app-font-family" id="AssignModal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content">
       <div class="modal-header">
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index f3a53b7c..e60ee794 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -313,12 +313,12 @@ hr{
     </div>
 </div>
 
-<div class="modal fade app-text-black" id="EditModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade app-text-black app-font-family" id="EditModal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content">
       <form id="ticketForm">
         <div class="modal-header">
-            <h4 class="modal-title title-text  app-font-family" id="EditModalLabel">Update</h4>
+            <h4 class="modal-title title-text" id="EditModalLabel" style="font-size:27px !important">Update</h4>
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
         </div>
 
@@ -375,12 +375,12 @@ hr{
   </div>
 </div>
 
-<div class="modal fade" id="relatedTicketModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade app-font-family" id="relatedTicketModal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content" style="border-radius:15px;">
       
         <div class="modal-header" style="border-bottom-width:0;">
-            <h4 class="modal-title title-text  app-font-family">Related Tickets</h4>
+            <h4 class="modal-title title-text  app-font-family" style="font-size:27px !important">Related Tickets</h4>
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
         </div>
 
@@ -420,7 +420,7 @@ hr{
   </div>
 </div>
 
-<div class="modal fade" id="PolicyModal" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade app-font-family" id="PolicyModal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content" style="border-radius:15px;">
       

From 85c20366d0b4377ea158ef4fa0f36ef04414492f Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Tue, 26 Aug 2025 14:32:00 +0530
Subject: [PATCH 49/54] FIX_5THand6TH fixes

---
 app/Controllers/ThzController.php |  3 +++
 app/Views/thz_list.php            | 12 ++++++------
 app/Views/thz_notes.php           |  2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 71e4c78e..e6703a0e 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -81,6 +81,9 @@ class ThzController extends BaseController
         
         
         $data = $this->request->getGet();
+        if ($returnType === 'web' && in_array(get_role_id(), [2,3,4])) {
+            $data['assign_to'] = $data['assign_to'] ?? get_session_userid();
+        }
 
         $tickets = $this->fetchTicketsBasedOnrole($data);
         
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index 3824473b..eaead156 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -254,13 +254,13 @@ table thead th {
                 <table id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-font-family">
                     <thead>
                         <tr>
-                            <th>Ticket No</th>
+                            <th>Ticket ID</th>
                             <th class="app-text-left">Name</th>
                             <th>Policy Number</th>
                             <th>Ticket Type</th>
                             <th>Subject</th>
                             <th>Status</th>
-                            <th>Assign To</th>
+                            <th class="app-text-left">Assign To</th>
                             <th>Created At</th>
                             <th>Updated At</th>
                         </tr>
@@ -716,7 +716,7 @@ $(document).ready(function() {
               "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
           buttons: [
               {
-                  text: '<i class="mdi mdi-plus app-text-white" ></i><span class="app-text-white">  Create New Ticket </span>',
+                  text: '<i class="mdi mdi-plus app-text-white" ></i><span class="app-text-white app-font-family btn-custom">  Create New Ticket </span>',
                   className: 'btn app-btn-primary app-btn-border-radius app-text-white mr-2',
                   action: function(e, dt, node, config) { 
                       openTicket();
@@ -724,18 +724,18 @@ $(document).ready(function() {
               },
               {
                   extend: 'collection',
-                  text: '<span class="app-text-white"> Export </span><i class="mdi mdi-menu-down app-text-white"></i>',
+                  text: '<span class="app-text-white app-font-family btn-custom"> Export </span><i class="mdi mdi-menu-down app-text-white"></i>',
                   className: 'btn app-btn-secondary app-btn-border-radius app-text-white',
                   buttons: [
                             {
                                 extend: 'csv',
-                                text: '<i class="mdi mdi-file-delimited app-text-white" ></i><span class="app-text-white">  CSV </span>',
+                                text: '<i class="mdi mdi-file-delimited app-text-white" ></i><span class="app-text-white app-font-family btn-custom">  CSV </span>',
                                 title: 'Tickets',
                                 className: 'app-btn-primary app-text-white',
                             },
                             {
                                 extend: 'excel',
-                                text: '<i class="mdi mdi-file-excel app-text-white" ></i><span class="app-text-white">  EXCEL </span>',
+                                text: '<i class="mdi mdi-file-excel app-text-white" ></i><span class="app-text-white app-font-family btn-custom">  EXCEL </span>',
                                 title: 'Tickets',
                                 exportOptions: {
                                     orthogonal: 'sort'
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index e60ee794..c8f7187a 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -161,6 +161,7 @@ hr{
                     <div class="card master-card" style="background:#F5FFFF;">
                         <div class="card-header d-flex justify-content-between align-items-center" style="background:none; border:none;">
                             <p class="sub-title-text app-font-family mb-0">Details</p>
+                            <?php if($master[0]['status'] !== "Closed") : ?>
                             <a href="javascript:void(0);" onclick="openEditTicket()">
                                 <i class="mdi mdi-pencil edit-icon" title="Edit"></i>
                                 <!-- <i class="mdi mdi-pencil"
@@ -170,6 +171,7 @@ hr{
                                 onmouseout="this.style.color='#555'; this.style.fontSize='15px';">
                                 </i> -->
                             </a>
+                            <?php endif; ?>
                         </div>
                         <div class="card-body card-scroll sub-title-text app-font-family" style="padding:0 27px !important; background:#F5FFFF;">
                             <div class="row mb-2 ml-o">

From 1eee77f1b8bcc0b73806f0847a28cd061a12c494 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 26 Aug 2025 15:40:29 +0530
Subject: [PATCH 50/54] FIX_BUGS : RV

---
 app/Controllers/EmployeeRestController.php    |  4 ++-
 .../PolicyTransactionController.php           |  8 +++---
 app/Controllers/TicketServiceController.php   | 27 ++++++++++++++-----
 .../policy_transaction_inception_form.php     | 20 +++++++-------
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index f307a351..4fc7d1c4 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -3902,7 +3902,9 @@ class EmployeeRestController extends AdminController
             $filePath   = $uploadPath . $record[0]['file_name'];
 
             if (!file_exists($filePath)) {
-                return $this->failNotFound("File not found on server");
+                // return $this->failNotFound("File not found on server");
+                $data['message'] = 'The Physical File Not Found';
+                return view('errors/404', $data);
             }
 
             // Force file download
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index f7e75acf..cada5a8f 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -248,12 +248,14 @@ class PolicyTransactionController extends BaseController
 
     // policy Transaction Create function start
     public function createInceptionPolicy()
-    {
-        // print_r($this->request->getPost()); die;
+    {   
+        $post_data = $this->request->getPost() ?? [];
+        $this->myLogger->logme('error', 'Policy Trancaction form data : '. json_encode($post_data));
+
         $id = $this->request->getPost('id');
         $data = $this->preparePolicyData();
         $data['cd_ac_pk'] = $this->request->getPost('cd_ac_no');
-        // print_r($this->request->getPost()); die;
+        $this->myLogger->logme('error', 'Policy Trancaction modified form data ( insert data ) : '. json_encode($data));
 
 
         if (!$id) {
diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index 3bf4f628..16c92d55 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -976,11 +976,12 @@ class TicketServiceController extends BaseController
         $columns_to_check = $excel_data_and_headers['claim_dump_excel_columns'];
         // dd($columns_to_check);  
 
-        $client_data = $this->clientModel->where('is_active', 1)->where('client_type', 1)->findAll();
-        $insurer_data = $this->insurerModel->where('is_active', 1)->findAll();
-        $tpa_data = $this->TPAModel->where('is_active', 1)->findAll();
-        $claim_status_data = $this->ticketClaimStatusModel->select('id, claim_status')->where('is_active', 1)->orderBy('id', 'asc')->groupBy('claim_status')->findAll();
-
+        //if upload the unwanted file upload handle
+        if(count($columns_to_check) == 0){
+            $message = "Wrong file was uploaded";
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+            return  array('error_summary' => [5], 'error_data' => $message);
+        }
 
         //Store the error data by this structure
         $result = ['error_type' => 1, 'error_summary' => [], 'error_data' => []];
@@ -988,6 +989,7 @@ class TicketServiceController extends BaseController
         //excel data is empty than through the error
         if(count($excel_data ?? []) <= 1){
             $message = "Uploaded file is empty";
+            $this->claimDumpFileModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
             return  array('error_summary' => [5], 'error_data' => $message);
         }
 
@@ -1007,6 +1009,11 @@ class TicketServiceController extends BaseController
             return  array('error_summary' => [6], 'error_data' => $message);
         }
 
+        $client_data = $this->clientModel->where('is_active', 1)->where('client_type', 1)->findAll();
+        $insurer_data = $this->insurerModel->where('is_active', 1)->findAll();
+        $tpa_data = $this->TPAModel->where('is_active', 1)->findAll();
+        $claim_status_data = $this->ticketClaimStatusModel->select('id, claim_status')->where('is_active', 1)->orderBy('id', 'asc')->groupBy('claim_status')->findAll();
+
         //remove header
         unset($excel_data[0]);
 
@@ -1213,9 +1220,15 @@ class TicketServiceController extends BaseController
 
                 //seperate the Account Manager Name and Mobile No
                 if (!empty($excel_acm_data)) {
+                    $excel_acm_data = str_replace(['–', '—'], '-', $excel_acm_data);
                     $parts = array_map('trim', explode('-', $excel_acm_data, 2));
                     $acm_name   = $parts[0] ?? null;
                     $acm_mobile = $parts[1] ?? null;
+
+                    // ensure mobile number is digits only
+                    if ($acm_mobile !== null) {
+                        $acm_mobile = preg_replace('/\D/', '', $acm_mobile);
+                    }
                 }
 
                 // dd($acm_name, $acm_mobile);
@@ -1648,13 +1661,13 @@ class TicketServiceController extends BaseController
             'claim_status_id'        => $claim_status_id ?? null,
             'acm_id'                 => $acm_data['id'] ?? null,
             'insurer_id'             => $db_data['insurer_id'] ?? null,
-            'tpa_id'                 => $excel_tpa_id_data ?? $db_data['tpa_id'] ?? null,
+            'tpa_id'                 => $db_data['tpa_id'] ?? null,
             'client_id'              => $db_data['client_id'] ?? null,
             'emp_id'                 => $db_data['emp_id'] ?? null,
             'client_policy_id'       => $db_data['client_policy_id'] ?? null,
             'policy_no'              => $db_data['policy_no'] ?? null,
             'emp_code'               => $db_data['emp_code'] ?? null,
-            'tpa_no'                 => $db_data['tpa_no'] ?? null,
+            'tpa_no'                 => $excel_tpa_id_data ?? $db_data['tpa_no'] ?? null,
             'emp_name'               => $db_data['emp_name'] ?? null,
             'relationship'           => $excel_relationship_data ?? null,
             'emp_mobile'             => $excel_emp_mobile_data ?? $db_data['emp_mobile'] ?? null,
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 12478554..9e095f2e 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -3975,14 +3975,6 @@ $('#policy_no').change(function(){
                     toastr.warning(res.message,'WARNING');
                     $('#policy_no').val("");
                     return;
-                }
-
-                if(res.status == true){                   
-                    $('#ct_type').val(1);
-                    $('#client_policy_id').val(res.data.id);
-                    $('#policy_start_date').val(res.data.policy_start_date);
-                    $('#policy_end_date').val(res.data.policy_end_date);
-                    $('#tpa').val(res.data.tpa_branch_id+'-'+res.data.tpa_id).select2();
                 }else{
                     $('#ct_type').val(2);
                     $('#client_policy_id').val('');
@@ -3991,6 +3983,14 @@ $('#policy_no').change(function(){
                     $('#tpa').val('').select2();
                     console.log(res.message, 'warning');
                 }
+
+                // if(res.status == true){                   
+                //     $('#ct_type').val(1);
+                //     $('#client_policy_id').val(res.data.id);
+                //     $('#policy_start_date').val(res.data.policy_start_date);
+                //     $('#policy_end_date').val(res.data.policy_end_date);
+                //     $('#tpa').val(res.data.tpa_branch_id+'-'+res.data.tpa_id).select2();
+                // }
             },
             error: function (xhr, status, error) {
                 console.error(xhr.responseText);
@@ -3999,12 +3999,12 @@ $('#policy_no').change(function(){
         });
     }else{
 
-        $('#ct_type').val(2)
+        $('#ct_type').val(2);
         $('#client_policy_id').val();
         $('#policy_start_date').val();
         $('#policy_end_date').val();
         $('#tpa').val('').select2();
-        console.log("Could not get policy data")
+        console.log("This is new policy Could not get policy data")
     }
 });
 

From 82e503c0338ea6d90a28b760bd893c12e12d3a4a Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 26 Aug 2025 16:14:39 +0530
Subject: [PATCH 51/54] FIX_BUGS : RV

---
 app/Controllers/TicketServiceController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index 16c92d55..52fa3d12 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -720,7 +720,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'Emp. Mobile',
                 'is_mandatory' => false,
                 'data_type' => 'string',
-                'format' => 'phone',
+                'format' => null,
                 'allowed_values' => null
             ],
             "emp_email" => [
@@ -1185,7 +1185,7 @@ class TicketServiceController extends BaseController
         $columns_to_check = $excel_data_and_headers['claim_dump_excel_columns'];
         // dd($columns_to_check);  
 
-        $result = ['error_type' => 2, 'error_summary' => [], 'error_data' => []];
+        $result = ['error_type' => 1, 'error_summary' => [], 'error_data' => []];
 
         //remove header
         unset($excel_data[0]);

From 8e1e1aa2ac2a037efe158253301fe089f3a1c826 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 26 Aug 2025 17:13:27 +0530
Subject: [PATCH 52/54] FIX_BUGS : RV

---
 app/Controllers/TicketServiceController.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index 52fa3d12..219bb9cc 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -774,7 +774,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'DOA',
                 'is_mandatory' => false,
                 'data_type' => 'date',
-                'format' => 'm/d/Y',
+                'format' => 'd/m/Y',
                 'allowed_values' => null
             ],
             "dod" => [
@@ -783,7 +783,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'DOD',
                 'is_mandatory' => false,
                 'data_type' => 'date',
-                'format' => 'm/d/Y',
+                'format' => 'd/m/Y',
                 'allowed_values' => null
             ],
             "claim_amount" => [
@@ -801,7 +801,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'Date of Claim Receipt',
                 'is_mandatory' => false,
                 'data_type' => 'date',
-                'format' => 'm/d/Y',
+                'format' => 'd/m/Y',
                 'allowed_values' => null
             ],
             "date_claim_registration" => [
@@ -810,7 +810,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'Date of Claim Registration',
                 'is_mandatory' => false,
                 'data_type' => 'date',
-                'format' => 'm/d/Y',
+                'format' => 'd/m/Y',
                 'allowed_values' => null
             ],
             "date_latest_query_raise" => [
@@ -819,7 +819,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'Date - Latest Query Raise',
                 'is_mandatory' => false,
                 'data_type' => 'date',
-                'format' => 'm/d/Y',
+                'format' => 'd/m/Y',
                 'allowed_values' => null
             ],
             "date_latest_query_resolution" => [
@@ -828,7 +828,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'Date - Latest Query Resolution',
                 'is_mandatory' => false,
                 'data_type' => 'date',
-                'format' => 'm/d/Y',
+                'format' => 'd/m/Y',
                 'allowed_values' => null
             ],
             "approved_amt" => [
@@ -846,7 +846,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'Date of Approval',
                 'is_mandatory' => false,
                 'data_type' => 'date',
-                'format' => 'm/d/Y',
+                'format' => 'd/m/Y',
                 'allowed_values' => null
             ],
             "utr_settlement" => [
@@ -864,7 +864,7 @@ class TicketServiceController extends BaseController
                 'col_name' => 'Date of Settlement',
                 'is_mandatory' => false,
                 'data_type' => 'date',
-                'format' => 'm/d/Y',
+                'format' => 'd/m/Y',
                 'allowed_values' => null
             ],
             "reason" => [

From f8b507ec3ed56d32d192740f206102dc7a3fd9b3 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 26 Aug 2025 17:53:31 +0530
Subject: [PATCH 53/54] FIX_BUGS : RV

---
 app/Controllers/TicketServiceController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/TicketServiceController.php b/app/Controllers/TicketServiceController.php
index 219bb9cc..d2265378 100644
--- a/app/Controllers/TicketServiceController.php
+++ b/app/Controllers/TicketServiceController.php
@@ -1669,7 +1669,7 @@ class TicketServiceController extends BaseController
             'emp_code'               => $db_data['emp_code'] ?? null,
             'tpa_no'                 => $excel_tpa_id_data ?? $db_data['tpa_no'] ?? null,
             'emp_name'               => $db_data['emp_name'] ?? null,
-            'relationship'           => $excel_relationship_data ?? null,
+            'relationship'           => strtolower($excel_relationship_data) ?? null,
             'emp_mobile'             => $excel_emp_mobile_data ?? $db_data['emp_mobile'] ?? null,
             'emp_mail'               => $excel_emp_email_data ?? $db_data['emp_mail'] ?? null,
 

From cb06e7799b89f540285ec115af3373cb103ebc08 Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Tue, 26 Aug 2025 18:25:24 +0530
Subject: [PATCH 54/54] FIX_little changes

---
 app/Config/Routes.php             |  3 +-
 app/Controllers/ThzController.php | 39 ++++++++++++++
 app/Models/TicketTypesModel.php   | 44 ++++++++++++++++
 app/Views/thz_list.php            | 87 ++++++++++++++++++++++++++-----
 app/Views/thz_notes.php           | 17 +++++-
 5 files changed, 175 insertions(+), 15 deletions(-)
 create mode 100644 app/Models/TicketTypesModel.php

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 75b95c76..acb156bd 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -659,4 +659,5 @@ $routes->post("ticketSave", "ThzController::ticketSave");
 $routes->get("ticketList", "ThzController::ticketList");
 $routes->post("ticketConversationSave", "ThzController::ticketConversationSave");
 $routes->get("ticketConversationList", "ThzController::ticketConversationList");
-$routes->post('ticketAutoFetchDetails',"ThzController::ticketAutoFetchDetails");
\ No newline at end of file
+$routes->post('ticketAutoFetchDetails',"ThzController::ticketAutoFetchDetails");
+// $routes->match(['get','post','put'], 'ticketType', 'ThzController::ticketType');
\ No newline at end of file
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index e6703a0e..e286d651 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -13,6 +13,7 @@ use App\Models\UserModel;
 use App\Models\ClientPolicyModel;
 use App\Models\ClientModel;
 use App\Models\TicketMailTemplateModel;
+// use App\Models\TicketTypesModel;
 
 
 class ThzController extends BaseController
@@ -28,6 +29,7 @@ class ThzController extends BaseController
     protected $clientModel;
 
     protected $ticketMailTemplateModel;
+    // protected $ticketTypesModel;
 
     public function __construct()
     {
@@ -226,6 +228,43 @@ class ThzController extends BaseController
 
     }
 
+    // public function ticketType()
+    // {
+    //         $method = $this->request->getMethod(); // get, post
+
+    //         if ($method === 'get') {
+    
+    //             $types = $this->ticketTypesModel->where('is_active', 1)->findAll();
+    //             if (empty($types)) {
+    //                 return $this->response->setJSON(['status'  => 'error','message' => 'No ticket types found'])->setStatusCode(404);
+    //             }
+    //             return $this->response->setJSON(['status' => 'success','data'   => $types])->setStatusCode(200);
+    
+    //         } 
+            
+    //         if ($method === 'post') {
+    
+    //             $data = $this->request->getPost();
+    //             if (!empty($data['id'])) {
+    //                 $text   = "update";            
+    //                 $result = $this->ticketTypesModel->update($data['id'], $data);
+    //                 $updateID = $data['id'];
+    //             } else {
+    //                 $text   = "create";                    
+    //                 $insertID  = $this->ticketTypesModel->insert($data);
+    //                 $result = true;
+    //             }
+
+    //             $id = isset($insertID) && !empty($insertID) ? $insertID : $updateID ;
+
+    //            return $this->response->setJSON([ 
+    //                     'status' => $id ? 'success' : 'error',
+    //                     'message' => $id ? "Ticket Type {$text}d successfully " : "Unable to {$text} ticket type. Please try again." ,
+    //                     'id'      => $id
+    //             ])->setStatusCode($id ? 200 : 400);
+    //         } 
+    //         return $this->response->setJSON(['status'  => 'error','message' => 'No ticket types found'])->setStatusCode(404);
+    //     }
 
 
     /**************************************************   PRIVATE FUNCTIONS  ********************************************************/
diff --git a/app/Models/TicketTypesModel.php b/app/Models/TicketTypesModel.php
new file mode 100644
index 00000000..33f31915
--- /dev/null
+++ b/app/Models/TicketTypesModel.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class TicketTypesModel extends Model
+{
+    protected $table            = 'ticket_types';
+    protected $primaryKey       = 'id';
+    protected $useAutoIncrement = true;
+    protected $returnType       = 'array';
+    protected $useSoftDeletes   = false;
+    protected $protectFields    = true;
+    protected $allowedFields    = ['name','created_at','updated_at','created_by','updated_by' ,'is_active'];
+
+    protected bool $allowEmptyInserts = false;
+
+    // Dates
+    protected $useTimestamps = false;
+    protected $dateFormat    = 'datetime';
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+    protected $deletedField  = 'deleted_at';
+
+    // Validation
+    protected $validationRules      = [];
+    protected $validationMessages   = [];
+    protected $skipValidation       = false;
+    protected $cleanValidationRules = true;
+
+    // Callbacks
+    protected $allowCallbacks = true;
+    protected $beforeInsert   = [];
+    protected $afterInsert    = [];
+    protected $beforeUpdate   = [];
+    protected $afterUpdate    = [];
+    protected $beforeFind     = [];
+    protected $afterFind      = [];
+    protected $beforeDelete   = [];
+    protected $afterDelete    = [];
+
+
+}
diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php
index eaead156..cde116e0 100644
--- a/app/Views/thz_list.php
+++ b/app/Views/thz_list.php
@@ -362,7 +362,7 @@ table thead th {
               </div>
         </div>
                 
-        <div class="modal-body" style="padding: 15px !important;">    
+        <div class="modal-body" style="padding: 12px 15px 0px 15px !important;">    
           <div class="form-row">
             <input type="hidden" id="thz_id" name="thz_id">
             <input type="hidden" id="return_type" name="return_type">
@@ -396,6 +396,7 @@ table thead th {
                 <option value="">Select Ticket Type</option>
                 <option value="Sales" selected >Sales</option>
                 <option value="Service">Service</option>
+                <!-- <option value="0">+ Add New</option> -->
               </select>
             </div>
 
@@ -420,31 +421,43 @@ table thead th {
 
             <!-- // enga 5-"head" and 1-"admin" assign pannvaga dropdown-data la varakudhathu. but dropdown display aganum
                  // 2,3,4 dropdown data'va varannum but dropdown hide pannanum  --> 
-            <?php if(in_array(get_role_id(), [1,5]) ) { ?> 
+            <?php if (in_array(get_role_id(), [1,5])): ?> 
               <div class="form-group col-md-4">
                 <label for="assign_to">Assign To</label>
                 <select class="form-control" id="assign_to" name="assign_to">
                   <option value="">Select Assign To</option>
-                  <?php if(isset($assignee)) { ?>
-                    <?php foreach ($assignee as $a) { ?>
-                      <option value="<?= $a['id']?>"><?= $a['emp_code'] ?> - <?= $a['first_name'] ?> <?= $a['last_name'] ?></option>
-                    <?php } ?>
-                  <?php } ?>
+                  <?php if (!empty($assignee)): ?>
+                    <?php foreach ($assignee as $a): ?>
+                      <option value="<?= esc($a['id']) ?>">
+                        <?= esc($a['emp_code']) ?> - <?= esc($a['first_name']) ?> <?= esc($a['last_name']) ?>
+                      </option>
+                    <?php endforeach; ?>
+                  <?php endif; ?>
                 </select>
               </div>
-            <?php } ?>
+            <?php else: ?> 
+              <input type="hidden" id="hide_assign_to" name="assign_to" value="<?= esc(get_session_userid()); ?>">
+            <?php endif; ?>
 
-            <div class="form-group col-md-12 app-font-family">
+            <!-- <div class="form-group col-md-12 app-font-family">
               <label for="subject">Subject<span class="text-danger">*</span></label>
-              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject" required maxlength="150">
               <small id="subjectCounter" class="form-text text-muted app-text-right">0/150</small>
+            </div> -->
+            <div class="form-group col-md-12 app-font-family">
+              <div class="d-flex justify-content-between">
+                <label for="subject" class="mb-1">Subject <span class="text-danger">*</span></label>
+                <small id="subjectCounter" class="form-text text-muted">0/150</small>
+              </div>
+              <input type="text" class="form-control" id="subject" name="subject" placeholder="Enter Subject" required maxlength="150">
             </div>
 
             <div class="form-group col-md-12 app-font-family">
-              <label for="message">Message<span class="text-danger">*</span></label>
+              <div class="d-flex justify-content-between">
+                <label for="message">Message<span class="text-danger">*</span></label>
+                <small id="messageCounter" class="form-text text-muted text-end app-text-right">0/1500</small>
+              </div>
               <!-- <input type="text" class="form-control" id="message" name="message" placeholder="Enter Message"> -->
-              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="4" required maxlength="1500"></textarea>
-              <small id="messageCounter" class="form-text text-muted text-end app-text-right">0/1500</small>
+              <textarea class="form-control"  id="message"  name="message"  placeholder="Enter Message" rows="3" required maxlength="1500"></textarea>
             </div>
 
           </div>
@@ -495,6 +508,8 @@ table thead th {
     function openTicket(){
         var form = document.getElementById('ticketForm');
         form.reset(); 
+        $("#client_id").select2();
+        $("#ticket_type").select2();
         document.getElementById('thz_id').value = '';
         document.getElementById('modalLabel').innerText = "New Ticket";
         document.getElementById('return_type').innerText = "Web";
@@ -505,6 +520,8 @@ table thead th {
     function resetTicket(){
         var form = document.getElementById('ticketForm');
         form.reset(); 
+        $("#client_id").select2();
+        $("#ticket_type").select2();
     }
 
     function submitTicket() {
@@ -678,6 +695,50 @@ table thead th {
       document.getElementById('policy_id').value = "";
     }
   }
+
+// function hideandshowpolicy() {
+//   var select = document.getElementById('ticket_type'); 
+//   var value = select.value;                            
+//   var policyContainer = document.getElementById('policy_container');
+
+//   if (value === "0") {
+//     let newType = prompt("Enter new ticket type:");
+//     if (newType && newType.trim() !== "") {
+      
+//       $.ajax({
+//         url: "<?= base_url('ticketType') ?>",
+//         type: "POST",
+//         data: { name: newType }, 
+//         dataType: 'json',
+//         success: function(response) {
+//           if (response.status === "success") {
+            
+//             let option = new Option(newType, newType);
+//             let addNewOption = select.querySelector('option[value="0"]');
+//             select.insertBefore(option, addNewOption);
+//             select.value = newType;
+//             value = newType;
+//             console.log(response.message); 
+
+//           } else { console.log(response.message); value = ""; }
+//         },
+//         error: function(xhr) { console.log("Error: " + xhr.statusText); value = ""; }
+//       });
+//     } else {
+//       select.value = "";
+//       value = "";
+//     }
+//   }
+
+//   if (value === 'Service') {
+//       policyContainer.style.display = "block";
+//   } else {
+//       policyContainer.style.display = "none";
+//       document.getElementById('policy_no').value = "";
+//       document.getElementById('policy_id').value = "";
+//   }
+
+// }
 </script>
 
 <script>
diff --git a/app/Views/thz_notes.php b/app/Views/thz_notes.php
index c8f7187a..a0653f03 100644
--- a/app/Views/thz_notes.php
+++ b/app/Views/thz_notes.php
@@ -297,7 +297,7 @@ hr{
                             <input type="hidden" id="notes_by" name="notes_by" value="Staff">
                             <input type="hidden" id="created_by" name="created_by" value="<?= get_session_userid(); ?>">
                             <div class="notes-box">
-                                    <textarea class="form-control" id="notes" name="notes" placeholder="Write your notes here..." required></textarea>
+                                    <textarea class="form-control" id="notes" name="notes" placeholder="Write your notes here..." required maxlength="1500"></textarea>
                                     <div class="icon-buttons">
                                         <!-- save btn means local - internal  -->
                                         <button type="button" class="btn-icon" onclick="submitConverstionTicket('Internal')"><i class="mdi mdi-content-save"></i></button>
@@ -305,6 +305,7 @@ hr{
                                         <button type="button" class="btn-icon" onclick="submitConverstionTicket('External')"><i class="mdi mdi-email"></i></button>
                                     </div>
                             </div>
+                            <small id="messageCounter" class="form-text text-muted text-end app-text-right">0/1500</small>
                         </form>
                     </div>
 
@@ -455,6 +456,20 @@ hr{
             $("#ticket_type").select2();
             $("#status").select2();
             $("#assign_to").select2();
+            const messageInput = document.getElementById("notes");
+            const messageCounter = document.getElementById("messageCounter");
+
+            messageInput.addEventListener("input", function () {
+            const messageLength = messageInput.value.length;
+            messageCounter.textContent = `${messageLength}/1500`;
+
+            if (messageLength > 1500) {
+                toastr.error('Message cannot exceed 1500 characters', 'Warning');
+                messageInput.classList.add('is-invalid');
+            } else {
+                messageInput.classList.remove('is-invalid');
+            }
+            });
             
 
     });