diff --git a/htdocs/resources/views/cetak/rekappenerimaansample.blade.php b/htdocs/resources/views/cetak/rekappenerimaansample.blade.php index a7b54233..96cd045b 100644 --- a/htdocs/resources/views/cetak/rekappenerimaansample.blade.php +++ b/htdocs/resources/views/cetak/rekappenerimaansample.blade.php @@ -98,6 +98,11 @@ +
@@ -137,7 +142,7 @@ $petugas = trim($petugas.' '.$r['nmppdsjunior2']); } @endphp - + @@ -184,6 +189,7 @@ var printOrientation = document.getElementById('printOrientation'); var sortStatus = document.getElementById('sortStatus'); var filterStatus = document.getElementById('filterStatus'); + var filterCetak = document.getElementById('filterCetak'); var printHistoryBody = document.getElementById('printHistoryBody'); var token = document.getElementById('token').value; var markPrintedUrl = @json(route('markRekapPenerimaanSamplePrinted')); @@ -384,6 +390,7 @@ var rows = Array.from(tableBody.querySelectorAll('tr')); var sortMode = sortStatus ? sortStatus.value : 'default'; var selectedStatus = filterStatus ? filterStatus.value : ''; + var selectedCetak = filterCetak ? filterCetak.value : ''; rows.sort(function(a, b) { if (sortMode === 'asc') { @@ -398,7 +405,10 @@ rows.forEach(function(row) { tableBody.appendChild(row); var rowStatus = row.dataset.status || ''; - var show = selectedStatus === '' || rowStatus === selectedStatus; + var rowPrinted = row.dataset.printed || ''; + var showByStatus = (selectedStatus === '' || rowStatus === selectedStatus); + var showByCetak = (selectedCetak === '' || rowPrinted === selectedCetak); + var show = showByStatus && showByCetak; row.style.display = show ? '' : 'none'; if (!show) { var cb = row.querySelector('.row-check'); @@ -435,6 +445,9 @@ if (filterStatus) { filterStatus.addEventListener('change', applyStatusSortFilter); } + if (filterCetak) { + filterCetak.addEventListener('change', applyStatusSortFilter); + } initStatusFilterOptions(); applyStatusSortFilter();