From 6f208725e04309561fc45588ef56c9586eb1053c Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Fri, 30 Jan 2026 15:24:48 +0530
Subject: [PATCH 1/8] FIX_HR_FILE_UPLOAD_ISSUE&HEADER7&FOOTER

---
 app/Helpers/utility_helper.php                |   8 +-
 app/Views/layout/footer.php                   | 117 +++---
 ...footer_old_outdated.php => footer_new.php} | 117 +++---
 app/Views/layout/header.php                   |  18 +-
 app/Views/layout/header_new.php               | 367 +++++++++++-------
 ...er_old_outdated.php => header_new_old.php} | 349 ++++++-----------
 6 files changed, 489 insertions(+), 487 deletions(-)
 rename app/Views/layout/{footer_old_outdated.php => footer_new.php} (90%)
 rename app/Views/layout/{header_old_outdated.php => header_new_old.php} (63%)

diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php
index d1f858b..71eeb49 100755
--- a/app/Helpers/utility_helper.php
+++ b/app/Helpers/utility_helper.php
@@ -739,12 +739,14 @@ if (!function_exists('validateExcelFile')) {
 
     function validateExcelFile($file)
     {
-        $allowed = [
-            'application/vnd.ms-excel',
+       $allowed = [
+            'application/vnd.ms-excel','application/vnd',
             'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'application/vnd.oasis.opendocument.spreadsheet'
+            'application/vnd.oasis.opendocument.spreadsheet',
+              'application/octet-stream'
         ];
 
+
         // if ($file->getError() !== UPLOAD_ERR_OK) return 'Upload error';
         // if ($file->getSize() > (16 * 1024 * 1024)) return 'File too large';
         // if (!in_array($file->getClientMimeType(), $allowed, true)) return 'Invalid file type';
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index ec1ca32..a412cef 100755
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -62,69 +62,88 @@
 
 <!-- /Right-bar -->
 
-<!-- Right bar overlay -->
+<!-- Right bar overlay-->
 <div class="rightbar-overlay"></div>
 
-<!-- ============================= -->
-<!-- Core Vendor JS (Local) -->
-<!-- ============================= -->
-<script src="<?= base_url("public/assets/js/vendor.min.js"); ?>"></script>
+<!-- Vendor js -->
+<script src="<?= base_url() . "public"; ?>/assets/js/vendor.min.js"></script>
 
-<!-- ============================= -->
-<!-- Charts -->
-<!-- ============================= -->
-<script src="<?= base_url("public/assets/libs/apexcharts/apexcharts.min.js"); ?>"></script>
+<!-- KNOB JS -->
+<script src="<?= base_url() . "public"; ?>/assets/libs/jquery-knob/jquery.knob.min.js"></script>
+<!-- Apex js-->
+<script src="<?= base_url() . "public"; ?>/assets/libs/apexcharts/apexcharts.min.js"></script>
 
-<!-- ============================= -->
-<!-- DataTables -->
-<!-- ============================= -->
-<script src="<?= base_url("public/assets/libs/datatables.net/js/jquery.dataTables.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/buttons.html5.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/buttons.print.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/datatables.net-select/js/dataTables.select.min.js"); ?>"></script>
+<!-- third party js -->
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net/js/jquery.dataTables.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/buttons.html5.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/buttons.flash.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/buttons.print.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
+<!-- <script src="<?= base_url() . "public"; ?>/assets/libs/pdfmake/build/pdfmake.min.js"></script> -->
+<!-- <script src="<?= base_url() . "public"; ?>/assets/libs/pdfmake/build/vfs_fonts.js"></script> -->
+<!-- third party js ends -->
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/moment/min/moment.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/bootstrap-daterangepicker/daterangepicker.js"></script>
 
-<!-- ============================= -->
-<!-- Date Handling -->
-<!-- ============================= -->
-<script src="<?= base_url("public/assets/libs/moment/min/moment.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/libs/bootstrap-daterangepicker/daterangepicker.js"); ?>"></script>
 
-<!-- OR: Flatpickr (prefer this long-term) -->
+<!-- Datatables init -->
+<!-- <script src="<?= base_url() . "public"; ?>/assets/js/pages/datatables.init.js"></script> -->
+
+
+<script src="<?= base_url() . "public"; ?>/assets/js/pages/tickets.init.js"></script>
+
+<!-- Plugins js-->
+<script src="<?= base_url() . "public"; ?>/assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/admin-resources/jquery.vectormap/maps/jquery-jvectormap-us-merc-en.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/libs/parsleyjs/parsley.min.js"></script>
+
+<!-- Dashboard init-->
+<script src="<?= base_url() . "public"; ?>/assets/js/pages/dashboard-analytics.init.js"></script>
+
+<!-- Validation init js-->
+<script src="<?= base_url() . "public"; ?>/assets/js/pages/form-validation.init.js"></script>
+
+<!-- App js -->
+<script src="<?= base_url() . "public"; ?>/assets/js/app.min.js"></script>
+
+
+<!-- Sweet Alert CDN -->
+<script src="https://cdn.jsdelivr.net/npm/bootstrap-multiselect@1.1.0/dist/js/bootstrap-multiselect.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/css/bootstrap-multiselect.css" />
+
+<script src="https://cdn.jsdelivr.net/npm/toastr@2.1.4/toastr.min.js"></script>
+<link href="https://cdn.jsdelivr.net/npm/toastr@2.1.4/build/toastr.min.css" rel="stylesheet">
+
+<!-- flatpicker datepicker -->
+<link href="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.css" rel="stylesheet">
 <script src="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.js"></script>
 
-<!-- ============================= -->
-<!-- Forms -->
-<!-- ============================= -->
-<script src="<?= base_url("public/assets/libs/parsleyjs/parsley.min.js"); ?>"></script>
-<script src="<?= base_url("public/assets/js/pages/form-validation.init.js"); ?>"></script>
+<!-- bootstrap datepicker -->
+<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.10.0/js/bootstrap-datepicker.min.js"></script> -->
 
-<!-- ============================= -->
-<!-- Notifications -->
-<!-- ============================= -->
-<script src="https://cdn.jsdelivr.net/npm/toastr@2.1.4/toastr.min.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/js/pages/jquery.xeditable.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/js/form-xeditable.init.js"></script>
+<script src="<?= base_url() . "public"; ?>/assets/js/bootstrap-editable.min.js"></script>
 
-<!-- ============================= -->
-<!-- Select2 -->
-<!-- ============================= -->
+<!-- Jodit Js  -->
+<script src="<?= base_url() . "public"; ?>/assets/js/jodit.min.js"></script>
+
+<!-- select2 -->
 <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
 
-<!-- ============================= -->
-<!-- Editor -->
-<!-- ============================= -->
-<script src="<?= base_url("public/assets/js/jodit.min.js"); ?>"></script>
 
-<!-- ============================= -->
-<!-- App Init -->
-<!-- ============================= -->
-<script src="<?= base_url("public/assets/js/app.min.js"); ?>"></script>
+<script src="https://cdn.datatables.net/plug-ins/2.0.8/sorting/scientific.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script>
+
 
 <script>
     toastr.options = {
diff --git a/app/Views/layout/footer_old_outdated.php b/app/Views/layout/footer_new.php
similarity index 90%
rename from app/Views/layout/footer_old_outdated.php
rename to app/Views/layout/footer_new.php
index a412cef..ec1ca32 100644
--- a/app/Views/layout/footer_old_outdated.php
+++ b/app/Views/layout/footer_new.php
@@ -62,88 +62,69 @@
 
 <!-- /Right-bar -->
 
-<!-- Right bar overlay-->
+<!-- Right bar overlay -->
 <div class="rightbar-overlay"></div>
 
-<!-- Vendor js -->
-<script src="<?= base_url() . "public"; ?>/assets/js/vendor.min.js"></script>
+<!-- ============================= -->
+<!-- Core Vendor JS (Local) -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/js/vendor.min.js"); ?>"></script>
 
-<!-- KNOB JS -->
-<script src="<?= base_url() . "public"; ?>/assets/libs/jquery-knob/jquery.knob.min.js"></script>
-<!-- Apex js-->
-<script src="<?= base_url() . "public"; ?>/assets/libs/apexcharts/apexcharts.min.js"></script>
+<!-- ============================= -->
+<!-- Charts -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/libs/apexcharts/apexcharts.min.js"); ?>"></script>
 
-<!-- third party js -->
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net/js/jquery.dataTables.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/buttons.html5.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/buttons.flash.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-buttons/js/buttons.print.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
-<!-- <script src="<?= base_url() . "public"; ?>/assets/libs/pdfmake/build/pdfmake.min.js"></script> -->
-<!-- <script src="<?= base_url() . "public"; ?>/assets/libs/pdfmake/build/vfs_fonts.js"></script> -->
-<!-- third party js ends -->
+<!-- ============================= -->
+<!-- DataTables -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/libs/datatables.net/js/jquery.dataTables.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-bs4/js/dataTables.bootstrap4.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-responsive/js/dataTables.responsive.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-responsive-bs4/js/responsive.bootstrap4.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/dataTables.buttons.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/buttons.html5.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-buttons/js/buttons.print.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-keytable/js/dataTables.keyTable.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/datatables.net-select/js/dataTables.select.min.js"); ?>"></script>
 
-<script src="<?= base_url() . "public"; ?>/assets/libs/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/moment/min/moment.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/bootstrap-daterangepicker/daterangepicker.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
 
+<!-- ============================= -->
+<!-- Date Handling -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/libs/moment/min/moment.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/libs/bootstrap-daterangepicker/daterangepicker.js"); ?>"></script>
 
-<!-- Datatables init -->
-<!-- <script src="<?= base_url() . "public"; ?>/assets/js/pages/datatables.init.js"></script> -->
-
-
-<script src="<?= base_url() . "public"; ?>/assets/js/pages/tickets.init.js"></script>
-
-<!-- Plugins js-->
-<script src="<?= base_url() . "public"; ?>/assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.min.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/admin-resources/jquery.vectormap/maps/jquery-jvectormap-us-merc-en.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/libs/parsleyjs/parsley.min.js"></script>
-
-<!-- Dashboard init-->
-<script src="<?= base_url() . "public"; ?>/assets/js/pages/dashboard-analytics.init.js"></script>
-
-<!-- Validation init js-->
-<script src="<?= base_url() . "public"; ?>/assets/js/pages/form-validation.init.js"></script>
-
-<!-- App js -->
-<script src="<?= base_url() . "public"; ?>/assets/js/app.min.js"></script>
-
-
-<!-- Sweet Alert CDN -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap-multiselect@1.1.0/dist/js/bootstrap-multiselect.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-multiselect/0.9.13/css/bootstrap-multiselect.css" />
-
-<script src="https://cdn.jsdelivr.net/npm/toastr@2.1.4/toastr.min.js"></script>
-<link href="https://cdn.jsdelivr.net/npm/toastr@2.1.4/build/toastr.min.css" rel="stylesheet">
-
-<!-- flatpicker datepicker -->
-<link href="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.css" rel="stylesheet">
+<!-- OR: Flatpickr (prefer this long-term) -->
 <script src="https://cdn.jsdelivr.net/npm/flatpickr@4.6.13/dist/flatpickr.min.js"></script>
 
-<!-- bootstrap datepicker -->
-<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.10.0/js/bootstrap-datepicker.min.js"></script> -->
+<!-- ============================= -->
+<!-- Forms -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/libs/parsleyjs/parsley.min.js"); ?>"></script>
+<script src="<?= base_url("public/assets/js/pages/form-validation.init.js"); ?>"></script>
 
-<script src="<?= base_url() . "public"; ?>/assets/js/pages/jquery.xeditable.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/js/form-xeditable.init.js"></script>
-<script src="<?= base_url() . "public"; ?>/assets/js/bootstrap-editable.min.js"></script>
+<!-- ============================= -->
+<!-- Notifications -->
+<!-- ============================= -->
+<script src="https://cdn.jsdelivr.net/npm/toastr@2.1.4/toastr.min.js"></script>
 
-<!-- Jodit Js  -->
-<script src="<?= base_url() . "public"; ?>/assets/js/jodit.min.js"></script>
-
-<!-- select2 -->
+<!-- ============================= -->
+<!-- Select2 -->
+<!-- ============================= -->
 <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
 
+<!-- ============================= -->
+<!-- Editor -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/js/jodit.min.js"); ?>"></script>
 
-<script src="https://cdn.datatables.net/plug-ins/2.0.8/sorting/scientific.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script>
-
+<!-- ============================= -->
+<!-- App Init -->
+<!-- ============================= -->
+<script src="<?= base_url("public/assets/js/app.min.js"); ?>"></script>
 
 <script>
     toastr.options = {
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index e021d8a..586695f 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -50,17 +50,17 @@
     <link href="<?= base_url() . "public"; ?>/assets/css/jodit.css" rel="stylesheet" type="text/css" />
 
 
-      <!-- JQuery CDN -->
-<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+    <!-- JQuery CDN -->
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 
-<!-- Sweet Alert CDN -->
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.12.0/dist/sweetalert2.all.min.js"></script>
+    <!-- Sweet Alert CDN -->
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.10.4/dist/sweetalert2.all.min.js"></script>
 
-<!-- select2 -->
-<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" type="text/css">
+    <!-- select2 -->
+    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" type="text/css">
 
-<script src="https://code.jquery.com/jquery-3.7.1.slim.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.3/dist/umd/popper.min.js"></script>
 
     <!-- <link rel="manifest" href="../manifest.json"> -->
 
@@ -77,7 +77,7 @@
     </script> -->
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.css" />
 <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick-theme.min.css" />
-<!-- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> -->
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.js"></script>
     <!-- srinivas -->
     <script src="https://editor.unlayer.com/embed.js"></script>
diff --git a/app/Views/layout/header_new.php b/app/Views/layout/header_new.php
index 297f7f2..e021d8a 100644
--- a/app/Views/layout/header_new.php
+++ b/app/Views/layout/header_new.php
@@ -50,34 +50,34 @@
     <link href="<?= base_url() . "public"; ?>/assets/css/jodit.css" rel="stylesheet" type="text/css" />
 
 
-    <!-- JQuery CDN -->
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+      <!-- JQuery CDN -->
+<script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
 
-    <!-- Sweet Alert CDN -->
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.10.4/dist/sweetalert2.all.min.js"></script>
+<!-- Sweet Alert CDN -->
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11.12.0/dist/sweetalert2.all.min.js"></script>
 
-    <!-- select2 -->
-    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-beta.1/dist/css/select2.min.css" rel="stylesheet" type="text/css">
+<!-- select2 -->
+<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" type="text/css">
 
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.3/dist/umd/popper.min.js"></script>
+<script src="https://code.jquery.com/jquery-3.7.1.slim.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js"></script>
 
     <!-- <link rel="manifest" href="../manifest.json"> -->
 
-    <script>
-        // if ('serviceWorker' in navigator) {
-        //     window.addEventListener('load', function() {
-        //         navigator.serviceWorker.register('../service-worker.js').then(function(registration) {
-        //             // console.log('Service Worker registration successful with scope:', registration.scope);
-        //         }, function(err) {
-        //             // console.log('Service Worker registration failed:', err);
-        //         });
-        //     });
-        // }
-    </script>
+   <!--  <script>
+        if ('serviceWorker' in navigator) {
+            window.addEventListener('load', function() {
+                navigator.serviceWorker.register('../service-worker.js').then(function(registration) {
+                    // console.log('Service Worker registration successful with scope:', registration.scope);
+                }, function(err) {
+                    // console.log('Service Worker registration failed:', err);
+                });
+            });
+        }
+    </script> -->
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.css" />
 <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick-theme.min.css" />
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+<!-- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> -->
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.js"></script>
     <!-- srinivas -->
     <script src="https://editor.unlayer.com/embed.js"></script>
@@ -329,84 +329,8 @@
         });
     </script>
 
-    <style>
-        #side-menu .menu-logo a:hover {
-            background-color: transparent !important;
-            color: inherit !important;
-            text-decoration: none !important;
-            box-shadow: none !important;
-        }
 
 
-        #side-menu .menu-logo img {
-            height: 24px ;
-            display: inline-block ;
-        }
-
-        .ul-flex{
-            display:flex;
-            flex-flow: column nowrap;
-            justify-content: center;
-            align-content: space-evenly;
-        }
-
-        .top-navbar-div{
-            display:flex;
-            flex-flow:row nowrap;
-            justify-content:space-between;
-        }
-
-        .nav-flex{
-             display:flex;
-            flex-flow: row nowrap;
-            justify-content:end;
-            margin-right:20px;
-        }
-
-        .card-body{
-            background-color:white;
-            padding-left:50px !important;
-            margin-top: 5px;
-        }
-
-        .content-page{
-            background-color: white !important;
-            color:white !important;
-            padding: 0px !important;
-        }
-
-        .footer{
-            background-color:white !important;
-            color:black;
-            margin: 30px !important;
-        }
-
-        html{
-            background-color: white !important;
-        }
-
-        .footer{
-            margin-left:150px;
-        }
-
-        .left-side-menu{
-            margin-left:30px; 
-            margin-top:20px;
-            margin-bottom:5px;
-            border-radius:25px;
-            background-color:#D4F5F6;
-            z-index:700;
-            padding:0px !important;
-            height:90%;
-        }
-
-        label{
-            color:#000;
-        }
-
-
-    </style>
-
 </head>
 
 <body class="loading" data-layout-mode="" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "sidebar": { "color": "light", "size": "condensed", "showuser": false}, "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": false}'></body>
