From ddbffe3c55ed1badb212ae56c91a70877bc7b756 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Wed, 19 Nov 2025 16:01:33 +0530 Subject: [PATCH 1/2] FIX_Over all search bar, search icon and close icon merged. Need to fix this issue. --- app/Views/add_image_list.php | 9 ++--- app/Views/cd_master_list.php | 22 ++++++------ app/Views/client_deposit_list.php | 4 +-- app/Views/client_list.php | 4 +-- app/Views/client_policy.php | 28 +++++++++++++++ app/Views/dms_search.php | 16 ++++++++- app/Views/hr_activity_history.php | 14 ++++++-- app/Views/insurer_statement_list.php | 35 ++++++++++++++++--- .../policy_transaction_endorsement_list.php | 3 +- .../policy_transaction_inception_list.php | 3 +- app/Views/thz_list.php | 12 +++++-- app/Views/vehicle_master_list.php | 28 +++++++++------ app/Views/vehicle_type_master_list.php | 10 +++--- 13 files changed, 142 insertions(+), 46 deletions(-) diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php index 46332236..c47c5880 100755 --- a/app/Views/add_image_list.php +++ b/app/Views/add_image_list.php @@ -36,9 +36,9 @@ table.dataTable thead th { - - - + + + @@ -222,7 +222,8 @@ var table; $(document).ready(function() { table = $('#tickets-table').DataTable({ - dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, button right + // dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, button right + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [ diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php index c0ff4584..c530a6bb 100755 --- a/app/Views/cd_master_list.php +++ b/app/Views/cd_master_list.php @@ -17,6 +17,8 @@ table.dataTable thead th { max-width: 98% !important; } +.column-header {margin-right: 10px;} + .custom-dropdown-menu { display: none; position: absolute; @@ -70,15 +72,15 @@ table.dataTable thead th {
Advertisement Image NameStatusAction
Advertisement Image Name
Status
Action
- - - - - - - - - + + + + + + + + + @@ -215,7 +217,7 @@ table.dataTable thead th { $('#scroll-horizontal-datatable').DataTable({ scrollX: true, - dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + + 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: [ diff --git a/app/Views/client_deposit_list.php b/app/Views/client_deposit_list.php index c8be27ae..a86ffa11 100755 --- a/app/Views/client_deposit_list.php +++ b/app/Views/client_deposit_list.php @@ -103,9 +103,9 @@ $(document).ready(function() {
_INPUT_ + style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666;"> + style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666; display:none;">
`, searchPlaceholder: "Search", emptyTable: '
No Data found
' diff --git a/app/Views/client_list.php b/app/Views/client_list.php index 1a2f21f4..473d75fe 100755 --- a/app/Views/client_list.php +++ b/app/Views/client_list.php @@ -344,9 +344,9 @@ $(document).ready(function()
_INPUT_ + style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666;"> + style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666; display:none;">
`, searchPlaceholder: "Search", emptyTable: '
No Data found
' diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index cb197be9..a64e3fc3 100755 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -560,6 +560,20 @@ input:checked + .slider_blue::before { searching: true, autoWidth: false, responsive: true, + language: { + search: ` +
+ _INPUT_ + + + +
+ `, + searchPlaceholder: "Search", + emptyTable: '
No Data found
' + }, }); @@ -2543,6 +2557,20 @@ $(document).ready(function () { searching: true, autoWidth: false, responsive: true, + // language: { + // search: ` + //
+ // _INPUT_ + // + + // + //
+ // `, + // searchPlaceholder: "Search", + // emptyTable: '
No Data found
' + // }, }); diff --git a/app/Views/dms_search.php b/app/Views/dms_search.php index 6bdd968a..1808ab8b 100644 --- a/app/Views/dms_search.php +++ b/app/Views/dms_search.php @@ -173,7 +173,7 @@ if (ticketsTable.length) { ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [{ @@ -197,6 +197,20 @@ }], paging: true, pageLength: 10, + language: { + search: ` +
+ _INPUT_ + + + +
+ `, + searchPlaceholder: "Search", + emptyTable: '
No Data found
' + }, order: [ [0, 'desc'] ] diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php index 8f52d592..f069c886 100644 --- a/app/Views/hr_activity_history.php +++ b/app/Views/hr_activity_history.php @@ -102,8 +102,18 @@ $(document).ready(function () { "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", language: { - search: "_INPUT_", - searchPlaceholder: "Search..." + search: ` +
+ _INPUT_ + + + +
+ `, + searchPlaceholder: "Search", + emptyTable: '
No Data found
' }, paging: true, pageLength: 10, diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php index 197d19ed..b0c05935 100644 --- a/app/Views/insurer_statement_list.php +++ b/app/Views/insurer_statement_list.php @@ -164,6 +164,15 @@ margin-left: 5px; border-radius: 6px; } + th.no-sort { + pointer-events: none; /* disable click */ + } + + th.no-sort:before, + th.no-sort:after { + display: none !important; /* hide DataTables sorting arrows */ + } +
@@ -205,11 +214,12 @@
-
+
+
S.No Client Name Insurer Name Insurer Branch Name Opening Date CD Account No Opening Amount Date/User Action 
S.No 
Client Name 
Insurer Name 
Insurer Branch Name 
Opening Date 
CD Account No 
Opening Amount 
Date/User 
Action 
- + @@ -1734,9 +1744,24 @@ "order": [], // Disable initial sorting if needed "pageLength": 10, // "dom": '<"top"lf>rt<"bottom"ip><"clear">', // This places length and filter controls at top - "language": { - "lengthMenu": "Show _MENU_ entries", - "search": "Search:" + // "language": { + // "lengthMenu": "Show _MENU_ entries", + // "search": "Search:" + // } + language: { + lengthMenu: "Show _MENU_ entries", + search: ` +
+ _INPUT_ + + + +
+ `, + searchPlaceholder: "Search", + emptyTable: '
No Data found
' } }); diff --git a/app/Views/policy_transaction_endorsement_list.php b/app/Views/policy_transaction_endorsement_list.php index 59963f43..49c3a18b 100644 --- a/app/Views/policy_transaction_endorsement_list.php +++ b/app/Views/policy_transaction_endorsement_list.php @@ -489,7 +489,8 @@ table.dataTable thead th { if (ticketsTable.length) { ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right + // dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right + dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector buttons: [ diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php index 37640c11..6566b389 100644 --- a/app/Views/policy_transaction_inception_list.php +++ b/app/Views/policy_transaction_inception_list.php @@ -561,7 +561,8 @@ $(document).ready(function() { if (ticketsTable.length) { ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-1'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right + // dom: "<'row'<'col-12'f><'col-sm-11 text-right'B>>" + // Filter left, buttons right + dom: "<'row'<'col-12 d-flex justify-content-between'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector buttons: [ diff --git a/app/Views/thz_list.php b/app/Views/thz_list.php index 63c64862..56134fa3 100644 --- a/app/Views/thz_list.php +++ b/app/Views/thz_list.php @@ -43,7 +43,7 @@ table.dataTable tbody td {
-
Insurer
+
@@ -315,7 +315,7 @@ table.dataTable tbody td { // Datatable document ready $(document).ready(function() { - var ticketsTable = $('#tickets-table'); + var ticketsTable = $('#thz-table'); if (ticketsTable.length) { ticketsTable.DataTable({ @@ -349,7 +349,7 @@ table.dataTable tbody td { orthogonal: 'sort' }, className: 'app-btn-primary ', - title: 'Tickets' + title: 'Tickets', sheetName: 'Tickets', } ] @@ -374,6 +374,12 @@ table.dataTable tbody td { } else { console.error("Table not found."); } + + $(document).on('click', '.datatable-clear-icon', function () { + const input = $(this).closest('.datatable-search-wrapper').find('input'); + input.val('').trigger('input'); + $('#thz-table').DataTable().search('').draw(); + }); }); diff --git a/app/Views/vehicle_master_list.php b/app/Views/vehicle_master_list.php index 2e54f852..b101c09c 100644 --- a/app/Views/vehicle_master_list.php +++ b/app/Views/vehicle_master_list.php @@ -15,6 +15,7 @@ table.dataTable tbody td { .col-12 { max-width: 98% !important; } +.column-header {margin-right: 10px;} .readonly-select { pointer-events: none; @@ -74,14 +75,14 @@ table.dataTable tbody td {
- - - - - - - - + + + + + + + + @@ -465,9 +466,11 @@ $(document).ready(function() { $(document).ready(function() { - $('#scroll-horizontal-datatable').DataTable({ + var ticketsTable = $('#scroll-horizontal-datatable'); + if (ticketsTable.length) { + ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", buttons: [ @@ -524,7 +527,10 @@ $(document).ready(function() { paging: true, pageLength: 10, order: [[0, 'desc']] - }); + }); + } else { + console.error("Table atet found."); + } }); function getEditVehicleDetailsData(input) { diff --git a/app/Views/vehicle_type_master_list.php b/app/Views/vehicle_type_master_list.php index fd6d0801..9cdcdb7d 100755 --- a/app/Views/vehicle_type_master_list.php +++ b/app/Views/vehicle_type_master_list.php @@ -2,6 +2,7 @@ .dataTables_filter { position: absolute; } +.column-header {margin-right: 10px;} @@ -12,10 +13,10 @@
S.No Owner Type Owner Name RC Book No Vehicle No Vehicle type Description Action 
S.No 
Owner Type 
Owner Name 
RC Book No 
Vehicle No 
Vehicle type 
Description 
Action 
- - + + - + @@ -94,7 +95,8 @@ var ticketsTable = $('#user-table'); ticketsTable.DataTable({ scrollX: true, - dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right + // dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" + "<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector buttons: [ From 0e1ccfe8ad4a1c8bb269436b5e928a2fa8099124 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Wed, 19 Nov 2025 16:18:00 +0530 Subject: [PATCH 2/2] FIX_Minor correction for sub-heading for the modal "Fetch employee data" under claims module --- app/Views/ticket_form_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/ticket_form_handler.php b/app/Views/ticket_form_handler.php index 2478280b..149a9150 100644 --- a/app/Views/ticket_form_handler.php +++ b/app/Views/ticket_form_handler.php @@ -69,7 +69,7 @@

- Search by Mobile Number + Search by Employee ID / Mobile Number ➤

S.No.Vehicle Type
S.No.
Vehicle Type
 Action
Action