Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
velz 2025-11-19 17:09:03 +05:30
commit 723a532212
14 changed files with 143 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Views/add_image_list.php
View File

@ -36,9 +36,9 @@ table.dataTable thead th {
<table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table"> <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table">
<thead class="bg-light"> <thead class="bg-light">
<tr> <tr>
<th class="font-weight-medium">Advertisement Image Name</th> <th class="font-weight-medium"><div class="column-header">Advertisement Image Name</div></th>
<th class="font-weight-medium">Status</th> <th class="font-weight-medium"><div class="column-header">Status</div></th>
<th class="font-weight-medium">Action</th> <th class="font-weight-medium"><div class="column-header">Action</div></th>
</tr> </tr>
</thead> </thead>
@ -222,7 +222,8 @@ var table;
$(document).ready(function() { $(document).ready(function() {
table = $('#tickets-table').DataTable({ 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-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>", "<'row'<'col-sm-5'i><'col-sm-7'p>>",
buttons: [ buttons: [

22
app/Views/cd_master_list.php
View File

@ -17,6 +17,8 @@ table.dataTable thead th {
max-width: 98% !important; max-width: 98% !important;
} }
.column-header {margin-right: 10px;}
.custom-dropdown-menu { .custom-dropdown-menu {
display: none; display: none;
position: absolute; position: absolute;
@ -70,15 +72,15 @@ table.dataTable thead th {
<table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-datatable"> <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap text-custom-black text-custom app-datatable">
<thead class="bg-light"> <thead class="bg-light">
<tr> <tr>
<th class="font-weight-medium">S.No&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">S.No&nbsp; </div> </th>
<th class="font-weight-medium">Client Name&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">Client Name&nbsp; </div> </th>
<th class="font-weight-medium">Insurer Name&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">Insurer Name&nbsp; </div> </th>
<th class="font-weight-medium">Insurer Branch Name&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">Insurer Branch Name&nbsp; </div> </th>
<th class="font-weight-medium">Opening Date&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">Opening Date&nbsp; </div> </th>
<th class="font-weight-medium">CD Account No&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">CD Account No&nbsp; </div> </th>
<th class="font-weight-medium">Opening Amount&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">Opening Amount&nbsp; </div> </th>
<th class="font-weight-medium">Date/User&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">Date/User&nbsp; </div> </th>
<th class="font-weight-medium">Action&nbsp;</th> <th class="font-weight-medium"> <div class="column-header">Action&nbsp; </div> </th>
</tr> </tr>
</thead> </thead>
<tbody class="app-table-body"> <tbody class="app-table-body">
@ -215,7 +217,7 @@ table.dataTable thead th {
$('#scroll-horizontal-datatable').DataTable({ $('#scroll-horizontal-datatable').DataTable({
scrollX: true, 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-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>", "<'row'<'col-sm-5'i><'col-sm-7'p>>",
buttons: [ buttons: [

4
app/Views/client_deposit_list.php
View File

@ -103,9 +103,9 @@ $(document).ready(function() {
<div class="datatable-search-wrapper" style="position:relative; display:inline-block;"> <div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
_INPUT_ _INPUT_
<i class="mdi mdi-magnify datatable-search-icon" <i class="mdi mdi-magnify datatable-search-icon"
style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i> style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666;"></i>
<i class="mdi mdi-close-circle datatable-clear-icon" <i class="mdi mdi-close-circle datatable-clear-icon"
style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;"></i> style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666; display:none;"></i>
</div>`, </div>`,
searchPlaceholder: "Search", searchPlaceholder: "Search",
emptyTable: '<div class="text-center text-muted">No Data found</div>' emptyTable: '<div class="text-center text-muted">No Data found</div>'

4
app/Views/client_list.php
View File

@ -344,9 +344,9 @@ $(document).ready(function()
<div class="datatable-search-wrapper" style="position:relative; display:inline-block;"> <div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
_INPUT_ _INPUT_
<i class="mdi mdi-magnify datatable-search-icon" <i class="mdi mdi-magnify datatable-search-icon"
style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i> style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666;"></i>
<i class="mdi mdi-close-circle datatable-clear-icon" <i class="mdi mdi-close-circle datatable-clear-icon"
style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;"></i> style="position:absolute; right:11px; top:50%; transform:translateY(-53%); color:#666; display:none;"></i>
</div>`, </div>`,
searchPlaceholder: "Search", searchPlaceholder: "Search",
emptyTable: '<div class="text-center text-muted">No Data found</div>' emptyTable: '<div class="text-center text-muted">No Data found</div>'

28
app/Views/client_policy.php
View File

@ -560,6 +560,20 @@ input:checked + .slider_blue::before {
searching: true, searching: true,
autoWidth: false, autoWidth: false,
responsive: true, responsive: true,
language: {
search: `
<div class="datatable-search-wrapper" style="position:relative; display:inline-block; width:100%;">
_INPUT_
<i class="mdi mdi-magnify datatable-search-icon"
style="position:absolute; right:122px !important; top:50%; transform:translateY(-50%); color:#666;"></i>
<i class="mdi mdi-close-circle datatable-clear-icon"
style="position:absolute; right:122px !important; top:50%; transform:translateY(-50%); color:#666; display:none; cursor:pointer;"></i>
</div>
`,
searchPlaceholder: "Search",
emptyTable: '<div class="text-center text-muted">No Data found</div>'
},
}); });
@ -2543,6 +2557,20 @@ $(document).ready(function () {
searching: true, searching: true,
autoWidth: false, autoWidth: false,
responsive: true, responsive: true,
// language: {
// search: `
// <div class="datatable-search-wrapper" style="position:relative; display:inline-block; width:100%;">
// _INPUT_
// <i class="mdi mdi-magnify datatable-search-icon"
// style="position:absolute; right:122px !important; top:50%; transform:translateY(-50%); color:#666;"></i>
// <i class="mdi mdi-close-circle datatable-clear-icon"
// style="position:absolute; right:122px !important; top:50%; transform:translateY(-50%); color:#666; display:none; cursor:pointer;"></i>
// </div>
// `,
// searchPlaceholder: "Search",
// emptyTable: '<div class="text-center text-muted">No Data found</div>'
// },
}); });

16
app/Views/dms_search.php
View File

@ -173,7 +173,7 @@
if (ticketsTable.length) { if (ticketsTable.length) {
ticketsTable.DataTable({ ticketsTable.DataTable({
scrollX: true, 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-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>", "<'row'<'col-sm-5'i><'col-sm-7'p>>",
buttons: [{ buttons: [{
@ -197,6 +197,20 @@
}], }],
paging: true, paging: true,
pageLength: 10, pageLength: 10,
language: {
search: `
<div class="datatable-search-wrapper" style="position:relative; display:inline-block; width:100%;">
_INPUT_
<i class="mdi mdi-magnify datatable-search-icon"
style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i>
<i class="mdi mdi-close-circle datatable-clear-icon"
style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none; cursor:pointer;"></i>
</div>
`,
searchPlaceholder: "Search",
emptyTable: '<div class="text-center text-muted">No Data found</div>'
},
order: [ order: [
[0, 'desc'] [0, 'desc']
] ]

14
app/Views/hr_activity_history.php
View File

@ -102,8 +102,18 @@ $(document).ready(function () {
"<'row'<'col-sm-12'tr>>" + "<'row'<'col-sm-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>", "<'row'<'col-sm-5'i><'col-sm-7'p>>",
language: { language: {
search: "_INPUT_", search: `
searchPlaceholder: "Search..." <div class="datatable-search-wrapper" style="position:relative; display:inline-block; width:100%;">
_INPUT_
<i class="mdi mdi-magnify datatable-search-icon"
style="position:absolute; right:122px !important; top:50%; transform:translateY(-50%); color:#666;"></i>
<i class="mdi mdi-close-circle datatable-clear-icon"
style="position:absolute; right:122px !important; top:50%; transform:translateY(-50%); color:#666; display:none; cursor:pointer;"></i>
</div>
`,
searchPlaceholder: "Search",
emptyTable: '<div class="text-center text-muted">No Data found</div>'
}, },
paging: true, paging: true,
pageLength: 10, pageLength: 10,

35
app/Views/insurer_statement_list.php
View File

@ -164,6 +164,15 @@
margin-left: 5px; margin-left: 5px;
border-radius: 6px; 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 */
}
</style> </style>
<div class="container-fluid-min"> <div class="container-fluid-min">
<div class="row" id="inception_list"> <div class="row" id="inception_list">
@ -205,11 +214,12 @@
</div> </div>
<div class="dataTables_length d-flex align-items-center"> <div class="dataTables_length d-flex align-items-center">
</div> </div>
<div> <div class="table-responsive">
<table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table"> <table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
<thead class="bg-light"> <thead class="bg-light">
<tr> <tr>
<th></th> <th class="no-sort"></th>
<th> <th>
<div class="column-header">Insurer</div> <div class="column-header">Insurer</div>
</th> </th>
@ -1734,9 +1744,24 @@
"order": [], // Disable initial sorting if needed "order": [], // Disable initial sorting if needed
"pageLength": 10, "pageLength": 10,
// "dom": '<"top"lf>rt<"bottom"ip><"clear">', // This places length and filter controls at top // "dom": '<"top"lf>rt<"bottom"ip><"clear">', // This places length and filter controls at top
"language": { // "language": {
"lengthMenu": "Show _MENU_ entries", // "lengthMenu": "Show _MENU_ entries",
"search": "Search:" // "search": "Search:"
// }
language: {
lengthMenu: "Show _MENU_ entries",
search: `
<div class="datatable-search-wrapper" style="position:relative; display:inline-block; width:100%;">
_INPUT_
<i class="mdi mdi-magnify datatable-search-icon"
style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666;"></i>
<i class="mdi mdi-close-circle datatable-clear-icon"
style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none; cursor:pointer;"></i>
</div>
`,
searchPlaceholder: "Search",
emptyTable: '<div class="text-center text-muted">No Data found</div>'
} }
}); });

3
app/Views/policy_transaction_endorsement_list.php
View File

@ -489,7 +489,8 @@ table.dataTable thead th {
if (ticketsTable.length) { if (ticketsTable.length) {
ticketsTable.DataTable({ ticketsTable.DataTable({
scrollX: true, 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-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
buttons: [ buttons: [

3
app/Views/policy_transaction_inception_list.php
View File

@ -561,7 +561,8 @@ $(document).ready(function() {
if (ticketsTable.length) { if (ticketsTable.length) {
ticketsTable.DataTable({ ticketsTable.DataTable({
scrollX: true, 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-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
buttons: [ buttons: [

12
app/Views/thz_list.php
View File

@ -43,7 +43,7 @@ table.dataTable tbody td {
<div class="card-body"> <div class="card-body">
<div> <div>
<div class="table-responsive"> <div class="table-responsive">
<table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="tickets-table"> <table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="thz-table">
<thead class="bg-light"> <thead class="bg-light">
<tr> <tr>
@ -315,7 +315,7 @@ table.dataTable tbody td {
// Datatable document ready // Datatable document ready
$(document).ready(function() { $(document).ready(function() {
var ticketsTable = $('#tickets-table'); var ticketsTable = $('#thz-table');
if (ticketsTable.length) { if (ticketsTable.length) {
ticketsTable.DataTable({ ticketsTable.DataTable({
@ -349,7 +349,7 @@ table.dataTable tbody td {
orthogonal: 'sort' orthogonal: 'sort'
}, },
className: 'app-btn-primary ', className: 'app-btn-primary ',
title: 'Tickets' title: 'Tickets',
sheetName: 'Tickets', sheetName: 'Tickets',
} }
] ]
@ -374,6 +374,12 @@ table.dataTable tbody td {
} else { } else {
console.error("Table not found."); 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();
});
}); });

2
app/Views/ticket_form_handler.php
View File

@ -69,7 +69,7 @@
<!-- Search by Mobile Number --> <!-- Search by Mobile Number -->
<div> <div>
<h4 onclick="toggleAccordion('mobileAccordion')"> <h4 onclick="toggleAccordion('mobileAccordion')">
Search by Mobile Number Search by Employee ID / Mobile Number
<span class="arrow" id="mobileArrow">➤</span> <span class="arrow" id="mobileArrow">➤</span>
</h4> </h4>
<div class="accordion-content" id="mobileAccordion"> <div class="accordion-content" id="mobileAccordion">

28
app/Views/vehicle_master_list.php
View File

@ -15,6 +15,7 @@ table.dataTable tbody td {
.col-12 { .col-12 {
max-width: 98% !important; max-width: 98% !important;
} }
.column-header {margin-right: 10px;}
.readonly-select { .readonly-select {
pointer-events: none; pointer-events: none;
@ -74,14 +75,14 @@ table.dataTable tbody td {
<table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap"> <table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
<thead class="bg-light"> <thead class="bg-light">
<tr> <tr>
<th class="font-weight-medium">S.No&nbsp;</th> <th class="font-weight-medium"><div class="column-header">S.No&nbsp;</div></th>
<th class="font-weight-medium">Owner Type&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Owner Type&nbsp;</div></th>
<th class="font-weight-medium">Owner Name&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Owner Name&nbsp;</div></th>
<th class="font-weight-medium">RC Book No&nbsp;</th> <th class="font-weight-medium"><div class="column-header">RC Book No&nbsp;</div></th>
<th class="font-weight-medium">Vehicle No&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Vehicle No&nbsp;</div></th>
<th class="font-weight-medium">Vehicle type&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Vehicle type&nbsp;</div></th>
<th class="font-weight-medium">Description&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Description&nbsp;</div></th>
<th class="font-weight-medium">Action&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Action&nbsp;</div></th>
</tr> </tr>
</thead> </thead>
@ -465,9 +466,11 @@ $(document).ready(function() {
$(document).ready(function() { $(document).ready(function() {
$('#scroll-horizontal-datatable').DataTable({ var ticketsTable = $('#scroll-horizontal-datatable');
if (ticketsTable.length) {
ticketsTable.DataTable({
scrollX: true, 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-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>", "<'row'<'col-sm-5'i><'col-sm-7'p>>",
buttons: [ buttons: [
@ -524,7 +527,10 @@ $(document).ready(function() {
paging: true, paging: true,
pageLength: 10, pageLength: 10,
order: [[0, 'desc']] order: [[0, 'desc']]
}); });
} else {
console.error("Table atet found.");
}
}); });
function getEditVehicleDetailsData(input) { function getEditVehicleDetailsData(input) {

10
app/Views/vehicle_type_master_list.php
View File

@ -2,6 +2,7 @@
.dataTables_filter { .dataTables_filter {
position: absolute; position: absolute;
} }
.column-header {margin-right: 10px;}
</style> </style>
<!-- End ADD and EDIT Page HTML --> <!-- End ADD and EDIT Page HTML -->
@ -12,10 +13,10 @@
<table data-custom-table-css="table" class="table table-sm m-0 table-centered dt-responsive nowrap w-100" cellspacing="a" id="user-table"> <table data-custom-table-css="table" class="table table-sm m-0 table-centered dt-responsive nowrap w-100" cellspacing="a" id="user-table">
<thead class="bg-light"> <thead class="bg-light">
<tr> <tr>
<th class="font-weight-medium">S.No.</th> <th class="font-weight-medium"><div class="column-header">S.No.</div></th>
<th class="font-weight-medium">Vehicle Type</th> <th class="font-weight-medium"><div class="column-header">Vehicle Type</div></th>
<!-- <th class="font-weight-medium">Status</th> --> <!-- <th class="font-weight-medium">Status</th> -->
<th class="font-weight-medium">Action</th> <th class="font-weight-medium"><div class="column-header">Action</div></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -94,7 +95,8 @@
var ticketsTable = $('#user-table'); var ticketsTable = $('#user-table');
ticketsTable.DataTable({ ticketsTable.DataTable({
scrollX: true, 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-12'tr>>" +
"<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
buttons: [ buttons: [