feat: implement flexible hse simper types, multi-simper personil, and mobile heavy timesheet integration
This commit is contained in:
@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Hse;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Employee;
|
||||
use App\Models\EmployeeSimper;
|
||||
use App\Models\SimperType;
|
||||
use App\Models\User;
|
||||
use App\Services\ImageCompressionService;
|
||||
use App\Services\SimperPdfExporter;
|
||||
@@ -73,7 +75,7 @@ class EmployeeController extends Controller
|
||||
*/
|
||||
private function getFilteredEmployees(Request $request): Builder
|
||||
{
|
||||
$query = Employee::query();
|
||||
$query = Employee::with(['simpers.simperType']);
|
||||
|
||||
// 1. Pencarian Kata Kunci (NIK, Nama, Jabatan, Unit, Divisi)
|
||||
if ($request->filled('search')) {
|
||||
@@ -156,7 +158,9 @@ class EmployeeController extends Controller
|
||||
$employeeTypes[] = 'Sukon';
|
||||
}
|
||||
|
||||
return view('hse.employees_index', compact('employees', 'employeeTypes'));
|
||||
$availableSimperTypes = SimperType::active()->orderBy('name')->get();
|
||||
|
||||
return view('hse.employees_index', compact('employees', 'employeeTypes', 'availableSimperTypes'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -613,7 +617,7 @@ class EmployeeController extends Controller
|
||||
$user->update(['photo_path' => $photoPath]);
|
||||
}
|
||||
|
||||
Employee::create([
|
||||
$employee = Employee::create([
|
||||
'nik' => $validated['nik'],
|
||||
'name' => $validated['name'],
|
||||
'employee_type' => $employeeType,
|
||||
@@ -626,6 +630,9 @@ class EmployeeController extends Controller
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
|
||||
// Sinkronisasi Multi-SIMPER Personil
|
||||
$this->syncEmployeeSimpers($employee, $request, $isOperator, $simperExpiredAt);
|
||||
|
||||
return back()->with('success', "Data karyawan {$validated['name']} berhasil ditambahkan.");
|
||||
}
|
||||
|
||||
@@ -677,6 +684,9 @@ class EmployeeController extends Controller
|
||||
'photo_path' => $photoPath,
|
||||
]);
|
||||
|
||||
// Sinkronisasi Multi-SIMPER Personil
|
||||
$this->syncEmployeeSimpers($employee, $request, $isOperator, $simperExpiredAt);
|
||||
|
||||
// Sinkronkan akun login User terkait
|
||||
$linkedUser = $employee->user ?: User::where('username', $employee->nik)->first();
|
||||
if ($linkedUser) {
|
||||
@@ -691,4 +701,67 @@ class EmployeeController extends Controller
|
||||
|
||||
return back()->with('success', "Data SIMPER untuk {$employee->name} berhasil diperbarui.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper sinkronisasi multi-SIMPER personil.
|
||||
*/
|
||||
private function syncEmployeeSimpers(Employee $employee, Request $request, bool $isOperator, ?string $fallbackDate): void
|
||||
{
|
||||
if (! $isOperator) {
|
||||
$employee->simpers()->delete();
|
||||
return;
|
||||
}
|
||||
|
||||
$simperAssignments = $request->input('simper_assignments') ?? $request->input('simpers');
|
||||
|
||||
if (is_array($simperAssignments) && count($simperAssignments) > 0) {
|
||||
$activeTypeIds = [];
|
||||
$maxExpiredAt = null;
|
||||
|
||||
foreach ($simperAssignments as $typeId => $data) {
|
||||
$isEnabled = ! empty($data['enabled']) || (! isset($data['enabled']) && ! empty($data['expired_at']));
|
||||
if ($isEnabled && ! empty($data['expired_at'])) {
|
||||
$expDate = $data['expired_at'];
|
||||
$simperNum = ! empty($data['simper_number']) ? trim($data['simper_number']) : ('SMP-' . str_pad($employee->id, 4, '0', STR_PAD_LEFT));
|
||||
|
||||
EmployeeSimper::updateOrCreate(
|
||||
['employee_id' => $employee->id, 'simper_type_id' => $typeId],
|
||||
[
|
||||
'simper_number' => $simperNum,
|
||||
'expired_at' => $expDate,
|
||||
'status' => 'active',
|
||||
]
|
||||
);
|
||||
|
||||
$activeTypeIds[] = (int) $typeId;
|
||||
|
||||
if (! $maxExpiredAt || $expDate > $maxExpiredAt) {
|
||||
$maxExpiredAt = $expDate;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Hapus jenis SIMPER yang sudah tidak dicentang
|
||||
EmployeeSimper::where('employee_id', $employee->id)
|
||||
->whereNotIn('simper_type_id', $activeTypeIds)
|
||||
->delete();
|
||||
|
||||
if ($maxExpiredAt && $employee->simper_expired_at != $maxExpiredAt) {
|
||||
$employee->update(['simper_expired_at' => $maxExpiredAt]);
|
||||
}
|
||||
} elseif ($fallbackDate) {
|
||||
// Fallback untuk form sederhana / pengujian yang mengirimkan 1 tanggal simper_expired_at
|
||||
$lvTypeId = SimperType::where('code', 'SIMPER-LV')->value('id');
|
||||
if ($lvTypeId) {
|
||||
EmployeeSimper::updateOrCreate(
|
||||
['employee_id' => $employee->id, 'simper_type_id' => $lvTypeId],
|
||||
[
|
||||
'simper_number' => 'SMP-' . str_pad($employee->id, 4, '0', STR_PAD_LEFT),
|
||||
'expired_at' => $fallbackDate,
|
||||
'status' => 'active',
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,106 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Hse;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\SimperType;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class SimperTypeController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan daftar master jenis SIMPER.
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$today = Carbon::today()->toDateString();
|
||||
|
||||
$simperTypes = SimperType::withCount([
|
||||
'employeeSimpers as active_holders_count' => function ($q) use ($today) {
|
||||
$q->where('status', 'active')
|
||||
->whereNotNull('expired_at')
|
||||
->where('expired_at', '>=', $today);
|
||||
},
|
||||
'employeeSimpers as total_holders_count',
|
||||
])
|
||||
->orderBy('name')
|
||||
->get();
|
||||
|
||||
$categoryScopes = SimperType::SCOPES;
|
||||
|
||||
return view('hse.simper_types_index', compact('simperTypes', 'categoryScopes'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tambah jenis SIMPER baru.
|
||||
*/
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'code' => ['required', 'string', 'max:50', 'unique:simper_types,code'],
|
||||
'name' => ['required', 'string', 'max:100'],
|
||||
'category_scope' => ['required', 'string', Rule::in(array_keys(SimperType::SCOPES))],
|
||||
'description' => ['nullable', 'string', 'max:500'],
|
||||
'is_active' => ['nullable', 'boolean'],
|
||||
]);
|
||||
|
||||
$code = strtoupper(trim($validated['code']));
|
||||
|
||||
SimperType::create([
|
||||
'code' => $code,
|
||||
'name' => trim($validated['name']),
|
||||
'category_scope' => $validated['category_scope'],
|
||||
'description' => $validated['description'] ?? null,
|
||||
'is_active' => $request->boolean('is_active', true),
|
||||
]);
|
||||
|
||||
return back()->with('success', "Jenis SIMPER '{$validated['name']}' ({$code}) berhasil ditambahkan.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Perbarui data jenis SIMPER.
|
||||
*/
|
||||
public function update(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$simperType = SimperType::findOrFail($id);
|
||||
|
||||
$validated = $request->validate([
|
||||
'code' => ['required', 'string', 'max:50', Rule::unique('simper_types', 'code')->ignore($simperType->id)],
|
||||
'name' => ['required', 'string', 'max:100'],
|
||||
'category_scope' => ['required', 'string', Rule::in(array_keys(SimperType::SCOPES))],
|
||||
'description' => ['nullable', 'string', 'max:500'],
|
||||
'is_active' => ['nullable', 'boolean'],
|
||||
]);
|
||||
|
||||
$simperType->update([
|
||||
'code' => strtoupper(trim($validated['code'])),
|
||||
'name' => trim($validated['name']),
|
||||
'category_scope' => $validated['category_scope'],
|
||||
'description' => $validated['description'] ?? null,
|
||||
'is_active' => $request->boolean('is_active', true),
|
||||
]);
|
||||
|
||||
return back()->with('success', "Jenis SIMPER '{$simperType->name}' berhasil diperbarui.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Hapus jenis SIMPER.
|
||||
*/
|
||||
public function destroy(int $id): RedirectResponse
|
||||
{
|
||||
$simperType = SimperType::withCount('employeeSimpers')->findOrFail($id);
|
||||
|
||||
if ($simperType->employee_simpers_count > 0) {
|
||||
return back()->with('error', "Jenis SIMPER '{$simperType->name}' tidak dapat dihapus karena masih digunakan oleh {$simperType->employee_simpers_count} personil. Anda dapat menonaktifkan statusnya.");
|
||||
}
|
||||
|
||||
$name = $simperType->name;
|
||||
$simperType->delete();
|
||||
|
||||
return back()->with('success', "Jenis SIMPER '{$name}' berhasil dihapus.");
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ class VerificationLogController extends Controller
|
||||
// Otomatis batalkan antrean pending yang melewati batas 5 jam
|
||||
VehicleActivity::expireOverduePendingActivities();
|
||||
|
||||
$query = VehicleActivity::with(['vehicle', 'driver', 'gate', 'securityGuard'])
|
||||
$query = VehicleActivity::with(['vehicle', 'driver.simpers.simperType', 'gate', 'securityGuard'])
|
||||
->orderByRaw('COALESCE(validated_at, recorded_at) DESC');
|
||||
|
||||
// Filter Rentang Tanggal (Default Hari Ini)
|
||||
|
||||
@@ -24,7 +24,14 @@ class VehicleActivityFormController extends Controller
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$query = Vehicle::lightVehicles();
|
||||
$type = $request->input('type', 'all');
|
||||
$query = Vehicle::timesheetEligible();
|
||||
|
||||
if ($type === 'light_vehicle') {
|
||||
$query->where('category', 'light_vehicle');
|
||||
} elseif ($type === 'unit_support') {
|
||||
$query->where('category', 'unit_support')->where('is_timesheet_mobile', true);
|
||||
}
|
||||
|
||||
if ($request->filled('search')) {
|
||||
$search = trim($request->input('search'));
|
||||
@@ -43,7 +50,7 @@ class VehicleActivityFormController extends Controller
|
||||
$employee = auth()->user()->getOrCreateEmployee();
|
||||
}
|
||||
|
||||
return view('mobilisasi.index', compact('vehicles', 'employee'));
|
||||
return view('mobilisasi.index', compact('vehicles', 'employee', 'type'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -51,8 +58,8 @@ class VehicleActivityFormController extends Controller
|
||||
*/
|
||||
public function show(Request $request, string $code): View|RedirectResponse
|
||||
{
|
||||
$vehicle = Vehicle::where('code', $code)
|
||||
->where('category', 'light_vehicle')
|
||||
$vehicle = Vehicle::timesheetEligible()
|
||||
->where('code', $code)
|
||||
->firstOrFail();
|
||||
|
||||
// Jika pengemudi scan lewat kamera luar dan belum login, arahkan ke login dengan intended URL
|
||||
@@ -77,11 +84,13 @@ class VehicleActivityFormController extends Controller
|
||||
$nikErrorTitle = 'Verifikasi Gagal';
|
||||
$inputNik = trim((string) ($request->input('nik') ?? $request->input('driver_nik') ?? ''));
|
||||
|
||||
$requiredSimper = $vehicle->requiredSimperType ? $vehicle->requiredSimperType->name : ($vehicle->isLightVehicle() ? 'SIMPER LV' : 'SIMPER Dump Truck / Heavy Mobile');
|
||||
|
||||
// Cek jika ada pengemudi yang sudah terverifikasi sebelumnya (via form error redirect atau query string NIK)
|
||||
$oldDriverId = old('driver_id');
|
||||
if ($oldDriverId) {
|
||||
$emp = Employee::find($oldDriverId);
|
||||
if ($emp && $emp->is_operator && $emp->hasValidSimper()) {
|
||||
if ($emp && $emp->is_operator && $emp->hasValidSimperForVehicle($vehicle)) {
|
||||
$verifiedDriver = $emp;
|
||||
}
|
||||
} elseif ($inputNik !== '') {
|
||||
@@ -95,14 +104,19 @@ class VehicleActivityFormController extends Controller
|
||||
} elseif (!$emp->is_operator) {
|
||||
$nikErrorTitle = 'Bukan Driver Terdaftar';
|
||||
$nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) terdaftar sebagai BUKAN DRIVER dan tidak memiliki izin mengemudi (SIMPER). Anda tidak diizinkan mengoperasikan kendaraan unit. Silakan hubungi Divisi HSE.";
|
||||
} elseif (!$emp->hasValidSimper()) {
|
||||
if ($emp->simper_expired_at) {
|
||||
$expiredDate = $emp->simper_expired_at->format('d/m/Y');
|
||||
$nikErrorTitle = 'Peringatan: SIMPER Kedaluwarsa';
|
||||
$nikError = "SIMPER atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) telah KEDALUWARSA pada {$expiredDate}. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER.";
|
||||
} elseif (!$emp->hasValidSimperForVehicle($vehicle)) {
|
||||
if (!$emp->hasValidSimper()) {
|
||||
if ($emp->simper_expired_at) {
|
||||
$expiredDate = $emp->simper_expired_at->format('d/m/Y');
|
||||
$nikErrorTitle = 'Peringatan: SIMPER Kedaluwarsa';
|
||||
$nikError = "SIMPER atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) telah KEDALUWARSA pada {$expiredDate}. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER.";
|
||||
} else {
|
||||
$nikErrorTitle = 'SIMPER Belum Terdaftar';
|
||||
$nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) belum memiliki tanggal masa berlaku SIMPER aktif. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE.";
|
||||
}
|
||||
} else {
|
||||
$nikErrorTitle = 'SIMPER Belum Terdaftar';
|
||||
$nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) belum memiliki tanggal masa berlaku SIMPER aktif. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE.";
|
||||
$nikErrorTitle = 'Izin SIMPER Tidak Sesuai';
|
||||
$nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) tidak memiliki izin SIMPER aktif yang sesuai untuk mengoperasikan unit {$vehicle->code} (Wajib: {$requiredSimper}). Silakan hubungi Divisi HSE.";
|
||||
}
|
||||
} else {
|
||||
$verifiedDriver = $emp;
|
||||
@@ -113,9 +127,14 @@ class VehicleActivityFormController extends Controller
|
||||
if (!$emp->is_operator) {
|
||||
$nikErrorTitle = 'Bukan Driver Terdaftar';
|
||||
$nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) terdaftar sebagai BUKAN DRIVER dan tidak memiliki izin mengemudi (SIMPER). Anda tidak diizinkan mengoperasikan kendaraan unit. Silakan hubungi Divisi HSE.";
|
||||
} elseif (!$emp->hasValidSimper()) {
|
||||
$nikErrorTitle = 'Peringatan: SIMPER Kedaluwarsa';
|
||||
$nikError = "SIMPER atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) telah KEDALUWARSA. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER.";
|
||||
} elseif (!$emp->hasValidSimperForVehicle($vehicle)) {
|
||||
if (!$emp->hasValidSimper()) {
|
||||
$nikErrorTitle = 'Peringatan: SIMPER Kedaluwarsa';
|
||||
$nikError = "SIMPER atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) telah KEDALUWARSA. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER.";
|
||||
} else {
|
||||
$nikErrorTitle = 'Izin SIMPER Tidak Sesuai';
|
||||
$nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) tidak memiliki izin SIMPER aktif yang sesuai untuk mengoperasikan unit {$vehicle->code} (Wajib: {$requiredSimper}). Silakan hubungi Divisi HSE.";
|
||||
}
|
||||
} else {
|
||||
$verifiedDriver = $emp;
|
||||
$inputNik = $emp->nik;
|
||||
@@ -147,8 +166,8 @@ class VehicleActivityFormController extends Controller
|
||||
*/
|
||||
public function checkNik(Request $request, string $code): JsonResponse
|
||||
{
|
||||
$vehicle = Vehicle::where('code', $code)
|
||||
->where('category', 'light_vehicle')
|
||||
$vehicle = Vehicle::timesheetEligible()
|
||||
->where('code', $code)
|
||||
->firstOrFail();
|
||||
|
||||
$rawNik = trim((string) $request->input('nik', ''));
|
||||
@@ -188,16 +207,24 @@ class VehicleActivityFormController extends Controller
|
||||
], 422);
|
||||
}
|
||||
|
||||
// Pengecekan 2: Karyawan adalah Driver, tapi masa berlaku SIMPER kedaluwarsa
|
||||
if (!$employee->hasValidSimper()) {
|
||||
if ($employee->simper_expired_at) {
|
||||
$expiredDate = $employee->simper_expired_at->format('d/m/Y');
|
||||
$title = 'Peringatan: SIMPER Kedaluwarsa';
|
||||
$message = "SIMPER atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) telah KEDALUWARSA pada {$expiredDate}. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER.";
|
||||
$requiredSimper = $vehicle->requiredSimperType ? $vehicle->requiredSimperType->name : ($vehicle->isLightVehicle() ? 'SIMPER LV' : 'SIMPER Dump Truck / Heavy Mobile');
|
||||
|
||||
// Pengecekan 2: Karyawan adalah Driver, tapi masa berlaku SIMPER tidak sesuai untuk unit ini
|
||||
if (!$employee->hasValidSimperForVehicle($vehicle)) {
|
||||
if (!$employee->hasValidSimper()) {
|
||||
if ($employee->simper_expired_at) {
|
||||
$expiredDate = $employee->simper_expired_at->format('d/m/Y');
|
||||
$title = 'Peringatan: SIMPER Kedaluwarsa';
|
||||
$message = "SIMPER atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) telah KEDALUWARSA pada {$expiredDate}. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER.";
|
||||
} else {
|
||||
$expiredDate = 'Belum Ada';
|
||||
$title = 'SIMPER Belum Terdaftar';
|
||||
$message = "Karyawan atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) belum memiliki tanggal masa berlaku SIMPER aktif. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE.";
|
||||
}
|
||||
} else {
|
||||
$expiredDate = 'Belum Ada';
|
||||
$title = 'SIMPER Belum Terdaftar';
|
||||
$message = "Karyawan atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) belum memiliki tanggal masa berlaku SIMPER aktif. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE.";
|
||||
$expiredDate = $employee->simper_expired_at ? $employee->simper_expired_at->format('d/m/Y') : '-';
|
||||
$title = 'Izin SIMPER Tidak Sesuai';
|
||||
$message = "Karyawan atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) tidak memiliki izin SIMPER aktif yang sesuai untuk mengoperasikan unit {$vehicle->code} (Wajib: {$requiredSimper}). Silakan hubungi Divisi HSE.";
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
@@ -218,14 +245,14 @@ class VehicleActivityFormController extends Controller
|
||||
return response()->json([
|
||||
'status' => 'valid',
|
||||
'title' => 'SIMPER Valid',
|
||||
'message' => "SIMPER valid. Selamat bertugas, {$employee->name}!",
|
||||
'message' => "SIMPER valid ({$requiredSimper}). Selamat bertugas, {$employee->name}!",
|
||||
'employee' => [
|
||||
'id' => $employee->id,
|
||||
'name' => $employee->name,
|
||||
'nik' => $employee->nik,
|
||||
'division' => $employee->division ?? 'Umum',
|
||||
'position' => $employee->position ?? 'Karyawan',
|
||||
'simper_expired_at' => $employee->simper_expired_at->format('d/m/Y'),
|
||||
'simper_expired_at' => $employee->simper_expired_at ? $employee->simper_expired_at->format('d/m/Y') : '-',
|
||||
'is_operator' => true,
|
||||
],
|
||||
]);
|
||||
@@ -241,8 +268,8 @@ class VehicleActivityFormController extends Controller
|
||||
->with('warning', 'Sesi login Anda telah berakhir. Silakan login kembali.');
|
||||
}
|
||||
|
||||
$vehicle = Vehicle::where('code', $code)
|
||||
->where('category', 'light_vehicle')
|
||||
$vehicle = Vehicle::timesheetEligible()
|
||||
->where('code', $code)
|
||||
->firstOrFail();
|
||||
|
||||
$previousKm = (float) $vehicle->current_km;
|
||||
|
||||
@@ -26,7 +26,7 @@ class ActivityLogController extends Controller
|
||||
// Otomatis update status perjalanan pending yang kedaluwarsa (> 5 jam)
|
||||
VehicleActivity::expireOverduePendingActivities();
|
||||
|
||||
$query = VehicleActivity::with(['vehicle', 'driver', 'gate', 'securityGuard'])
|
||||
$query = VehicleActivity::with(['vehicle', 'driver.simpers.simperType', 'gate', 'securityGuard'])
|
||||
->latest('recorded_at');
|
||||
|
||||
// Filter Rentang Tanggal (Default Hari Ini jika tidak diisi)
|
||||
|
||||
@@ -138,7 +138,8 @@ class SupportTimesheetController extends Controller
|
||||
->orderBy('code')
|
||||
->get();
|
||||
|
||||
$operators = Employee::orderBy('name')
|
||||
$operators = Employee::with(['simpers.simperType'])
|
||||
->orderBy('name')
|
||||
->get(['id', 'nik', 'name', 'position', 'is_operator', 'employee_type', 'simper_expired_at']);
|
||||
|
||||
$shifts = self::SHIFTS;
|
||||
|
||||
@@ -7,6 +7,7 @@ use App\Models\Employee;
|
||||
use App\Models\Gate;
|
||||
use App\Models\P2hRecord;
|
||||
use App\Models\P2hTemplate;
|
||||
use App\Models\SimperType;
|
||||
use App\Models\Vehicle;
|
||||
use App\Models\VehicleActivity;
|
||||
use App\Services\ImageCompressionService;
|
||||
@@ -414,6 +415,8 @@ class VehicleController extends Controller
|
||||
->values()
|
||||
->all();
|
||||
|
||||
$simperTypes = SimperType::active()->orderBy('name')->get();
|
||||
|
||||
return view('qma.vehicles_support_units', compact(
|
||||
'category',
|
||||
'units',
|
||||
@@ -425,7 +428,8 @@ class VehicleController extends Controller
|
||||
'nextUnitNumber',
|
||||
'nextUnitCode',
|
||||
'existingCodes',
|
||||
'masterLocations'
|
||||
'masterLocations',
|
||||
'simperTypes'
|
||||
));
|
||||
}
|
||||
|
||||
@@ -897,6 +901,8 @@ class VehicleController extends Controller
|
||||
'ownership' => ['nullable', 'string', 'max:150'],
|
||||
'division' => ['nullable', 'string', 'max:100'],
|
||||
'photo' => ['nullable', 'image', 'mimes:jpeg,png,jpg,webp', 'max:10240'],
|
||||
'is_timesheet_mobile' => ['nullable', 'boolean'],
|
||||
'required_simper_type_id' => ['nullable', 'exists:simper_types,id'],
|
||||
]);
|
||||
|
||||
return DB::transaction(function () use ($request, $category) {
|
||||
@@ -947,6 +953,8 @@ class VehicleController extends Controller
|
||||
'silo_document' => $request->input('silo_document'),
|
||||
'kir_document' => $request->input('kir_document'),
|
||||
'photo_path' => $photoPath,
|
||||
'is_timesheet_mobile' => $request->boolean('is_timesheet_mobile'),
|
||||
'required_simper_type_id' => $request->input('required_simper_type_id') ?: null,
|
||||
]);
|
||||
|
||||
return back()->with('success', "Unit fisik [{$unit->code}] berhasil ditambahkan ke kategori {$category->unit_category}.");
|
||||
@@ -971,6 +979,8 @@ class VehicleController extends Controller
|
||||
'status' => [$category === 'unit_support' ? 'nullable' : 'required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'],
|
||||
'current_km' => [$category === 'unit_support' ? 'nullable' : 'required', 'numeric', 'min:0'],
|
||||
'photo' => ['nullable', 'image', 'mimes:jpeg,png,jpg,webp', 'max:10240'],
|
||||
'is_timesheet_mobile' => ['nullable', 'boolean'],
|
||||
'required_simper_type_id' => ['nullable', 'exists:simper_types,id'],
|
||||
];
|
||||
|
||||
// Atribut opsional spesifik Heavy Equipment (Kendaraan Berat)
|
||||
@@ -1003,6 +1013,9 @@ class VehicleController extends Controller
|
||||
$validated['current_km'] = $validated['current_km'] ?? 0;
|
||||
}
|
||||
|
||||
$validated['is_timesheet_mobile'] = $request->boolean('is_timesheet_mobile');
|
||||
$validated['required_simper_type_id'] = $request->input('required_simper_type_id') ?: null;
|
||||
|
||||
if ($request->hasFile('photo')) {
|
||||
$validated['photo_path'] = ImageCompressionService::uploadAndCompress($request->file('photo'), 'vehicles', 800, 800, 75);
|
||||
}
|
||||
@@ -1060,6 +1073,8 @@ class VehicleController extends Controller
|
||||
'pajak_document' => ['nullable', 'string', 'max:150'],
|
||||
'kir_document' => ['nullable', 'string', 'max:150'],
|
||||
'photo' => ['nullable', 'image', 'mimes:jpeg,png,jpg,webp', 'max:10240'],
|
||||
'is_timesheet_mobile' => ['nullable', 'boolean'],
|
||||
'required_simper_type_id' => ['nullable', 'exists:simper_types,id'],
|
||||
];
|
||||
|
||||
$validated = $request->validate($rules, [
|
||||
@@ -1075,6 +1090,9 @@ class VehicleController extends Controller
|
||||
}
|
||||
unset($validated['photo']);
|
||||
|
||||
$validated['is_timesheet_mobile'] = $request->boolean('is_timesheet_mobile');
|
||||
$validated['required_simper_type_id'] = $request->input('required_simper_type_id') ?: null;
|
||||
|
||||
DB::transaction(function () use ($vehicle, $validated, $oldCode, $newCode) {
|
||||
$vehicle->update($validated);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user