@@ -420,24 +344,219 @@
 
 <!-- <img src="<?= base_url() . "public" ?>/assets/images/nhance-loader-fast.gif" height="40" width="40" alt="Loading..."> -->
 <!-- Begin page -->
-<div id="wrapper" style="background-color:white;">
+<div id="wrapper">
 
+    <!-- Topbar Start -->
+    <div class="navbar-custom">
+        <div class="container-fluid">
+            <ul class="list-unstyled topnav-menu float-right mb-0">
+
+                <!-- <li class="d-none d-lg-block">
+                    <form class="app-search">
+                        <div class="app-search-box dropdown">
+                            <div class="input-group">
+                                <input type="search" class="form-control" placeholder="Search..." id="top-search">
+                                <div class="input-group-append">
+                                    <button class="btn" type="submit">
+                                        <i class="fe-search"></i>
+                                    </button>
+                                </div>
+                            </div> -->
+                            <!-- <div class="dropdown-menu dropdown-lg" id="search-dropdown">
+                                        <div class="dropdown-header noti-title">
+                                            <h5 class="text-overflow mb-2">Found <span class="text-danger">09</span> results</h5>
+                                        </div>
+            
+                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                            <i class="fe-home mr-1"></i>
+                                            <span>Analytics Report</span>
+                                        </a>
+            
+                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                            <i class="fe-aperture mr-1"></i>
+                                            <span>How can I help you?</span>
+                                        </a>
+                            
+                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                            <i class="fe-settings mr-1"></i>
+                                            <span>User profile settings</span>
+                                        </a>
+
+                                        <div class="dropdown-header noti-title">
+                                            <h6 class="text-overflow mb-2 text-uppercase">Users</h6>
+                                        </div>
+
+                                        <div class="notification-list">
+                                            <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                                <div class="media">
+                                                    <img class="d-flex mr-2 rounded-circle" src="<?= base_url() . "public"; ?>/assets/images/users/avatar-2.jpg" alt="Generic placeholder image" height="32">
+                                                    <div class="media-body">
+                                                        <h5 class="m-0 font-14">Erwin E. Brown</h5>
+                                                        <span class="font-12 mb-0">UI Designer</span>
+                                                    </div>
+                                                </div>
+                                            </a>
+
+                                            <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                                <div class="media">
+                                                    <img class="d-flex mr-2 rounded-circle" src="<?= base_url() . "public"; ?>/assets/images/users/avatar-5.jpg" alt="Generic placeholder image" height="32">
+                                                    <div class="media-body">
+                                                        <h5 class="m-0 font-14">Jacob Deo</h5>
+                                                        <span class="font-12 mb-0">Developer</span>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </div>
+            
+                                    </div>   -->
+                        <!-- </div>
+                    </form>
+                </li> -->
+
+                 <!-- <li class="dropdown notification-list topbar-dropdown"> 
+                    <a class="nav-link dropdown-toggle right-bar-toggle waves-effect waves-light">
+                        <i class="fe-bell noti-icon"></i>
+                        <span class="badge badge-danger rounded-circle noti-icon-badge" id="notification_count">0</span>
+                    </a>
+                </li> -->
+
+                <li class="dropdown notification-list topbar-dropdown">
+                    <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
+                        <img src="<?php echo (get_userProfile() != null && !empty(get_userProfile())) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png'; ?>" alt="user-image" class="rounded-circle">
+                        <span class="pro-user-name ml-1" style="font-size: 16px;">
+                            <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?>
+                            <!-- <i class="mdi mdi-chevron-down"></i>  -->
+                        </span>
+                    </a> 
+                    <!--<div class="dropdown-menu dropdown-menu-right profile-dropdown ">
+                                 <div class="dropdown-header noti-title">
+                                    <h6 class="text-overflow m-0">Welcome !</h6>
+                                </div>
+    
+                                <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                    <i class="ri-account-circle-line"></i>
+                                    <span>My Account</span>
+                                </a>
+
+                                <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                    <i class="ri-settings-3-line"></i>
+                                    <span>Settings</span>
+                                </a>
+
+                                <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                    <i class="ri-wallet-line"></i>
+                                    <span>My Wallet <span class="badge badge-success float-right">3</span> </span>
+                                </a>
+
+                                <a href="javascript:void(0);" class="dropdown-item notify-item">
+                                    <i class="ri-lock-line"></i>
+                                    <span>Lock Screen</span>
+                                </a> 
+
+ 
+                                 <a href="<?= base_url('/logout'); ?>" class="dropdown-item notify-item">
+                                    <i class="ri-logout-box-line"></i>
+                                    <span>Logout</span>
+                                </a>
+    
+                            </div>
+                <!-- </li> -->
+
+                <!-- <li class="dropdown notification-list">
+                            <a href="javascript:void(0);" class="nav-link right-bar-toggle waves-effect waves-light">
+                                <i class="fe-settings noti-icon"></i>
+                            </a>
+                        </li> -->
+
+                <li class="dropdown notification-list">
+                    <a href="<?= base_url('/logout'); ?>" class="nav-link waves-effect waves-light">
+                        <i class="ri-logout-box-r-line" style="font-size: 25px;"></i>
+                    </a>
+                </li>
+
+            </ul>
+
+            <!-- LOGO -->
+            <div class="logo-box">
+                <a href="https://localhost/nhance-enrollment/dashboard/view" class="logo logo-dark text-center">
+                    <span class="logo-sm">
+                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="24">
+                        <!-- <span class="logo-lg-text-light">NHANCE</span> -->
+                    </span>
+                    <span class="logo-lg">
+                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="20">
+                        <!-- <span class="logo-lg-text-light">M</span> -->
+                    </span>
+                </a>
+
+                <a href="https://localhost/nhance-enrollment/dashboard/view" class="logo logo-light text-center">
+                    <span class="logo-sm">
+                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="24">
+                    </span>
+                    <!-- <span class="logo-lg">
+                                <img src="<?= base_url() . "public"; ?>/assets/images/logo-light.png" alt="" height="20">
+                            </span> -->
+                </a>
+            </div>
+
+            <ul class="list-unstyled topnav-menu topnav-menu-left m-0">
+                <li>
+                    <button class="button-menu-mobile waves-effect waves-light">
+                        <i class="fe-menu"></i>
+                    </button>
+                </li>
+
+                <li>
+                    <!-- Mobile menu toggle (Horizontal Layout)-->
+                    <a class="navbar-toggle nav-link" data-toggle="collapse" data-target="#topnav-menu-content">
+                        <div class="lines">
+                            <span></span>
+                            <span></span>
+                            <span></span>
+                        </div>
+                    </a>
+                    <!-- End mobile menu toggle-->
+                </li>
+
+
+            </ul>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+    <!-- end Topbar -->
 
     <!-- ========== Left Sidebar Start ========== -->
     <div class="left-side-menu">
 
