diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 9384b60d..b046ee78 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -454,19 +454,44 @@ class LeadsController extends BaseController 'errors' => ['required' => 'Entity Type is required'], ]; + $clientNameRules = 'required|regex_match[/^[a-zA-Z0-9_ -]+$/]'; + $clientShortNameRules = 'required|regex_match[/^[a-zA-Z0-9_-]+$/]'; + + // Only validate for uniqueness if it's a new client being specified. + // If an existing client is selected from the dropdown, `client_id` will be present. + if (empty($postData['client_id'])) { + $ignoreClientId = null; + if ($id) { // This is an update of a lead + $lead = $this->leadsModel->find($id); + if ($lead && !empty($lead['is_client_created'])) { + $ignoreClientId = $lead['is_client_created']; + } + } + + if ($ignoreClientId) { + $clientNameRules .= '|is_unique[clients.client_name,id,' . $ignoreClientId . ']'; + $clientShortNameRules .= '|is_unique[clients.short_name,id,' . $ignoreClientId . ']'; + } else { + $clientNameRules .= '|is_unique[clients.client_name]'; + $clientShortNameRules .= '|is_unique[clients.short_name]'; + } + } + $rules['client_name'] = [ - 'rules' => 'required|regex_match[/^[a-zA-Z0-9_ -]+$/]', + 'rules' => $clientNameRules, 'errors' => [ 'required' => 'Client Name is required', 'regex_match' => 'Client Name only letters, numbers, space, hyphens and underscores are allowed', + 'is_unique' => 'This Client Name already exists.', ], ]; $rules['client_short_name'] = [ - 'rules' => 'required|regex_match[/^[a-zA-Z0-9_-]+$/]', + 'rules' => $clientShortNameRules, 'errors' => [ - 'required' => 'Client Short Name is required', - 'regex_match' => 'Client Short Name only letters, numbers, hyphens and underscores are allowed' + 'required' => 'Client Short Name is required', + 'regex_match' => 'Client Short Name only letters, numbers, hyphens and underscores are allowed', + 'is_unique' => 'This Client Short Name already exists.', ], ]; } @@ -925,6 +950,11 @@ class LeadsController extends BaseController $insertCount[] = $insert; $this->insertLeadStatus($insert, $value['status'], 3); + if ($value['lead_type'] == 1 && $value['status'] == 'won') { + $leadDataForClient = $this->leadsModel->find($insert); + $this->createClientWithLeadData($leadDataForClient); + } + if ($value['lead_form_type'] == 1) { //for this push the job to the calculateMembersDemography() function $job_details = new Jobs(); @@ -950,6 +980,14 @@ class LeadsController extends BaseController $this->insertMultiFilesData($data[0]['multi_file_data'], $id, $data[0]['lead_form_type']); $this->insertLeadStatus($id, $data[0]['status'], 3); + + if ($data[0]['lead_type'] == 1 && $data[0]['status'] == 'won') { + $leadDataForClient = $this->leadsModel->find($id); + if (empty($leadDataForClient['is_client_created'])) { + $this->createClientWithLeadData($leadDataForClient); + } + } + return $this->respond(['status' => true, 'lead_id' => $id, 'message' => "Opportunity updated successfully", 'data' => $data], 200); } return $this->respond(['status' => false, 'lead_id' => $id, 'message' => "Failed to update Opportunity", 'data' => $data], 200); diff --git a/app/Views/UserList.php b/app/Views/UserList.php index 3e927271..0adae2ad 100755 --- a/app/Views/UserList.php +++ b/app/Views/UserList.php @@ -78,13 +78,8 @@ table.dataTable tbody td { float: left !important; } - .table th, - .table td { - padding: 8px; - } - - table.dataTable tbody td { - padding: 4px 4px !important; + .col-12 { + max-width: 98% !important; } /* Tooltip Styles */ @@ -247,9 +242,12 @@ table.dataTable tbody td { border:1px solid rgba(41, 139, 142, 1); } - .dt-buttons.btn-group{ - display: grid; - grid-template-columns: 1fr .4fr .5fr .2fr; + .dt-buttons.btn-group{ + width: 100%; + display: flex; + align-items: center; + justify-content: flex-end; + gap: 8px; } #user-table_filter input{ width:100%; } @@ -361,15 +359,15 @@ table.dataTable tbody td {

Users

