This commit is contained in:
Dwi Swandhana
2026-04-20 09:50:38 +07:00
parent f964939863
commit 8628087bfc
2 changed files with 14 additions and 5 deletions
@@ -861,13 +861,15 @@ class ReportController extends Controller
$query->whereMonth('daftar', $bulan);
}
// Glass report perlu menampilkan seluruh hasil filter agar jumlah baris konsisten.
$orderbydate = $query->orderBy('daftar', 'ASC')->orderBy('id', 'ASC')->get();
// Preview dibuat paginated agar aman saat filter setahun.
$orderbydate = $query->orderBy('daftar', 'ASC')->orderBy('id', 'ASC')->paginate(50);
$orderbydate->appends(['bulan' => $bulan, 'tahun' => $tahun]);
$pageIds = $orderbydate->pluck('id')->toArray();
$antibiotikLookup = $this->mapAntibiotikData($pageIds);
$glassLookups = $this->getGlassReportLookups($orderbydate);
$glassTables = $this->splitGlassReportRows($orderbydate, $glassLookups);
$glassRows = $orderbydate->getCollection();
$glassLookups = $this->getGlassReportLookups($glassRows);
$glassTables = $this->splitGlassReportRows($glassRows, $glassLookups);
$glassHeaders = $this->getGlassReportHeaders();
return view('admin.glassreport', [