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;
|
namespace App\Http\Controllers\Hse;
|
||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use Carbon\Carbon;
|
||||||
use App\Models\Employee;
|
use App\Models\Employee;
|
||||||
use App\Models\EmployeeSimper;
|
use App\Models\EmployeeSimper;
|
||||||
use App\Models\SimperType;
|
use App\Models\SimperType;
|
||||||
@@ -617,6 +618,23 @@ class EmployeeController extends Controller
|
|||||||
$isOperator = (bool) $validated['is_operator'];
|
$isOperator = (bool) $validated['is_operator'];
|
||||||
$simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? null) : null;
|
$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');
|
$employeeType = $request->input('employee_type');
|
||||||
if ($employeeType === '__CUSTOM__' && $request->filled('custom_employee_type')) {
|
if ($employeeType === '__CUSTOM__' && $request->filled('custom_employee_type')) {
|
||||||
$employeeType = trim($request->input('custom_employee_type'));
|
$employeeType = trim($request->input('custom_employee_type'));
|
||||||
@@ -752,6 +770,28 @@ class EmployeeController extends Controller
|
|||||||
$isOperator = (bool) $validated['is_operator'];
|
$isOperator = (bool) $validated['is_operator'];
|
||||||
$simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? $employee->simper_expired_at) : null;
|
$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');
|
$employeeType = $request->input('employee_type');
|
||||||
if ($employeeType === '__CUSTOM__' && $request->filled('custom_employee_type')) {
|
if ($employeeType === '__CUSTOM__' && $request->filled('custom_employee_type')) {
|
||||||
$employeeType = trim($request->input('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
|
public function destroy(int $id): RedirectResponse
|
||||||
{
|
{
|
||||||
$employee = Employee::with(['user', 'activities', 'p2hRecords', 'supportTimesheets'])->findOrFail($id);
|
$employee = Employee::with(['user'])->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.");
|
|
||||||
}
|
|
||||||
|
|
||||||
$empName = $employee->name;
|
$empName = $employee->name;
|
||||||
$empNik = $employee->nik;
|
$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 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.
|
// 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();
|
$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'])) {
|
if ($user && $user->role === 'employee' && ! $user->hasAnyRole(['super_admin', 'hse_admin', 'qma_admin', 'pg_admin', 'gate_officer'])) {
|
||||||
$user->syncRoles([]);
|
$user->syncRoles([]);
|
||||||
$user->delete();
|
$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
|
// Jika request berasal dari halaman edit terpisah, arahkan kembali ke index
|
||||||
if (url()->previous() === route('hse.employees.edit', $id)) {
|
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
|
public function employee(): BelongsTo
|
||||||
{
|
{
|
||||||
return $this->belongsTo(Employee::class);
|
return $this->belongsTo(Employee::class)->withTrashed();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function simperType(): BelongsTo
|
public function simperType(): BelongsTo
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ class P2hRecord extends Model
|
|||||||
|
|
||||||
public function employee(): BelongsTo
|
public function employee(): BelongsTo
|
||||||
{
|
{
|
||||||
return $this->belongsTo(Employee::class);
|
return $this->belongsTo(Employee::class)->withTrashed();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function template(): BelongsTo
|
public function template(): BelongsTo
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ class SimperType extends Model
|
|||||||
protected $appends = [
|
protected $appends = [
|
||||||
'scopes',
|
'scopes',
|
||||||
'category_scope_display',
|
'category_scope_display',
|
||||||
|
'short_scope_display',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -184,6 +185,34 @@ class SimperType extends Model
|
|||||||
return implode(', ', $formatted);
|
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
|
public function employeeSimpers(): HasMany
|
||||||
{
|
{
|
||||||
return $this->hasMany(EmployeeSimper::class);
|
return $this->hasMany(EmployeeSimper::class);
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ class UnitSupportTimesheet extends Model
|
|||||||
|
|
||||||
public function operator(): BelongsTo
|
public function operator(): BelongsTo
|
||||||
{
|
{
|
||||||
return $this->belongsTo(Employee::class, 'operator_id');
|
return $this->belongsTo(Employee::class, 'operator_id')->withTrashed();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function createdByUser(): BelongsTo
|
public function createdByUser(): BelongsTo
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ class UnitTransfer extends Model
|
|||||||
*/
|
*/
|
||||||
public function transporterDriver(): BelongsTo
|
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
|
public function driver(): BelongsTo
|
||||||
{
|
{
|
||||||
return $this->belongsTo(Employee::class, 'driver_id');
|
return $this->belongsTo(Employee::class, 'driver_id')->withTrashed();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function gate(): BelongsTo
|
public function gate(): BelongsTo
|
||||||
|
|||||||
@@ -422,6 +422,11 @@ class TrashService
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($item instanceof Employee) {
|
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()
|
EmployeeSimper::withTrashed()
|
||||||
->where('employee_id', $item->id)
|
->where('employee_id', $item->id)
|
||||||
->forceDelete();
|
->forceDelete();
|
||||||
|
|||||||
@@ -204,32 +204,32 @@
|
|||||||
@endphp
|
@endphp
|
||||||
|
|
||||||
<div class="p-4 rounded-xl border {{ $isChecked ? 'border-emerald-200 bg-emerald-50/20' : 'border-slate-200 bg-slate-50/50' }} hover:border-slate-300 transition">
|
<div class="p-4 rounded-xl border {{ $isChecked ? 'border-emerald-200 bg-emerald-50/20' : 'border-slate-200 bg-slate-50/50' }} hover:border-slate-300 transition">
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-start sm:items-center justify-between gap-2.5">
|
||||||
<label class="flex items-center space-x-3 text-xs font-bold text-slate-900 cursor-pointer">
|
<label class="flex items-start sm:items-center space-x-3 text-xs font-bold text-slate-900 cursor-pointer flex-1 min-w-0">
|
||||||
<input type="checkbox"
|
<input type="checkbox"
|
||||||
name="simper_assignments[{{ $st->id }}][enabled]"
|
name="simper_assignments[{{ $st->id }}][enabled]"
|
||||||
value="1"
|
value="1"
|
||||||
id="chkSimper_{{ $st->id }}"
|
id="chkSimper_{{ $st->id }}"
|
||||||
{{ $isChecked ? 'checked' : '' }}
|
{{ $isChecked ? 'checked' : '' }}
|
||||||
onchange="toggleSimperRow({{ $st->id }})"
|
onchange="toggleSimperRow({{ $st->id }})"
|
||||||
class="w-4 h-4 rounded text-[#1b5e20] border-slate-300 focus:ring-emerald-500 cursor-pointer">
|
class="w-4 h-4 mt-0.5 sm:mt-0 rounded text-[#1b5e20] border-slate-300 focus:ring-emerald-500 flex-shrink-0 cursor-pointer">
|
||||||
<div>
|
<div class="min-w-0">
|
||||||
<span class="font-extrabold text-slate-900 text-xs">{{ $st->name }}</span>
|
<span class="block truncate font-extrabold text-slate-900 text-xs">{{ $st->name }}</span>
|
||||||
<span class="text-slate-400 font-mono text-[11px] ml-1">({{ $st->code }})</span>
|
<span class="block text-slate-400 font-mono text-[10px] font-semibold">{{ $st->code }}</span>
|
||||||
</div>
|
</div>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
@if($st->coversScope('all'))
|
@if($st->coversScope('all'))
|
||||||
<span class="text-[10px] font-mono px-2 py-0.5 rounded bg-purple-50 text-purple-700 font-bold border border-purple-200">
|
<span class="text-[9px] font-mono px-2 py-0.5 rounded-md bg-purple-50 text-purple-700 font-bold border border-purple-200 flex-shrink-0">
|
||||||
SEMUA ARMADA
|
SEMUA ARMADA
|
||||||
</span>
|
</span>
|
||||||
@elseif($st->scopes === ['light_vehicle'])
|
@elseif($st->scopes === ['light_vehicle'])
|
||||||
<span class="text-[10px] font-mono px-2 py-0.5 rounded bg-blue-50 text-blue-700 font-bold border border-blue-200">
|
<span class="text-[9px] font-mono px-2 py-0.5 rounded-md bg-blue-50 text-blue-700 font-bold border border-blue-200 flex-shrink-0">
|
||||||
LV
|
LV
|
||||||
</span>
|
</span>
|
||||||
@else
|
@else
|
||||||
<span class="text-[10px] font-mono px-2 py-0.5 rounded bg-amber-50 text-amber-700 font-bold border border-amber-200 max-w-[200px] truncate" title="{{ $st->category_scope_display }}">
|
<span class="text-[9px] font-mono px-2 py-0.5 rounded-md bg-amber-50 text-amber-700 font-bold border border-amber-200 max-w-[140px] sm:max-w-[200px] truncate flex-shrink-0" title="{{ $st->category_scope_display }}">
|
||||||
{{ strtoupper($st->category_scope_display) }}
|
{{ $st->short_scope_display ?? strtoupper($st->category_scope_display) }}
|
||||||
</span>
|
</span>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
@@ -250,13 +250,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-[11px] font-bold text-slate-600 mb-1">
|
<label class="block text-[11px] font-bold text-slate-600 mb-1">
|
||||||
Masa Berlaku SIMPER
|
Masa Berlaku SIMPER <span class="text-rose-500">*</span>
|
||||||
</label>
|
</label>
|
||||||
<input type="date"
|
<input type="date"
|
||||||
name="simper_assignments[{{ $st->id }}][expired_at]"
|
name="simper_assignments[{{ $st->id }}][expired_at]"
|
||||||
id="inputSimperExp_{{ $st->id }}"
|
id="inputSimperExp_{{ $st->id }}"
|
||||||
value="{{ $simperExp }}"
|
value="{{ $simperExp }}"
|
||||||
{{ $isChecked ? '' : 'disabled' }}
|
min="{{ date('Y-m-d') }}"
|
||||||
|
{{ $isChecked ? 'required' : 'disabled' }}
|
||||||
class="w-full text-xs px-3 py-2 rounded-xl border border-slate-200 bg-white text-slate-800 font-semibold focus:outline-none focus:border-emerald-600 disabled:opacity-50 disabled:bg-slate-100">
|
class="w-full text-xs px-3 py-2 rounded-xl border border-slate-200 bg-white text-slate-800 font-semibold focus:outline-none focus:border-emerald-600 disabled:opacity-50 disabled:bg-slate-100">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -365,16 +366,28 @@
|
|||||||
const fields = document.getElementById(`fieldsSimper_${id}`);
|
const fields = document.getElementById(`fieldsSimper_${id}`);
|
||||||
const numInp = document.getElementById(`inputSimperNum_${id}`);
|
const numInp = document.getElementById(`inputSimperNum_${id}`);
|
||||||
const expInp = document.getElementById(`inputSimperExp_${id}`);
|
const expInp = document.getElementById(`inputSimperExp_${id}`);
|
||||||
|
const todayStr = new Date().toISOString().split('T')[0];
|
||||||
|
|
||||||
if (chk && fields) {
|
if (chk && fields) {
|
||||||
if (chk.checked) {
|
if (chk.checked) {
|
||||||
fields.classList.remove('hidden');
|
fields.classList.remove('hidden');
|
||||||
if (numInp) numInp.disabled = false;
|
if (numInp) numInp.disabled = false;
|
||||||
if (expInp) expInp.disabled = false;
|
if (expInp) {
|
||||||
|
expInp.disabled = false;
|
||||||
|
expInp.required = true;
|
||||||
|
expInp.min = todayStr;
|
||||||
|
if (!expInp.value) {
|
||||||
|
const d = new Date();
|
||||||
|
d.setFullYear(d.getFullYear() + 1);
|
||||||
|
expInp.value = d.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
fields.classList.add('hidden');
|
fields.classList.add('hidden');
|
||||||
if (numInp) numInp.disabled = true;
|
if (numInp) numInp.disabled = true;
|
||||||
if (expInp) {
|
if (expInp) {
|
||||||
expInp.disabled = true;
|
expInp.disabled = true;
|
||||||
|
expInp.required = false;
|
||||||
expInp.value = '';
|
expInp.value = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -483,18 +483,21 @@
|
|||||||
<div class="space-y-2 max-h-[48vh] overflow-y-auto pr-1">
|
<div class="space-y-2 max-h-[48vh] overflow-y-auto pr-1">
|
||||||
@foreach($availableSimperTypes as $st)
|
@foreach($availableSimperTypes as $st)
|
||||||
<div class="p-3 rounded-2xl border border-slate-200 bg-slate-50/70 hover:bg-slate-50 transition">
|
<div class="p-3 rounded-2xl border border-slate-200 bg-slate-50/70 hover:bg-slate-50 transition">
|
||||||
<div class="flex items-center justify-between gap-2">
|
<div class="flex items-start sm:items-center justify-between gap-2.5">
|
||||||
<label class="flex items-center space-x-2.5 text-xs font-bold text-slate-800 cursor-pointer flex-1 min-w-0">
|
<label class="flex items-start sm:items-center space-x-2.5 text-xs font-bold text-slate-800 cursor-pointer flex-1 min-w-0">
|
||||||
<input type="checkbox"
|
<input type="checkbox"
|
||||||
name="simper_assignments[{{ $st->id }}][enabled]"
|
name="simper_assignments[{{ $st->id }}][enabled]"
|
||||||
value="1"
|
value="1"
|
||||||
id="addSimperCheck_{{ $st->id }}"
|
id="addSimperCheck_{{ $st->id }}"
|
||||||
onchange="toggleAddSimperFields({{ $st->id }})"
|
onchange="toggleAddSimperFields({{ $st->id }})"
|
||||||
class="w-4 h-4 rounded text-emerald-700 border-slate-300 focus:ring-emerald-500 flex-shrink-0">
|
class="w-4 h-4 mt-0.5 sm:mt-0 rounded text-emerald-700 border-slate-300 focus:ring-emerald-500 flex-shrink-0 cursor-pointer">
|
||||||
<span class="truncate">{{ $st->name }} ({{ $st->code }})</span>
|
<div class="min-w-0">
|
||||||
|
<span class="block truncate font-extrabold text-slate-900 text-xs">{{ $st->name }}</span>
|
||||||
|
<span class="block text-[10px] font-mono text-slate-400 font-semibold">{{ $st->code }}</span>
|
||||||
|
</div>
|
||||||
</label>
|
</label>
|
||||||
<span class="text-[9px] font-mono px-2 py-0.5 rounded-md bg-slate-200 text-slate-700 font-bold uppercase flex-shrink-0" title="{{ $st->category_scope_display }}">
|
<span class="text-[9px] font-mono px-2 py-0.5 rounded-md bg-slate-200 text-slate-700 font-bold uppercase max-w-[140px] sm:max-w-[200px] truncate flex-shrink-0" title="{{ $st->category_scope_display }}">
|
||||||
{{ $st->category_scope_display }}
|
{{ $st->short_scope_display ?? $st->category_scope_display }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div id="addSimperFields_{{ $st->id }}" class="hidden grid grid-cols-1 sm:grid-cols-2 gap-2 mt-2 pt-2 border-t border-slate-200/60">
|
<div id="addSimperFields_{{ $st->id }}" class="hidden grid grid-cols-1 sm:grid-cols-2 gap-2 mt-2 pt-2 border-t border-slate-200/60">
|
||||||
@@ -919,18 +922,21 @@
|
|||||||
<div class="space-y-2 max-h-[50vh] overflow-y-auto pr-1">
|
<div class="space-y-2 max-h-[50vh] overflow-y-auto pr-1">
|
||||||
@foreach($availableSimperTypes as $st)
|
@foreach($availableSimperTypes as $st)
|
||||||
<div class="p-3 rounded-2xl border border-slate-200 bg-slate-50/70 hover:bg-slate-50 transition">
|
<div class="p-3 rounded-2xl border border-slate-200 bg-slate-50/70 hover:bg-slate-50 transition">
|
||||||
<div class="flex items-center justify-between gap-2">
|
<div class="flex items-start sm:items-center justify-between gap-2.5">
|
||||||
<label class="flex items-center space-x-2.5 text-xs font-bold text-slate-800 cursor-pointer flex-1 min-w-0">
|
<label class="flex items-start sm:items-center space-x-2.5 text-xs font-bold text-slate-800 cursor-pointer flex-1 min-w-0">
|
||||||
<input type="checkbox"
|
<input type="checkbox"
|
||||||
name="simper_assignments[{{ $st->id }}][enabled]"
|
name="simper_assignments[{{ $st->id }}][enabled]"
|
||||||
value="1"
|
value="1"
|
||||||
id="editSimperCheck_{{ $st->id }}"
|
id="editSimperCheck_{{ $st->id }}"
|
||||||
onchange="toggleEditSimperFields({{ $st->id }})"
|
onchange="toggleEditSimperFields({{ $st->id }})"
|
||||||
class="w-4 h-4 rounded text-emerald-700 border-slate-300 focus:ring-emerald-500 flex-shrink-0">
|
class="w-4 h-4 mt-0.5 sm:mt-0 rounded text-emerald-700 border-slate-300 focus:ring-emerald-500 flex-shrink-0 cursor-pointer">
|
||||||
<span class="truncate">{{ $st->name }} ({{ $st->code }})</span>
|
<div class="min-w-0">
|
||||||
|
<span class="block truncate font-extrabold text-slate-900 text-xs">{{ $st->name }}</span>
|
||||||
|
<span class="block text-[10px] font-mono text-slate-400 font-semibold">{{ $st->code }}</span>
|
||||||
|
</div>
|
||||||
</label>
|
</label>
|
||||||
<span class="text-[9px] font-mono px-2 py-0.5 rounded-md bg-slate-200 text-slate-700 font-bold uppercase flex-shrink-0" title="{{ $st->category_scope_display }}">
|
<span class="text-[9px] font-mono px-2 py-0.5 rounded-md bg-slate-200 text-slate-700 font-bold uppercase max-w-[140px] sm:max-w-[200px] truncate flex-shrink-0" title="{{ $st->category_scope_display }}">
|
||||||
{{ $st->category_scope_display }}
|
{{ $st->short_scope_display ?? $st->category_scope_display }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div id="editSimperFields_{{ $st->id }}" class="hidden grid grid-cols-1 sm:grid-cols-2 gap-2 mt-2 pt-2 border-t border-slate-200/60">
|
<div id="editSimperFields_{{ $st->id }}" class="hidden grid grid-cols-1 sm:grid-cols-2 gap-2 mt-2 pt-2 border-t border-slate-200/60">
|
||||||
@@ -1200,13 +1206,32 @@
|
|||||||
function toggleAddSimperFields(id) {
|
function toggleAddSimperFields(id) {
|
||||||
const check = document.getElementById(`addSimperCheck_${id}`);
|
const check = document.getElementById(`addSimperCheck_${id}`);
|
||||||
const fields = document.getElementById(`addSimperFields_${id}`);
|
const fields = document.getElementById(`addSimperFields_${id}`);
|
||||||
|
const numInp = document.getElementById(`addSimperNum_${id}`);
|
||||||
|
const expInp = document.getElementById(`addSimperExp_${id}`);
|
||||||
|
const todayStr = new Date().toISOString().split('T')[0];
|
||||||
|
|
||||||
if (check && fields) {
|
if (check && fields) {
|
||||||
if (check.checked) {
|
if (check.checked) {
|
||||||
fields.classList.remove('hidden');
|
fields.classList.remove('hidden');
|
||||||
|
if (numInp) numInp.disabled = false;
|
||||||
|
if (expInp) {
|
||||||
|
expInp.disabled = false;
|
||||||
|
expInp.required = true;
|
||||||
|
expInp.min = todayStr;
|
||||||
|
if (!expInp.value) {
|
||||||
|
const d = new Date();
|
||||||
|
d.setFullYear(d.getFullYear() + 1);
|
||||||
|
expInp.value = d.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
fields.classList.add('hidden');
|
fields.classList.add('hidden');
|
||||||
const expInp = document.getElementById(`addSimperExp_${id}`);
|
if (numInp) numInp.disabled = true;
|
||||||
if (expInp) expInp.value = '';
|
if (expInp) {
|
||||||
|
expInp.disabled = true;
|
||||||
|
expInp.required = false;
|
||||||
|
expInp.value = '';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
syncAddPrimarySimperDate();
|
syncAddPrimarySimperDate();
|
||||||
@@ -1234,16 +1259,28 @@
|
|||||||
const fields = document.getElementById(`editSimperFields_${id}`);
|
const fields = document.getElementById(`editSimperFields_${id}`);
|
||||||
const numInp = document.getElementById(`editSimperNum_${id}`);
|
const numInp = document.getElementById(`editSimperNum_${id}`);
|
||||||
const expInp = document.getElementById(`editSimperExp_${id}`);
|
const expInp = document.getElementById(`editSimperExp_${id}`);
|
||||||
|
const todayStr = new Date().toISOString().split('T')[0];
|
||||||
|
|
||||||
if (check && fields) {
|
if (check && fields) {
|
||||||
if (check.checked) {
|
if (check.checked) {
|
||||||
fields.classList.remove('hidden');
|
fields.classList.remove('hidden');
|
||||||
if (numInp) numInp.disabled = false;
|
if (numInp) numInp.disabled = false;
|
||||||
if (expInp) expInp.disabled = false;
|
if (expInp) {
|
||||||
|
expInp.disabled = false;
|
||||||
|
expInp.required = true;
|
||||||
|
expInp.min = todayStr;
|
||||||
|
if (!expInp.value) {
|
||||||
|
const d = new Date();
|
||||||
|
d.setFullYear(d.getFullYear() + 1);
|
||||||
|
expInp.value = d.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
fields.classList.add('hidden');
|
fields.classList.add('hidden');
|
||||||
if (numInp) numInp.disabled = true;
|
if (numInp) numInp.disabled = true;
|
||||||
if (expInp) {
|
if (expInp) {
|
||||||
expInp.disabled = true;
|
expInp.disabled = true;
|
||||||
|
expInp.required = false;
|
||||||
expInp.value = '';
|
expInp.value = '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ class HseEmployeeFlexibleUnitKerjaAndModalTest extends TestCase
|
|||||||
$this->assertSoftDeleted('users', ['id' => $linkedUser->id]);
|
$this->assertSoftDeleted('users', ['id' => $linkedUser->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_cannot_delete_employee_with_operational_records(): void
|
public function test_can_delete_employee_with_operational_records_and_preserves_history(): void
|
||||||
{
|
{
|
||||||
$superAdmin = User::factory()->create([
|
$superAdmin = User::factory()->create([
|
||||||
'username' => 'superadmin_check',
|
'username' => 'superadmin_check',
|
||||||
@@ -290,7 +290,7 @@ class HseEmployeeFlexibleUnitKerjaAndModalTest extends TestCase
|
|||||||
'current_km' => 1000,
|
'current_km' => 1000,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
\App\Models\VehicleActivity::create([
|
$activity = \App\Models\VehicleActivity::create([
|
||||||
'transaction_no' => 'TRX-TEST-001',
|
'transaction_no' => 'TRX-TEST-001',
|
||||||
'vehicle_id' => $vehicle->id,
|
'vehicle_id' => $vehicle->id,
|
||||||
'driver_id' => $employee->id,
|
'driver_id' => $employee->id,
|
||||||
@@ -309,8 +309,13 @@ class HseEmployeeFlexibleUnitKerjaAndModalTest extends TestCase
|
|||||||
->from(route('hse.employees.index'))
|
->from(route('hse.employees.index'))
|
||||||
->delete(route('hse.employees.destroy', $employee->id));
|
->delete(route('hse.employees.destroy', $employee->id));
|
||||||
|
|
||||||
$response->assertSessionHas('error');
|
$response->assertSessionHas('success');
|
||||||
$this->assertDatabaseHas('employees', ['id' => $employee->id]);
|
$this->assertSoftDeleted('employees', ['id' => $employee->id]);
|
||||||
|
|
||||||
|
// Pastikan riwayat operasional tetap terhubung via withTrashed()
|
||||||
|
$activityFresh = \App\Models\VehicleActivity::find($activity->id);
|
||||||
|
$this->assertNotNull($activityFresh->driver);
|
||||||
|
$this->assertEquals($employee->name, $activityFresh->driver->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_hse_edit_modal_and_edit_page_render_division_and_position_inputs(): void
|
public function test_hse_edit_modal_and_edit_page_render_division_and_position_inputs(): void
|
||||||
|
|||||||
@@ -425,4 +425,131 @@ class HseSimperTypeTest extends TestCase
|
|||||||
$this->assertSoftDeleted('simper_types', ['id' => $simperType->id]);
|
$this->assertSoftDeleted('simper_types', ['id' => $simperType->id]);
|
||||||
$this->assertSoftDeleted('employee_simpers', ['id' => $empSimper->id]);
|
$this->assertSoftDeleted('employee_simpers', ['id' => $empSimper->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mencentang SIMPER tanpa memasukkan tanggal masa berlaku ditolak dengan pesan error.
|
||||||
|
*/
|
||||||
|
public function test_checking_simper_without_expiry_date_fails_validation(): void
|
||||||
|
{
|
||||||
|
$type = SimperType::create([
|
||||||
|
'code' => 'SIMPER-DT-TEST',
|
||||||
|
'name' => 'SIMPER Dump Truck',
|
||||||
|
'category_scope' => 'all',
|
||||||
|
'is_active' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$employee = Employee::create([
|
||||||
|
'nik' => 'EMP-EXP-VALIDATE-01',
|
||||||
|
'name' => 'Operator Test',
|
||||||
|
'is_operator' => true,
|
||||||
|
'unit_kerja' => 'Pembangkit',
|
||||||
|
'division' => 'Operasi',
|
||||||
|
'position' => 'Operator',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response = $this->actingAs($this->adminHse)
|
||||||
|
->post(route('hse.employees.update', $employee->id), [
|
||||||
|
'nik' => $employee->nik,
|
||||||
|
'name' => $employee->name,
|
||||||
|
'is_operator' => 1,
|
||||||
|
'unit_kerja' => 'Pembangkit',
|
||||||
|
'division' => 'Operasi',
|
||||||
|
'position' => 'Operator',
|
||||||
|
'simper_assignments' => [
|
||||||
|
$type->id => [
|
||||||
|
'enabled' => 1,
|
||||||
|
'expired_at' => '',
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertSessionHas('error');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mencentang SIMPER dengan tanggal masa berlaku di masa lampau ditolak.
|
||||||
|
*/
|
||||||
|
public function test_checking_simper_with_past_expiry_date_fails_validation(): void
|
||||||
|
{
|
||||||
|
$type = SimperType::create([
|
||||||
|
'code' => 'SIMPER-DT-PAST',
|
||||||
|
'name' => 'SIMPER Dump Truck',
|
||||||
|
'category_scope' => 'all',
|
||||||
|
'is_active' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$employee = Employee::create([
|
||||||
|
'nik' => 'EMP-EXP-VALIDATE-02',
|
||||||
|
'name' => 'Operator Test Past',
|
||||||
|
'is_operator' => true,
|
||||||
|
'unit_kerja' => 'Pembangkit',
|
||||||
|
'division' => 'Operasi',
|
||||||
|
'position' => 'Operator',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response = $this->actingAs($this->adminHse)
|
||||||
|
->post(route('hse.employees.update', $employee->id), [
|
||||||
|
'nik' => $employee->nik,
|
||||||
|
'name' => $employee->name,
|
||||||
|
'is_operator' => 1,
|
||||||
|
'unit_kerja' => 'Pembangkit',
|
||||||
|
'division' => 'Operasi',
|
||||||
|
'position' => 'Operator',
|
||||||
|
'simper_assignments' => [
|
||||||
|
$type->id => [
|
||||||
|
'enabled' => 1,
|
||||||
|
'expired_at' => Carbon::yesterday()->toDateString(),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertSessionHas('error');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mencentang SIMPER dengan tanggal masa depan berhasil disimpan.
|
||||||
|
*/
|
||||||
|
public function test_checking_simper_with_future_expiry_date_succeeds(): void
|
||||||
|
{
|
||||||
|
$type = SimperType::create([
|
||||||
|
'code' => 'SIMPER-DT-OK',
|
||||||
|
'name' => 'SIMPER Dump Truck OK',
|
||||||
|
'category_scope' => 'all',
|
||||||
|
'is_active' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$employee = Employee::create([
|
||||||
|
'nik' => 'EMP-EXP-VALIDATE-03',
|
||||||
|
'name' => 'Operator Test Future',
|
||||||
|
'is_operator' => true,
|
||||||
|
'unit_kerja' => 'Pembangkit',
|
||||||
|
'division' => 'Operasi',
|
||||||
|
'position' => 'Operator',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$futureDate = Carbon::now()->addMonths(6)->toDateString();
|
||||||
|
|
||||||
|
$response = $this->actingAs($this->adminHse)
|
||||||
|
->post(route('hse.employees.update', $employee->id), [
|
||||||
|
'nik' => $employee->nik,
|
||||||
|
'name' => $employee->name,
|
||||||
|
'is_operator' => 1,
|
||||||
|
'unit_kerja' => 'Pembangkit',
|
||||||
|
'division' => 'Operasi',
|
||||||
|
'position' => 'Operator',
|
||||||
|
'simper_assignments' => [
|
||||||
|
$type->id => [
|
||||||
|
'enabled' => 1,
|
||||||
|
'expired_at' => $futureDate,
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertSessionHas('success');
|
||||||
|
$this->assertDatabaseHas('employee_simpers', [
|
||||||
|
'employee_id' => $employee->id,
|
||||||
|
'simper_type_id' => $type->id,
|
||||||
|
'expired_at' => $futureDate . ' 00:00:00',
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user