+
+        <!-- LOGO -->
+        <div class="logo-box">
+            <a href="<?= base_url('/dashboard/view') ?>" class="logo logo-dark text-center">
+                <span class="logo-sm">
+                    <img src="<?= base_url() . "public"; ?>/assets/images/logo-sm-dark.png" alt="" height="24">
+                    <!-- <span class="logo-lg-text-light">nHance</span> -->
+                </span>
+                <span class="logo-lg">
+                    <img src="<?= base_url() . "public"; ?>/assets/images/logo-dark.png" alt="" height="20">
+                    <!-- <span class="logo-lg-text-light">N</span> -->
+                </span>
+            </a>
+
+            <a href="<?= base_url('/dashboard/view') ?>" class="logo logo-light text-center">
+                <span class="logo-sm">
+                    <img src="<?= base_url() . "public"; ?>/assets/images/nhance_white_logo.svg" alt="" width="130" height="30">
+                </span>
+                <!-- <span class="logo-lg">
+                            <img src="<?= base_url() . "public"; ?>./assets/images/logo-light.png" alt="" height="20">
+                        </span> -->
+            </a>
+        </div>
+
         <div class="h-100" data-simplebar>
 
             <!--- Sidemenu -->
             <div id="sidebar-menu">
-                <ul class="ul-flex" id="side-menu">
-
-                    <li class="menu-logo"  >
-                        <a href="<?= base_url('/dashboard/view') ?>">
-                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo" height="24">
-                        </a>
-                    </li>
-
+                <ul id="side-menu">
 
                     <li>
                         <a href="<?= base_url('/dashboard/view') ?>">
