Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

This commit is contained in:
VENKATESHWARAN 2025-11-27 11:33:56 +05:30
commit 84c5402004
4 changed files with 25 additions and 14 deletions

View File

@ -10,6 +10,8 @@
.dataTables_length label {height: 21px !important;} .dataTables_length label {height: 21px !important;}
.column-header { margin-right: 10px; /* Adjust this value as needed */ }
</style> </style>
@ -22,18 +24,19 @@
</div> </div>
</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"> <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">S.No&nbsp;</th> <th class="font-weight-medium"><div class="column-header">S.No</div></th>
<th class="font-weight-medium">File name&nbsp;</th> <th class="font-weight-medium"><div class="column-header">File name</div></th>
<th class="font-weight-medium">Client&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Client</div></th>
<th class="font-weight-medium">Client Branch&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Client Branch</div></th>
<th class="font-weight-medium">Policy&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Policy</div></th>
<th class="font-weight-medium">Event&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Event</div></th>
<th class="font-weight-medium">User/Time&nbsp;</th> <th class="font-weight-medium"><div class="column-header">User/Time</div></th>
<th class="font-weight-medium">Status&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Status</div></th>
<th class="font-weight-medium">Action&nbsp;</th> <th class="font-weight-medium"><div class="column-header">Action</div></th>
</tr> </tr>
</thead> </thead>
@ -117,6 +120,7 @@
</table> </table>
</div> </div>
</div> </div>
</div>
</div><!-- end col --> </div><!-- end col -->

View File

@ -428,7 +428,7 @@
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody id="attachment_tbody"> <tbody id="attachment_tbody_common">
</tbody> </tbody>
</table> </table>
@ -1445,6 +1445,9 @@
if (template_name == 'member_welcome_mail') { if (template_name == 'member_welcome_mail') {
container = document.getElementById('attachment_tbody'); container = document.getElementById('attachment_tbody');
} }
else if (template_name == 'member_common_mail') {
container = document.getElementById('attachment_tbody_common');
}
else { else {
container = document.getElementById('attachment_tbody_ecard'); container = document.getElementById('attachment_tbody_ecard');
} }
@ -1512,7 +1515,11 @@
function removeHTMLInput(element) { function removeHTMLInput(element) {
if (template_name == 'member_welcome_mail') { if (template_name == 'member_welcome_mail') {
const container = document.getElementById('attachment_tbody'); 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 container = document.getElementById('attachment_tbody_ecard');
} }
const rows = container.querySelectorAll('.dynamic-form-row'); const rows = container.querySelectorAll('.dynamic-form-row');

View File

@ -566,11 +566,11 @@
allowInput: false allowInput: false
}); });
updateClaimStatusDisplay("<?= isset($ticket_data['claim_status_id']) ? $ticket_data['claim_status_id'] : 0 ?>")
var extraFields = <?= json_encode(isset($extra_fields) ? $extra_fields : []); ?>; var extraFields = <?= json_encode(isset($extra_fields) ? $extra_fields : []); ?>;
GlobelExtraFields = extraFields; GlobelExtraFields = extraFields;
console.log("extraFields", extraFields); console.log("extraFields", extraFields);
claimStatusFieldChanges(extraFields); claimStatusFieldChanges(extraFields);
updateClaimStatusDisplay("<?= isset($ticket_data['claim_status_id']) ? $ticket_data['claim_status_id'] : 0 ?>")
}) })

View File

@ -97,7 +97,7 @@
// 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
// "<'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
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'<'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>>", "<'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]], lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],