feat: resolve audit items (multi-simper hse dashboard & export, soft-delete conflict handling, p2h blank initial state, qma breakdown recovery, and exclude lv from transporter)
This commit is contained in:
@@ -74,8 +74,8 @@ class UserController extends Controller
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'username' => ['required', 'string', 'max:50', 'unique:users,username'],
|
||||
'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email'],
|
||||
'username' => ['required', 'string', 'max:50', Rule::unique('users', 'username')->whereNull('deleted_at')],
|
||||
'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users', 'email')->whereNull('deleted_at')],
|
||||
'password' => ['required', 'string', 'min:6'],
|
||||
'role' => ['required', 'string', 'exists:roles,name'],
|
||||
'gate_id' => ['nullable', 'exists:gates,id'],
|
||||
@@ -102,15 +102,38 @@ class UserController extends Controller
|
||||
$photoPath = ImageCompressionService::uploadAndCompress($request->file('photo'), 'employees', 500, 500, 80);
|
||||
}
|
||||
|
||||
$user = User::create([
|
||||
'name' => $validated['name'],
|
||||
'username' => $validated['username'],
|
||||
'email' => $validated['email'],
|
||||
'password' => Hash::make($validated['password']),
|
||||
'role' => $validated['role'], // Simpan ke kolom legacy untuk backwards-compat
|
||||
'gate_id' => $validated['gate_id'] ?? null,
|
||||
'photo_path' => $photoPath,
|
||||
]);
|
||||
$user = User::withTrashed()
|
||||
->where('username', $validated['username'])
|
||||
->orWhere('email', $validated['email'])
|
||||
->first();
|
||||
|
||||
if ($user) {
|
||||
if ($user->trashed()) {
|
||||
$user->restore();
|
||||
}
|
||||
$userData = [
|
||||
'name' => $validated['name'],
|
||||
'username' => $validated['username'],
|
||||
'email' => $validated['email'],
|
||||
'password' => Hash::make($validated['password']),
|
||||
'role' => $validated['role'],
|
||||
'gate_id' => $validated['gate_id'] ?? null,
|
||||
];
|
||||
if ($photoPath) {
|
||||
$userData['photo_path'] = $photoPath;
|
||||
}
|
||||
$user->update($userData);
|
||||
} else {
|
||||
$user = User::create([
|
||||
'name' => $validated['name'],
|
||||
'username' => $validated['username'],
|
||||
'email' => $validated['email'],
|
||||
'password' => Hash::make($validated['password']),
|
||||
'role' => $validated['role'], // Simpan ke kolom legacy untuk backwards-compat
|
||||
'gate_id' => $validated['gate_id'] ?? null,
|
||||
'photo_path' => $photoPath,
|
||||
]);
|
||||
}
|
||||
|
||||
// Assign Spatie Role
|
||||
$user->assignRole($validated['role']);
|
||||
@@ -141,7 +164,7 @@ class UserController extends Controller
|
||||
$defaultDivision = ($isGateOfficer || $isPgAdmin) ? 'Private Guard' : '-';
|
||||
$defaultPosition = $isGateOfficer ? 'Anggota' : ($isPgAdmin ? 'Admin PG' : ($isEmployeeRole ? 'Driver Operasional' : '-'));
|
||||
|
||||
$emp = Employee::where('user_id', $user->id)->orWhere('nik', $user->username)->first();
|
||||
$emp = Employee::withTrashed()->where('user_id', $user->id)->orWhere('nik', $user->username)->first();
|
||||
$empData = [
|
||||
'user_id' => $user->id,
|
||||
'nik' => $user->username,
|
||||
@@ -154,6 +177,9 @@ class UserController extends Controller
|
||||
'photo_path' => $photoPath ?: $emp?->photo_path,
|
||||
];
|
||||
if ($emp) {
|
||||
if ($emp->trashed()) {
|
||||
$emp->restore();
|
||||
}
|
||||
$emp->update($empData);
|
||||
} else {
|
||||
Employee::create($empData);
|
||||
|
||||
@@ -17,6 +17,7 @@ use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class EmployeeController extends Controller
|
||||
@@ -42,9 +43,10 @@ class EmployeeController extends Controller
|
||||
->take(5)
|
||||
->get();
|
||||
|
||||
// 2. Monitoring Status & Masa Berlaku SIMPER (Prioritas Kedaluwarsa & Segera Habis)
|
||||
// 2. Monitoring Status & Masa Berlaku SIMPER (Prioritas Kedaluwarsa & Segera Habis dengan Dukungan Multi-SIMPER)
|
||||
$today = now()->toDateString();
|
||||
$simperLogs = Employee::where('is_operator', true)
|
||||
->with(['simpers.simperType'])
|
||||
->orderByRaw("CASE
|
||||
WHEN simper_expired_at IS NULL THEN 1
|
||||
WHEN simper_expired_at < ? THEN 0
|
||||
@@ -209,6 +211,7 @@ class EmployeeController extends Controller
|
||||
'Unit Kerja' => 20,
|
||||
'Divisi' => 20,
|
||||
'Status Driver' => 16,
|
||||
'Jenis Izin SIMPER' => 24,
|
||||
'Masa Berlaku SIMPER' => 22,
|
||||
'Status SIMPER' => 24,
|
||||
];
|
||||
@@ -221,6 +224,13 @@ class EmployeeController extends Controller
|
||||
$isDriver = $emp->is_operator;
|
||||
$expDate = $emp->simper_expired_at ? $emp->simper_expired_at->format('d/m/Y') : '-';
|
||||
|
||||
// Ambil rincian seluruh kode SIMPER yang dipegang
|
||||
$simperList = $emp->simpers->map(function ($s) {
|
||||
$code = $s->simperType?->code ?: 'SIMPER';
|
||||
return str_replace('SIMPER-', '', $code);
|
||||
})->filter()->unique()->values();
|
||||
$simperTypesText = $simperList->isNotEmpty() ? $simperList->join(', ') : ($isDriver ? 'LV (Default)' : '-');
|
||||
|
||||
if (! $isDriver) {
|
||||
$statusText = 'Bukan Driver';
|
||||
} elseif (! $emp->simper_expired_at) {
|
||||
@@ -242,6 +252,7 @@ class EmployeeController extends Controller
|
||||
$emp->unit_kerja ?: '-',
|
||||
$emp->division ?: '-',
|
||||
$isDriver ? 'Driver' : 'Bukan Driver',
|
||||
$simperTypesText,
|
||||
$expDate,
|
||||
$statusText,
|
||||
];
|
||||
@@ -256,6 +267,7 @@ class EmployeeController extends Controller
|
||||
'left', // Unit Kerja
|
||||
'left', // Divisi
|
||||
'center', // Status Driver
|
||||
'center', // Jenis Izin SIMPER
|
||||
'center', // Masa Berlaku
|
||||
'center', // Status SIMPER
|
||||
];
|
||||
@@ -580,7 +592,7 @@ class EmployeeController extends Controller
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'nik' => ['required', 'string', 'max:50', 'unique:employees,nik'],
|
||||
'nik' => ['required', 'string', 'max:50', Rule::unique('employees', 'nik')->whereNull('deleted_at')],
|
||||
'name' => ['required', 'string', 'max:100'],
|
||||
'unit_kerja' => ['required', 'string'],
|
||||
'division' => ['required', 'string'],
|
||||
@@ -613,15 +625,24 @@ class EmployeeController extends Controller
|
||||
$employeeType = 'Karyawan';
|
||||
}
|
||||
|
||||
$user = User::firstOrCreate(
|
||||
['username' => $validated['nik']],
|
||||
[
|
||||
$user = User::withTrashed()->where('username', $validated['nik'])->first();
|
||||
if ($user) {
|
||||
if ($user->trashed()) {
|
||||
$user->restore();
|
||||
}
|
||||
$user->update([
|
||||
'name' => $validated['name'],
|
||||
'role' => $user->role ?: 'employee',
|
||||
]);
|
||||
} else {
|
||||
$user = User::create([
|
||||
'username' => $validated['nik'],
|
||||
'name' => $validated['name'],
|
||||
'email' => strtolower(str_replace(['-', ' '], '', $validated['nik'])) . '@kmh.co.id',
|
||||
'password' => Hash::make(config('auth.default_employee_password', '123456')),
|
||||
'role' => 'employee',
|
||||
]
|
||||
);
|
||||
]);
|
||||
}
|
||||
|
||||
if (!$user->hasRole('employee')) {
|
||||
$user->assignRole('employee');
|
||||
@@ -633,18 +654,36 @@ class EmployeeController extends Controller
|
||||
$user->update(['photo_path' => $photoPath]);
|
||||
}
|
||||
|
||||
$employee = Employee::create([
|
||||
'nik' => $validated['nik'],
|
||||
'name' => $validated['name'],
|
||||
'employee_type' => $employeeType,
|
||||
'unit_kerja' => $validated['unit_kerja'],
|
||||
'division' => $validated['division'],
|
||||
'position' => $validated['position'],
|
||||
'is_operator' => $isOperator,
|
||||
'simper_expired_at' => $simperExpiredAt,
|
||||
'photo_path' => $photoPath,
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
$employee = Employee::withTrashed()->where('nik', $validated['nik'])->first();
|
||||
if ($employee) {
|
||||
if ($employee->trashed()) {
|
||||
$employee->restore();
|
||||
}
|
||||
$employee->update([
|
||||
'name' => $validated['name'],
|
||||
'employee_type' => $employeeType,
|
||||
'unit_kerja' => $validated['unit_kerja'],
|
||||
'division' => $validated['division'],
|
||||
'position' => $validated['position'],
|
||||
'is_operator' => $isOperator,
|
||||
'simper_expired_at' => $simperExpiredAt,
|
||||
'photo_path' => $photoPath ?? $employee->photo_path,
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
} else {
|
||||
$employee = Employee::create([
|
||||
'nik' => $validated['nik'],
|
||||
'name' => $validated['name'],
|
||||
'employee_type' => $employeeType,
|
||||
'unit_kerja' => $validated['unit_kerja'],
|
||||
'division' => $validated['division'],
|
||||
'position' => $validated['position'],
|
||||
'is_operator' => $isOperator,
|
||||
'simper_expired_at' => $simperExpiredAt,
|
||||
'photo_path' => $photoPath,
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
}
|
||||
|
||||
// Sinkronisasi Multi-SIMPER Personil
|
||||
$this->syncEmployeeSimpers($employee, $request, $isOperator, $simperExpiredAt);
|
||||
|
||||
@@ -735,8 +735,11 @@ class P2hInspectionController extends Controller
|
||||
]);
|
||||
|
||||
// Jika unit dinyatakan aman dan sebelumnya breakdown karena review, status unit disetujui operasi
|
||||
if (!$record->hasDefects() && $record->vehicle->status === 'Breakdown') {
|
||||
$record->vehicle->update(['status' => 'Operation']);
|
||||
if (!$record->hasDefects() && $record->vehicle && $record->vehicle->status === 'Breakdown') {
|
||||
$record->vehicle->update([
|
||||
'status' => 'Operation',
|
||||
'location_note' => "Status dipulihkan ke Operation pasca persetujuan P2H {$record->transaction_no}",
|
||||
]);
|
||||
}
|
||||
|
||||
return back()->with('success', "Inspeksi P2H [{$record->transaction_no}] untuk unit {$record->vehicle->code} berhasil DISETUJUI.");
|
||||
|
||||
@@ -144,8 +144,14 @@ class SupportTimesheetController extends Controller
|
||||
$activeUnitsCount = $statsItems->pluck('vehicle_id')->unique()->count();
|
||||
$breakdownCount = $statsItems->where('status', 'Breakdown')->count();
|
||||
|
||||
// Data Master untuk Form & Filter
|
||||
// Data Master untuk Form & Filter (Alat Berat / Heavy Equipment - Bebas dari Unit LV)
|
||||
$unitSupports = Vehicle::unitSupports()
|
||||
->where('category', '!=', 'light_vehicle')
|
||||
->where(function (Builder $q) {
|
||||
$q->where('code', 'not like', 'LV %')
|
||||
->where('code', 'not like', 'LV-%')
|
||||
->where('code', 'not like', 'LV_%');
|
||||
})
|
||||
->where(function (Builder $q) {
|
||||
$q->whereNotNull('parent_id')
|
||||
->orWhereDoesntHave('units');
|
||||
@@ -425,7 +431,12 @@ class SupportTimesheetController extends Controller
|
||||
]);
|
||||
});
|
||||
|
||||
return back()->with('success', "Timesheet {$timesheetNo} untuk unit {$vehicle->code} berhasil disimpan.");
|
||||
$successMsg = "Timesheet {$timesheetNo} untuk unit {$vehicle->code} berhasil disimpan.";
|
||||
if ($operatingHours !== null && $operatingHours > 24) {
|
||||
$successMsg .= " (Catatan: Total waktu operasi tercatat {$operatingHours} HM/Jam [> 24 jam]. Harap periksa apakah angka Start HM atau End HM sudah sesuai).";
|
||||
}
|
||||
|
||||
return back()->with('success', $successMsg);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -527,7 +538,12 @@ class SupportTimesheetController extends Controller
|
||||
'notes' => $validated['notes'] ?? null,
|
||||
]);
|
||||
|
||||
return back()->with('success', "Timesheet {$timesheet->timesheet_no} berhasil diperbarui.");
|
||||
$successMsg = "Timesheet {$timesheet->timesheet_no} berhasil diperbarui.";
|
||||
if ($operatingHours !== null && $operatingHours > 24) {
|
||||
$successMsg .= " (Catatan: Total waktu operasi tercatat {$operatingHours} HM/Jam [> 24 jam]. Harap periksa apakah angka Start HM atau End HM sudah sesuai).";
|
||||
}
|
||||
|
||||
return back()->with('success', $successMsg);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -143,9 +143,18 @@ class UnitTransferController extends Controller
|
||||
->map(fn($group) => $group->count())
|
||||
->sortKeys();
|
||||
|
||||
// 2. Daftar unit kendaraan kita untuk armada pengangkut (Truk, Flatbed, Lowbed, Towing, LV, dsb.)
|
||||
$transporterUnits = Vehicle::trackableUnits()
|
||||
->orderBy('category')
|
||||
// 2. Daftar armada pengangkut khusus truk/alat angkut (Truk, Flatbed, Lowbed, Towing, dsb. - Eksklusif Non-LV)
|
||||
$transporterUnits = Vehicle::where('category', '!=', 'light_vehicle')
|
||||
->where(function (Builder $q) {
|
||||
$q->where('code', 'not like', 'LV %')
|
||||
->where('code', 'not like', 'LV-%')
|
||||
->where('code', 'not like', 'LV/%')
|
||||
->where('code', 'not like', 'LV_%');
|
||||
})
|
||||
->where(function (Builder $q) {
|
||||
$q->whereNotNull('parent_id')
|
||||
->orWhereDoesntHave('units');
|
||||
})
|
||||
->orderBy('code')
|
||||
->get();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user