diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index b46b2f2..8a39130 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -17,10 +17,6 @@ class EmployeeController extends Controller { $totalEmployees = Employee::count(); $totalDrivers = Employee::where('is_operator', true)->count(); - $validSimperCount = Employee::where('is_operator', true) - ->whereNotNull('simper_expired_at') - ->where('simper_expired_at', '>=', now()->toDateString()) - ->count(); $expiredSimperCount = Employee::where('is_operator', true) ->where(function ($q) { $q->whereNull('simper_expired_at') @@ -50,7 +46,6 @@ class EmployeeController extends Controller return view('hse.dashboard', compact( 'totalEmployees', 'totalDrivers', - 'validSimperCount', 'expiredSimperCount', 'nonDriversCount', 'recentDrivers', @@ -62,9 +57,58 @@ class EmployeeController extends Controller /** * Tampilkan daftar master karyawan HSE & status SIMPER. */ - public function index(): View + public function index(Request $request): View { - $employees = Employee::orderBy('name')->get(); + $query = Employee::query(); + + // 1. Pencarian Kata Kunci (NIK, Nama, Jabatan, Unit, Divisi) + if ($request->filled('search')) { + $search = trim($request->input('search')); + $query->where(function ($q) use ($search) { + $q->where('nik', 'like', "%{$search}%") + ->orWhere('name', 'like', "%{$search}%") + ->orWhere('position', 'like', "%{$search}%") + ->orWhere('unit_kerja', 'like', "%{$search}%") + ->orWhere('division', 'like', "%{$search}%"); + }); + } + + // 2. Filter Status Driver + if ($request->filled('driver_status')) { + $driverStatus = $request->input('driver_status'); + if ($driverStatus === 'driver') { + $query->where('is_operator', true); + } elseif ($driverStatus === 'non_driver') { + $query->where('is_operator', false); + } + } + + // 3. Filter Masa Berlaku SIMPER + if ($request->filled('simper_status')) { + $simperStatus = $request->input('simper_status'); + $today = now()->toDateString(); + $expiringSoon = now()->addDays(30)->toDateString(); + + if ($simperStatus === 'valid') { + $query->where('is_operator', true) + ->whereNotNull('simper_expired_at') + ->where('simper_expired_at', '>=', $today); + } elseif ($simperStatus === 'expired') { + $query->where('is_operator', true) + ->where(function ($q) use ($today) { + $q->whereNull('simper_expired_at') + ->orWhere('simper_expired_at', '<', $today); + }); + } elseif ($simperStatus === 'expiring_soon') { + $query->where('is_operator', true) + ->whereNotNull('simper_expired_at') + ->where('simper_expired_at', '>=', $today) + ->where('simper_expired_at', '<=', $expiringSoon); + } + } + + $employees = $query->orderBy('name')->get(); + return view('hse.employees_index', compact('employees')); } diff --git a/resources/views/hse/employees_index.blade.php b/resources/views/hse/employees_index.blade.php index 297826b..5196b9f 100644 --- a/resources/views/hse/employees_index.blade.php +++ b/resources/views/hse/employees_index.blade.php @@ -42,15 +42,57 @@ - -
- - - - + +
+
+
+ +
+ + + + +
+ + +
+ +
+ + +
+ +
+
+ + + @if(request()->anyFilled(['search', 'driver_status', 'simper_status'])) + + @endif +
@@ -148,7 +190,14 @@ - Belum ada data pengemudi atau SIMPER yang terdaftar. + Belum ada data pengemudi atau SIMPER yang sesuai kriteria filter. + @if(request()->anyFilled(['search', 'driver_status', 'simper_status'])) +
+ + Reset Filter + +
+ @endif @endforelse diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php index 703b971..565136f 100644 --- a/tests/Feature/AuthenticationTest.php +++ b/tests/Feature/AuthenticationTest.php @@ -228,4 +228,52 @@ class AuthenticationTest extends TestCase $this->assertEquals('Mima HSE Updated', $user->name); $this->assertEquals('mima.updated@kerincihydro.co.id', $user->email); } + + /** + * Memastikan Admin HSE dapat memfilter data SIMPER berdasarkan Status Driver dan Masa Berlaku. + */ + public function test_admin_hse_can_filter_employees_by_driver_status_and_simper_validity(): void + { + $hseUser = User::where('username', '1185')->first(); + + // 1. Tanpa filter: semua tampil dan tombol Reset tidak muncul + $response = $this->actingAs($hseUser)->get('/hse/employees'); + $response->assertStatus(200); + $response->assertSee('Semua Status Driver'); + $response->assertSee('Semua Masa Berlaku'); + $response->assertDontSee('Reset', false); + + // 2. Filter status driver = driver + $responseDriver = $this->actingAs($hseUser)->get('/hse/employees?driver_status=driver'); + $responseDriver->assertStatus(200); + $responseDriver->assertSee('KMH-2022-001'); // Driver + $responseDriver->assertDontSee('KMH-2021-088'); // Bukan driver + $responseDriver->assertSee('Reset', 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); + + // 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); + + // 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); + + // 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); + } }