--> - +
- - - - - - + + + + + + @@ -384,8 +382,8 @@ table.dataTable tbody td { is_active == 1){ echo 'Active'; }else{ echo 'In-Active'; } ?> -
NameEmailMobile NoRoleStatusActionName Email Mobile No Role Status Action 
-
+
+
Edit @@ -611,7 +609,7 @@ table.dataTable tbody td {
-
+
@@ -619,23 +617,22 @@ table.dataTable tbody td {
- +
- +
- +
- - +
@@ -662,7 +659,7 @@ table.dataTable tbody td {
- +
@@ -1060,11 +1057,15 @@ table.dataTable tbody td { style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;">
`, searchPlaceholder: "Search", - emptyTable: '
No Data found
' + emptyTable: '
No Data found
', + paginate: { + previous: '◄', + next: '►' + } }, initComplete: function () { $(".dt-buttons").prepend(` -
+
Users | Nhance Partner @@ -1085,6 +1086,26 @@ table.dataTable tbody td { } }); + function applyBottomRowDropup() { + if (!table) return; + + const currentRows = table.rows({ page: 'current' }).nodes().toArray(); + $('#user-table tbody tr').removeClass('nh-force-dropup'); + $('#user-table tbody tr td.table-action-cell .btn-group.dropdown').removeClass('dropup'); + + // Mark last two rows on current page to open action menu upward. + const targetCount = Math.min(2, currentRows.length); + for (let i = 0; i < targetCount; i++) { + const row = currentRows[currentRows.length - 1 - i]; + if (!row) continue; + $(row).addClass('nh-force-dropup'); + $(row).find('td.table-action-cell .btn-group.dropdown').addClass('dropup'); + } + } + + applyBottomRowDropup(); + $('#user-table').on('draw.dt', applyBottomRowDropup); + // IMPORTANT — DataTables draw event REF: TTS table.on('draw.dt', function () { @@ -1243,6 +1264,8 @@ table.dataTable tbody td { }); $('body').on('click', '.btnPartnerEdit', function () { + $('#PartnerForm').parsley().reset(); + let user = JSON.parse($(this).attr('data-obj')); // ✅ convert back to object $('#PartnerForm').attr('action', ''); $('#partner_id').val(user.id); @@ -1328,13 +1351,6 @@ table.dataTable tbody td { }); - function onlyNumbers(event){ - var charcode; - charcode = event.which || event.keyCode; - if(charcode>= 48 && charcode <= 57)return true; - return false; - } - var form = document.getElementById("UserForm"); form.addEventListener("submit", function(event) { @@ -1426,58 +1442,18 @@ form.addEventListener("submit", function(event) { }); }); - function submitPartner(event) { - event.preventDefault(); + $('#PartnerForm').on('submit', function(e) { + e.preventDefault(); + var $form = $(this); + + $form.parsley().validate(); - var form = document.getElementById('PartnerForm'); + if ($form.parsley().isValid()) { var btn = document.getElementById('btnPartnerSubmit'); - var myModal = new bootstrap.Modal(document.getElementById('nhance-partner-modal')); - - // reset any old error styles - form.classList.remove('was-validated'); - - var name = document.getElementById('partner_name').value.trim(); - var mobile = document.getElementById('mobile_no').value.trim(); - var email = document.getElementById('email_addr').value.trim(); - // var address = document.getElementById('locn').value.trim(); - var rate = document.getElementById('retention_rate').value.trim(); - var nb = document.getElementById('partner_nhance_branch_id').value.trim(); - - // Validation checks - if (name === "" || mobile === "" || email === "" || rate === "" || nb === "") { - // console.log(name); - // console.log(mobile); - // console.log(email); - toastr.warning('Please fill all required fields.', 'Warning'); - form.classList.add('was-validated'); - return; - } - - // if (address.length > 1500) { - // toastr.error('Address cannot exceed 1500 characters', 'Warning'); - // form.classList.add('was-validated'); - // return; - // } - - var mobilePattern = /^[6-9]\d{9}$/; // must start with 6–9 and be 10 digits - if (!mobilePattern.test(mobile)) { - toastr.warning('Please enter a valid 10-digit mobile number starting with 6, 7, 8, or 9.', 'Warning'); - document.getElementById('mobile').focus(); - return; - } - - var emailPattern = /^[^@\s]+@[^@\s]+\.[^@\s]+$/; - if (!emailPattern.test(email)) { - toastr.warning('Please enter a valid email address.', 'Warning'); - document.getElementById('email').focus(); - return; - } - - // Disable button during submit btn.disabled = true; btn.innerText = "Saving..."; - var formData = new FormData(form); + var formData = new FormData(this); $.ajax({ url: "", @@ -1489,8 +1465,9 @@ form.addEventListener("submit", function(event) { success: function(response) { if (response.status === "success") { toastr.success('Partner saved successfully!', 'Success'); - myModal.hide(); - form.reset(); // reset form after success + $('#nhance-partner-modal').modal('hide'); + $form[0].reset(); + $('#partner_nhance_branch_id').val(null).trigger('change.select2'); } else { toastr.warning(response.message || 'Something went wrong.', 'Warning'); } @@ -1498,41 +1475,38 @@ form.addEventListener("submit", function(event) { error: function(xhr) { console.log("Error: " + xhr.statusText); if (xhr.status === 400) { - let response = JSON.parse(xhr.responseText); - let errorMessages = ""; - let seenMessages = []; // Array to store unique messages - if (response.errors) { - $.each(response.errors, function (field, message) { - if (!seenMessages.includes(message)) { - errorMessages += `• ${message}
`; - seenMessages.push(message); // Mark this message as "seen" - } - }); - toastr.error(errorMessages, 'Validation Error', { "allowHtml": true }); - } else { - toastr.warning(response.message || 'Validation failed', 'Warning'); - } - - }else if (xhr.status === 403) { - let response = JSON.parse(xhr.responseText); - toastr.error(response.message, 'Security Policy'); - } else if (xhr.status === 500) { - toastr.error('Something went wrong . Please try again later.', 'Server Error'); + let response = JSON.parse(xhr.responseText); + let errorMessages = ""; + let seenMessages = []; + if (response.errors) { + $.each(response.errors, function (field, message) { + if (!seenMessages.includes(message)) { + errorMessages += `• ${message}
`; + seenMessages.push(message); + } + }); + toastr.error(errorMessages, 'Validation Error', { "allowHtml": true }); } else { - toastr.error('An unexpected error occurred. Please try again later.', 'Error'); + toastr.warning(response.message || 'Validation failed', 'Warning'); } - console.error('Unexpected error:', xhr.responseText); - + } else if (xhr.status === 403) { + let response = JSON.parse(xhr.responseText); + toastr.error(response.message, 'Security Policy'); + } else if (xhr.status === 500) { + toastr.error('Something went wrong . Please try again later.', 'Server Error'); + } else { + toastr.error('An unexpected error occurred. Please try again later.', 'Error'); + } + console.error('Unexpected error:', xhr.responseText); }, complete: function() { btn.disabled = false; - btn.innerText = "Submit"; - $('#nhance-partner-modal').removeClass('show').hide(); - $('.modal-backdrop').remove(); + btn.innerText = "Submit"; loadPartner(); } }); - } + } + }); function submitIncentivePartner(event) { event.preventDefault(); @@ -1683,7 +1657,8 @@ form.addEventListener("submit", function(event) { ]; } - table.row.add(rowData); + let newRow = table.row.add(rowData); + $(newRow.node()).find('td:last').addClass('text-center table-action-cell'); }); } else { // Show placeholder if no data @@ -2122,6 +2097,8 @@ form.addEventListener("submit", function(event) { // myModal.show(); // open modal // }); $(document).on('click', '#btnNhancePartnerAdd', function(){ + $('#PartnerForm')[0].reset(); + $('#PartnerForm').parsley().reset(); $('#partner_name').val(''); $('#email_addr').val(''); $('#partner_id').val(''); diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php index d79655f6..4417e947 100755 --- a/app/Views/add_image_list.php +++ b/app/Views/add_image_list.php @@ -1,17 +1,4 @@
Saved
@@ -119,7 +155,7 @@ input:checked + .slider_blue::before {
- +
@@ -569,23 +605,32 @@ input:checked + .slider_blue::before { paging: true, searching: true, autoWidth: false, - responsive: true, + scrollX: true, + responsive: false, + dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'>>>" + + "<'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>>", language: { search: ` -
+
_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
' + emptyTable: '
No data available
', + zeroRecords: '
No data available
' }, }); + setTimeout(function () { + const dt = $('#table-client-policy').DataTable(); + dt.columns.adjust().draw(false); + }, 0); @@ -2664,7 +2709,7 @@ input:checked + .slider_blue::before { diff --git a/app/Views/faq_list.php b/app/Views/faq_list.php index aed8bbcb..1bffb6c9 100644 --- a/app/Views/faq_list.php +++ b/app/Views/faq_list.php @@ -1,8 +1,7 @@ @@ -37,15 +39,15 @@
-
Insurer
+
- - - + + + - - + + @@ -76,8 +78,8 @@ -
S.No.CategoryQuestionS.No. Category Question  StatusActionStatus Action 
-
+
+
@@ -116,7 +118,12 @@
- + Please enter the sub-category separated by '/'. For Example: Category / Category-1 / Category-2 @@ -126,18 +133,26 @@
- +
- +
@@ -155,10 +170,6 @@ // let faqEditor; let editor; - - - - // ClassicEditor // .create(document.querySelector('#answer')) // .then(editor => { @@ -207,9 +218,13 @@ // 2. Initialize editor = Jodit.make("#answer", editorConfig); + editor.events.on('change keyup', function () { + $('#answer').val(editor.value); + $('#answer').parsley().validate(); + }); var ticketsTable = $('#user-table'); - ticketsTable.DataTable({ + var table = ticketsTable.DataTable({ scrollX: true, // dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right // "<'row'<'col-sm-12'tr>>" + @@ -220,8 +235,7 @@ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]], buttons: [ { - text: 'Add', - className: 'btn app-btn-primary mr-2', + text: ' Add ', action: function(e, dt, node, config) { resetValues();openModal(); } @@ -253,12 +267,59 @@ style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;">
`, searchPlaceholder: "Search", - emptyTable: '
No Data found
' + emptyTable: '
No Data found
', + paginate: { + previous: '◄', + next: '►' + } }, paging: true, // Enable pagination pageLength: 10, // Set default number of rows per page (optional) // ordering: false, }); + + function placeActionDropdown($toggle) { + const $group = $toggle.closest('.btn-group.dropdown'); + const $menu = $group.find('.dropdown-menu'); + if (!$group.length || !$menu.length) return; + + // Reset previous state before recalculating placement. + $group.removeClass('dropup'); + + const toggleRect = $toggle[0].getBoundingClientRect(); + const menuHeight = $menu.outerHeight() || 120; + const spaceBelow = window.innerHeight - toggleRect.bottom; + const spaceAbove = toggleRect.top; + + // Open upward only when bottom space is insufficient. + if (spaceBelow < menuHeight + 12 && spaceAbove > menuHeight) { + $group.addClass('dropup'); + } + } + + $('#user-table').on('show.bs.dropdown', '.table-action-cell .dropdown-toggle', function () { + const $toggle = $(this); + const $scrollBody = $toggle.closest('.dataTables_scrollBody'); + + if ($scrollBody.length) { + $scrollBody.data('prev-overflow-y', $scrollBody.css('overflow-y')); + $scrollBody.css('overflow-y', 'visible'); + } + + placeActionDropdown($toggle); + }); + + $('#user-table').on('hide.bs.dropdown', '.table-action-cell .dropdown-toggle', function () { + const $scrollBody = $(this).closest('.dataTables_scrollBody'); + const prevOverflowY = $scrollBody.data('prev-overflow-y'); + if ($scrollBody.length) { + $scrollBody.css('overflow-y', prevOverflowY || 'auto'); + } + }); + + ticketsTable.on('draw.dt', function () { + $('#user-table tbody tr td.table-action-cell .btn-group.dropdown').removeClass('dropup'); + }); }); $('.close').click(function(){ resetValues(); }) @@ -404,115 +465,23 @@ return; } - if (typeof editor !== 'undefined') { - // Strip HTML tags and trim whitespace to see if there is actual text - const plainText = editor.value.replace(/<[^>]*>/g, '').trim(); - - // Check if it's truly empty or just contains empty tags like


- if (editor.value === '' || plainText === '') { - toastr.warning("Answer is required", 'Warning'); - return; // Stop the function here - } + var isValid = $(this).parsley({ + excluded: 'input[type=button], input[type=submit], input[type=reset], input[type=hidden]' + }).validate(); - // Block unsafe HTML/JS patterns - if (hasUnsafeHtml(editor.value)) { - toastr.error("Answer contains restricted tags or attributes. Script tags, iframes and event handlers (like onclick, onerror, onmouseover) are not allowed.", "Validation Error"); - return; - } - } + if (!isValid) return; // If valid, submit via AJAX handleSaveEditAndDelete('submit'); }); - - + $('#question').on('input', function() { + this.value = this.value.replace(/[^a-zA-Z0-9 _\-.,;:!?()&\/]/g, ''); + }); + + diff --git a/app/Views/file_list.php b/app/Views/file_list.php index eb4d6511..ca52b04d 100755 --- a/app/Views/file_list.php +++ b/app/Views/file_list.php @@ -39,6 +39,39 @@ font-size: 13px; } +#tickets-table{ + width: 100% !important; +} + +#tickets-table thead th{ + white-space: nowrap; + vertical-align: middle; +} + +#tickets-table_wrapper .datatable-search-wrapper{ + width: auto !important; +} + +#tickets-table_wrapper .dataTables_filter input{ + padding-right: 34px !important; + width: 220px !important; +} + +#tickets-table_wrapper .row.align-items-center{ + flex-wrap: nowrap; +} + +#tickets-table_wrapper .dataTables_info, +#tickets-table_wrapper .dataTables_length, +#tickets-table_wrapper .dataTables_paginate{ + white-space: nowrap; +} + +#tickets-table_wrapper .datatable-search-icon, +#tickets-table_wrapper .datatable-clear-icon{ + right: 11px !important; +} +
@@ -542,6 +575,17 @@ paging: true, }); + setTimeout(function () { + const dt = $('#tickets-table').DataTable(); + dt.columns.adjust().draw(false); + }, 0); + + }); + + $(window).on('resize', function () { + if ($.fn.DataTable.isDataTable('#tickets-table')) { + $('#tickets-table').DataTable().columns.adjust(); + } }); \ No newline at end of file diff --git a/app/Views/frontend_content_list.php b/app/Views/frontend_content_list.php index bf194d24..7ea2e54a 100644 --- a/app/Views/frontend_content_list.php +++ b/app/Views/frontend_content_list.php @@ -1,34 +1,8 @@ @@ -36,16 +10,16 @@
- +
- - - - - - + + + + + + @@ -61,10 +35,10 @@ -
S.No.TypeContent SectionHeadingStatusActionS.No. Type Content Section Heading Status Action 
-
+
+
-
+
Edit @@ -101,15 +75,30 @@
- +
- +
- +

@@ -117,21 +106,30 @@
- +
- +
+
@@ -259,10 +257,19 @@ // placeholder: "Start typing here...", // }; content_editor = Jodit.make("#content", editorConfig); + content_editor.events.on('change keyup', function () { + $('#content').val(content_editor.value); + $('#content').parsley().validate(); + }); + notes_editor = Jodit.make("#notes", editorConfig); + notes_editor.events.on('change keyup', function () { + $('#notes').val(notes_editor.value); + $('#notes').parsley().validate(); + }); var ticketsTable = $('#user-table'); - ticketsTable.DataTable({ + table = ticketsTable.DataTable({ scrollX: true, // dom: "<'row'<'col-sm-7'f><'col-sm-5 text-right'B>>" + // Filter left, buttons right // "<'row'<'col-sm-12'tr>>" + @@ -273,7 +280,7 @@ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]], buttons: [ { - text: 'Add', + text: ' Add ', className: 'btn app-btn-primary mr-2', action: function(e, dt, node, config) { resetValues();openModal();// $('#btnSubmit').removeClass('d-none'); @@ -306,12 +313,34 @@ style="position:absolute; right:10px; top:50%; transform:translateY(-50%); color:#666; display:none;">
`, searchPlaceholder: "Search", - emptyTable: '
No Data found
' + emptyTable: '
No Data found
', + paginate: { + previous: '◄', + next: '►' + } }, paging: true, // Enable pagination pageLength: 10, // Set default number of rows per page (optional) // ordering: false, }); + + function applyBottomRowDropup() { + if (!table) return; + + const currentRows = table.rows({ page: 'current' }).nodes().toArray(); + $('#user-table tbody tr').removeClass('nh-force-dropup'); + $('#user-table tbody tr td.table-action-cell .btn-group.dropdown').removeClass('dropup'); + + const targetCount = Math.min(2, currentRows.length); + for (let i = 0; i < targetCount; i++) { + const row = currentRows[currentRows.length - 1 - i]; + if (!row) continue; + $(row).addClass('nh-force-dropup'); + $(row).find('td.table-action-cell .btn-group.dropdown').addClass('dropup'); + } + } + applyBottomRowDropup(); + $('#user-table').on('draw.dt', applyBottomRowDropup); }); $('.close').click(function(){ resetValues(); }) @@ -560,6 +589,20 @@ return; } + // Sync jodit value back to textarea before parsely validation + if (typeof content_editor !== 'undefined') { + $('#content').val(content_editor.value); + } + if (typeof notes_editor !== 'undefined') { + $('#notes').val(notes_editor.value); + } + + var isValid = $(this).parsley({ + excluded: 'input[type=button], input[type=submit], input[type=reset], input[type=hidden]' + }).validate(); + + if (!isValid) return; + // Content validation if (typeof content_editor !== 'undefined') { if (isEditorEmpty(content_editor.value)) { @@ -629,9 +672,24 @@ } }); + // Restrict user typing to allow Regex only characters + $('#type').on('input', function() { + this.value = this.value.replace(/[^a-zA-Z0-9_ \-]/g, ''); + }); + + $('#content_section').on('input', function() { + this.value = this.value.replace(/[^a-zA-Z0-9_ \-]/g, ''); + }); + + $('#heading').on('input', function() { + this.value = this.value.replace(/[^a-zA-Z0-9 _\-.,;:!?()&\/]/g, ''); + }); + + // $('#type').on('input blur', function () { fieldTouched.type = true; validateTypeField(false); }); + // $('#heading').on('input blur', function () { fieldTouched.heading = true; validateHeadingField(false); }); - - \ No newline at end of file diff --git a/app/Views/kyc_onboarding.php b/app/Views/kyc_onboarding.php index eec6866d..427676aa 100755 --- a/app/Views/kyc_onboarding.php +++ b/app/Views/kyc_onboarding.php @@ -49,7 +49,7 @@

KYC Entity Type

- " > + " >
-->
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php index ba977d6e..a6ea4a3d 100755 --- a/app/Views/layout/footer.php +++ b/app/Views/layout/footer.php @@ -92,6 +92,94 @@ + @@ -134,6 +222,26 @@ + + @@ -1287,6 +1395,379 @@ $(function(){ table.search('').draw(); }); + /** + * NHance — DataTables row action menus (tbody .dropdown) + * + * Moving the menu to body broke Bootstrap: clicks on Edit/Delete are no longer inside + * the .btn-group parent, so the menu closes before the link receives the click. + * + * Keep the menu in the DOM under the ⋯: data-display="static" (no Popper transforms), + * data-boundary="scrollParent" (no position-static parent). While open, set overflow + * visible on .table-responsive / scroll body so the menu is not clipped. If there is + * more room above the button than below, add Bootstrap’s .dropup so the menu opens + * upward (last rows / short viewport). + */ + (function () { + if (typeof jQuery === 'undefined') { + return; + } + var $ = jQuery; + var syncNs = '.nhDtRowToolbarDd'; + + function nhRowDropdownScrollHost($dd) { + var $body = $dd.closest('.dataTables_scrollBody'); + if ($body.length) { + return $body; + } + return $dd.closest('.table-responsive'); + } + + function nhScheduleDropdownPopper($dd) { + var $toggle = $dd.children('[data-toggle="dropdown"]').first(); + if (!$toggle.length) { + return; + } + var inst = $toggle.data('bs.dropdown'); + if (inst && inst._popper) { + inst._popper.scheduleUpdate(); + } + } + + function nhRowActionDropdownOpts() { + $('.dataTables_wrapper table.dataTable tbody [data-toggle="dropdown"]').attr({ + 'data-boundary': 'scrollParent', + 'data-display': 'static', + 'data-flip': 'false' + }); + } + + function nhNormalizeActionCells(tableApi) { + if (!tableApi) { + return; + } + var $table = $(tableApi.table().node()); + $table.find('tbody tr').each(function () { + var $row = $(this); + var $actionCell = $row.find('td').filter(function () { + return $(this).find('.btn-group.dropdown, .dropdown-menu').length > 0; + }).last(); + if ($actionCell.length) { + $actionCell.addClass('table-action-cell'); + } + }); + } + + function nhApplyBottomRowDropup(tableApi) { + if (!tableApi) { + return; + } + var $table = $(tableApi.table().node()); + var rows = tableApi.rows({ page: 'current' }).nodes().toArray(); + $table.find('tbody tr').removeClass('nh-force-dropup'); + $table.find('tbody td.table-action-cell .btn-group.dropdown').removeClass('dropup'); + + var target = 0; + for (var i = rows.length - 1; i >= 0 && target < 2; i--) { + var $row = $(rows[i]); + var $group = $row.find('td.table-action-cell .btn-group.dropdown').first(); + if (!$group.length) { + continue; + } + $row.addClass('nh-force-dropup'); + $group.addClass('dropup'); + target++; + } + } + + $(function () { + var D = $.fn.dropdown && $.fn.dropdown.Constructor && $.fn.dropdown.Constructor.Default; + if (D) { + D.boundary = 'window'; + } + nhRowActionDropdownOpts(); + }); + + $(document).on('draw.dt', 'table.dataTable', function () { + nhRowActionDropdownOpts(); + var dt = $(this).DataTable(); + nhNormalizeActionCells(dt); + nhApplyBottomRowDropup(dt); + }); + + $(document).on('show.bs.dropdown', '.dataTables_wrapper table.dataTable tbody .dropdown', function () { + var $dd = $(this); + var $toggle = $dd.children('[data-toggle="dropdown"]').first(); + var $menu = $dd.children('.dropdown-menu').first(); + var el = $toggle[0]; + var $row = $dd.closest('tr'); + var isForcedDropup = $row.hasClass('nh-force-dropup'); + if (!isForcedDropup) { + // Fallback: if row marker is missing, still force dropup on the last 2 visible rows. + var $tbodyRows = $row.closest('tbody').children('tr:visible'); + if ($tbodyRows.length) { + var rowIdx = $tbodyRows.index($row); + isForcedDropup = rowIdx >= ($tbodyRows.length - 2); + } + } + var $scroll = $dd.closest('.dataTables_scrollBody'); + if ($scroll.length) { + $scroll.data('nh-prev-overflow', $scroll.css('overflow')); + $scroll.css('overflow', 'visible'); + } + var $resp = $dd.closest('.table-responsive'); + if ($resp.length) { + $resp.data('nh-prev-overflow-tr', $resp.css('overflow')); + $resp.css('overflow', 'visible'); + } + var $cardBody = $dd.closest('.card-body'); + if ($cardBody.length) { + $cardBody.data('nh-prev-overflow-cb', $cardBody.css('overflow')); + $cardBody.css('overflow', 'visible'); + } + if (!el || !el.getClientRects().length) { + return; + } + var rect = el.getBoundingClientRect(); + var vh = window.innerHeight; + var below = Math.max(0, vh - rect.bottom - 8); + var above = Math.max(0, rect.top - 8); + var menuHeight = 0; + if ($menu.length) { + // Measure true menu height even while hidden. + var prevStyle = $menu.attr('style'); + $menu.css({ display: 'block', visibility: 'hidden', maxHeight: '', overflowY: '' }); + menuHeight = $menu.outerHeight() || 0; + if (prevStyle !== undefined) { + $menu.attr('style', prevStyle); + } else { + $menu.removeAttr('style'); + } + } + + // Pick direction by space; prefer the side that can fit the full menu. + var openUp = false; + if (isForcedDropup) { + openUp = true; + } else if (menuHeight > 0) { + if (below >= menuHeight) { + openUp = false; + } else if (above >= menuHeight) { + openUp = true; + } else { + openUp = above > below; + } + } else { + openUp = below < 150 && above > below; + } + + // Keep explicit per-row dropup (set by nhApplyBottomRowDropup / page scripts). + if (!isForcedDropup) { + $dd.removeClass('dropup'); + } + $dd.removeData('nh-auto-dropup'); + + if (openUp) { + $dd.addClass('dropup'); + if (!isForcedDropup) { + $dd.data('nh-auto-dropup', 1); + } + } + + // If there still isn't enough room, keep all actions reachable via scroll. + if ($menu.length && menuHeight > 0) { + var usableSpace = openUp ? above : below; + var maxVisible = Math.max(140, usableSpace - 12); + if (menuHeight > maxVisible) { + $menu.css({ + maxHeight: maxVisible + 'px', + overflowY: 'auto' + }); + } else { + $menu.css({ + maxHeight: '', + overflowY: '' + }); + } + } + }); + + $(document).on('hidden.bs.dropdown', '.dataTables_wrapper table.dataTable tbody .dropdown', function () { + var $dd = $(this); + var $scroll = $dd.closest('.dataTables_scrollBody'); + if ($scroll.length) { + var o = $scroll.data('nh-prev-overflow'); + if (o !== undefined) { + $scroll.css('overflow', o); + } + $scroll.removeData('nh-prev-overflow'); + } + var $resp = $dd.closest('.table-responsive'); + if ($resp.length) { + var o2 = $resp.data('nh-prev-overflow-tr'); + if (o2 !== undefined) { + $resp.css('overflow', o2); + } + $resp.removeData('nh-prev-overflow-tr'); + } + var $cardBody = $dd.closest('.card-body'); + if ($cardBody.length) { + var o3 = $cardBody.data('nh-prev-overflow-cb'); + if (o3 !== undefined) { + $cardBody.css('overflow', o3); + } + $cardBody.removeData('nh-prev-overflow-cb'); + } + if ($dd.data('nh-auto-dropup')) { + $dd.removeClass('dropup'); + $dd.removeData('nh-auto-dropup'); + } + $dd.children('.dropdown-menu').css({ + maxHeight: '', + overflowY: '' + }); + }); + + $(document).on('shown.bs.dropdown', '.dataTables_wrapper .dropdown', function () { + var $dd = $(this); + if ($dd.closest('table.dataTable tbody').length) { + return; + } + var sync = function () { + nhScheduleDropdownPopper($dd); + }; + nhScheduleDropdownPopper($dd); + nhRowDropdownScrollHost($dd).off(syncNs).on('scroll' + syncNs, sync); + $(window).off(syncNs).on('scroll' + syncNs, sync); + var $contentPage = $dd.closest('.content-page'); + if ($contentPage.length) { + $contentPage.off(syncNs).on('scroll' + syncNs, sync); + } + }); + + $(document).on('hidden.bs.dropdown', '.dataTables_wrapper .dropdown', function () { + var $dd = $(this); + if ($dd.closest('table.dataTable tbody').length) { + return; + } + nhRowDropdownScrollHost($dd).off(syncNs); + $(window).off(syncNs); + $dd.closest('.content-page').off(syncNs); + }); + + /** + * NHance — standardize DataTables control layout for pages still using + * default DataTables DOM: + * top: length + search, bottom: info + paginate + * + * Requirement format: + * - top row: search (left), buttons (right if present) + * - bottom row: info (left), show-length + pagination (right) + * + * For wrappers without custom dom, move top `.dataTables_length` to + * bottom row before `.dataTables_paginate`. + */ + function normalizeDataTableLayout(wrapper) { + if (!wrapper || !wrapper.length) { + return; + } + var $rows = wrapper.children('div.row'); + if ($rows.length < 2) { + return; + } + + var $top = $rows.first(); + var $bottom = $rows.last(); + + var $topLength = $top.find('div.dataTables_length').first(); + var $bottomPaginate = $bottom.find('div.dataTables_paginate').first(); + + if (!$topLength.length || !$bottomPaginate.length) { + applyBottomSlotClasses($bottom); + return; + } + + if ($bottom.find('div.dataTables_length').length) { + applyBottomSlotClasses($bottom); + return; // already normalized/customized + } + + $bottomPaginate.before($topLength); + applyBottomSlotClasses($bottom); + } + + /** + * Mark bottom row containers so CSS can enforce exact requirement layout: + * info left; length + pagination grouped right. + */ + function applyBottomSlotClasses($bottomRow) { + if (!$bottomRow || !$bottomRow.length) { + return; + } + + $bottomRow.children('div').removeClass('nh-dt-bottom-info nh-dt-bottom-length nh-dt-bottom-paginate'); + + var $info = $bottomRow.find('div.dataTables_info').first().closest('div'); + var $len = $bottomRow.find('div.dataTables_length').first().closest('div'); + var $pag = $bottomRow.find('div.dataTables_paginate').first().closest('div'); + + if ($info.length) { + $info.addClass('nh-dt-bottom-info'); + } + if ($len.length) { + $len.addClass('nh-dt-bottom-length'); + } + if ($pag.length) { + $pag.addClass('nh-dt-bottom-paginate'); + } + } + + $(document).on('init.dt', function (e, settings) { + if (!settings || !settings.nTableWrapper) { + return; + } + var wrapper = $(settings.nTableWrapper); + normalizeDataTableLayout(wrapper); + /* Stops Bootstrap `.table-responsive` from adding a second horizontal scrollbar under pagination */ + wrapper.closest('.table-responsive').addClass('nh-dt-no-outer-scroll'); + try { + var dt = $(settings.nTable).DataTable(); + nhNormalizeActionCells(dt); + nhApplyBottomRowDropup(dt); + } catch (err) { + // keep page running if a table has non-standard setup + } + }); + + /** + * Prev/next disabled state (first page, last page, single page): DataTables + * normally sets `li.page-item.disabled`; re-sync from page.info() after each + * draw so grey-arrow styles in custom.css / header always match behaviour. + */ + $(document).on('draw.dt', function (e, settings) { + if (!settings || !settings.nTableWrapper || !settings.oFeatures || !settings.oFeatures.bPaginate) { + return; + } + var api; + try { + api = new $.fn.dataTable.Api(settings); + } catch (err) { + return; + } + var info = api.page.info(); + var $pag = $(settings.nTableWrapper).find('.dataTables_paginate'); + if (!$pag.length) { + return; + } + var pages = info.pages; + var atFirst = info.page <= 0; + var atLast = pages <= 0 || info.page >= pages - 1; + $pag.find('li.paginate_button.page-item.previous, li.page-item.previous').toggleClass('disabled', atFirst); + $pag.find('li.paginate_button.page-item.next, li.page-item.next').toggleClass('disabled', atLast); + $pag.find('a.paginate_button.previous').toggleClass('disabled', atFirst); + $pag.find('a.paginate_button.next').toggleClass('disabled', atLast); + }); + })(); + diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 97eef3be..d4082e93 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -30,6 +30,7 @@ /assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" /> /assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" /> + /assets/css/custom.css" rel="stylesheet" type="text/css" /> /assets/css/icons.min.css" rel="stylesheet" type="text/css" /> @@ -828,43 +829,164 @@ border: none !important; } - /* Previous / Next buttons */ - .dataTables_wrapper .dataTables_paginate .page-item.previous .page-link, - .dataTables_wrapper .dataTables_paginate .page-item.next .page-link { + .dataTables_wrapper .dataTables_paginate .page-item.previous, + .dataTables_wrapper .dataTables_paginate .page-item.next { + display: inline-flex !important; + align-items: center !important; + align-self: center !important; + } + + /* Previous / Next — white background; box matches page number height; arrow via ::before */ + .dataTables_wrapper .dataTables_paginate .page-item.previous:not(.disabled) .page-link, + .dataTables_wrapper .dataTables_paginate .page-item.next:not(.disabled) .page-link { border-radius: 13px !important; - background-color: #F5FFFF; + background-color: #ffffff !important; border: none !important; - box-shadow: 0 0 0 0.15rem #F5FFFF; - font-size: 0; - /* hide default text */ - position: relative; + box-shadow: none !important; + outline: none !important; + font-size: 0 !important; + line-height: 0 !important; + color: transparent !important; + position: relative !important; + overflow: hidden !important; + min-width: 32px !important; + width: 32px !important; + min-height: 2.25rem !important; + padding: 0 !important; + display: inline-flex !important; + align-items: center !important; + justify-content: center !important; } - /* Custom arrows */ - .dataTables_wrapper .dataTables_paginate .page-item.previous .page-link::before { - content: "◄"; - font-size: 14px; + /* Previous / Next — disabled (first page, last page, or single page): white btn, grey arrows */ + .dataTables_wrapper .dataTables_paginate .page-item.previous.disabled .page-link, + .dataTables_wrapper .dataTables_paginate .page-item.next.disabled .page-link { + border-radius: 13px !important; + background-color: #ffffff !important; + border: none !important; + box-shadow: none !important; + outline: none !important; + font-size: 0 !important; + line-height: 0 !important; + color: transparent !important; + position: relative !important; + overflow: hidden !important; + min-width: 32px !important; + width: 32px !important; + min-height: 2.25rem !important; + padding: 0 !important; + display: inline-flex !important; + align-items: center !important; + justify-content: center !important; + cursor: not-allowed !important; + pointer-events: none !important; + opacity: 1 !important; } + .dataTables_wrapper .dataTables_paginate .page-item.previous.disabled .page-link::before, + .dataTables_wrapper .dataTables_paginate .page-item.next.disabled .page-link::before { + color: #adb5bd !important; + } + + /* DataTables variant without .page-item/.page-link markup */ + .dataTables_wrapper .dataTables_paginate .paginate_button.previous:not(.disabled), + .dataTables_wrapper .dataTables_paginate .paginate_button.next:not(.disabled) { + border-radius: 13px !important; + background-color: #ffffff !important; + border: none !important; + box-shadow: none !important; + outline: none !important; + font-size: 0 !important; + line-height: 0 !important; + color: transparent !important; + position: relative !important; + overflow: hidden !important; + min-width: 32px !important; + width: 32px !important; + min-height: 2.25rem !important; + padding: 0 !important; + display: inline-flex !important; + align-items: center !important; + justify-content: center !important; + } + + .dataTables_wrapper .dataTables_paginate .paginate_button.previous.disabled, + .dataTables_wrapper .dataTables_paginate .paginate_button.next.disabled { + border-radius: 13px !important; + background-color: #ffffff !important; + border: none !important; + box-shadow: none !important; + outline: none !important; + font-size: 0 !important; + line-height: 0 !important; + min-width: 32px !important; + width: 32px !important; + min-height: 2.25rem !important; + padding: 0 !important; + position: relative !important; + overflow: hidden !important; + display: inline-flex !important; + align-items: center !important; + justify-content: center !important; + cursor: not-allowed !important; + pointer-events: none !important; + opacity: 1 !important; + } + + .dataTables_wrapper .dataTables_paginate .paginate_button.previous.disabled::before, + .dataTables_wrapper .dataTables_paginate .paginate_button.next.disabled::before { + color: #adb5bd !important; + } + + /* Arrows: dead-center in the hit box (Unicode glyphs have uneven metrics otherwise) */ + .dataTables_wrapper .dataTables_paginate .page-item.previous .page-link::before, .dataTables_wrapper .dataTables_paginate .page-item.next .page-link::before { - content: "►"; - font-size: 14px; + content: ""; + position: absolute !important; + left: 50% !important; + top: 50% !important; + transform: translate(-50%, -50%) !important; + line-height: 1 !important; + font-size: 12px !important; + display: block !important; + margin: 0 !important; } + .dataTables_wrapper .dataTables_paginate .page-item.previous:not(.disabled) .page-link::before { + content: "◄"; + color: #333333; + } + .dataTables_wrapper .dataTables_paginate .page-item.next:not(.disabled) .page-link::before { + content: "►"; + color: #333333; + } + .dataTables_wrapper .dataTables_paginate .page-item.previous.disabled .page-link::before { + content: "◄"; + } - /* Active / Inactive pages */ + .dataTables_wrapper .dataTables_paginate .page-item.next.disabled .page-link::before { + content: "►"; + } + + /* Avoid double arrows when Bootstrap markup nests .paginate_button + .page-link */ + .dataTables_wrapper .dataTables_paginate li.paginate_button.previous::before, + .dataTables_wrapper .dataTables_paginate li.paginate_button.next::before { + content: none !important; + } + + /* Active / Inactive page numbers only (not prev/next arrows) */ .dataTables_wrapper .dataTables_paginate .page-item.active .page-link { color: #fff !important; border-radius: 13px !important; } - .dataTables_wrapper .dataTables_paginate .page-item:not(.active) .page-link { + .dataTables_wrapper .dataTables_paginate .page-item:not(.active):not(.previous):not(.next) .page-link { border: 1px solid #fff !important; border-radius: 13px !important; } - + /* Info text */ .dataTables_info { font-size: 12px; @@ -959,8 +1081,7 @@ .card-body .card-body .dt-buttons, .card-body .card-body .datatable-buttons { margin-right: 0 !important; - padding-right: 2.25rem !important; - /* match card-body padding */ + padding-right: 0 !important; } /* Applies only to tables with data-custom-table-css="table" */ @@ -1424,7 +1545,7 @@ } - .dropdown { + .topbar-actions .dropdown { margin-right: 10px !important; } @@ -2389,6 +2510,20 @@ body[data-sidebar-size="condensed"] .footer { $default = base_url('public/assets/images/avatar_2x.png'); $firstName = isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'A'; $initial = strtoupper(substr($firstName, 0, 1)); + $roleId = get_role_id(); + $roleName = 'User'; + if ($roleId == ADMIN_ROLE_ID) { + $roleName = 'Admin'; + } elseif ($roleId == HEAD_ROLE_ID) { + $roleName = 'Head'; + } elseif ($roleId == MANAGER_ROLE_ID) { + $roleName = 'Manager'; + } elseif ($roleId == ACCOUNT_MANAGER_ROLE_ID) { + $roleName = 'Account Manager'; + } elseif ($roleId == STAFF_ROLE_ID) { + $roleName = 'Staff'; + } + $userTitle = $firstName . ' ( ' . $roleName . ' )'; ?> @@ -2397,18 +2532,19 @@ body[data-sidebar-size="condensed"] .footer { src="" onerror="this.onerror=null; this.src=''; this.style.display='none'; document.getElementById('avatar-fallback').style.display='flex';" alt="user-image" + title="" height="38" width="38" class="rounded-circle" style="object-fit:cover; border: 2px solid var(--primary-light); cursor:pointer;" > -