@@ -448,16 +567,15 @@
 
                     <li>
                         <a href="<?= base_url('/client/list') ?>">
-                            <img 
-                            src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
-                            <span>Clients</span>
+                            <i class="mdi mdi-domain"></i>
+                            <span> Clients </span>
                         </a>
                     </li>
 
                     <li>
                         <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
-                             <img 
-                            src="<?= base_url() . "public"; ?>/assets/images/action_on_policies_sb.png" alt="Logo" height="20">
+                            <i class="fas fa-user-tie"></i>
+                            <span class="badge badge-success badge-pill float-right">2</span>
                             <span> Action on Policies </span>
                         </a>
                         <div class="collapse" id="sidebarDashboards">
@@ -486,8 +604,8 @@
 
                         <li>
                             <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
-                                <img 
-                                src="<?= base_url() . "public"; ?>/assets/images/masters_sb.png" alt="Logo" height="20">
+                                <i class="ri-database-2-line"></i>
+                                <span class="badge badge-success badge-pill float-right">2</span>
                                 <span> Masters </span>
                             </a>
                             <div class="collapse" id="sidebarDashboards">
@@ -630,31 +748,6 @@
     </div>
     <!-- Left Sidebar End -->
 
-    <!-- Top Bar -->
-        <div class="top-navbar-div" style="margin-left:150px; margin-top:20px;" >
-                <div>
-                    <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>  
-                </div>
-                <div class="nav-flex">
-                    <div>
-                        <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"
-                            >
-                                <img 
-                                style="color: black;"
-                                src="<?php echo (get_userProfile() != null && !empty(get_userProfile())) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png'; ?>" alt="user-image" 
-                                class="rounded-circle">
-                            </a> 
-                    </div>
-                    <div>
-                        <a href="<?= base_url('/logout'); ?>" style="font-size: 16px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;">
-                                <i class="ri-logout-box-r-line" style="font-size: 20px; color:#000;padding:0px;"></i>
-                            </a>
-                    </div>              
-                </div>
-        </div>
-    <!-- End of Top -->
-    
-
     <!-- ============================================================== -->
     <!-- Start Page Content here -->
     <!-- ============================================================== -->
diff --git a/app/Views/layout/header_old_outdated.php b/app/Views/layout/header_new_old.php
similarity index 63%
rename from app/Views/layout/header_old_outdated.php
rename to app/Views/layout/header_new_old.php
index 586695f..297f7f2 100644
--- a/app/Views/layout/header_old_outdated.php
+++ b/app/Views/layout/header_new_old.php
@@ -64,17 +64,17 @@
 
     <!-- <link rel="manifest" href="../manifest.json"> -->
 
-   <!--  <script>
-        if ('serviceWorker' in navigator) {
-            window.addEventListener('load', function() {
-                navigator.serviceWorker.register('../service-worker.js').then(function(registration) {
-                    // console.log('Service Worker registration successful with scope:', registration.scope);
-                }, function(err) {
-                    // console.log('Service Worker registration failed:', err);
-                });
-            });
-        }
-    </script> -->
+    <script>
+        // if ('serviceWorker' in navigator) {
+        //     window.addEventListener('load', function() {
+        //         navigator.serviceWorker.register('../service-worker.js').then(function(registration) {
+        //             // console.log('Service Worker registration successful with scope:', registration.scope);
+        //         }, function(err) {
+        //             // console.log('Service Worker registration failed:', err);
+        //         });
+        //     });
+        // }
+    </script>
  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.css" />
 <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick-theme.min.css" />
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
@@ -329,8 +329,84 @@
         });
     </script>
 
+    <style>
+        #side-menu .menu-logo a:hover {
+            background-color: transparent !important;
+            color: inherit !important;
+            text-decoration: none !important;
+            box-shadow: none !important;
+        }
 
 
+        #side-menu .menu-logo img {
+            height: 24px ;
+            display: inline-block ;
+        }
+
+        .ul-flex{
+            display:flex;
+            flex-flow: column nowrap;
+            justify-content: center;
+            align-content: space-evenly;
+        }
+
+        .top-navbar-div{
+            display:flex;
+            flex-flow:row nowrap;
+            justify-content:space-between;
+        }
+
+        .nav-flex{
+             display:flex;
+            flex-flow: row nowrap;
+            justify-content:end;
+            margin-right:20px;
+        }
+
+        .card-body{
+            background-color:white;
+            padding-left:50px !important;
+            margin-top: 5px;
+        }
+
+        .content-page{
+            background-color: white !important;
+            color:white !important;
+            padding: 0px !important;
+        }
+
+        .footer{
+            background-color:white !important;
+            color:black;
+            margin: 30px !important;
+        }
+
+        html{
+            background-color: white !important;
+        }
+
+        .footer{
+            margin-left:150px;
+        }
+
+        .left-side-menu{
+            margin-left:30px; 
+            margin-top:20px;
+            margin-bottom:5px;
+            border-radius:25px;
+            background-color:#D4F5F6;
+            z-index:700;
+            padding:0px !important;
+            height:90%;
+        }
+
+        label{
+            color:#000;
+        }
+
+
+    </style>
+
 </head>
 
 <body class="loading" data-layout-mode="" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "sidebar": { "color": "light", "size": "condensed", "showuser": false}, "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": false}'></body>
