From 3b587d2a1a4376551b4b694a38e0e24a1c4cf4c5 Mon Sep 17 00:00:00 2001 From: Fatimac2804 Date: Wed, 2 Sep 2026 13:46:07 +0200 Subject: [PATCH] Affichage des detait de la reservation de salle --- gestion_salle/static/gestion_salle/js/index.js | 11 ++++++++--- gestion_salle/templates/gestion_salle/index.html | 2 +- .../gestion_salle/parts/modalDetailResevation.html | 4 ++-- gestion_salle/views.py | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gestion_salle/static/gestion_salle/js/index.js b/gestion_salle/static/gestion_salle/js/index.js index 6950c0e..959284d 100644 --- a/gestion_salle/static/gestion_salle/js/index.js +++ b/gestion_salle/static/gestion_salle/js/index.js @@ -12,7 +12,12 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), { const modal = new bootstrap.Modal($("modalDetailReservation")); modal.show(); fetch (`/gestion-salle/revervation/details/${event.guid}`) - .then(response => response.json()) + .then(response => { + if (!response.ok) { + throw new Error(`Erreur HTTP ${response.status}`); + } + return response.json(); + }) .then(data => { currentReservationId = data.id_reservation; $("id_reservation_detail").value = data.id_reservation; @@ -21,7 +26,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), { $("employe").value=data.employe; $("salle").value=data.salle; $("statut-reservation").innerHTML=data.statut; - $("date_evenement").value=data.date_evenement; + $("date_debut").value=data.date_debut; $("heure_debut").value=data.heure_debut; $("heure_fin").value=data.heure_fin; $("motif_reservation").value=data.motif_reservation; @@ -34,6 +39,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), { } }) + .catch(error => console.error("Impossible de charger les détails de la réservation :", error)); } }); @@ -180,7 +186,6 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => { $("salle").value=data.salle; $("statut-reservation").innerHTML=data.statut; $("date_debut").value = data.date_debut; - $("date_fin").value = data.date_fin; $("heure_debut").value=data.heure_debut; $("heure_fin").value=data.heure_fin; $("motif_reservation").value=data.motif_reservation; diff --git a/gestion_salle/templates/gestion_salle/index.html b/gestion_salle/templates/gestion_salle/index.html index db35f40..70e6408 100644 --- a/gestion_salle/templates/gestion_salle/index.html +++ b/gestion_salle/templates/gestion_salle/index.html @@ -55,5 +55,5 @@ {% block 'js' %} - + {% endblock %} \ No newline at end of file diff --git a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html index 20bf762..c32abd9 100644 --- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html +++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html @@ -25,10 +25,10 @@ -
+ {% comment %}
-
+
{% endcomment %}
diff --git a/gestion_salle/views.py b/gestion_salle/views.py index 075aef5..9cfbf1e 100644 --- a/gestion_salle/views.py +++ b/gestion_salle/views.py @@ -153,7 +153,7 @@ def detail_reservation(request:HttpRequest, reservation_id:int): 'employe': f"{employe.first_name} {employe.last_name}", 'salle': reservation.salle, 'statut': dict(Reservation.STATUT).get(reservation.statut), - 'date_evenement': reservation.date_debut.strftime('%Y-%m-%d'), + 'date_debut': reservation.date_debut.strftime('%Y-%m-%d'), 'heure_debut': reservation.heure_debut.strftime('%H:%M'), 'heure_fin': reservation.heure_fin.strftime('%H:%M'), 'motif_reservation': reservation.motif_reservation,