From 8628087bfc1af2e266e736750a3a591c4548478e Mon Sep 17 00:00:00 2001 From: Dwi Swandhana Date: Mon, 20 Apr 2026 09:50:38 +0700 Subject: [PATCH] update --- htdocs/app/Http/Controllers/ReportController.php | 10 ++++++---- htdocs/resources/views/admin/glassreport.blade.php | 9 ++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/htdocs/app/Http/Controllers/ReportController.php b/htdocs/app/Http/Controllers/ReportController.php index 5121652a..9a37d605 100644 --- a/htdocs/app/Http/Controllers/ReportController.php +++ b/htdocs/app/Http/Controllers/ReportController.php @@ -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', [ diff --git a/htdocs/resources/views/admin/glassreport.blade.php b/htdocs/resources/views/admin/glassreport.blade.php index b46e084f..b83d5715 100644 --- a/htdocs/resources/views/admin/glassreport.blade.php +++ b/htdocs/resources/views/admin/glassreport.blade.php @@ -13,10 +13,12 @@ Download Full Excel (CSV) +
+ Preview Glass Report ditampilkan per halaman 50 pemeriksaan agar aman di memori. Untuk data lengkap gunakan tombol download CSV. +
@foreach (['A', 'B', 'C'] as $tableKey)

TABEL {{ $tableKey }}

- @@ -41,6 +43,11 @@
@endforeach + @if(method_exists($orderbydate, 'links')) +
+ {{ $orderbydate->links() }} +
+ @endif