From 7742df5d6734434045be25e79c97fb1ccb440143 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Sun, 27 Apr 2025 19:03:11 +0700 Subject: [PATCH] fix(currency): perbaiki logika pagination dan pencarian - Ubah perhitungan jumlah halaman untuk menggunakan jumlah record yang difilter. - Sesuaikan pengambilan nomor halaman saat ini dari request. - Ganti event listener pencarian dari 'input' menjadi 'change' untuk meningkatkan performa. - Tambahkan pemanggilan fungsi untuk mengatur ulang halaman ke 1 saat pencarian dilakukan. --- app/Http/Controllers/CurrencyController.php | 4 ++-- app/Models/Base.php | 5 ++++- resources/views/currency/index.blade.php | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index d118241..2924a82 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -134,10 +134,10 @@ $data = $query->get(); // Calculate the page count - $pageCount = ceil($totalRecords / $request->get('size')); + $pageCount = ceil($filteredRecords / ($request->get('size') ?: 1)); // Calculate the current page number - $currentPage = 0 + 1; + $currentPage = $request->get('page') ?: 1; // Return the response data as a JSON object return response()->json([ diff --git a/app/Models/Base.php b/app/Models/Base.php index 373f384..09da381 100644 --- a/app/Models/Base.php +++ b/app/Models/Base.php @@ -4,6 +4,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; + use Spatie\Activitylog\Facades\CauserResolver; use Spatie\Activitylog\LogOptions; use Spatie\Activitylog\Traits\LogsActivity; use Wildside\Userstamps\Userstamps; @@ -46,6 +47,8 @@ public function getActivitylogOptions() : LogOptions { - return LogOptions::defaults()->logAll()->useLogName('LPJ : '); + //CauserResolver::setCauser(auth()->user()); + + return LogOptions::defaults()->logAll()->useLogName('Basic Data'); } } diff --git a/resources/views/currency/index.blade.php b/resources/views/currency/index.blade.php index 8c19b19..63a0cad 100644 --- a/resources/views/currency/index.blade.php +++ b/resources/views/currency/index.blade.php @@ -193,8 +193,9 @@ let dataTable = new KTDataTable(element, dataTableOptions); // Custom search functionality - searchInput.addEventListener('input', function () { + searchInput.addEventListener('change', function () { const searchValue = this.value.trim(); + dataTable.goPage(1); dataTable.search(searchValue, true); });