From 79626e28b2df8b6f1e1bbb42e20461744d0080e3 Mon Sep 17 00:00:00 2001 From: Zakiaass <117088186+zakiaass@users.noreply.github.com> Date: Tue, 19 Mar 2024 14:42:23 +0700 Subject: [PATCH] Pagination and Searching Riwayat --- .../Controllers/PerhitunganController.php | 21 +++++++++++++-- .../views/perhitungan/riwayat-hasil.blade.php | 26 ++++++++++++++++--- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/PerhitunganController.php b/app/Http/Controllers/PerhitunganController.php index 15d670f..a0d6fbf 100644 --- a/app/Http/Controllers/PerhitunganController.php +++ b/app/Http/Controllers/PerhitunganController.php @@ -245,8 +245,11 @@ public function perangkingan(Request $request) return view('perhitungan.perangkingan', compact('criterias', 'extracuricullars', 'nilaiAkhir', 'totalNilaiAkhir', 'totalNilaiAkhirPersen', 'peringkat')); } - public function getRiwayatHasil() + public function getRiwayatHasil(Request $request) { + // Ambil data riwayat hasil dengan pagination + $logsQuery = LogActivity::query(); + // Periksa apakah pengguna telah login if (auth()->check()) { // Jika pengguna adalah admin, ambil semua aktivitas log @@ -262,6 +265,20 @@ public function getRiwayatHasil() $logs = collect(); } + if ($request->has('search')) { + $search = $request->search; + $logsQuery->where(function ($query) use ($search) { + $query->whereHas('user', function ($query) use ($search) { + $query->where('name', 'like', '%' . $search . '%'); + })->orWhereHas('extracuricullar', function ($query) use ($search) { + $query->where('nama', 'like', '%' . $search . '%'); + }); + }); + } + + // Lakukan pagination dengan 10 item per halaman + $logs = $logsQuery->paginate(10); + // Ambil data dari formulir atau perhitungan Anda $nilaiUtility = session('nilaiUtility', []); @@ -335,7 +352,7 @@ public function getRiwayatHasil() public function index() { - // + } /** diff --git a/resources/views/perhitungan/riwayat-hasil.blade.php b/resources/views/perhitungan/riwayat-hasil.blade.php index 75b9580..2009a66 100644 --- a/resources/views/perhitungan/riwayat-hasil.blade.php +++ b/resources/views/perhitungan/riwayat-hasil.blade.php @@ -33,7 +33,19 @@
-

Hasil Riwayat

+

Hasil Riwayat Penilaian

+
+
+
+
+ +
+ +
+
+
@csrf @@ -49,9 +61,9 @@ - @forelse ($logs as $log) + @forelse ($logs as $index => $log) - {{ $loop->iteration }} + {{ $index + $logs->firstItem() }} {{ $log->user->name }} {{ $log->extracuricullar->nama }} {{ $log->final_score }} @@ -63,6 +75,14 @@ @endforelse +
+
+
+ Showing data {{ $logs->firstItem() }} to {{ $logs->lastItem() }} of {{ $logs->total() }} entries +
+
{{ $logs->links() }}
+
+