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.");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user