@@ -344,219 +420,24 @@
 
 <!-- <img src="<?= base_url() . "public" ?>/assets/images/nhance-loader-fast.gif" height="40" width="40" alt="Loading..."> -->
 <!-- Begin page -->
-<div id="wrapper">
+<div id="wrapper" style="background-color:white;">
 
-    <!-- Topbar Start -->
-    <div class="navbar-custom">
-        <div class="container-fluid">
-            <ul class="list-unstyled topnav-menu float-right mb-0">
-
-                <!-- <li class="d-none d-lg-block">
-                    <form class="app-search">
-                        <div class="app-search-box dropdown">
-                            <div class="input-group">
-                                <input type="search" class="form-control" placeholder="Search..." id="top-search">
-                                <div class="input-group-append">
-                                    <button class="btn" type="submit">
-                                        <i class="fe-search"></i>
-                                    </button>
-                                </div>
-                            </div> -->
-                            <!-- <div class="dropdown-menu dropdown-lg" id="search-dropdown">
-                                        <div class="dropdown-header noti-title">
-                                            <h5 class="text-overflow mb-2">Found <span class="text-danger">09</span> results</h5>
-                                        </div>
-            
-                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                            <i class="fe-home mr-1"></i>
-                                            <span>Analytics Report</span>
-                                        </a>
-            
-                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                            <i class="fe-aperture mr-1"></i>
-                                            <span>How can I help you?</span>
-                                        </a>
-                            
-                                        <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                            <i class="fe-settings mr-1"></i>
-                                            <span>User profile settings</span>
-                                        </a>
-
-                                        <div class="dropdown-header noti-title">
-                                            <h6 class="text-overflow mb-2 text-uppercase">Users</h6>
-                                        </div>
-
-                                        <div class="notification-list">
-                                            <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                                <div class="media">
-                                                    <img class="d-flex mr-2 rounded-circle" src="<?= base_url() . "public"; ?>/assets/images/users/avatar-2.jpg" alt="Generic placeholder image" height="32">
-                                                    <div class="media-body">
-                                                        <h5 class="m-0 font-14">Erwin E. Brown</h5>
-                                                        <span class="font-12 mb-0">UI Designer</span>
-                                                    </div>
-                                                </div>
-                                            </a>
-
-                                            <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                                <div class="media">
-                                                    <img class="d-flex mr-2 rounded-circle" src="<?= base_url() . "public"; ?>/assets/images/users/avatar-5.jpg" alt="Generic placeholder image" height="32">
-                                                    <div class="media-body">
-                                                        <h5 class="m-0 font-14">Jacob Deo</h5>
-                                                        <span class="font-12 mb-0">Developer</span>
-                                                    </div>
-                                                </div>
-                                            </a>
-                                        </div>
-            
-                                    </div>   -->
-                        <!-- </div>
-                    </form>
-                </li> -->
-
-                 <!-- <li class="dropdown notification-list topbar-dropdown"> 
-                    <a class="nav-link dropdown-toggle right-bar-toggle waves-effect waves-light">
-                        <i class="fe-bell noti-icon"></i>
-                        <span class="badge badge-danger rounded-circle noti-icon-badge" id="notification_count">0</span>
-                    </a>
-                </li> -->
-
-                <li class="dropdown notification-list topbar-dropdown">
-                    <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
-                        <img src="<?php echo (get_userProfile() != null && !empty(get_userProfile())) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png'; ?>" alt="user-image" class="rounded-circle">
-                        <span class="pro-user-name ml-1" style="font-size: 16px;">
-                            <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?>
-                            <!-- <i class="mdi mdi-chevron-down"></i>  -->
-                        </span>
-                    </a> 
-                    <!--<div class="dropdown-menu dropdown-menu-right profile-dropdown ">
-                                 <div class="dropdown-header noti-title">
-                                    <h6 class="text-overflow m-0">Welcome !</h6>
-                                </div>
-    
-                                <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                    <i class="ri-account-circle-line"></i>
-                                    <span>My Account</span>
-                                </a>
-
-                                <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                    <i class="ri-settings-3-line"></i>
-                                    <span>Settings</span>
-                                </a>
-
-                                <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                    <i class="ri-wallet-line"></i>
-                                    <span>My Wallet <span class="badge badge-success float-right">3</span> </span>
-                                </a>
-
-                                <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                    <i class="ri-lock-line"></i>
-                                    <span>Lock Screen</span>
-                                </a> 
-
- 
-                                 <a href="<?= base_url('/logout'); ?>" class="dropdown-item notify-item">
-                                    <i class="ri-logout-box-line"></i>
-                                    <span>Logout</span>
-                                </a>
-    
-                            </div>
-                <!-- </li> -->
-
-                <!-- <li class="dropdown notification-list">
-                            <a href="javascript:void(0);" class="nav-link right-bar-toggle waves-effect waves-light">
-                                <i class="fe-settings noti-icon"></i>
-                            </a>
-                        </li> -->
-
-                <li class="dropdown notification-list">
-                    <a href="<?= base_url('/logout'); ?>" class="nav-link waves-effect waves-light">
-                        <i class="ri-logout-box-r-line" style="font-size: 25px;"></i>
-                    </a>
-                </li>
-
-            </ul>
-
-            <!-- LOGO -->
-            <div class="logo-box">
-                <a href="https://localhost/nhance-enrollment/dashboard/view" class="logo logo-dark text-center">
-                    <span class="logo-sm">
-                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="24">
-                        <!-- <span class="logo-lg-text-light">NHANCE</span> -->
-                    </span>
-                    <span class="logo-lg">
-                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="20">
-                        <!-- <span class="logo-lg-text-light">M</span> -->
-                    </span>
-                </a>
-
-                <a href="https://localhost/nhance-enrollment/dashboard/view" class="logo logo-light text-center">
-                    <span class="logo-sm">
-                        <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.svg" alt="" height="24">
-                    </span>
-                    <!-- <span class="logo-lg">
-                                <img src="<?= base_url() . "public"; ?>/assets/images/logo-light.png" alt="" height="20">
-                            </span> -->
-                </a>
-            </div>
-
-            <ul class="list-unstyled topnav-menu topnav-menu-left m-0">
-                <li>
-                    <button class="button-menu-mobile waves-effect waves-light">
-                        <i class="fe-menu"></i>
-                    </button>
-                </li>
-
-                <li>
-                    <!-- Mobile menu toggle (Horizontal Layout)-->
-                    <a class="navbar-toggle nav-link" data-toggle="collapse" data-target="#topnav-menu-content">
-                        <div class="lines">
-                            <span></span>
-                            <span></span>
-                            <span></span>
-                        </div>
-                    </a>
-                    <!-- End mobile menu toggle-->
-                </li>
-
-
-            </ul>
-            <div class="clearfix"></div>
-        </div>
-    </div>
-    <!-- end Topbar -->
 
     <!-- ========== Left Sidebar Start ========== -->
     <div class="left-side-menu">
 
