feat(pg): add flexible gate selection pop-up and remove rigid guard gate assignment
This commit is contained in:
@@ -21,13 +21,30 @@ class GateInspectionController extends Controller
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
// Ambil gerbang yang terikat pada akun petugas pos jaga yang sedang login
|
||||
$user = $request->user();
|
||||
$currentGuard = $user ? $user->securityGuard : null;
|
||||
$gateId = $user ? $user->gate_id : $request->query('gate_id');
|
||||
|
||||
// Jika tidak ada gate_id terikat, ambil gerbang pertama sebagai fallback
|
||||
$gate = $gateId ? Gate::find($gateId) : Gate::first();
|
||||
$allGates = Gate::where('is_active', true)->orderBy('name')->get();
|
||||
|
||||
// Cek gate yang dipilih: query param > session 'active_gate_id' > user->gate_id
|
||||
$selectedGateId = $request->query('gate_id')
|
||||
?: session('active_gate_id')
|
||||
?: ($user?->gate_id);
|
||||
|
||||
$needsGateSelection = false;
|
||||
$gate = null;
|
||||
|
||||
if ($selectedGateId && $allGates->contains('id', (int) $selectedGateId)) {
|
||||
$gate = $allGates->firstWhere('id', (int) $selectedGateId);
|
||||
session(['active_gate_id' => $gate->id]);
|
||||
if ($user && $user->gate_id !== $gate->id) {
|
||||
$user->update(['gate_id' => $gate->id]);
|
||||
}
|
||||
} else {
|
||||
// Belum ada pos yang dipilih di sesi
|
||||
$gate = $allGates->first();
|
||||
$needsGateSelection = true;
|
||||
}
|
||||
|
||||
$pendingActivities = collect();
|
||||
if ($gate) {
|
||||
@@ -38,24 +55,61 @@ class GateInspectionController extends Controller
|
||||
->get();
|
||||
}
|
||||
|
||||
// Hitung antrean pending di setiap gerbang untuk pop-up pemilihan
|
||||
$gateQueueCounts = VehicleActivity::where('validation_status', 'pending')
|
||||
->select('gate_id', DB::raw('count(*) as count'))
|
||||
->groupBy('gate_id')
|
||||
->pluck('count', 'gate_id');
|
||||
|
||||
// Daftar satpam aktif untuk fallback pilihan
|
||||
$guards = SecurityGuard::where('is_active', true)->orderBy('name')->get();
|
||||
|
||||
return view('pg.gate_inspection', compact(
|
||||
'gate',
|
||||
'allGates',
|
||||
'gateQueueCounts',
|
||||
'needsGateSelection',
|
||||
'pendingActivities',
|
||||
'guards',
|
||||
'currentGuard'
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Set / ganti pos gerbang aktif yang sedang dijaga oleh petugas saat ini.
|
||||
*/
|
||||
public function selectGate(Request $request): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
'gate_id' => ['required', 'exists:gates,id'],
|
||||
], [
|
||||
'gate_id.required' => 'Silakan pilih salah satu pos gerbang.',
|
||||
'gate_id.exists' => 'Pos gerbang yang dipilih tidak valid.',
|
||||
]);
|
||||
|
||||
$gateId = (int) $request->input('gate_id');
|
||||
$gate = Gate::findOrFail($gateId);
|
||||
|
||||
session(['active_gate_id' => $gate->id]);
|
||||
|
||||
$user = $request->user();
|
||||
if ($user && $user->gate_id !== $gate->id) {
|
||||
$user->update(['gate_id' => $gate->id]);
|
||||
}
|
||||
|
||||
return redirect()->route('pg.gate.inspection', ['gate_id' => $gate->id])
|
||||
->with('success', "Pos jaga aktif berhasil dialihkan ke: {$gate->name}");
|
||||
}
|
||||
|
||||
/**
|
||||
* Endpoint sync antrean realtime (Fetch) tanpa reload halaman.
|
||||
*/
|
||||
public function liveQueue(Request $request): JsonResponse
|
||||
{
|
||||
$user = $request->user();
|
||||
$gateId = $user ? $user->gate_id : $request->query('gate_id');
|
||||
$gateId = $request->query('gate_id')
|
||||
?: session('active_gate_id')
|
||||
?: ($user ? $user->gate_id : null);
|
||||
$gate = $gateId ? Gate::find($gateId) : Gate::first();
|
||||
|
||||
$pendingActivities = collect();
|
||||
|
||||
@@ -215,7 +215,7 @@ class SecurityGuardController extends Controller
|
||||
'badge_id' => ['required', 'string', 'max:50', 'unique:security_guards,badge_id', 'unique:users,username'],
|
||||
'name' => ['required', 'string', 'max:100'],
|
||||
'team' => ['required', 'integer', 'in:1,2,3'],
|
||||
'gate_id' => ['required', 'exists:gates,id'],
|
||||
'gate_id' => ['nullable', 'exists:gates,id'],
|
||||
'password' => ['required', 'string', 'min:4'],
|
||||
], [
|
||||
'badge_id.required' => 'ID Satpam wajib diisi.',
|
||||
@@ -223,13 +223,13 @@ class SecurityGuardController extends Controller
|
||||
'name.required' => 'Nama lengkap Satpam wajib diisi.',
|
||||
'team.required' => 'Silakan pilih Regu Satpam (1, 2, atau 3).',
|
||||
'team.in' => 'Regu Satpam harus bernilai 1, 2, atau 3.',
|
||||
'gate_id.required' => 'Silakan tentukan penempatan Pos Gerbang.',
|
||||
'password.required' => 'Password akun login Satpam wajib diisi.',
|
||||
'password.min' => 'Password minimal terdiri dari 4 karakter.',
|
||||
]);
|
||||
|
||||
DB::transaction(function () use ($request) {
|
||||
$badgeId = strtoupper(trim($request->input('badge_id')));
|
||||
$gateId = $request->input('gate_id') ?: null;
|
||||
|
||||
// 1. Buat akun User untuk login Satpam di pos jaga
|
||||
$user = User::create([
|
||||
@@ -238,7 +238,7 @@ class SecurityGuardController extends Controller
|
||||
'email' => strtolower($badgeId) . '@kmh.co.id',
|
||||
'password' => Hash::make($request->input('password')),
|
||||
'role' => 'gate_officer',
|
||||
'gate_id' => $request->input('gate_id'),
|
||||
'gate_id' => $gateId,
|
||||
]);
|
||||
|
||||
// 2. Simpan master data Satpam
|
||||
@@ -246,7 +246,7 @@ class SecurityGuardController extends Controller
|
||||
'badge_id' => $badgeId,
|
||||
'name' => $request->input('name'),
|
||||
'team' => (int) $request->input('team'),
|
||||
'gate_id' => $request->input('gate_id'),
|
||||
'gate_id' => $gateId,
|
||||
'user_id' => $user->id,
|
||||
'is_active' => true,
|
||||
]);
|
||||
@@ -265,26 +265,27 @@ class SecurityGuardController extends Controller
|
||||
$request->validate([
|
||||
'name' => ['required', 'string', 'max:100'],
|
||||
'team' => ['required', 'integer', 'in:1,2,3'],
|
||||
'gate_id' => ['required', 'exists:gates,id'],
|
||||
'gate_id' => ['nullable', 'exists:gates,id'],
|
||||
'password' => ['nullable', 'string', 'min:4'],
|
||||
], [
|
||||
'name.required' => 'Nama lengkap Satpam wajib diisi.',
|
||||
'team.required' => 'Silakan pilih Regu Satpam (1, 2, atau 3).',
|
||||
'gate_id.required' => 'Silakan tentukan penempatan Pos Gerbang.',
|
||||
'password.min' => 'Password minimal terdiri dari 4 karakter.',
|
||||
]);
|
||||
|
||||
DB::transaction(function () use ($request, $guard) {
|
||||
$gateId = $request->has('gate_id') ? ($request->input('gate_id') ?: null) : $guard->gate_id;
|
||||
|
||||
$guard->update([
|
||||
'name' => $request->input('name'),
|
||||
'team' => (int) $request->input('team'),
|
||||
'gate_id' => $request->input('gate_id'),
|
||||
'gate_id' => $gateId,
|
||||
]);
|
||||
|
||||
if ($guard->user) {
|
||||
$userData = [
|
||||
'name' => $request->input('name'),
|
||||
'gate_id' => $request->input('gate_id'),
|
||||
'gate_id' => $gateId,
|
||||
];
|
||||
|
||||
if ($request->filled('password')) {
|
||||
|
||||
Reference in New Issue
Block a user