update
This commit is contained in:
@@ -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', [
|
||||
|
||||
Reference in New Issue
Block a user