From 94997f6057d616c60ba5aeaf9bf7f9de6d531748 Mon Sep 17 00:00:00 2001 From: Wahyudin Date: Tue, 13 Oct 2026 21:38:14 +0700 Subject: [PATCH] feat(qma): separate search bar above collapsible filter card on activity log --- resources/views/hse/employees_index.blade.php | 239 ++++++++++++++---- resources/views/qma/activity_log.blade.php | 117 ++++++--- tests/Feature/AuthenticationTest.php | 10 +- 3 files changed, 277 insertions(+), 89 deletions(-) diff --git a/resources/views/hse/employees_index.blade.php b/resources/views/hse/employees_index.blade.php index 52d20b6..8edf403 100644 --- a/resources/views/hse/employees_index.blade.php +++ b/resources/views/hse/employees_index.blade.php @@ -8,34 +8,38 @@
- - MANAJEMEN SISTEM - -
-

- Data Simper -

- - - +
+ + MANAJEMEN SISTEM + +
+

+ Data Simper +

- -
+ +
- @@ -43,9 +47,9 @@
-
+ -
+
@@ -57,39 +61,45 @@ class="w-full text-xs pl-10 pr-4 py-2.5 rounded-xl border border-slate-200 bg-white text-slate-800 placeholder-slate-400 focus:outline-none focus:border-[#1b5e20] focus:ring-2 focus:ring-[#1b5e20]/10 shadow-sm transition">
- -
- - + +
+
+ + - - + + +
- - @if(request()->anyFilled(['search', 'driver_status', 'simper_status'])) - - Reset - - @endif + +
+ @if(request()->anyFilled(['search', 'driver_status', 'simper_status'])) + + + Reset Filter + + @endif +
- -
+ +
@@ -422,10 +432,112 @@ + + + + + @endsection @section('scripts') @endsection diff --git a/resources/views/qma/activity_log.blade.php b/resources/views/qma/activity_log.blade.php index 36c1312..32d7cf0 100644 --- a/resources/views/qma/activity_log.blade.php +++ b/resources/views/qma/activity_log.blade.php @@ -32,45 +32,81 @@ - -
-
- -
- - Filter & Pencarian Log - + @php + $activeFilterCount = count(array_filter(request()->only(['start_date', 'end_date', 'gate_id', 'direction', 'status']))); + $isFilterOpen = request()->anyFilled(['start_date', 'end_date', 'gate_id', 'direction', 'status']); + @endphp + + + + +
+ +
+
+ +
+ +
+ + +
+ +
+
+ + +
+ +
+
+ + Opsi Filter Lanjutan + + @if($activeFilterCount > 0) + ({{ $activeFilterCount }} filter aktif) + @endif +
+ +
- -
- -
- -
-
- -
+
@@ -82,7 +118,7 @@
-
+
@@ -117,24 +153,21 @@
-
- -
-
- - Status PG: - -
- -
+
+
@@ -361,6 +394,18 @@ document.addEventListener('DOMContentLoaded', function () { } }); + // Toggle Card Filter Lanjutan + function toggleFilterCard() { + const card = document.getElementById('collapsibleFilterCard'); + const chevron = document.getElementById('filterChevron'); + if (card) { + card.classList.toggle('hidden'); + } + if (chevron) { + chevron.classList.toggle('rotate-180'); + } + } + // Buka & Tutup Modal Panduan Halaman function openGuideModal() { const modal = document.getElementById('guideModal'); diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php index 565136f..70ac7bf 100644 --- a/tests/Feature/AuthenticationTest.php +++ b/tests/Feature/AuthenticationTest.php @@ -248,32 +248,32 @@ class AuthenticationTest extends TestCase $responseDriver->assertStatus(200); $responseDriver->assertSee('KMH-2022-001'); // Driver $responseDriver->assertDontSee('KMH-2021-088'); // Bukan driver - $responseDriver->assertSee('Reset', false); + $responseDriver->assertSee('Reset Filter', false); // 3. Filter status driver = non_driver $responseNonDriver = $this->actingAs($hseUser)->get('/hse/employees?driver_status=non_driver'); $responseNonDriver->assertStatus(200); $responseNonDriver->assertSee('KMH-2021-088'); // Bukan driver $responseNonDriver->assertDontSee('KMH-2022-001'); // Driver - $responseNonDriver->assertSee('Reset', false); + $responseNonDriver->assertSee('Reset Filter', false); // 4. Filter SIMPER valid (masih berlaku) $responseValid = $this->actingAs($hseUser)->get('/hse/employees?simper_status=valid'); $responseValid->assertStatus(200); $responseValid->assertSee('KMH-2022-001'); // Valid $responseValid->assertDontSee('KMH-2023-012'); // Expired - $responseValid->assertSee('Reset', false); + $responseValid->assertSee('Reset Filter', false); // 5. Filter SIMPER expired (kedaluwarsa) $responseExpired = $this->actingAs($hseUser)->get('/hse/employees?simper_status=expired'); $responseExpired->assertStatus(200); $responseExpired->assertSee('KMH-2023-012'); // Expired $responseExpired->assertDontSee('KMH-2022-001'); // Valid - $responseExpired->assertSee('Reset', false); + $responseExpired->assertSee('Reset Filter', false); // 6. Request dengan query param kosong (default) tidak menampilkan tombol Reset $responseEmpty = $this->actingAs($hseUser)->get('/hse/employees?search=&driver_status=&simper_status='); $responseEmpty->assertStatus(200); - $responseEmpty->assertDontSee('Reset', false); + $responseEmpty->assertDontSee('Reset Filter', false); } }