From 8e1ec7f150c9d766a7be9a40dbb71b48ddd40e1e Mon Sep 17 00:00:00 2001
From: venba-Inspriron-3558 <venba2026@gmail.com>
Date: Thu, 27 Nov 2025 10:23:14 +0530
Subject: [PATCH] FIX_Code Revert (After the user changes the status and clicks
 Submit, the collection of next-next status fields is displayed. These fields
 do not belong to the selected status, which confuses the user)

---
 app/Views/file_list.php                | 22 +++++++++++++---------
 app/Views/notification.php             | 13 ++++++++++---
 app/Views/ticket_form_gmc.php          |  2 +-
 app/Views/vehicle_type_master_list.php |  2 +-
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index 2086aeef..5e2f79dc 100755
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -10,6 +10,8 @@
 
 .dataTables_length label {height: 21px !important;}
 
+.column-header { margin-right: 10px; /* Adjust this value as needed */ }
+
 
 </style>
 
@@ -22,18 +24,19 @@
                 </div>
 
             </div>
+            <div class="table-responsive">
             <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
                 <thead class="bg-light">
                     <tr>
-                        <th class="font-weight-medium">S.No&nbsp;</th>
-                        <th class="font-weight-medium">File name&nbsp;</th>
-                        <th class="font-weight-medium">Client&nbsp;</th>
-                        <th class="font-weight-medium">Client Branch&nbsp;</th>
-                        <th class="font-weight-medium">Policy&nbsp;</th>
-                        <th class="font-weight-medium">Event&nbsp;</th>
-                        <th class="font-weight-medium">User/Time&nbsp;</th>
-                        <th class="font-weight-medium">Status&nbsp;</th>
-                        <th class="font-weight-medium">Action&nbsp;</th>
+                        <th class="font-weight-medium"><div class="column-header">S.No</div></th>
+                        <th class="font-weight-medium"><div class="column-header">File name</div></th>
+                        <th class="font-weight-medium"><div class="column-header">Client</div></th>
+                        <th class="font-weight-medium"><div class="column-header">Client Branch</div></th>
+                        <th class="font-weight-medium"><div class="column-header">Policy</div></th>
+                        <th class="font-weight-medium"><div class="column-header">Event</div></th>
+                        <th class="font-weight-medium"><div class="column-header">User/Time</div></th>
+                        <th class="font-weight-medium"><div class="column-header">Status</div></th>
+                        <th class="font-weight-medium"><div class="column-header">Action</div></th>
                     </tr>
                 </thead>
 
@@ -115,6 +118,7 @@
 
                 </tbody>
             </table>
+            </div>
         </div>
     </div>
 </div><!-- end col -->
diff --git a/app/Views/notification.php b/app/Views/notification.php
index ed1c2364..b346857a 100755
--- a/app/Views/notification.php
+++ b/app/Views/notification.php
@@ -428,7 +428,7 @@
                                     <th>Action</th>
                                 </tr>
                             </thead>
-                            <tbody id="attachment_tbody">
+                            <tbody id="attachment_tbody_common">
 
                             </tbody>
                         </table>
@@ -1445,7 +1445,10 @@
         if (template_name == 'member_welcome_mail') {
             container = document.getElementById('attachment_tbody');
         }
-         else {
+        else if (template_name == 'member_common_mail') {
+            container = document.getElementById('attachment_tbody_common');
+        }
+        else {
             container = document.getElementById('attachment_tbody_ecard');
         }
 
@@ -1512,7 +1515,11 @@
     function removeHTMLInput(element) {
         if (template_name == 'member_welcome_mail') {
             const container = document.getElementById('attachment_tbody');
-        } else {
+        }
+        else if (template_name == 'member_common_mail') {
+            container = document.getElementById('attachment_tbody_common');
+        }
+        else {
             const container = document.getElementById('attachment_tbody_ecard');
         }
         const rows = container.querySelectorAll('.dynamic-form-row');
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index 7428ab32..dc28a793 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -566,11 +566,11 @@
             allowInput: false
         });
 
+        updateClaimStatusDisplay("<?= isset($ticket_data['claim_status_id']) ? $ticket_data['claim_status_id'] : 0 ?>")
         var extraFields = <?= json_encode(isset($extra_fields) ? $extra_fields : []); ?>;
         GlobelExtraFields = extraFields;
         console.log("extraFields", extraFields);
         claimStatusFieldChanges(extraFields);
-        updateClaimStatusDisplay("<?= isset($ticket_data['claim_status_id']) ? $ticket_data['claim_status_id'] : 0 ?>")
 
     })
 
diff --git a/app/Views/vehicle_type_master_list.php b/app/Views/vehicle_type_master_list.php
index 3f4faa46..a2001b8c 100755
--- a/app/Views/vehicle_type_master_list.php
+++ b/app/Views/vehicle_type_master_list.php
@@ -97,7 +97,7 @@
             // 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
-            dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
+            dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" +
                 "<'row'<'col-sm-12'tr>>" +
                 "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
             lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],