alvin/Challenge_15_Magazijn_App_Maken
1
0
Fork 0
mirror of https://github.com/Alvin-Zilverstand/Challenge_15_Magazijn_App_Maken.git synced 2026-03-06 13:22:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add return pending status and related functionality for reservations

Browse Source
This commit is contained in:
Alvin
2025-10-22 14:34:43 +02:00
parent 56ebf599ea
commit 68b0f9c557
7 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/js/student-reservations.js
View File

@@ -87,11 +87,13 @@ function filterAndDisplayReservations() {
<i class="bi bi-x-circle"></i> Cancel
</button>
` : reservation.status === 'APPROVED' ? `
<button class="btn btn-sm btn-info" onclick="returnReservation('${reservation._id}')" title="Return Item">
<i class="bi bi-arrow-return-left"></i> Return
<button class="btn btn-sm btn-info" onclick="returnReservation('${reservation._id}')" title="Request Return">
<i class="bi bi-arrow-return-left"></i> Request Return
</button>
` : reservation.status === 'REJECTED' ? `
<span class="text-muted"><i class="bi bi-x-circle"></i> Rejected</span>
` : reservation.status === 'RETURN_PENDING' ? `
<span class="text-warning"><i class="bi bi-clock"></i> Return Pending Approval</span>
` : reservation.status === 'RETURNED' ? `
<span class="text-success"><i class="bi bi-check-circle"></i> Returned</span>
` : ''}
@@ -126,7 +128,7 @@ async function deleteReservation(reservationId) {
// Return reservation (mark as returned)
async function returnReservation(reservationId) {
if (!confirm('Are you sure you want to return this item?')) return;
if (!confirm('Are you sure you want to request return for this item? An admin will need to approve the return.')) return;
try {
const response = await fetch(`/api/reservations/${reservationId}`, {
@@ -135,29 +137,29 @@ async function returnReservation(reservationId) {
'Content-Type': 'application/json',
'Authorization': `Bearer ${localStorage.getItem('token')}`
},
body: JSON.stringify({ status: 'RETURNED' })
body: JSON.stringify({ status: 'RETURN_PENDING' })
});
if (response.ok) {
// Successfully returned, reload reservations
// Successfully requested return, reload reservations
await loadReservations();
// Show success message
const alert = document.createElement('div');
alert.className = 'alert alert-success alert-dismissible fade show';
alert.innerHTML = `
Item returned successfully!
Return requested successfully! An admin will review your request.
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
`;
const container = document.querySelector('.container');
container.prepend(alert);
setTimeout(() => alert.remove(), 3000);
setTimeout(() => alert.remove(), 5000);
} else {
const error = await response.json();
throw new Error(error.message || 'Failed to return item');
throw new Error(error.message || 'Failed to request return');
}
} catch (error) {
console.error('Error returning item:', error);
alert(`Failed to return item: ${error.message}`);
console.error('Error requesting return:', error);
alert(`Failed to request return: ${error.message}`);
}
}