Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
723a532212
@ -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">
|
||||
<thead class="bg-light">
|
||||
<tr>
|
||||
<th class="font-weight-medium">Advertisement Image Name</th>
|
||||
<th class="font-weight-medium">Status</th>
|
||||
<th class="font-weight-medium">Action</th>
|
||||
<th class="font-weight-medium"><div class="column-header">Advertisement Image Name</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>
|
||||
|
||||
@ -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: [
|
||||
|
||||
@ -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 {
|
||||
<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">
|
||||
<tr>
|
||||
<th class="font-weight-medium">S.No </th>
|
||||
<th class="font-weight-medium">Client Name </th>
|
||||
<th class="font-weight-medium">Insurer Name </th>
|
||||
<th class="font-weight-medium">Insurer Branch Name </th>
|
||||
<th class="font-weight-medium">Opening Date </th>
|
||||
<th class="font-weight-medium">CD Account No </th>
|
||||
<th class="font-weight-medium">Opening Amount </th>
|
||||
<th class="font-weight-medium">Date/User </th>
|
||||
<th class="font-weight-medium">Action </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">S.No </div> </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">Client Name </div> </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">Insurer Name </div> </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">Insurer Branch Name </div> </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">Opening Date </div> </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">CD Account No </div> </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">Opening Amount </div> </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">Date/User </div> </th>
|
||||
<th class="font-weight-medium"> <div class="column-header">Action </div> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="app-table-body">
|
||||
@ -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: [
|
||||
|
||||
@ -103,9 +103,9 @@ $(document).ready(function() {
|
||||
<div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
|
||||
_INPUT_
|
||||
<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"
|
||||
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>`,
|
||||
searchPlaceholder: "Search",
|
||||
emptyTable: '<div class="text-center text-muted">No Data found</div>'
|
||||
|
||||
@ -344,9 +344,9 @@ $(document).ready(function()
|
||||
<div class="datatable-search-wrapper" style="position:relative; display:inline-block;">
|
||||
_INPUT_
|
||||
<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"
|
||||
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>`,
|
||||
searchPlaceholder: "Search",
|
||||
emptyTable: '<div class="text-center text-muted">No Data found</div>'
|
||||
|
||||
@ -560,6 +560,20 @@ input:checked + .slider_blue::before {
|
||||
searching: true,
|
||||
autoWidth: false,
|
||||
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,
|
||||
autoWidth: false,
|
||||
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>'
|
||||
// },
|
||||
});
|
||||
|
||||
|
||||
|
||||
@ -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: `
|
||||
<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: [
|
||||
[0, 'desc']
|
||||
]
|
||||
|
||||
@ -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: `
|
||||
<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,
|
||||
pageLength: 10,
|
||||
|
||||
@ -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 */
|
||||
}
|
||||
|
||||
</style>
|
||||
<div class="container-fluid-min">
|
||||
<div class="row" id="inception_list">
|
||||
@ -205,11 +214,12 @@
|
||||
</div>
|
||||
<div class="dataTables_length d-flex align-items-center">
|
||||
</div>
|
||||
<div>
|
||||
<div class="table-responsive">
|
||||
|
||||
<table data-custom-table-css="table" class="table table-striped mb-0 nowrap" cellspacing="0" id="tickets-table">
|
||||
<thead class="bg-light">
|
||||
<tr>
|
||||
<th></th>
|
||||
<th class="no-sort"></th>
|
||||
<th>
|
||||
<div class="column-header">Insurer</div>
|
||||
</th>
|
||||
@ -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: `
|
||||
<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>'
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@ -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: [
|
||||
|
||||
@ -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: [
|
||||
|
||||
@ -43,7 +43,7 @@ table.dataTable tbody td {
|
||||
<div class="card-body">
|
||||
<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">
|
||||
<table data-custom-table-css="table" class="table mb-0 nowrap w-100 table-centered" cellspacing="0" id="thz-table">
|
||||
|
||||
<thead class="bg-light">
|
||||
<tr>
|
||||
@ -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();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
@ -69,7 +69,7 @@
|
||||
<!-- Search by Mobile Number -->
|
||||
<div>
|
||||
<h4 onclick="toggleAccordion('mobileAccordion')">
|
||||
Search by Mobile Number
|
||||
Search by Employee ID / Mobile Number
|
||||
<span class="arrow" id="mobileArrow">➤</span>
|
||||
</h4>
|
||||
<div class="accordion-content" id="mobileAccordion">
|
||||
|
||||
@ -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 {
|
||||
<table data-custom-table-css="table" id="scroll-horizontal-datatable" class="table w-100 nowrap">
|
||||
<thead class="bg-light">
|
||||
<tr>
|
||||
<th class="font-weight-medium">S.No </th>
|
||||
<th class="font-weight-medium">Owner Type </th>
|
||||
<th class="font-weight-medium">Owner Name </th>
|
||||
<th class="font-weight-medium">RC Book No </th>
|
||||
<th class="font-weight-medium">Vehicle No </th>
|
||||
<th class="font-weight-medium">Vehicle type </th>
|
||||
<th class="font-weight-medium">Description </th>
|
||||
<th class="font-weight-medium">Action </th>
|
||||
<th class="font-weight-medium"><div class="column-header">S.No </div></th>
|
||||
<th class="font-weight-medium"><div class="column-header">Owner Type </div></th>
|
||||
<th class="font-weight-medium"><div class="column-header">Owner Name </div></th>
|
||||
<th class="font-weight-medium"><div class="column-header">RC Book No </div></th>
|
||||
<th class="font-weight-medium"><div class="column-header">Vehicle No </div></th>
|
||||
<th class="font-weight-medium"><div class="column-header">Vehicle type </div></th>
|
||||
<th class="font-weight-medium"><div class="column-header">Description </div></th>
|
||||
<th class="font-weight-medium"><div class="column-header">Action </div></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
.dataTables_filter {
|
||||
position: absolute;
|
||||
}
|
||||
.column-header {margin-right: 10px;}
|
||||
</style>
|
||||
|
||||
<!-- 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">
|
||||
<thead class="bg-light">
|
||||
<tr>
|
||||
<th class="font-weight-medium">S.No.</th>
|
||||
<th class="font-weight-medium">Vehicle Type</th>
|
||||
<th class="font-weight-medium"><div class="column-header">S.No.</div></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">Action</th>
|
||||
<th class="font-weight-medium"><div class="column-header">Action</div></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -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: [
|
||||
|
||||
Loading…
Reference in New Issue
Block a user