From e731e9cea043db9748bafc095f78a00cd6876435 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 7 May 2025 13:31:34 +0700 Subject: [PATCH] fix(laporan-penilaian): perbaiki logika paginasi dan tambahkan kontrol pagination di view - Ubah logika default nilai parameter halaman ketika tidak ada input dari request. - Tambahkan elemen kontrol pagination dan jumlah data per halaman di tampilan UI. - Pastikan data table kembali ke halaman pertama saat melakukan ekspor data. Signed-off-by: Daeng Deni Mardaeni --- ...lPenilaianJaminanInternalExternalController.php | 2 +- .../index.blade.php | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php b/app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php index 3bac546..081d455 100644 --- a/app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php +++ b/app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php @@ -190,7 +190,7 @@ $pageCount = ceil($totalRecords / $request->get('size')); // Calculate the current page number - $currentPage = $request->get('page', 1); + $currentPage = $request->get('page') ?: 1; // Return the response data as a JSON object return response()->json([ diff --git a/resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php b/resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php index f67fb41..bc59c17 100644 --- a/resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php +++ b/resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php @@ -219,10 +219,19 @@ - - + @@ -437,6 +446,7 @@ // Update export URL with filters function updateExportUrl() { + dataTable.goPage(1); let url = new URL(exportBtn.href); if (startDateInput.value) {