feat: fitur koreksi odometer, kamera scan qr unit, remember me 30 hari, dan strict route guard 403

This commit is contained in:
Ray1111-aa
2026-10-19 23:21:55 +07:00
parent d216322ac6
commit e08b81e0c2
32 changed files with 2232 additions and 189 deletions
@@ -94,6 +94,11 @@ class UserController extends Controller
// Assign Spatie Role
$user->assignRole($validated['role']);
// Jika role employee, sinkronkan atau buat data master Employee
if ($validated['role'] === 'employee') {
$user->getOrCreateEmployee();
}
// Sync Direct Permissions (jika ada izin khusus tambahan)
if ($request->has('direct_permissions')) {
$user->syncPermissions($request->input('direct_permissions', []));
@@ -174,6 +179,16 @@ class UserController extends Controller
// Sync Spatie Role
$user->syncRoles([$validated['role']]);
// Sinkronkan data master Employee jika pengguna berstatus employee
if ($user->employee) {
$user->employee->update([
'name' => $user->name,
'nik' => $user->username,
]);
} elseif ($validated['role'] === 'employee') {
$user->getOrCreateEmployee();
}
// Sync Direct Permissions
$user->syncPermissions($request->input('direct_permissions', []));
+22 -3
View File
@@ -36,6 +36,9 @@ class LoginController extends Controller
]);
$remember = $request->boolean('remember');
if ($remember) {
Auth::guard('web')->setRememberDuration(43200); // 30 hari (30 * 24 * 60 menit)
}
$loginField = filter_var($credentials['username'], FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
if (Auth::attempt([$loginField => $credentials['username'], 'password' => $credentials['password']], $remember)) {
@@ -44,6 +47,11 @@ class LoginController extends Controller
/** @var \App\Models\User $user */
$user = Auth::user();
if ($request->session()->has('url.intended')) {
return redirect()->intended()
->with('success', "Selamat datang kembali, {$user->name}!");
}
return $this->redirectBasedOnRole($user)
->with('success', "Selamat datang kembali, {$user->name}!");
}
@@ -75,14 +83,25 @@ class LoginController extends Controller
return redirect()->route('admin.dashboard');
}
if ($user->role === 'employee') {
if ($user->can('employee.dashboard')) {
return redirect()->route('employee.dashboard');
} elseif ($user->can('employee.p2h')) {
return redirect()->route('p2h.index');
} elseif ($user->can('employee.timesheet')) {
return redirect()->route('timesheet.index');
} else {
return redirect()->route('profile.index');
}
}
return match ($user->role) {
'super_admin', 'superadmin', 'admin' => redirect()->route('superadmin.dashboard'),
'super_admin', 'superadmin', 'admin' => redirect()->route('admin.dashboard'),
'hse_admin' => redirect()->route('hse.dashboard'),
'qma_admin' => redirect()->route('qma.dashboard'),
'pg_admin' => redirect()->route('pg.dashboard'),
'gate_officer' => redirect()->route('pg.gate.inspection'),
'employee' => redirect()->route('employee.dashboard'),
default => redirect()->route('superadmin.dashboard'),
default => redirect()->route('profile.index'),
};
}
}
@@ -4,6 +4,8 @@ namespace App\Http\Controllers\Employee;
use App\Http\Controllers\Controller;
use App\Models\Vehicle;
use App\Models\VehicleActivity;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
@@ -14,10 +16,117 @@ class DashboardController extends Controller
*/
public function index(): View
{
$employee = auth()->user()->employee;
$user = auth()->user();
if (!$user->isSuperAdmin() && !$user->can('employee.dashboard') && !$user->can('employee.timesheet') && !$user->can('employee.p2h')) {
abort(403, 'Akses Ditolak: Anda tidak memiliki wewenang untuk membuka halaman operasional karyawan.');
}
$employee = $user->getOrCreateEmployee();
$totalSupport = Vehicle::unitSupports()->count();
$totalLv = Vehicle::lightVehicles()->count();
return view('employee.dashboard', compact('employee', 'totalSupport', 'totalLv'));
$pendingActivity = null;
$myRecentActivities = collect();
if ($employee) {
$pendingActivity = VehicleActivity::with(['vehicle', 'gate'])
->where('driver_id', $employee->id)
->where('validation_status', 'pending')
->latest('recorded_at')
->first();
$myRecentActivities = VehicleActivity::with(['vehicle', 'gate', 'securityGuard'])
->where('driver_id', $employee->id)
->latest('recorded_at')
->take(6)
->get();
}
return view('employee.dashboard', compact(
'employee',
'totalSupport',
'totalLv',
'pendingActivity',
'myRecentActivities'
));
}
/**
* Koreksi angka KM pada tiket perjalanan yang masih berstatus pending oleh pengemudi.
*/
public function updateKm(Request $request, int $id): RedirectResponse
{
$employee = auth()->user()->getOrCreateEmployee();
if (!$employee) {
return redirect()->route('employee.dashboard')->with('error', 'Profil karyawan tidak ditemukan.');
}
$activity = VehicleActivity::with('vehicle')->findOrFail($id);
if ($activity->driver_id !== $employee->id) {
abort(403, 'Aksi Ditolak: Anda tidak memiliki akses untuk mengubah tiket ini.');
}
if ($activity->validation_status !== 'pending') {
return redirect()->route('employee.dashboard')
->with('error', 'Gagal: Tiket ini sudah diproses/disetujui oleh petugas Satpam di pos gerbang dan terkunci permanen.');
}
$validated = $request->validate([
'current_km' => ['required', 'numeric', 'min:0'],
], [
'current_km.required' => 'Nilai odometer KM saat ini wajib diisi.',
'current_km.numeric' => 'Nilai odometer harus berupa angka.',
'current_km.min' => 'Nilai odometer tidak boleh negatif.',
]);
$previousKm = (float) $activity->previous_km;
$newCurrentKm = (float) $validated['current_km'];
if ($newCurrentKm < $previousKm) {
return back()->withInput()->with('error', "Nilai kilometer input ({$newCurrentKm} KM) tidak boleh lebih kecil dari kilometer awal ({$previousKm} KM).");
}
$newDistance = max(0, $newCurrentKm - $previousKm);
$activity->update([
'current_km' => $newCurrentKm,
'distance' => $newDistance,
]);
return redirect()->route('employee.dashboard')
->with('success', "Odometer tiket {$activity->transaction_no} ({$activity->vehicle->code}) berhasil diperbaiki menjadi " . number_format($newCurrentKm, 0, ',', '.') . " KM.");
}
/**
* Batalkan tiket perjalanan yang masih berstatus pending oleh pengemudi.
*/
public function cancelActivity(Request $request, int $id): RedirectResponse
{
$employee = auth()->user()->getOrCreateEmployee();
if (!$employee) {
return redirect()->route('employee.dashboard')->with('error', 'Profil karyawan tidak ditemukan.');
}
$activity = VehicleActivity::with('vehicle')->findOrFail($id);
if ($activity->driver_id !== $employee->id) {
abort(403, 'Aksi Ditolak: Anda tidak memiliki akses untuk membatalkan tiket ini.');
}
if ($activity->validation_status !== 'pending') {
return redirect()->route('employee.dashboard')
->with('error', 'Gagal: Tiket ini sudah diproses/disetujui oleh petugas Satpam di pos gerbang dan tidak dapat dibatalkan.');
}
$reason = trim($request->input('cancel_reason', 'Dibatalkan mandiri oleh pengemudi'));
$activity->update([
'validation_status' => 'cancelled',
'rejection_note' => $reason,
]);
return redirect()->route('employee.dashboard')
->with('success', "Tiket perjalanan {$activity->transaction_no} ({$activity->vehicle->code}) berhasil dibatalkan.");
}
}
@@ -63,7 +63,7 @@ class P2hFormController extends Controller
->firstOrFail();
$user = Auth::user();
$employee = $user->employee;
$employee = $user->getOrCreateEmployee();
// Validasi identitas operator di sistem HSE
$simperError = null;
@@ -116,7 +116,7 @@ class P2hFormController extends Controller
->firstOrFail();
$user = Auth::user();
$employee = $user->employee;
$employee = $user->getOrCreateEmployee();
if ($user->isQmaAdmin() || $user->isSuperAdmin()) {
return back()->with('error', 'Admin QMA tidak memiliki wewenang untuk mengisi formulir P2H operator. Formulir wajib diisi langsung oleh Operator alat berlisensi SIMPER aktif.');
@@ -40,7 +40,7 @@ class VehicleActivityFormController extends Controller
$employee = null;
if (auth()->check()) {
$employee = auth()->user()->employee;
$employee = auth()->user()->getOrCreateEmployee();
}
return view('mobilisasi.index', compact('vehicles', 'employee'));
@@ -49,12 +49,18 @@ class VehicleActivityFormController extends Controller
/**
* Tampilkan form pencatatan aktivitas kendaraan saat scan QR code.
*/
public function show(Request $request, string $code): View
public function show(Request $request, string $code): View|RedirectResponse
{
$vehicle = Vehicle::where('code', $code)
->where('category', 'light_vehicle')
->firstOrFail();
// Jika pengemudi scan lewat kamera luar dan belum login, arahkan ke login dengan intended URL
if (!auth()->check()) {
return redirect()->guest(route('login'))
->with('warning', "Silakan login terlebih dahulu untuk mengisi formulir timesheet unit {$vehicle->code}.");
}
// Ambil daftar gerbang aktif
$gates = Gate::where('is_active', true)
->orderBy('name')
@@ -66,7 +72,7 @@ class VehicleActivityFormController extends Controller
$verifiedDriver = null;
$nikError = null;
$nikErrorTitle = 'Verifikasi Gagal';
$inputNik = trim((string) $request->input('nik', ''));
$inputNik = trim((string) ($request->input('nik') ?? $request->input('driver_nik') ?? ''));
// Cek jika ada pengemudi yang sudah terverifikasi sebelumnya (via form error redirect atau query string NIK)
$oldDriverId = old('driver_id');
@@ -98,8 +104,8 @@ class VehicleActivityFormController extends Controller
} else {
$verifiedDriver = $emp;
}
} elseif (auth()->check() && auth()->user()->isEmployee()) {
$emp = auth()->user()->employee;
} else {
$emp = auth()->user()->getOrCreateEmployee();
if ($emp) {
if (!$emp->is_operator) {
$nikErrorTitle = 'Bukan Driver Terdaftar';
@@ -219,6 +225,11 @@ class VehicleActivityFormController extends Controller
*/
public function store(StoreVehicleActivityRequest $request, string $code): RedirectResponse
{
if (!auth()->check()) {
return redirect()->guest(route('login'))
->with('warning', 'Sesi login Anda telah berakhir. Silakan login kembali.');
}
$vehicle = Vehicle::where('code', $code)
->where('category', 'light_vehicle')
->firstOrFail();
@@ -3,14 +3,17 @@
namespace App\Http\Controllers\Qma;
use App\Http\Controllers\Controller;
use App\Models\AdminActivityLog;
use App\Models\Gate;
use App\Models\VehicleActivity;
use App\Services\QmaTablePdfExporter;
use App\Services\SimpleXlsxExporter;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\DB;
use Illuminate\View\View;
class ActivityLogController extends Controller
@@ -145,7 +148,10 @@ class ActivityLogController extends Controller
$currKm = $act->current_km !== null ? number_format($act->current_km, 0, ',', '.') : '-';
$diffKm = $act->distance !== null ? number_format($act->distance, 0, ',', '.') : '-';
$purpose = $act->purpose ?: '-';
$statusPg = $act->validation_status === 'approved' ? 'Disetujui' : ($act->validation_status === 'rejected' ? 'Ditolak' : 'Menunggu PG');
$statusPg = $act->validation_status === 'approved' ? 'Disetujui' : ($act->validation_status === 'rejected' ? 'Ditolak' : ($act->validation_status === 'cancelled' ? 'Dibatalkan' : 'Menunggu PG'));
if ($act->is_corrected) {
$statusPg .= ' (Terkoreksi)';
}
$guard = $act->securityGuard?->name ?: '-';
$rows[] = [
@@ -246,7 +252,10 @@ class ActivityLogController extends Controller
$currKm = $act->current_km !== null ? number_format($act->current_km, 0, ',', '.') : '-';
$diffKm = $act->distance !== null ? number_format($act->distance, 0, ',', '.') . ' KM' : '-';
$purpose = $act->purpose ?: '-';
$statusPg = $act->validation_status === 'approved' ? 'Disetujui' : ($act->validation_status === 'rejected' ? 'Ditolak' : 'Menunggu PG');
$statusPg = $act->validation_status === 'approved' ? 'Disetujui' : ($act->validation_status === 'rejected' ? 'Ditolak' : ($act->validation_status === 'cancelled' ? 'Dibatalkan' : 'Menunggu PG'));
if ($act->is_corrected) {
$statusPg .= ' (Terkoreksi)';
}
$rows[] = [
$idx + 1,
@@ -651,4 +660,85 @@ class ActivityLogController extends Controller
'Pragma' => 'public',
]);
}
/**
* Koreksi odometer perjalanan (Timesheet LV) oleh Admin QMA / Super Admin.
*/
public function correctOdometer(Request $request, int $id): RedirectResponse
{
$activity = VehicleActivity::with(['vehicle', 'driver'])->findOrFail($id);
$validated = $request->validate([
'new_current_km' => ['required', 'numeric', 'min:0'],
'correction_reason' => ['required', 'string', 'min:5', 'max:500'],
], [
'new_current_km.required' => 'Nilai odometer koreksi wajib diisi.',
'new_current_km.numeric' => 'Nilai odometer harus berupa angka.',
'new_current_km.min' => 'Nilai odometer tidak boleh negatif.',
'correction_reason.required' => 'Alasan perbaikan odometer wajib diisi.',
'correction_reason.min' => 'Alasan perbaikan minimal 5 karakter.',
'correction_reason.max' => 'Alasan perbaikan maksimal 500 karakter.',
]);
$previousKm = (float) $activity->previous_km;
$newCurrentKm = (float) $validated['new_current_km'];
$oldCurrentKm = (float) $activity->current_km;
$oldDistance = (float) $activity->distance;
$reason = trim($validated['correction_reason']);
if ($newCurrentKm < $previousKm) {
return back()->withInput()->with('error', "Nilai kilometer koreksi ({$newCurrentKm} KM) tidak boleh lebih kecil dari kilometer awal ({$previousKm} KM).");
}
$newDistance = max(0, $newCurrentKm - $previousKm);
DB::transaction(function () use ($activity, $newCurrentKm, $oldCurrentKm, $oldDistance, $newDistance, $reason) {
// 1. Simpan original_current_km jika baru pertama kali dikoreksi
$originalKm = $activity->is_corrected ? $activity->original_current_km : $oldCurrentKm;
$activity->update([
'current_km' => $newCurrentKm,
'distance' => $newDistance,
'is_corrected' => true,
'original_current_km' => $originalKm,
'correction_reason' => $reason,
'corrected_by_user_id' => auth()->id(),
'corrected_at' => Carbon::now(),
]);
// 2. Sinkronkan Master Kendaraan jika ini adalah aktivitas approved terakhir / terbaru dari unit tersebut
$latestActivity = VehicleActivity::where('vehicle_id', $activity->vehicle_id)
->where('validation_status', 'approved')
->latest('recorded_at')
->first();
if ($latestActivity && $latestActivity->id === $activity->id) {
$activity->vehicle->update([
'current_km' => $newCurrentKm,
]);
}
// 3. Rekam ke Riwayat Aktivitas Super Admin (Audit Trail)
$vehicleCode = $activity->vehicle->code;
AdminActivityLog::record(
actionType: 'update',
module: 'Operasional Kendaraan (QMA)',
description: "Mengoreksi angka odometer tiket {$activity->transaction_no} pada unit {$vehicleCode} dari " . number_format($oldCurrentKm, 0, ',', '.') . " KM menjadi " . number_format($newCurrentKm, 0, ',', '.') . " KM. Alasan: {$reason}",
targetType: 'VehicleActivity',
targetId: $activity->id,
targetName: "{$vehicleCode} ({$activity->transaction_no})",
oldValues: [
'current_km' => $oldCurrentKm,
'distance' => $oldDistance,
],
newValues: [
'current_km' => $newCurrentKm,
'distance' => $newDistance,
'correction_reason' => $reason,
]
);
});
return back()->with('success', "Odometer transaksi {$activity->transaction_no} ({$activity->vehicle->code}) berhasil dikoreksi menjadi " . number_format($newCurrentKm, 0, ',', '.') . " KM.");
}
}
+39
View File
@@ -98,6 +98,45 @@ class User extends Authenticatable
return $this->hasOne(Employee::class);
}
/**
* Dapatkan profil Employee yang tertaut, atau cari berdasarkan NIK (username),
* atau buat profil Employee default jika akun berstatus employee / super admin penguji.
*/
public function getOrCreateEmployee(): ?Employee
{
if ($this->relationLoaded('employee') && $this->employee) {
return $this->employee;
}
$emp = $this->employee()->first();
if ($emp) {
return $emp;
}
// Cek jika sudah ada master Employee dengan NIK sama dengan username
$emp = Employee::where('nik', $this->username)->first();
if ($emp) {
$emp->update(['user_id' => $this->id]);
return $emp;
}
// Jika user memiliki role employee atau admin yang memerlukan profil operasional
if ($this->isEmployee() || $this->isSuperAdmin()) {
return Employee::create([
'user_id' => $this->id,
'nik' => $this->username,
'name' => $this->name,
'unit_kerja' => 'Umum',
'division' => 'Operasional',
'position' => 'Driver Operasional',
'is_operator' => true,
'simper_expired_at' => now()->addYears(2),
]);
}
return null;
}
public function isEmployee(): bool
{
return $this->role === 'employee' || $this->hasRole('employee');
+4 -1
View File
@@ -158,7 +158,10 @@ class Vehicle extends Model
*/
public function determineNextAllowedDirection(): string
{
$last = $this->latestActivity;
$last = $this->activities()
->whereNotIn('validation_status', ['cancelled', 'rejected'])
->latest('recorded_at')
->first();
if (!$last) {
return 'ANY';
+33
View File
@@ -26,14 +26,22 @@ class VehicleActivity extends Model
'validation_status',
'rejection_note',
'validated_at',
'is_corrected',
'original_current_km',
'correction_reason',
'corrected_by_user_id',
'corrected_at',
];
protected $casts = [
'previous_km' => 'decimal:2',
'current_km' => 'decimal:2',
'distance' => 'decimal:2',
'original_current_km' => 'decimal:2',
'is_corrected' => 'boolean',
'recorded_at' => 'datetime',
'validated_at' => 'datetime',
'corrected_at' => 'datetime',
];
public function vehicle(): BelongsTo
@@ -56,6 +64,31 @@ class VehicleActivity extends Model
return $this->belongsTo(SecurityGuard::class, 'security_guard_id');
}
public function correctedBy(): BelongsTo
{
return $this->belongsTo(User::class, 'corrected_by_user_id');
}
public function isPending(): bool
{
return $this->validation_status === 'pending';
}
public function isApproved(): bool
{
return $this->validation_status === 'approved';
}
public function isCancelled(): bool
{
return $this->validation_status === 'cancelled';
}
public function isRejected(): bool
{
return $this->validation_status === 'rejected';
}
public function scopePending(Builder $query): Builder
{
return $query->where('validation_status', 'pending');
+5
View File
@@ -27,5 +27,10 @@ class AppServiceProvider extends ServiceProvider
Gate::before(function ($user, $ability) {
return ($user->role === 'super_admin' || $user->hasRole('super_admin')) ? true : null;
});
// Konfigurasi durasi "Ingat Saya" (Remember Me) menjadi 30 hari (43.200 menit)
if (class_exists(\Illuminate\Support\Facades\Auth::class)) {
\Illuminate\Support\Facades\Auth::guard('web')->setRememberDuration(43200);
}
}
}