fix(hse): allow soft deleting employee without losing operational history, fix simper checklist badge overflow, and enforce valid future expiry date
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
namespace App\Http\Controllers\Hse;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use Carbon\Carbon;
|
||||
use App\Models\Employee;
|
||||
use App\Models\EmployeeSimper;
|
||||
use App\Models\SimperType;
|
||||
@@ -617,6 +618,23 @@ class EmployeeController extends Controller
|
||||
$isOperator = (bool) $validated['is_operator'];
|
||||
$simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? null) : null;
|
||||
|
||||
// Validasi kustom penugasan SIMPER ketika driver aktif
|
||||
if ($isOperator && is_array($request->input('simper_assignments'))) {
|
||||
$today = Carbon::today()->toDateString();
|
||||
foreach ($request->input('simper_assignments') as $typeId => $data) {
|
||||
if (!empty($data['enabled'])) {
|
||||
$st = SimperType::find($typeId);
|
||||
$typeName = $st ? $st->name : "Tipe #{$typeId}";
|
||||
if (empty($data['expired_at'])) {
|
||||
return back()->withInput()->with('error', "Masa berlaku untuk jenis SIMPER '{$typeName}' wajib diisi ketika dicentang.");
|
||||
}
|
||||
if ($data['expired_at'] < $today) {
|
||||
return back()->withInput()->with('error', "Masa berlaku untuk jenis SIMPER '{$typeName}' tidak boleh tanggal lampau (minimal hari ini).");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$employeeType = $request->input('employee_type');
|
||||
if ($employeeType === '__CUSTOM__' && $request->filled('custom_employee_type')) {
|
||||
$employeeType = trim($request->input('custom_employee_type'));
|
||||
@@ -752,6 +770,28 @@ class EmployeeController extends Controller
|
||||
$isOperator = (bool) $validated['is_operator'];
|
||||
$simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? $employee->simper_expired_at) : null;
|
||||
|
||||
// Validasi kustom penugasan SIMPER ketika driver aktif
|
||||
if ($isOperator && is_array($request->input('simper_assignments'))) {
|
||||
$today = Carbon::today()->toDateString();
|
||||
foreach ($request->input('simper_assignments') as $typeId => $data) {
|
||||
if (!empty($data['enabled'])) {
|
||||
$st = SimperType::find($typeId);
|
||||
$typeName = $st ? $st->name : "Tipe #{$typeId}";
|
||||
if (empty($data['expired_at'])) {
|
||||
return back()->withInput()->with('error', "Masa berlaku untuk jenis SIMPER '{$typeName}' wajib diisi ketika dicentang.");
|
||||
}
|
||||
if ($data['expired_at'] < $today) {
|
||||
// Cek apakah tanggal ini memang tanggal lama yang belum diubah oleh admin
|
||||
$existingSimper = $employee->simpers->firstWhere('simper_type_id', (int) $typeId);
|
||||
$isOldUnchanged = $existingSimper && $existingSimper->expired_at?->format('Y-m-d') === $data['expired_at'];
|
||||
if (!$isOldUnchanged) {
|
||||
return back()->withInput()->with('error', "Masa berlaku untuk jenis SIMPER '{$typeName}' tidak boleh tanggal lampau (minimal hari ini: {$today}).");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$employeeType = $request->input('employee_type');
|
||||
if ($employeeType === '__CUSTOM__' && $request->filled('custom_employee_type')) {
|
||||
$employeeType = trim($request->input('custom_employee_type'));
|
||||
@@ -802,26 +842,12 @@ class EmployeeController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Hapus data personil / karyawan beserta izin SIMPER dan akun login terkait.
|
||||
* Hapus data personil / karyawan (Soft Delete masuk ke Tong Sampah).
|
||||
* Seluruh riwayat transaksi (Timesheet, Gate, P2H) tetap aman dan terhubung.
|
||||
*/
|
||||
public function destroy(int $id): RedirectResponse
|
||||
{
|
||||
$employee = Employee::with(['user', 'activities', 'p2hRecords', 'supportTimesheets'])->findOrFail($id);
|
||||
|
||||
// 1. Proteksi integritas relasi: pastikan tidak ada logbook perjalanan kendaraan
|
||||
if ($employee->activities()->exists()) {
|
||||
return back()->with('error', "Aksi Ditolak: Karyawan '{$employee->name}' ({$employee->nik}) tidak dapat dihapus karena telah tercatat dalam riwayat logbook operasional kendaraan.");
|
||||
}
|
||||
|
||||
// 2. Proteksi integritas relasi: pastikan tidak ada data inspeksi P2H
|
||||
if ($employee->p2hRecords()->exists()) {
|
||||
return back()->with('error', "Aksi Ditolak: Karyawan '{$employee->name}' ({$employee->nik}) tidak dapat dihapus karena telah memiliki formulir riwayat inspeksi P2H.");
|
||||
}
|
||||
|
||||
// 3. Proteksi integritas relasi: pastikan tidak ada data timesheet unit support
|
||||
if ($employee->supportTimesheets()->exists()) {
|
||||
return back()->with('error', "Aksi Ditolak: Karyawan '{$employee->name}' ({$employee->nik}) tidak dapat dihapus karena telah tercatat dalam riwayat timesheet unit support.");
|
||||
}
|
||||
$employee = Employee::with(['user'])->findOrFail($id);
|
||||
|
||||
$empName = $employee->name;
|
||||
$empNik = $employee->nik;
|
||||
@@ -833,22 +859,24 @@ class EmployeeController extends Controller
|
||||
// Berkas foto tidak dihapus saat soft delete agar foto tetap ada jika dipulihkan dari tong sampah.
|
||||
// Berkas baru dihapus permanen ketika dilakukan 'Hapus Permanen' (force delete) di TrashService.
|
||||
|
||||
// Hapus data karyawan (relasi employee_simpers otomatis cascade terhapus)
|
||||
// Hapus data karyawan (soft delete - dipindahkan ke Tong Sampah)
|
||||
$employee->delete();
|
||||
|
||||
// Hapus akun login User terkait jika perannya murni hanya karyawan (bukan admin)
|
||||
// Nonaktifkan / soft delete akun login User terkait jika perannya murni hanya karyawan (bukan admin)
|
||||
if ($user && $user->role === 'employee' && ! $user->hasAnyRole(['super_admin', 'hse_admin', 'qma_admin', 'pg_admin', 'gate_officer'])) {
|
||||
$user->syncRoles([]);
|
||||
$user->delete();
|
||||
}
|
||||
});
|
||||
|
||||
$message = "Data personil '{$empName}' ({$empNik}) berhasil dihapus dan dipindahkan ke Tong Sampah. Seluruh riwayat operasional masa lalu tetap tersimpan utuh.";
|
||||
|
||||
// Jika request berasal dari halaman edit terpisah, arahkan kembali ke index
|
||||
if (url()->previous() === route('hse.employees.edit', $id)) {
|
||||
return redirect()->route('hse.employees.index')->with('success', "Data karyawan '{$empName}' ({$empNik}) berhasil dihapus dari sistem.");
|
||||
return redirect()->route('hse.employees.index')->with('success', $message);
|
||||
}
|
||||
|
||||
return back()->with('success', "Data karyawan '{$empName}' ({$empNik}) berhasil dihapus dari sistem.");
|
||||
return back()->with('success', $message);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -32,7 +32,7 @@ class EmployeeSimper extends Model
|
||||
|
||||
public function employee(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Employee::class);
|
||||
return $this->belongsTo(Employee::class)->withTrashed();
|
||||
}
|
||||
|
||||
public function simperType(): BelongsTo
|
||||
|
||||
@@ -49,7 +49,7 @@ class P2hRecord extends Model
|
||||
|
||||
public function employee(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Employee::class);
|
||||
return $this->belongsTo(Employee::class)->withTrashed();
|
||||
}
|
||||
|
||||
public function template(): BelongsTo
|
||||
|
||||
@@ -98,6 +98,7 @@ class SimperType extends Model
|
||||
protected $appends = [
|
||||
'scopes',
|
||||
'category_scope_display',
|
||||
'short_scope_display',
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -184,6 +185,34 @@ class SimperType extends Model
|
||||
return implode(', ', $formatted);
|
||||
}
|
||||
|
||||
/**
|
||||
* Teks ringkas pendek untuk badge di UI (maksimal 2 kategori + counter jika panjang).
|
||||
*/
|
||||
public function getShortScopeDisplayAttribute(): string
|
||||
{
|
||||
$scopes = $this->scopes;
|
||||
|
||||
if (empty($scopes) || in_array(self::SCOPE_ALL, $scopes, true)) {
|
||||
return 'UNIVERSAL';
|
||||
}
|
||||
|
||||
if (count($scopes) === 1 && $scopes[0] === self::SCOPE_LIGHT_VEHICLE) {
|
||||
return 'LV';
|
||||
}
|
||||
|
||||
$formatted = array_map(function ($s) {
|
||||
if ($s === self::SCOPE_LIGHT_VEHICLE) return 'LV';
|
||||
if ($s === self::SCOPE_ALL) return 'Universal';
|
||||
return strtoupper(str_replace('_', ' ', $s));
|
||||
}, $scopes);
|
||||
|
||||
if (count($formatted) > 2) {
|
||||
return $formatted[0] . ', ' . $formatted[1] . ' (+' . (count($formatted) - 2) . ')';
|
||||
}
|
||||
|
||||
return implode(', ', $formatted);
|
||||
}
|
||||
|
||||
public function employeeSimpers(): HasMany
|
||||
{
|
||||
return $this->hasMany(EmployeeSimper::class);
|
||||
|
||||
@@ -57,7 +57,7 @@ class UnitSupportTimesheet extends Model
|
||||
|
||||
public function operator(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Employee::class, 'operator_id');
|
||||
return $this->belongsTo(Employee::class, 'operator_id')->withTrashed();
|
||||
}
|
||||
|
||||
public function createdByUser(): BelongsTo
|
||||
|
||||
@@ -68,7 +68,7 @@ class UnitTransfer extends Model
|
||||
*/
|
||||
public function transporterDriver(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Employee::class, 'transporter_driver_id');
|
||||
return $this->belongsTo(Employee::class, 'transporter_driver_id')->withTrashed();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -56,7 +56,7 @@ class VehicleActivity extends Model
|
||||
|
||||
public function driver(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Employee::class, 'driver_id');
|
||||
return $this->belongsTo(Employee::class, 'driver_id')->withTrashed();
|
||||
}
|
||||
|
||||
public function gate(): BelongsTo
|
||||
|
||||
@@ -422,6 +422,11 @@ class TrashService
|
||||
}
|
||||
|
||||
if ($item instanceof Employee) {
|
||||
// Cegah hapus permanen jika karyawan memiliki riwayat operasional (menjaga integritas data)
|
||||
if ($item->activities()->exists() || $item->p2hRecords()->exists() || $item->supportTimesheets()->exists()) {
|
||||
throw new \RuntimeException("Karyawan '{$item->name}' ({$item->nik}) memiliki riwayat transaksi aktif dan tidak dapat dihapus permanen untuk menjaga integritas data.");
|
||||
}
|
||||
|
||||
EmployeeSimper::withTrashed()
|
||||
->where('employee_id', $item->id)
|
||||
->forceDelete();
|
||||
|
||||
Reference in New Issue
Block a user