feat: add filter for driver status and simper validity on hse employees page
This commit is contained in:
@@ -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'));
|
||||
}
|
||||
|
||||
|
||||
@@ -42,15 +42,57 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Kotak Pencarian (Search Bar Persis Format Gambar Data Karyawan) -->
|
||||
<div class="relative w-full max-w-sm sm:max-w-md">
|
||||
<!-- Filter & Pencarian Data Simper -->
|
||||
<div class="bg-white rounded-2xl border border-slate-200 shadow-sm p-3.5 sm:p-4">
|
||||
<form method="GET" action="{{ route('hse.employees.index') }}" class="flex flex-col md:flex-row items-stretch md:items-center justify-between gap-3">
|
||||
<div class="flex flex-col sm:flex-row items-stretch sm:items-center gap-3 flex-1">
|
||||
<!-- Pencarian Cepat -->
|
||||
<div class="relative flex-1 max-w-sm">
|
||||
<span class="absolute inset-y-0 left-0 pl-3.5 flex items-center pointer-events-none text-slate-400">
|
||||
<i class="fa-solid fa-magnifying-glass text-xs"></i>
|
||||
</span>
|
||||
<input type="text"
|
||||
name="search"
|
||||
id="simperSearchInput"
|
||||
value="{{ request('search') }}"
|
||||
placeholder="Cari NIK atau nama karyawan..."
|
||||
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-emerald-600 focus:ring-2 focus:ring-emerald-600/10 shadow-sm transition">
|
||||
class="w-full text-xs pl-10 pr-4 py-2.5 rounded-xl border border-slate-200 bg-slate-50/50 hover:bg-white focus:bg-white text-slate-800 placeholder-slate-400 focus:outline-none focus:ring-2 focus:ring-[#1b5e20]/20 focus:border-[#1b5e20] transition">
|
||||
</div>
|
||||
|
||||
<!-- Filter Status Driver -->
|
||||
<div class="w-full sm:w-48">
|
||||
<select name="driver_status"
|
||||
onchange="this.form.submit()"
|
||||
class="w-full text-xs rounded-xl border border-slate-200 bg-slate-50/50 hover:bg-white focus:bg-white px-3 py-2.5 text-slate-800 focus:outline-none focus:ring-2 focus:ring-[#1b5e20]/20 focus:border-[#1b5e20] transition">
|
||||
<option value="">Semua Status Driver</option>
|
||||
<option value="driver" {{ request('driver_status') === 'driver' ? 'selected' : '' }}>Driver</option>
|
||||
<option value="non_driver" {{ request('driver_status') === 'non_driver' ? 'selected' : '' }}>Bukan Driver</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Filter Masa Berlaku SIMPER -->
|
||||
<div class="w-full sm:w-56">
|
||||
<select name="simper_status"
|
||||
onchange="this.form.submit()"
|
||||
class="w-full text-xs rounded-xl border border-slate-200 bg-slate-50/50 hover:bg-white focus:bg-white px-3 py-2.5 text-slate-800 focus:outline-none focus:ring-2 focus:ring-[#1b5e20]/20 focus:border-[#1b5e20] transition">
|
||||
<option value="">Semua Masa Berlaku</option>
|
||||
<option value="valid" {{ request('simper_status') === 'valid' ? 'selected' : '' }}>Masih Berlaku (Aktif)</option>
|
||||
<option value="expiring_soon" {{ request('simper_status') === 'expiring_soon' ? 'selected' : '' }}>Segera Habis (≤ 30 Hari)</option>
|
||||
<option value="expired" {{ request('simper_status') === 'expired' ? 'selected' : '' }}>Kedaluwarsa (Expired)</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tombol Reset (Hanya tampil saat filter digunakan) -->
|
||||
@if(request()->anyFilled(['search', 'driver_status', 'simper_status']))
|
||||
<div class="flex items-center justify-end">
|
||||
<a href="{{ route('hse.employees.index') }}"
|
||||
class="px-4 py-2.5 rounded-xl text-xs font-semibold text-slate-600 bg-slate-100 hover:bg-slate-200 border border-slate-200 transition whitespace-nowrap">
|
||||
<span>Reset</span>
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- Tabel Data Simper dengan Header Biru Tua Navy (Persis Format Gambar) -->
|
||||
@@ -148,7 +190,14 @@
|
||||
<tr>
|
||||
<td colspan="8" class="py-12 text-center text-slate-400">
|
||||
<i class="fa-regular fa-folder-open text-3xl mb-2 block text-slate-300"></i>
|
||||
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']))
|
||||
<div class="mt-3">
|
||||
<a href="{{ route('hse.employees.index') }}" class="inline-flex items-center space-x-1.5 px-3 py-1.5 rounded-lg text-xs font-semibold text-[#1b5e20] bg-emerald-50 border border-emerald-200 hover:bg-emerald-100 transition">
|
||||
<span>Reset Filter</span>
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforelse
|
||||
|
||||
@@ -228,4 +228,52 @@ class AuthenticationTest extends TestCase
|
||||
$this->assertEquals('Mima HSE Updated', $user->name);
|
||||
$this->assertEquals('[email protected]', $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('<span>Reset</span>', 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('<span>Reset</span>', 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('<span>Reset</span>', 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('<span>Reset</span>', 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('<span>Reset</span>', 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('<span>Reset</span>', false);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user