From d6b1d8cb10ef1ebfbb3a49f4ae9144f6362b7c2e Mon Sep 17 00:00:00 2001 From: Wahyudin Date: Tue, 13 Oct 2026 21:12:43 +0700 Subject: [PATCH] feat: move reset filter to top-right corner of filter card in qma activity log --- resources/views/qma/activity_log.blade.php | 15 ++++++--------- tests/Feature/VehicleActivityTest.php | 6 +++--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/resources/views/qma/activity_log.blade.php b/resources/views/qma/activity_log.blade.php index 420ff79..ff91b6f 100644 --- a/resources/views/qma/activity_log.blade.php +++ b/resources/views/qma/activity_log.blade.php @@ -36,6 +36,12 @@ Filter & Pencarian Log + @if(request()->anyFilled(['search', 'start_date', 'end_date', 'gate_id', 'direction', 'status'])) + + + Reset Filter + + @endif @@ -117,15 +123,6 @@ - - - @if(request()->anyFilled(['search', 'start_date', 'end_date', 'gate_id', 'direction', 'status'])) -
- - Reset - -
- @endif diff --git a/tests/Feature/VehicleActivityTest.php b/tests/Feature/VehicleActivityTest.php index fb8a685..1e98a7e 100644 --- a/tests/Feature/VehicleActivityTest.php +++ b/tests/Feature/VehicleActivityTest.php @@ -190,17 +190,17 @@ class VehicleActivityTest extends TestCase // 1. Unfiltered request should NOT see Reset button $response = $this->actingAs($qmaAdmin)->get('/qma/activity-log'); $response->assertStatus(200); - $response->assertDontSee('Reset', false); + $response->assertDontSee('Reset Filter', 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); + $responseEmpty->assertDontSee('Reset Filter', 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); + $responseFiltered->assertSee('Reset Filter', false); } public function test_admin_pg_can_store_security_guard_and_creates_login_account(): void