diff --git a/resources/views/pg/verification_logs.blade.php b/resources/views/pg/verification_logs.blade.php index 71c464e..f53ae95 100644 --- a/resources/views/pg/verification_logs.blade.php +++ b/resources/views/pg/verification_logs.blade.php @@ -39,7 +39,7 @@ Filter & Pencarian Log Audit - @if(request()->hasAny(['search', 'team', 'security_guard_id', 'gate_id', 'direction', 'status', 'start_date', 'end_date'])) + @if(request()->anyFilled(['search', 'team', 'security_guard_id', 'gate_id', 'direction', 'status', 'start_date', 'end_date'])) Reset Semua Filter diff --git a/resources/views/qma/activity_log.blade.php b/resources/views/qma/activity_log.blade.php index f6ada7d..888372f 100644 --- a/resources/views/qma/activity_log.blade.php +++ b/resources/views/qma/activity_log.blade.php @@ -36,11 +36,6 @@ Filter & Pencarian Log - @if(request()->hasAny(['search', 'start_date', 'end_date', 'gate_id', 'direction', 'status'])) - - Reset Semua Filter - - @endif @@ -124,12 +119,14 @@ - -
- - Reset - -
+ + @if(request()->anyFilled(['search', 'start_date', 'end_date', 'gate_id', 'direction', 'status'])) +
+ + Reset + +
+ @endif @@ -261,7 +258,7 @@

Tidak ditemukan catatan aktivitas kendaraan yang sesuai dengan kriteria filter saat ini.

- @if(request()->hasAny(['search', 'start_date', 'end_date', 'gate_id', 'direction', 'status'])) + @if(request()->anyFilled(['search', 'start_date', 'end_date', 'gate_id', 'direction', 'status'])) Reset Filter diff --git a/tests/Feature/VehicleActivityTest.php b/tests/Feature/VehicleActivityTest.php index c64cd9e..fb8a685 100644 --- a/tests/Feature/VehicleActivityTest.php +++ b/tests/Feature/VehicleActivityTest.php @@ -183,6 +183,26 @@ class VehicleActivityTest extends TestCase $response->assertSee('Aktivitas'); } + public function test_qma_log_reset_button_shown_only_when_filtered(): void + { + $qmaAdmin = User::where('role', 'qma_admin')->first(); + + // 1. Unfiltered request should NOT see Reset button + $response = $this->actingAs($qmaAdmin)->get('/qma/activity-log'); + $response->assertStatus(200); + $response->assertDontSee('Reset', false); + + // 2. Request with empty filter params should NOT see Reset button + $responseEmpty = $this->actingAs($qmaAdmin)->get('/qma/activity-log?search=&direction=&gate_id='); + $responseEmpty->assertStatus(200); + $responseEmpty->assertDontSee('Reset', false); + + // 3. Request with active filter should see Reset button + $responseFiltered = $this->actingAs($qmaAdmin)->get('/qma/activity-log?direction=in'); + $responseFiltered->assertStatus(200); + $responseFiltered->assertSee('Reset', false); + } + public function test_admin_pg_can_store_security_guard_and_creates_login_account(): void { $adminPg = User::where('role', 'pg_admin')->first();