diff --git a/app/Views/client_basic_info.php b/app/Views/client_basic_info.php index 4cf5ab23..ce8b0735 100755 --- a/app/Views/client_basic_info.php +++ b/app/Views/client_basic_info.php @@ -106,6 +106,58 @@ input:checked + .slider:before { .slider.round:before { border-radius: 50%; } + +.hr-processed-options { + display: inline-flex; + align-items: center; + justify-content: flex-start; + gap: 1.25rem; + flex-wrap: nowrap; + white-space: nowrap; + width: auto; + max-width: 100%; +} + +.hr-processed-option { + display: inline-flex; + align-items: center; + justify-content: flex-start; + flex: 0 0 auto; + width: auto; + margin: 0; +} + +.hr-radio-input { + appearance: auto; + -webkit-appearance: radio; + width: 14px; + height: 14px; + margin-top: 0; + margin-right: 0.35rem; + margin-left: 0; + position: static; + float: none; + vertical-align: middle; +} + +.hr-radio-label { + display: inline-block; + width: auto; + margin: 0; + white-space: nowrap; + line-height: 1.2; +} + +#hr_file_processed_by_error_container { + display: block; + width: 100%; + margin-top: 0.25rem; + clear: both; +} + +#hr_file_processed_by_error_container .parsley-errors-list { + margin-bottom: 0; +}
@@ -170,8 +222,10 @@ input:checked + .slider:before { id="client_logo" name="client_logo" accept="image/jpeg, image/jpg, image/png" onchange="PreviewImage0(event);" - data-parsley-max-file-size="200" - data-parsley-file-extension="jpg,jpeg,png" + data-parsley-client-max-file-size="200" + data-parsley-client-file-extension="jpg,jpeg,png" + data-parsley-client-max-file-size-message="Maximum file size allowed is 200KB." + data-parsley-client-file-extension-message="Only JPG, JPEG, PNG files are allowed." data-parsley-errors-container="#client_logo_error_container" />
@@ -198,25 +252,29 @@ input:checked + .slider:before {
- +
- +
- +
@@ -473,35 +471,54 @@ $gst_total = 0; $(document).ready(function() { var ticketsTable = $('#employee-data-list-table'); - if (ticketsTable.length) { - nhanceListDataTableBeforeInit(); - var nhEmpDataTable = ticketsTable.DataTable(nhanceMergeListDataTableOptions({ - // dom: "<'row'<'col-sm-6'f><'col-sm-6 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-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right - "<'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>>", + if (ticketsTable.length) { + var _dtDefScroll = { + scrollX: $.fn.dataTable.defaults.scrollX, + scrollY: $.fn.dataTable.defaults.scrollY, + scrollCollapse: $.fn.dataTable.defaults.scrollCollapse + }; + $.extend($.fn.dataTable.defaults, { scrollX: false, scrollY: false, scrollCollapse: false }); + + var nhEmpDataTable = ticketsTable.DataTable({ + dom: "<'row'<'col-sm-6'f><'col-sm-6 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]], + scrollX: false, + scrollY: false, + scrollCollapse: false, + initComplete: function () { + var $wrap = $(this.api().table().container()); + var $body = $wrap.find('.dataTables_scrollBody'); + var $head = $wrap.find('.dataTables_scrollHead'); + if ($body.length && $head.length) { + $body.off('scroll.nhEmpHScroll').on('scroll.nhEmpHScroll', function () { + $head.scrollLeft($(this).scrollLeft()); + }); + $head.off('scroll.nhEmpHScroll').on('scroll.nhEmpHScroll', function () { + $body.scrollLeft($(this).scrollLeft()); + }); + } + }, buttons: [ { extend: 'collection', text: ' Export ', className: 'btn app-btn-secondary ', buttons: [ - { - extend: 'csv', - text: ' CSV ', - className: 'app-btn-primary ', - title: 'Members', - }, - { - extend: 'excel', - text: ' EXCEL ', - className: 'app-btn-primary ', - title: 'Members', - sheetName: 'Members' - } + { + extend: 'csv', + text: ' CSV ', + className: 'app-btn-primary ', + title: 'Members', + }, + { + extend: 'excel', + text: ' EXCEL ', + className: 'app-btn-primary ', + title: 'Members', + sheetName: 'Members' + } ] } ], @@ -517,16 +534,28 @@ $gst_total = 0; searchPlaceholder: "Search", emptyTable: '
No Data found
' }, - paging: true, // Enable pagination - pageLength: 25, // Set default number of rows per page (optional) + paging: true, + pageLength: 25, + autoWidth: false, + responsive: false, columnDefs: [ { targets: , width: 'px' }, ], - })); - nhanceListDataTableAfterInit(); - nhanceListDataTableBindAdjust(nhEmpDataTable); + }); + + $.extend($.fn.dataTable.defaults, _dtDefScroll); + + nhEmpDataTable.on('draw.dt', function () { + nhEmpDataTable.columns.adjust(); + }); + $(window).on('resize', function () { + nhEmpDataTable.columns.adjust(); + }); + setTimeout(function () { + nhEmpDataTable.columns.adjust(); + }, 0); } else { console.error("Table not found."); } diff --git a/app/Views/insurer_basic_info.php b/app/Views/insurer_basic_info.php index ce0720ba..b3af15ed 100755 --- a/app/Views/insurer_basic_info.php +++ b/app/Views/insurer_basic_info.php @@ -170,8 +170,10 @@ input:checked + .slider:before {
@@ -204,8 +206,8 @@ input:checked + .slider:before { + \ No newline at end of file