update
This commit is contained in:
@@ -98,6 +98,11 @@
|
|||||||
<select id="filterStatus" class="btn btn-default">
|
<select id="filterStatus" class="btn btn-default">
|
||||||
<option value="">Filter Status: Semua</option>
|
<option value="">Filter Status: Semua</option>
|
||||||
</select>
|
</select>
|
||||||
|
<select id="filterCetak" class="btn btn-default">
|
||||||
|
<option value="">Filter Cetak: Semua</option>
|
||||||
|
<option value="done">Sudah Dicetak</option>
|
||||||
|
<option value="pending">Belum Dicetak</option>
|
||||||
|
</select>
|
||||||
<button type="button" class="btn btn-success" id="btnprintselected"><i class="fa fa-print"></i> Cetak Terpilih</button>
|
<button type="button" class="btn btn-success" id="btnprintselected"><i class="fa fa-print"></i> Cetak Terpilih</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="rekap-table-wrap">
|
<div class="rekap-table-wrap">
|
||||||
@@ -137,7 +142,7 @@
|
|||||||
$petugas = trim($petugas.' '.$r['nmppdsjunior2']);
|
$petugas = trim($petugas.' '.$r['nmppdsjunior2']);
|
||||||
}
|
}
|
||||||
@endphp
|
@endphp
|
||||||
<tr data-id="{{ $r['id'] }}" data-status="{{ strtolower($statusValue) }}" data-order="{{ $loop->index }}" class="{{ $isPrinted ? 'printed-row' : '' }}">
|
<tr data-id="{{ $r['id'] }}" data-status="{{ strtolower($statusValue) }}" data-printed="{{ $isPrinted ? 'done' : 'pending' }}" data-order="{{ $loop->index }}" class="{{ $isPrinted ? 'printed-row' : '' }}">
|
||||||
<td style="text-align:center;">
|
<td style="text-align:center;">
|
||||||
<input type="checkbox" class="row-check" {{ $isPrinted ? 'disabled' : '' }}>
|
<input type="checkbox" class="row-check" {{ $isPrinted ? 'disabled' : '' }}>
|
||||||
</td>
|
</td>
|
||||||
@@ -184,6 +189,7 @@
|
|||||||
var printOrientation = document.getElementById('printOrientation');
|
var printOrientation = document.getElementById('printOrientation');
|
||||||
var sortStatus = document.getElementById('sortStatus');
|
var sortStatus = document.getElementById('sortStatus');
|
||||||
var filterStatus = document.getElementById('filterStatus');
|
var filterStatus = document.getElementById('filterStatus');
|
||||||
|
var filterCetak = document.getElementById('filterCetak');
|
||||||
var printHistoryBody = document.getElementById('printHistoryBody');
|
var printHistoryBody = document.getElementById('printHistoryBody');
|
||||||
var token = document.getElementById('token').value;
|
var token = document.getElementById('token').value;
|
||||||
var markPrintedUrl = @json(route('markRekapPenerimaanSamplePrinted'));
|
var markPrintedUrl = @json(route('markRekapPenerimaanSamplePrinted'));
|
||||||
@@ -384,6 +390,7 @@
|
|||||||
var rows = Array.from(tableBody.querySelectorAll('tr'));
|
var rows = Array.from(tableBody.querySelectorAll('tr'));
|
||||||
var sortMode = sortStatus ? sortStatus.value : 'default';
|
var sortMode = sortStatus ? sortStatus.value : 'default';
|
||||||
var selectedStatus = filterStatus ? filterStatus.value : '';
|
var selectedStatus = filterStatus ? filterStatus.value : '';
|
||||||
|
var selectedCetak = filterCetak ? filterCetak.value : '';
|
||||||
|
|
||||||
rows.sort(function(a, b) {
|
rows.sort(function(a, b) {
|
||||||
if (sortMode === 'asc') {
|
if (sortMode === 'asc') {
|
||||||
@@ -398,7 +405,10 @@
|
|||||||
rows.forEach(function(row) {
|
rows.forEach(function(row) {
|
||||||
tableBody.appendChild(row);
|
tableBody.appendChild(row);
|
||||||
var rowStatus = row.dataset.status || '';
|
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';
|
row.style.display = show ? '' : 'none';
|
||||||
if (!show) {
|
if (!show) {
|
||||||
var cb = row.querySelector('.row-check');
|
var cb = row.querySelector('.row-check');
|
||||||
@@ -435,6 +445,9 @@
|
|||||||
if (filterStatus) {
|
if (filterStatus) {
|
||||||
filterStatus.addEventListener('change', applyStatusSortFilter);
|
filterStatus.addEventListener('change', applyStatusSortFilter);
|
||||||
}
|
}
|
||||||
|
if (filterCetak) {
|
||||||
|
filterCetak.addEventListener('change', applyStatusSortFilter);
|
||||||
|
}
|
||||||
|
|
||||||
initStatusFilterOptions();
|
initStatusFilterOptions();
|
||||||
applyStatusSortFilter();
|
applyStatusSortFilter();
|
||||||
|
|||||||
Reference in New Issue
Block a user