feat: add 5-hour trip expiration timer and rbac activity deletion permissions

This commit is contained in:
Ray1111-aa
2026-10-22 12:23:13 +07:00
parent d389e0a9c2
commit 34c9310e8a
14 changed files with 753 additions and 27 deletions
+44 -1
View File
@@ -83,7 +83,15 @@
</div>
</div>
<div class="self-start sm:self-center">
<div class="self-start sm:self-center flex flex-wrap items-center gap-2">
<!-- Timer Countdown Sisa Waktu 5 Jam -->
<div id="pendingTripCountdownContainer"
data-expires-at="{{ $pendingActivity->expires_at?->toISOString() }}"
class="inline-flex items-center px-3 py-1 rounded-full text-xs font-mono font-bold bg-white text-rose-700 border border-rose-300 shadow-2xs">
<i class="fa-solid fa-stopwatch mr-1.5 text-rose-600 animate-pulse"></i>
<span>Sisa: <strong id="tripCountdownTimerText">--:--:--</strong></span>
</div>
<span class="inline-flex items-center px-3 py-1 rounded-full text-xs font-bold bg-amber-100 text-amber-900 border border-amber-300">
<span class="w-2 h-2 rounded-full bg-amber-500 animate-ping mr-1.5"></span>
<span class="w-2 h-2 rounded-full bg-amber-500 mr-1.5 -ml-3.5"></span>
@@ -776,5 +784,40 @@
errorMsg.textContent = (err && err.message) ? err.message : 'Kamera tidak dapat diakses. Pastikan peramban browser diberikan izin akses kamera (Camera Permission).';
}
}
// Countdown Timer Tiket Pending (Batas Waktu 5 Jam)
const countdownContainer = document.getElementById('pendingTripCountdownContainer');
if (countdownContainer) {
const expiresAtRaw = countdownContainer.getAttribute('data-expires-at');
const timerTextEl = document.getElementById('tripCountdownTimerText');
if (expiresAtRaw && timerTextEl) {
const expireTime = new Date(expiresAtRaw).getTime();
function updateTripCountdown() {
const now = new Date().getTime();
const distance = expireTime - now;
if (distance <= 0) {
timerTextEl.textContent = 'Kedaluwarsa';
countdownContainer.classList.remove('text-rose-700', 'border-rose-300');
countdownContainer.classList.add('text-slate-600', 'bg-slate-100', 'border-slate-300');
setTimeout(() => {
window.location.reload();
}, 2500);
return;
}
const hours = Math.floor(distance / (1000 * 60 * 60));
const minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
const seconds = Math.floor((distance % (1000 * 60)) / 1000);
const pad = (n) => String(n).padStart(2, '0');
timerTextEl.textContent = `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
}
updateTripCountdown();
setInterval(updateTripCountdown, 1000);
}
}
</script>
@endsection
+81 -1
View File
@@ -241,6 +241,9 @@
<th class="py-3.5 px-4 text-center">ARAH</th>
<th class="py-3.5 px-4 text-right">ODOMETER</th>
<th class="py-3.5 px-4 text-center">STATUS & CATATAN</th>
@can('pg.logs.delete')
<th class="py-3.5 px-4 text-center whitespace-nowrap">AKSI</th>
@endcan
</tr>
</thead>
<tbody id="verificationLogTableBody" class="divide-y divide-slate-100 font-medium text-slate-700">
@@ -390,6 +393,18 @@
<i class="fa-solid fa-check text-[10px]"></i>
<span>Disetujui</span>
</span>
@elseif($item->validation_status === 'cancelled')
<div>
<span class="inline-flex items-center gap-1 px-2.5 py-1 rounded-full text-[11px] font-bold bg-slate-100 text-slate-700" title="{{ $item->rejection_note }}">
<i class="fa-solid fa-ban text-[10px] text-slate-400"></i>
<span>Dibatalkan</span>
</span>
@if($item->rejection_note)
<p class="text-[10px] text-slate-500 max-w-xs truncate mx-auto mt-0.5" title="{{ $item->rejection_note }}">
{{ $item->rejection_note }}
</p>
@endif
</div>
@elseif($item->validation_status === 'rejected')
<div>
<span class="inline-flex items-center gap-1 px-2.5 py-1 rounded-full text-[11px] font-bold bg-rose-100 text-rose-800" title="{{ $item->rejection_note }}">
@@ -409,10 +424,23 @@
</span>
@endif
</td>
<!-- Aksi Hapus Log (RBAC Protected) -->
@can('pg.logs.delete')
<td class="py-3 px-4 text-center whitespace-nowrap">
<button type="button"
onclick="confirmDeleteVerificationLog({{ $item->id }}, '{{ $item->transaction_no }}', '{{ $item->vehicle?->code ?? '-' }}')"
class="inline-flex items-center space-x-1 px-2.5 py-1.5 rounded-lg text-xs font-bold bg-rose-50 text-rose-700 border border-rose-200 hover:bg-rose-100 hover:border-rose-300 transition cursor-pointer shadow-2xs"
title="Hapus Catatan Log Ini">
<i class="fa-regular fa-trash-can text-rose-600 text-[11px]"></i>
<span>Hapus</span>
</button>
</td>
@endcan
</tr>
@empty
<tr id="serverVerificationEmptyRow">
<td colspan="10" class="py-12 text-center text-slate-400">
<td colspan="{{ auth()->user()->can('pg.logs.delete') ? 11 : 10 }}" class="py-12 text-center text-slate-400">
<div class="flex flex-col items-center justify-center space-y-2">
<div class="w-12 h-12 rounded-full bg-slate-100 flex items-center justify-center text-slate-400 text-lg">
<i class="fa-solid fa-clipboard-question"></i>
@@ -696,7 +724,59 @@
document.addEventListener('keydown', function(e) {
if (e.key === 'Escape') {
closeGuideModal();
closeDeleteVerificationLogModal();
}
});
// Modal Konfirmasi Hapus Log Verifikasi Gerbang
function confirmDeleteVerificationLog(id, trxNo, vehicleCode) {
const textEl = document.getElementById('deleteLogTrxText');
const codeEl = document.getElementById('deleteLogCodeText');
const form = document.getElementById('deleteVerificationLogForm');
if (textEl) textEl.textContent = trxNo;
if (codeEl) codeEl.textContent = vehicleCode;
if (form) form.action = "{{ url('/pg/verification-logs') }}/" + id;
const modal = document.getElementById('deleteVerificationLogModal');
if (modal) modal.style.display = 'flex';
}
function closeDeleteVerificationLogModal() {
const modal = document.getElementById('deleteVerificationLogModal');
if (modal) modal.style.display = 'none';
}
</script>
@can('pg.logs.delete')
<!-- Modal Konfirmasi Hapus Log Verifikasi Gerbang PG -->
<div id="deleteVerificationLogModal" style="display: none;" class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-slate-900/60 backdrop-blur-xs">
<div class="bg-white rounded-2xl max-w-md w-full shadow-2xl border border-slate-100 overflow-hidden transform transition-all">
<div class="p-6 text-center">
<div class="w-14 h-14 rounded-2xl bg-rose-50 text-rose-600 flex items-center justify-center mx-auto mb-4 border border-rose-100 text-2xl">
<i class="fa-solid fa-triangle-exclamation"></i>
</div>
<h3 class="text-lg font-bold text-slate-900">Konfirmasi Hapus Log Gerbang</h3>
<p class="text-xs text-slate-500 mt-1.5">
Apakah Anda yakin ingin menghapus data perlintasan <strong id="deleteLogTrxText" class="text-slate-800 font-mono"></strong> pada kendaraan <strong id="deleteLogCodeText" class="text-emerald-700 font-mono"></strong>?
</p>
<p class="text-[11px] text-amber-700 bg-amber-50 p-2.5 rounded-xl border border-amber-200 mt-3 text-left">
<i class="fa-solid fa-circle-info mr-1 text-amber-600"></i>
Tindakan ini permanen dan akan dicatat ke dalam riwayat audit log sistem.
</p>
</div>
<form id="deleteVerificationLogForm" method="POST" action="">
@csrf
@method('DELETE')
<div class="bg-slate-50 px-6 py-4 flex items-center justify-end space-x-2 border-t border-slate-100">
<button type="button" onclick="closeDeleteVerificationLogModal()" class="px-4 py-2 rounded-xl text-xs font-bold text-slate-600 hover:bg-slate-200 transition cursor-pointer">
Batal
</button>
<button type="submit" class="px-4 py-2 rounded-xl text-xs font-bold text-white bg-rose-600 hover:bg-rose-700 transition cursor-pointer shadow-sm">
<i class="fa-regular fa-trash-can mr-1.5"></i> Ya, Hapus Log
</button>
</div>
</form>
</div>
</div>
@endcan
@endsection
+86 -25
View File
@@ -211,9 +211,9 @@
<th class="py-3.5 px-4 text-right whitespace-nowrap">KM Berjalan</th>
<th class="py-3.5 px-4 whitespace-nowrap">Aktivitas</th>
<th class="py-3.5 px-4 text-center whitespace-nowrap">Status PG</th>
@can('qma.logs.edit_odometer')
@if(auth()->user()->can('qma.logs.edit_odometer') || auth()->user()->can('qma.logs.delete'))
<th class="py-3.5 px-4 text-center whitespace-nowrap">Aksi</th>
@endcan
@endif
</tr>
</thead>
<tbody id="activityLogTableBody" class="divide-y divide-slate-100 text-slate-700 bg-white">
@@ -325,34 +325,48 @@
@endif
</td>
<!-- Aksi Koreksi Odometer (RBAC Protected) -->
@can('qma.logs.edit_odometer')
<!-- Aksi (Koreksi Odometer & Hapus - RBAC Protected) -->
@if(auth()->user()->can('qma.logs.edit_odometer') || auth()->user()->can('qma.logs.delete'))
<td class="py-3.5 px-4 text-center whitespace-nowrap">
<button type="button"
onclick="openQmaOdometerModal({{ json_encode([
'id' => $act->id,
'trx' => $act->transaction_no,
'code' => $act->vehicle?->code ?? '-',
'unit' => $act->vehicle?->brand_type ?? 'Kendaraan',
'driver' => $act->driver?->name ?? 'Pengemudi',
'previous_km' => (float)$act->previous_km,
'current_km' => (float)$act->current_km,
'distance' => (float)$act->distance,
'is_corrected' => (bool)$act->is_corrected,
'original_km' => (float)($act->original_current_km ?? $act->current_km),
'reason' => $act->correction_reason ?? '',
]) }})"
class="inline-flex items-center space-x-1 px-2.5 py-1.5 rounded-lg text-xs font-bold bg-amber-50 text-amber-800 border border-amber-200 hover:bg-amber-100 hover:border-amber-300 transition cursor-pointer shadow-2xs"
title="Koreksi Odometer Transaksi Ini">
<i class="fa-solid fa-screwdriver-wrench text-amber-600 text-[11px]"></i>
<span>Koreksi</span>
</button>
<div class="inline-flex items-center gap-1.5">
@can('qma.logs.edit_odometer')
<button type="button"
onclick="openQmaOdometerModal({{ json_encode([
'id' => $act->id,
'trx' => $act->transaction_no,
'code' => $act->vehicle?->code ?? '-',
'unit' => $act->vehicle?->brand_type ?? 'Kendaraan',
'driver' => $act->driver?->name ?? 'Pengemudi',
'previous_km' => (float)$act->previous_km,
'current_km' => (float)$act->current_km,
'distance' => (float)$act->distance,
'is_corrected' => (bool)$act->is_corrected,
'original_km' => (float)($act->original_current_km ?? $act->current_km),
'reason' => $act->correction_reason ?? '',
]) }})"
class="inline-flex items-center space-x-1 px-2.5 py-1.5 rounded-lg text-xs font-bold bg-amber-50 text-amber-800 border border-amber-200 hover:bg-amber-100 hover:border-amber-300 transition cursor-pointer shadow-2xs"
title="Koreksi Odometer Transaksi Ini">
<i class="fa-solid fa-screwdriver-wrench text-amber-600 text-[11px]"></i>
<span>Koreksi</span>
</button>
@endcan
@can('qma.logs.delete')
<button type="button"
onclick="confirmDeleteActivity({{ $act->id }}, '{{ $act->transaction_no }}', '{{ $act->vehicle?->code ?? '-' }}')"
class="inline-flex items-center space-x-1 px-2.5 py-1.5 rounded-lg text-xs font-bold bg-rose-50 text-rose-700 border border-rose-200 hover:bg-rose-100 hover:border-rose-300 transition cursor-pointer shadow-2xs"
title="Hapus Catatan Perjalanan Ini">
<i class="fa-regular fa-trash-can text-rose-600 text-[11px]"></i>
<span>Hapus</span>
</button>
@endcan
</div>
</td>
@endcan
@endif
</tr>
@empty
<tr id="serverActivityEmptyRow">
<td colspan="{{ auth()->user()->can('qma.logs.edit_odometer') ? 12 : 11 }}" class="py-12 px-4 text-center">
<td colspan="{{ (auth()->user()->can('qma.logs.edit_odometer') || auth()->user()->can('qma.logs.delete')) ? 12 : 11 }}" class="py-12 px-4 text-center">
<div class="flex flex-col items-center justify-center space-y-3">
<div class="w-14 h-14 rounded-full bg-slate-100 flex items-center justify-center text-slate-400 text-2xl">
<i class="fa-solid fa-magnifying-glass"></i>
@@ -794,4 +808,51 @@ document.addEventListener('DOMContentLoaded', function () {
}
</script>
@endcan
@can('qma.logs.delete')
<!-- Modal Konfirmasi Hapus Catatan Perjalanan QMA -->
<div id="deleteActivityModal" style="display: none;" class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-slate-900/60 backdrop-blur-xs">
<div class="bg-white rounded-2xl max-w-md w-full shadow-2xl border border-slate-100 overflow-hidden transform transition-all">
<div class="p-6 text-center">
<div class="w-14 h-14 rounded-2xl bg-rose-50 text-rose-600 flex items-center justify-center mx-auto mb-4 border border-rose-100 text-2xl">
<i class="fa-solid fa-triangle-exclamation"></i>
</div>
<h3 class="text-lg font-bold text-slate-900">Konfirmasi Hapus Perjalanan</h3>
<p class="text-xs text-slate-500 mt-1.5">
Apakah Anda yakin ingin menghapus data perjalanan <strong id="deleteTrxNoText" class="text-slate-800 font-mono"></strong> pada unit <strong id="deleteVehicleCodeText" class="text-emerald-700 font-mono"></strong>?
</p>
<p class="text-[11px] text-amber-700 bg-amber-50 p-2.5 rounded-xl border border-amber-200 mt-3 text-left">
<i class="fa-solid fa-circle-info mr-1 text-amber-600"></i>
Tindakan ini permanen dan akan dicatat ke dalam riwayat audit log sistem.
</p>
</div>
<form id="deleteActivityForm" method="POST" action="">
@csrf
@method('DELETE')
<div class="bg-slate-50 px-6 py-4 flex items-center justify-end space-x-2 border-t border-slate-100">
<button type="button" onclick="closeDeleteActivityModal()" class="px-4 py-2 rounded-xl text-xs font-bold text-slate-600 hover:bg-slate-200 transition cursor-pointer">
Batal
</button>
<button type="submit" class="px-4 py-2 rounded-xl text-xs font-bold text-white bg-rose-600 hover:bg-rose-700 transition cursor-pointer shadow-sm">
<i class="fa-regular fa-trash-can mr-1.5"></i> Ya, Hapus Catatan
</button>
</div>
</form>
</div>
</div>
<script>
function confirmDeleteActivity(id, trxNo, vehicleCode) {
document.getElementById('deleteTrxNoText').textContent = trxNo;
document.getElementById('deleteVehicleCodeText').textContent = vehicleCode;
const form = document.getElementById('deleteActivityForm');
form.action = "{{ url('/qma/activity-log') }}/" + id;
document.getElementById('deleteActivityModal').style.display = 'flex';
}
function closeDeleteActivityModal() {
document.getElementById('deleteActivityModal').style.display = 'none';
}
</script>
@endcan
@endsection