-
-        <!-- LOGO -->
-        <div class="logo-box">
-            <a href="<?= base_url('/dashboard/view') ?>" class="logo logo-dark text-center">
-                <span class="logo-sm">
-                    <img src="<?= base_url() . "public"; ?>/assets/images/logo-sm-dark.png" alt="" height="24">
-                    <!-- <span class="logo-lg-text-light">nHance</span> -->
-                </span>
-                <span class="logo-lg">
-                    <img src="<?= base_url() . "public"; ?>/assets/images/logo-dark.png" alt="" height="20">
-                    <!-- <span class="logo-lg-text-light">N</span> -->
-                </span>
-            </a>
-
-            <a href="<?= base_url('/dashboard/view') ?>" class="logo logo-light text-center">
-                <span class="logo-sm">
-                    <img src="<?= base_url() . "public"; ?>/assets/images/nhance_white_logo.svg" alt="" width="130" height="30">
-                </span>
-                <!-- <span class="logo-lg">
-                            <img src="<?= base_url() . "public"; ?>./assets/images/logo-light.png" alt="" height="20">
-                        </span> -->
-            </a>
-        </div>
-
         <div class="h-100" data-simplebar>
 
             <!--- Sidemenu -->
             <div id="sidebar-menu">
-                <ul id="side-menu">
+                <ul class="ul-flex" id="side-menu">
+
+                    <li class="menu-logo"  >
+                        <a href="<?= base_url('/dashboard/view') ?>">
+                            <img src="<?= base_url() . "public"; ?>/assets/images/Nhance_Favi.png" alt="Logo" height="24">
+                        </a>
+                    </li>
+
 
                     <li>
                         <a href="<?= base_url('/dashboard/view') ?>">
@@ -567,15 +448,16 @@
 
                     <li>
                         <a href="<?= base_url('/client/list') ?>">
-                            <i class="mdi mdi-domain"></i>
-                            <span> Clients </span>
+                            <img 
+                            src="<?= base_url() . "public"; ?>/assets/images/clients_sb.png" alt="Logo" height="24">
+                            <span>Clients</span>
                         </a>
                     </li>
 
                     <li>
                         <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
-                            <i class="fas fa-user-tie"></i>
-                            <span class="badge badge-success badge-pill float-right">2</span>
+                             <img 
+                            src="<?= base_url() . "public"; ?>/assets/images/action_on_policies_sb.png" alt="Logo" height="20">
                             <span> Action on Policies </span>
                         </a>
                         <div class="collapse" id="sidebarDashboards">
@@ -604,8 +486,8 @@
 
                         <li>
                             <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">
-                                <i class="ri-database-2-line"></i>
-                                <span class="badge badge-success badge-pill float-right">2</span>
+                                <img 
+                                src="<?= base_url() . "public"; ?>/assets/images/masters_sb.png" alt="Logo" height="20">
                                 <span> Masters </span>
                             </a>
                             <div class="collapse" id="sidebarDashboards">
@@ -748,6 +630,31 @@
     </div>
     <!-- Left Sidebar End -->
 
+    <!-- Top Bar -->
+        <div class="top-navbar-div" style="margin-left:150px; margin-top:20px;" >
+                <div>
+                    <h5>Welcome <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?> </h5>  
+                </div>
+                <div class="nav-flex">
+                    <div>
+                        <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false"
+                            >
+                                <img 
+                                style="color: black;"
+                                src="<?php echo (get_userProfile() != null && !empty(get_userProfile())) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png'; ?>" alt="user-image" 
+                                class="rounded-circle">
+                            </a> 
+                    </div>
+                    <div>
+                        <a href="<?= base_url('/logout'); ?>" style="font-size: 16px; color:#000;background-color:#D4F5F6 !important;border-radius:25px;padding:7px;">
+                                <i class="ri-logout-box-r-line" style="font-size: 20px; color:#000;padding:0px;"></i>
+                            </a>
+                    </div>              
+                </div>
+        </div>
+    <!-- End of Top -->
+    
+
     <!-- ============================================================== -->
     <!-- Start Page Content here -->
     <!-- ============================================================== -->

From d96be779466a893d6ea63b9ea4826d96ea33a671 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Fri, 30 Jan 2026 16:01:53 +0530
Subject: [PATCH 2/8] FIX_FILTER_ISSUE

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

diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index ecf5672..9f28a05 100755
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -62,7 +62,7 @@ class Filters extends BaseConfig
             'HttpRequestLog' => ['except' => 'cli/*'],
             'AclFilter' => ['except' => ['login', 'logout', 'auth/*', 'oauth2callback','claim-form-download', 'claims-feedback-form', 'autobookstackLogin','/employeeRest/*','processjob']],
             'Cors',
-            'SecurityInputFilter' => ['except' => ['notification/create','test_mail'] ],
+            'SecurityInputFilter' => ['except' => ['/client/notification/create','test_mail'] ],
             'GlobalPostFileUploadGuard',
             // 'invalidchars',
         ],

From 62fb19c1e992290a21fdb539e5d5c140037c009a Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Sat, 31 Jan 2026 11:56:12 +0530
Subject: [PATCH 3/8] FIX_ENROL_DATE_MISSING_ISSUE

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

diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 936d914..0678394 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -181,7 +181,10 @@ class EmployeeController extends AdminController
     //handles employee & dependent  bulk upload with events like inception,addition,deletion, correction and SI enhancements
     public function employeesUplodWithEvents($post_data = [])
     {
-
+        if(empty($post_data))
+        {
+         $post_data = $this->request->getPost();
+        }
         // $empDataServiceController = new EmpDataServiceController();
         // !dd($empDataServiceController->importInceptionUpdateTPAandUHID(['file_id' => 79]));
 

From a87679ad39b67c21141314d3455829f64905e4c5 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Sat, 31 Jan 2026 12:27:44 +0530
Subject: [PATCH 4/8] FIX_HR_RELATED_ISSUE

---
 app/Config/Routes.php                         |  2 +-
 app/Controllers/EmployeeController.php        | 40 ++++++++++++++-----
 app/Controllers/EmployeeRestController.php    | 21 +++++++++-
 app/Controllers/EmployeeServiceController.php | 15 +++++++
 app/Filters/GlobalPostFileUploadGuard.php     |  4 +-
 5 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index cccdc3d..6b133ac 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -454,7 +454,7 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
 // $routes->post("employeeRest/createOrUpdateEmployeePolicySiAmount", "EmployeeRestController::createOrUpdateEmployeePolicySiAmount");
 // $routes->post("employeeRest/calculatePremium", "EmployeeRestController::calculatePremium");
  // $routes->post("updateMpin", "RestAuthenticationController::updateMpin");
-$routes->group("employeeRest", ['filter' => ['appSignature' , 'authJWT'] ], function ($routes) {
+$routes->group("employeeRest", ['filter' => ['GlobalPostFileUploadGuard', 'appSignature' , 'authJWT'] ], function ($routes) {
 
     $routes->post('logout', 'RestAuthenticationController::logout');
 
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 936d914..df12f29 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -181,6 +181,9 @@ class EmployeeController extends AdminController
     //handles employee & dependent  bulk upload with events like inception,addition,deletion, correction and SI enhancements
     public function employeesUplodWithEvents($post_data = [])
     {
+        if(empty($post_data)){
+            $post_data = $this->request->getPost();
+        }
 
         // $empDataServiceController = new EmpDataServiceController();
         // !dd($empDataServiceController->importInceptionUpdateTPAandUHID(['file_id' => 79]));
@@ -370,12 +373,21 @@ class EmployeeController extends AdminController
             //process post variable entry in file table
             $loggedInUserID = $post_data['created_by'] ?? get_session_userid();
 
-            $client_id             = isset($post_data['client_id']) ? $post_data['client_id'] : $this->request->getPost('client_id');
-            $policy_id             = isset($post_data['policy_id']) ? $post_data['policy_id'] : $this->request->getPost('policy_id');
-            $branch_id             = isset($post_data['client_branch_id']) ? $post_data['client_branch_id'] : $this->request->getPost('branch_id');
-            $action                = isset($post_data['file_action']) ? $post_data['file_action'] : $this->request->getPost('upload-action-type');
-            $enrollment_open_date  = isset($post_data['enrollment_open_date']) ? $post_data['enrollment_open_date'] : $this->request->getPost('enrollment_open_date') ?? null;
-            $enrollment_close_date = isset($post_data['enrollment_close_date']) ? $post_data['enrollment_close_date'] : $this->request->getPost('enrollment_close_date') ?? null;
+            // $client_id             = isset($post_data['client_id']) ? $post_data['client_id'] : $this->request->getPost('client_id');
+            // $policy_id             = isset($post_data['policy_id']) ? $post_data['policy_id'] : $this->request->getPost('policy_id');
+            // $branch_id             = isset($post_data['client_branch_id']) ? $post_data['client_branch_id'] : $this->request->getPost('branch_id');
+            // $action                = isset($post_data['file_action']) ? $post_data['file_action'] : $this->request->getPost('upload-action-type');
+            // $enrollment_open_date  = isset($post_data['enrollment_open_date']) ? $post_data['enrollment_open_date'] : $this->request->getPost('enrollment_open_date') ?? null;
+            // $enrollment_close_date = isset($post_data['enrollment_close_date']) ? $post_data['enrollment_close_date'] : $this->request->getPost('enrollment_close_date') ?? null;
+            // $status                = 'inprogress';
+            // $hr_id                 = $post_data['created_by'] ?? null;            
+            
+            $client_id             = $post_data['client_id'] ?? null;
+            $policy_id             = $post_data['policy_id'] ?? null;
+            $branch_id             = $post_data['client_branch_id'] ?? null;
+            $action                = $post_data['file_action'] ?? null;
+            $enrollment_open_date  = $post_data['enrollment_open_date'] ?? null;
+            $enrollment_close_date = $post_data['enrollment_close_date'] ?? null;
             $status                = 'inprogress';
             $hr_id                 = $post_data['created_by'] ?? null;
 
@@ -394,7 +406,7 @@ class EmployeeController extends AdminController
                 //endof validation process
                 if (isset($result['error_summary']) && count($result['error_summary'])) {
                     if(!empty($post_data)){
-                        return ['status' => true, 'message' => 'file rejected with errors', 'file_id' => $file_id];
+                        return ['status' => false, 'message' => 'file rejected with errors', 'file_id' => $file_id];
                     }else{
                         return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'file rejected with errors'], 200);
                     }
@@ -495,13 +507,23 @@ class EmployeeController extends AdminController
 
 
         // dd($data['fileList']);die();
-        if ($this->request->getMethod() == "get") {
+        if ($_SERVER('REQUEST_METHOD') == "GET") {
             $this->loadLayout('import_export', $data);
         }
     }
 
     public function getExcelFileErrors($file_id, $retun_type = null)
-    {
+    {   
+
+        $file_data = $this->fileModel->where('id', $file_id)->first();
+        $error = json_decode($file_data['reason'] ?? '{}', true);
+        if(!empty($error) && $retun_type == 'api'){
+            $send = isset($error['error_summary'][5]) || isset($error['error_summary'][6]) ? true : false;
+            if($send){
+                return $this->respond(['status' => false, 'code' => 404,  'message' => $error['error_data'], 'data' => []], 200);
+            }
+        }
+
         // $file_id = $this->request->uri->getSegment(3);
         $empServiceController = new EmployeeServiceController();
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index d8ffc24..bdb7a23 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -826,9 +826,16 @@ class EmployeeRestController extends AdminController
                 'enrollment_open_date'  => $this->request->getPost('enrollment_open_date'),
                 'enrollment_close_date' => $this->request->getPost('enrollment_close_date'),
                 'file_action'           => "enrollment",
-                'created_by'            => $this->request->getPost('created_by'),
+                'created_by'            => $this->request->getPost('created_by') ?? null,
                 'emplist'               => $this->request->getFile('file')
             ];
+
+            if (is_string($post_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $post_data['client_id'])) {
+                $client_data = $this->clientModel->where('MD5(id)', $post_data['client_id'])->first();
+                $post_data['client_id'] = $client_data['id'];
+            } 
+
+           
             // print_r($post_data); die;
 
             if(empty($post_data['client_id'])){
@@ -839,7 +846,7 @@ class EmployeeRestController extends AdminController
             $responce = $employeeController->employeesUplodWithEvents($post_data);
             // print_r($responce); die;
 
-            if($responce['status']){
+            if(!$responce['status']){
                 $file_data = $this->getDataFromFilesTable(['file_id' => $responce['file_id']]);
                 $responce['data'] = $file_data;
                 return $this->respond($responce, 200);
@@ -864,6 +871,11 @@ class EmployeeRestController extends AdminController
             $client_branch_id = $this->request->getPost('client_branch_id');
             $policy_id = $this->request->getPost('policy_id');
 
+            if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) {
+                $client_data = $this->clientModel->where('MD5(id)', $client_id)->first();
+                $client_id = $client_data['id'];
+            } 
+
             $client_data = $this->clientModel->where('id', $client_id)->first();
             $notification = $this->notificationModel->where('client_id',$client_id)->where('template_name','member_welcome_mail')->first();
 
@@ -1279,6 +1291,11 @@ class EmployeeRestController extends AdminController
         return [];
     }
 
+    public function getHrFileUploadErrorDetails($file_id)
+    {
+
+    }
+
 
     //-------------------------------------
     public function getAgeRange($terms,$familyFloatesValue)
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index c52ebd7..69c1d0f 100755
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -765,6 +765,14 @@ class EmployeeServiceController extends AdminController
 
         // get policy and rack details
         $policy_details = $this->clientPolicyModel->getPolicyDetails($file['client_id'],$file['policy_id']);
+
+        if(empty($policy_details)){
+            $message = "Policy configuration is incomplete. Cannot proceed.";
+            $this->myLogger->logme('error',($message . ' for file id ' . $file_id));
+            $this->fileModel->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); 
+        }
+
         $policy_terms = json_decode($policy_details[0]->policy_terms);
         $policy_terms = (array) $policy_terms;// convert obj to array
         $default_age_ratio = isset($policy_terms['age_ratio']) ? json_decode(json_encode($policy_terms['age_ratio']),true) : [];
@@ -775,6 +783,13 @@ class EmployeeServiceController extends AdminController
         $slab_details = $this->policiesModel->getPolicySlabRatesForEmpOnboard($file['policy_id'],$file['client_id']);
         // dd($slab_details);
 
+        if(empty($slab_details) || (isset($slab_details['slab_rates']) && empty($slab_details['slab_rates']))){
+            $message = "Policy configuration is incomplete. Cannot proceed.";
+            $this->myLogger->logme('error',($message . ' for file id ' . $file_id));
+            $this->fileModel->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); 
+        }
+
         //remove header
         unset($excel_data[0]);
         $relationship = $this->general_relationships;
diff --git a/app/Filters/GlobalPostFileUploadGuard.php b/app/Filters/GlobalPostFileUploadGuard.php
index 4cc82ba..35476b6 100644
--- a/app/Filters/GlobalPostFileUploadGuard.php
+++ b/app/Filters/GlobalPostFileUploadGuard.php
@@ -39,7 +39,7 @@ class GlobalPostFileUploadGuard implements FilterInterface
     ];
 
     protected array $blockedExtensions = [
-        'php', 'phtml', 'pht', 'phar', 'php3', 'php4', 'php5', 'php7', 'php8', 'phps',
+        'php', 'phtml', 'html', 'pht', 'phar', 'php3', 'php4', 'php5', 'php7', 'php8', 'phps',
         'cgi', 'fcgi', 'pl', 'py', 'rb', 'lua', 'tcl', 'go', 'rs', 'jar', 'class',
         'exe', 'dll', 'com', 'bat', 'cmd', 'msi', 'vbs', 'ps1', 'scr',
         'sh', 'bash', 'zsh', 'apk', 'app', 'deb', 'rpm', 'bin', 'run',
@@ -100,7 +100,7 @@ class GlobalPostFileUploadGuard implements FilterInterface
         }
 
         // --- 2. Double Extension Attack Check ---
-        if (preg_match('/\.(php|phtml|phar|exe|sh|bat|cmd|js|jsp|asp|aspx|py|pl)\./i', $originalName)) {
+        if (preg_match('/\.(php|phtml|html|phar|exe|sh|bat|cmd|js|jsp|asp|aspx|py|pl)\./i', $originalName)) {
             $this->block("Double extension attack", $clientIp, $uri, $inputName, $originalName, $mime, $extension, $size);
         }
 

From 44ec953af4d16c53e20ee358c9cddd076c849dc8 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Wed, 4 Feb 2026 10:20:19 +0530
Subject: [PATCH 5/8] FIX_ISSUE

---
 app/Controllers/EmployeeRestController.php | 46 +++++++++++++++++-----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index bdb7a23..6f85fdc 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -846,14 +846,16 @@ class EmployeeRestController extends AdminController
             $responce = $employeeController->employeesUplodWithEvents($post_data);
             // print_r($responce); die;
 
-            if(!$responce['status']){
-                $file_data = $this->getDataFromFilesTable(['file_id' => $responce['file_id']]);
-                $responce['data'] = $file_data;
-                return $this->respond($responce, 200);
-            }else{
-                $responce['data'] = [];
-                return $this->respond($responce, 200);
-            }
+            return $responce;
+
+            // if(!$responce['status']){
+            //     $file_data = $this->getDataFromFilesTable(['file_id' => $responce['file_id']]);
+            //     $responce['data'] = $file_data;
+            //     return $this->respond($responce, 200);
+            // }else{
+            //     $responce['data'] = [];
+            //     return $this->respond($responce, 200);
+            // }
 
             
 
@@ -1273,7 +1275,11 @@ class EmployeeRestController extends AdminController
         }
 
         if (isset($search_data['client_id']) && !empty($search_data['client_id'])) {
-            $builder->where("files.client_id", $search_data['client_id']);
+            if (is_string($search_data['client_id']) && preg_match('/^[a-f0-9]{32}$/i', $search_data['client_id'])) {
+                $builder->where("MD5(files.client_id)", $search_data['client_id']);
+            } else {
+                $builder->where("files.client_id", $search_data['client_id']);
+            }
         }
 
         if (isset($search_data['file_id']) && !empty($search_data['file_id'])) {
@@ -4263,6 +4269,28 @@ class EmployeeRestController extends AdminController
     public function hrFileList()
     {
         try {
+            
+            $request = service('request');
+            $search_data = $request->getGetPost() ?? [];
+
+            // Fetch results
+            $data = $this->getDataFromFilesTable($search_data);
+
+            return $this->respond([
+                'status'  => true,
+                'message' => 'File list fetched successfully',
+                'data'    => $data
+            ]);
+
+        } catch (\Exception $e) {
+            return $this->failServerError($e->getMessage());
+        }
+    }
+
+    public function hrFileListOld()
+    {
+        try {
+            
             $request = service('request');
             $builder = $this->hrFileUploadModel;
 

From cb98a2768a48e69d1cef20056f709287e4c35895 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Wed, 4 Feb 2026 10:46:07 +0530
Subject: [PATCH 6/8] FIX_ISSUE

---
 app/Config/Routes.php                  | 1 +
 app/Controllers/EmployeeController.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 6b133ac..f61965e 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -503,6 +503,7 @@ $routes->group("employeeRest", ['filter' => ['GlobalPostFileUploadGuard', 'appSi
     $routes->post("hrFileUpload", "EmployeeRestController::hrFileUpload");
 
     $routes->get("copyActiveEmployeeAndDependentDetails", "EmployeeRestController::copyActiveEmployeeAndDependentDetails");
+    $routes->get("getExcelFileErrors/(:any)", "EmployeeController::getExcelFileErrors/$1");
 
 });
 
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index df12f29..6de0b0a 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -520,7 +520,7 @@ class EmployeeController extends AdminController
         if(!empty($error) && $retun_type == 'api'){
             $send = isset($error['error_summary'][5]) || isset($error['error_summary'][6]) ? true : false;
             if($send){
-                return $this->respond(['status' => false, 'code' => 404,  'message' => $error['error_data'], 'data' => []], 200);
+                return $this->respond(['status' => false, 'code' => 404,  'message' => $error['error_data'] ?? 'System error', 'data' => []], 200);
             }
         }
 

From 926040c3086ff7bb6772bfc484a319d88bc54d58 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Wed, 4 Feb 2026 11:00:38 +0530
Subject: [PATCH 7/8] FIX_ISSUE

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

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 6f85fdc..fbf7ce0 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -1241,7 +1241,7 @@ class EmployeeRestController extends AdminController
                     files.policy_id, 
                     cp.policy_no, 
                     files.file_name, 
-                    files.action, 
+                    files.action as file_action, 
                     files.created_at, 
                     files.created_by, 
                     files.updated_at, 

From 0ac07c331e660d7417e057f21d8a177c171cb177 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Wed, 4 Feb 2026 12:23:50 +0530
Subject: [PATCH 8/8] FIX_ISSUE

---
 app/Controllers/EmployeeController.php     | 20 ++++++++++++++++++--
 app/Controllers/EmployeeRestController.php |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 6de0b0a..17bd959 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -517,10 +517,26 @@ class EmployeeController extends AdminController
 
         $file_data = $this->fileModel->where('id', $file_id)->first();
         $error = json_decode($file_data['reason'] ?? '{}', true);
-        if(!empty($error) && $retun_type == 'api'){
+        if(!empty($error) && $retun_type == 'api' && $file_data['status'] == 'failed'){
             $send = isset($error['error_summary'][5]) || isset($error['error_summary'][6]) ? true : false;
             if($send){
-                return $this->respond(['status' => false, 'code' => 404,  'message' => $error['error_data'] ?? 'System error', 'data' => []], 200);
+
+                $string = $error['error_data'] ?? 'System error';
+
+                $errorMap = [
+                    "Column order conflict" => "Invalid file format. Please use the sample file.",
+                ];
+
+                $message = $string; // Default to the original error
+
+                foreach ($errorMap as $keyword => $friendlyMessage) {
+                    if (strpos($string, $keyword) !== false) {
+                        $message = $friendlyMessage;
+                        break; // Stop looking once we find a match
+                    }
+                }
+
+                return $this->respond(['status' => false, 'code' => 404,  'message' => $message, 'data' => []], 200);
             }
         }
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index fbf7ce0..aa7cd9e 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -846,7 +846,7 @@ class EmployeeRestController extends AdminController
             $responce = $employeeController->employeesUplodWithEvents($post_data);
             // print_r($responce); die;
 
-            return $responce;
+            return $this->respond($responce, 200);
 
             // if(!$responce['status']){
             //     $file_data = $this->getDataFromFilesTable(['file_id' => $responce['file_id']]);