feat: complete master satpam with ID, Regu 1/2/3, Penempatan, and auto-generated guard login accounts
This commit is contained in:
@@ -21,6 +21,7 @@ class GateInspectionController extends Controller
|
||||
{
|
||||
// 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
|
||||
@@ -35,10 +36,10 @@ class GateInspectionController extends Controller
|
||||
->get();
|
||||
}
|
||||
|
||||
// Daftar satpam aktif untuk dipilih saat verifikasi
|
||||
// Daftar satpam aktif untuk fallback pilihan
|
||||
$guards = SecurityGuard::where('is_active', true)->orderBy('name')->get();
|
||||
|
||||
return view('pg.gate_inspection', compact('gate', 'pendingActivities', 'guards'));
|
||||
return view('pg.gate_inspection', compact('gate', 'pendingActivities', 'guards', 'currentGuard'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -46,11 +47,18 @@ class GateInspectionController extends Controller
|
||||
*/
|
||||
public function approve(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
'security_guard_id' => ['required', 'exists:security_guards,id'],
|
||||
], [
|
||||
'security_guard_id.required' => 'Silakan pilih nama petugas Satpam yang melakukan pemeriksaan.',
|
||||
]);
|
||||
$user = $request->user();
|
||||
$currentGuard = $user ? $user->securityGuard : null;
|
||||
$guardId = $request->input('security_guard_id') ?? ($currentGuard ? $currentGuard->id : null);
|
||||
|
||||
if (!$guardId) {
|
||||
$request->validate([
|
||||
'security_guard_id' => ['required', 'exists:security_guards,id'],
|
||||
], [
|
||||
'security_guard_id.required' => 'Silakan pilih nama petugas Satpam yang melakukan pemeriksaan.',
|
||||
]);
|
||||
$guardId = $request->input('security_guard_id');
|
||||
}
|
||||
|
||||
$activity = VehicleActivity::with('vehicle')->findOrFail($id);
|
||||
|
||||
@@ -58,9 +66,7 @@ class GateInspectionController extends Controller
|
||||
return back()->with('error', 'Aktivitas ini sudah pernah divalidasi sebelumnya.');
|
||||
}
|
||||
|
||||
DB::transaction(function () use ($request, $activity) {
|
||||
$guardId = $request->input('security_guard_id');
|
||||
|
||||
DB::transaction(function () use ($guardId, $activity) {
|
||||
// 1. Update status aktivitas menjadi approved
|
||||
$activity->update([
|
||||
'validation_status' => 'approved',
|
||||
@@ -82,11 +88,22 @@ class GateInspectionController extends Controller
|
||||
*/
|
||||
public function reject(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$user = $request->user();
|
||||
$currentGuard = $user ? $user->securityGuard : null;
|
||||
$guardId = $request->input('security_guard_id') ?? ($currentGuard ? $currentGuard->id : null);
|
||||
|
||||
if (!$guardId) {
|
||||
$request->validate([
|
||||
'security_guard_id' => ['required', 'exists:security_guards,id'],
|
||||
], [
|
||||
'security_guard_id.required' => 'Silakan pilih nama petugas Satpam.',
|
||||
]);
|
||||
$guardId = $request->input('security_guard_id');
|
||||
}
|
||||
|
||||
$request->validate([
|
||||
'security_guard_id' => ['required', 'exists:security_guards,id'],
|
||||
'rejection_note' => ['required', 'string', 'max:500'],
|
||||
], [
|
||||
'security_guard_id.required' => 'Silakan pilih nama petugas Satpam.',
|
||||
'rejection_note.required' => 'Alasan penolakan wajib diisi.',
|
||||
]);
|
||||
|
||||
@@ -98,7 +115,7 @@ class GateInspectionController extends Controller
|
||||
|
||||
$activity->update([
|
||||
'validation_status' => 'rejected',
|
||||
'security_guard_id' => $request->input('security_guard_id'),
|
||||
'security_guard_id' => $guardId,
|
||||
'rejection_note' => $request->input('rejection_note'),
|
||||
'validated_at' => Carbon::now(),
|
||||
]);
|
||||
|
||||
@@ -3,39 +3,122 @@
|
||||
namespace App\Http\Controllers\Pg;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Gate;
|
||||
use App\Models\SecurityGuard;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class SecurityGuardController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan daftar petugas Satpam.
|
||||
* Tampilkan daftar petugas Satpam beserta daftar pos gerbang.
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
$guards = SecurityGuard::orderBy('name')->get();
|
||||
return view('pg.guards_index', compact('guards'));
|
||||
$guards = SecurityGuard::with(['gate', 'user'])
|
||||
->orderBy('team')
|
||||
->orderBy('name')
|
||||
->get();
|
||||
|
||||
$gates = Gate::where('is_active', true)->orderBy('name')->get();
|
||||
|
||||
return view('pg.guards_index', compact('guards', 'gates'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Simpan data petugas Satpam baru.
|
||||
* Simpan data petugas Satpam baru dan otomatis buatkan akun login pos.
|
||||
*/
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
'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'],
|
||||
'password' => ['required', 'string', 'min:4'],
|
||||
], [
|
||||
'name.required' => 'Nama petugas Satpam wajib diisi.',
|
||||
'badge_id.required' => 'ID Satpam wajib diisi.',
|
||||
'badge_id.unique' => 'ID Satpam ini sudah digunakan oleh petugas lain.',
|
||||
'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.',
|
||||
]);
|
||||
|
||||
SecurityGuard::create([
|
||||
'name' => $request->input('name'),
|
||||
'is_active' => true,
|
||||
DB::transaction(function () use ($request) {
|
||||
$badgeId = strtoupper(trim($request->input('badge_id')));
|
||||
|
||||
// 1. Buat akun User untuk login Satpam di pos jaga
|
||||
$user = User::create([
|
||||
'name' => $request->input('name'),
|
||||
'username' => $badgeId,
|
||||
'email' => strtolower($badgeId) . '@kmh.co.id',
|
||||
'password' => Hash::make($request->input('password')),
|
||||
'role' => 'gate_officer',
|
||||
'gate_id' => $request->input('gate_id'),
|
||||
]);
|
||||
|
||||
// 2. Simpan master data Satpam
|
||||
SecurityGuard::create([
|
||||
'badge_id' => $badgeId,
|
||||
'name' => $request->input('name'),
|
||||
'team' => (int) $request->input('team'),
|
||||
'gate_id' => $request->input('gate_id'),
|
||||
'user_id' => $user->id,
|
||||
'is_active' => true,
|
||||
]);
|
||||
});
|
||||
|
||||
return back()->with('success', "Petugas Satpam {$request->input('name')} (ID: {$request->input('badge_id')}) berhasil didaftarkan.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Perbarui data Satpam (Nama, Regu, Penempatan Pos, dan Password opsional).
|
||||
*/
|
||||
public function update(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$guard = SecurityGuard::with('user')->findOrFail($id);
|
||||
|
||||
$request->validate([
|
||||
'name' => ['required', 'string', 'max:100'],
|
||||
'team' => ['required', 'integer', 'in:1,2,3'],
|
||||
'gate_id' => ['required', '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.',
|
||||
]);
|
||||
|
||||
return back()->with('success', 'Petugas Satpam berhasil ditambahkan ke dalam sistem.');
|
||||
DB::transaction(function () use ($request, $guard) {
|
||||
$guard->update([
|
||||
'name' => $request->input('name'),
|
||||
'team' => (int) $request->input('team'),
|
||||
'gate_id' => $request->input('gate_id'),
|
||||
]);
|
||||
|
||||
if ($guard->user) {
|
||||
$userData = [
|
||||
'name' => $request->input('name'),
|
||||
'gate_id' => $request->input('gate_id'),
|
||||
];
|
||||
|
||||
if ($request->filled('password')) {
|
||||
$userData['password'] = Hash::make($request->input('password'));
|
||||
}
|
||||
|
||||
$guard->user->update($userData);
|
||||
}
|
||||
});
|
||||
|
||||
return back()->with('success', "Data petugas Satpam {$guard->name} berhasil diperbarui.");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -43,12 +126,16 @@ class SecurityGuardController extends Controller
|
||||
*/
|
||||
public function toggleStatus(int $id): RedirectResponse
|
||||
{
|
||||
$guard = SecurityGuard::findOrFail($id);
|
||||
$guard->update([
|
||||
'is_active' => !$guard->is_active,
|
||||
]);
|
||||
$guard = SecurityGuard::with('user')->findOrFail($id);
|
||||
$newStatus = !$guard->is_active;
|
||||
|
||||
$status = $guard->is_active ? 'diaktifkan' : 'dinonaktifkan';
|
||||
return back()->with('success', "Status petugas Satpam ({$guard->name}) berhasil {$status}.");
|
||||
DB::transaction(function () use ($guard, $newStatus) {
|
||||
$guard->update([
|
||||
'is_active' => $newStatus,
|
||||
]);
|
||||
});
|
||||
|
||||
$statusText = $newStatus ? 'diaktifkan' : 'dinonaktifkan';
|
||||
return back()->with('success', "Status petugas Satpam ({$guard->name}) berhasil {$statusText}.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,14 +11,29 @@ class SecurityGuard extends Model
|
||||
use HasFactory;
|
||||
|
||||
protected $fillable = [
|
||||
'badge_id',
|
||||
'name',
|
||||
'team',
|
||||
'gate_id',
|
||||
'user_id',
|
||||
'is_active',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'is_active' => 'boolean',
|
||||
'team' => 'integer',
|
||||
];
|
||||
|
||||
public function gate()
|
||||
{
|
||||
return $this->belongsTo(Gate::class);
|
||||
}
|
||||
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class);
|
||||
}
|
||||
|
||||
public function activities(): HasMany
|
||||
{
|
||||
return $this->hasMany(VehicleActivity::class);
|
||||
|
||||
@@ -6,6 +6,7 @@ namespace App\Models;
|
||||
use Database\Factories\UserFactory;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasOne;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
|
||||
@@ -56,6 +57,11 @@ class User extends Authenticatable
|
||||
return $this->belongsTo(Gate::class);
|
||||
}
|
||||
|
||||
public function securityGuard(): HasOne
|
||||
{
|
||||
return $this->hasOne(SecurityGuard::class);
|
||||
}
|
||||
|
||||
public function isGateOfficer(): bool
|
||||
{
|
||||
return $this->role === 'gate_officer';
|
||||
|
||||
Reference in New Issue
Block a user