diff --git a/resources/views/staff/worklist/index.blade.php b/resources/views/staff/worklist/index.blade.php index 872826e..8686e0b 100644 --- a/resources/views/staff/worklist/index.blade.php +++ b/resources/views/staff/worklist/index.blade.php @@ -192,23 +192,17 @@ function (givenDate) { filterTable(); }); - const tableId = '#worklist-table'; - const table = $(tableId).DataTable({ + const worklist_table = $('#worklist-table').DataTable({ retrieve: true }); - function getActiveTabStatus() { - return $('.nav-tabs .active').attr('id').replace('nav-', ''); - } - function filterTableStatus(status) { _status = status; - table.ajax.url(generateUrl()).load(); + worklist_table.ajax.url(generateUrl()).load(); } function filterTable() { - console.log(generateUrl()); - table.ajax.url(generateUrl()).load(); + worklist_table.ajax.url(generateUrl()).load(); } function formatDate(date) { @@ -216,8 +210,14 @@ function formatDate(date) { } $('a[data-bs-toggle="tab"]').on('click', function (e) { - _status = $(e.target).attr('id').replace('nav__', ''); - filterTable(); + let target = $(e.target); + //if (e.target.tagName === 'i') + if (!target.is('a')) target = target.closest('a'); + let _id = target.attr('id'); + if (_id) { + _status = _id.replace('nav__', ''); + filterTable(); + } }); filterTableStatus('unread');