diff --git a/app/Http/Controllers/Pg/GateInspectionController.php b/app/Http/Controllers/Pg/GateInspectionController.php index 12fb772..7ac553e 100644 --- a/app/Http/Controllers/Pg/GateInspectionController.php +++ b/app/Http/Controllers/Pg/GateInspectionController.php @@ -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(), ]); diff --git a/app/Http/Controllers/Pg/SecurityGuardController.php b/app/Http/Controllers/Pg/SecurityGuardController.php index b09f63a..24cdd44 100644 --- a/app/Http/Controllers/Pg/SecurityGuardController.php +++ b/app/Http/Controllers/Pg/SecurityGuardController.php @@ -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}."); } } diff --git a/app/Models/SecurityGuard.php b/app/Models/SecurityGuard.php index e1b3426..419d786 100644 --- a/app/Models/SecurityGuard.php +++ b/app/Models/SecurityGuard.php @@ -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); diff --git a/app/Models/User.php b/app/Models/User.php index e606123..130f570 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -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'; diff --git a/database/migrations/2026_10_13_000001_add_details_to_security_guards_table.php b/database/migrations/2026_10_13_000001_add_details_to_security_guards_table.php new file mode 100644 index 0000000..4e11bc1 --- /dev/null +++ b/database/migrations/2026_10_13_000001_add_details_to_security_guards_table.php @@ -0,0 +1,33 @@ +string('badge_id', 50)->nullable()->unique()->after('id'); + $table->unsignedTinyInteger('team')->default(1)->after('name'); // Regu 1, 2, 3 + $table->foreignId('gate_id')->nullable()->constrained('gates')->nullOnDelete()->after('team'); + $table->foreignId('user_id')->nullable()->constrained('users')->nullOnDelete()->after('gate_id'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('security_guards', function (Blueprint $table) { + $table->dropForeign(['gate_id']); + $table->dropForeign(['user_id']); + $table->dropColumn(['badge_id', 'team', 'gate_id', 'user_id']); + }); + } +}; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 2d9aced..af776a0 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -46,16 +46,34 @@ class DatabaseSeeder extends Seeder ]); } - // 2. Seed Master Security Guards (Satpam PG) - $guards = [ - ['name' => 'Ahmad Fauzi', 'is_active' => true], - ['name' => 'Budi Santoso', 'is_active' => true], - ['name' => 'Hendra Pratama', 'is_active' => true], - ['name' => 'Rusli Efendi', 'is_active' => true], - ['name' => 'Slamet Widodo', 'is_active' => true], + // 2. Seed Master Security Guards (Satpam PG Lengkap dengan Akun Login) + $guardData = [ + ['badge_id' => 'SEC-001', 'name' => 'Ahmad Fauzi', 'team' => 1, 'gate' => 'BTUNGGAL'], + ['badge_id' => 'SEC-002', 'name' => 'Budi Santoso', 'team' => 2, 'gate' => 'ADIT1'], + ['badge_id' => 'SEC-003', 'name' => 'Hendra Pratama', 'team' => 3, 'gate' => 'REGWEIR'], + ['badge_id' => 'SEC-004', 'name' => 'Rusli Efendi', 'team' => 1, 'gate' => 'ADIT2'], + ['badge_id' => 'SEC-005', 'name' => 'Slamet Widodo', 'team' => 2, 'gate' => 'ADIT3'], ]; - foreach ($guards as $guard) { - SecurityGuard::create($guard); + + foreach ($guardData as $g) { + $gateModel = $createdGates[$g['gate']]; + $guardUser = User::create([ + 'name' => $g['name'], + 'username' => $g['badge_id'], + 'email' => strtolower($g['badge_id']) . '@kmh.co.id', + 'password' => Hash::make('password'), + 'role' => 'gate_officer', + 'gate_id' => $gateModel->id, + ]); + + SecurityGuard::create([ + 'badge_id' => $g['badge_id'], + 'name' => $g['name'], + 'team' => $g['team'], + 'gate_id' => $gateModel->id, + 'user_id' => $guardUser->id, + 'is_active' => true, + ]); } // 3. Seed Users (Admin & Shared Gate Accounts) diff --git a/resources/views/pg/gate_inspection.blade.php b/resources/views/pg/gate_inspection.blade.php index df49380..eb92cca 100644 --- a/resources/views/pg/gate_inspection.blade.php +++ b/resources/views/pg/gate_inspection.blade.php @@ -5,79 +5,89 @@ @section('content')
-
+
-
- - Pos Gerbang Aktif +
+ + Pos Gerbang Aktif - Akun Bersama Pos Jaga + + @if($currentGuard) + + + Petugas: {{ $currentGuard->name }} (ID: {{ $currentGuard->badge_id }}) • Regu {{ $currentGuard->team }} + + @else + Akun Pengawas / Bersama + @endif
-

+ +

{{ $gate ? $gate->name : 'Pos Gerbang Belum Dipilih' }}

Petugas Satpam yang sedang piket wajib memverifikasi kondisi fisik kendaraan dan angka odometer riil sebelum membuka portal.

+
- - + + Antrean: {{ $pendingActivities->count() }} Kendaraan
-
-
-

+
+
+

Kendaraan Menunggu Verifikasi Fisik

Auto-refresh saat halaman dimuat ulang
-
+
@forelse($pendingActivities as $act) -
+
- + {{ $act->vehicle->code }} - + {{ $act->vehicle->license_plate ?? 'Tanpa Plat' }} @if($act->direction === 'in') - - MASUK (In) + + MASUK (In) @else - - KELUAR (Out) + + KELUAR (Out) @endif - + Diinput: {{ $act->recorded_at->format('H:i:s d/m/Y') }}
-
Unit: {{ $act->vehicle->brand_type }}
-
Pengemudi: {{ $act->driver->name }} ({{ $act->driver->division ?? '-' }})
-
KM Input (Odometer): {{ number_format($act->current_km, 0, ',', '.') }} KM
-
Jarak Sesi Ini: +{{ number_format($act->distance, 0, ',', '.') }} KM
+
Unit: {{ $act->vehicle->brand_type }}
+
Pengemudi: {{ $act->driver->name }} ({{ $act->driver->division ?? '-' }})
+
KM Odometer Input: {{ number_format($act->current_km, 0, ',', '.') }} KM
+
Jarak Sesi Ini: +{{ number_format($act->distance, 0, ',', '.') }} KM
-
- Rencana Kerja: {{ $act->purpose }} +
+ Keperluan Kerja: {{ $act->purpose }}
@@ -86,8 +96,8 @@ @empty
-

Tidak ada kendaraan yang menunggu verifikasi di gerbang ini saat ini.

- Semua aktivitas kendaraan telah diperiksa atau belum ada pemindaian baru. +

Tidak ada kendaraan yang menunggu verifikasi saat ini.

+ Semua aktivitas kendaraan di pos gerbang ini telah diperiksa.
@endforelse
@@ -96,57 +106,80 @@