From 8503689aa4434c814aebac261ef2634c83eb9b1a Mon Sep 17 00:00:00 2001 From: Soriba SYLLA Date: Fri, 15 May 2026 16:31:11 +0000 Subject: [PATCH] Bug: Correction du refus des reservations et d'envoi de mail --- Jenkinsfile | 1 + .../__pycache__/views.cpython-310.pyc | Bin 16696 -> 16653 bytes gestion_projet/views.py | 1 - .../__pycache__/views.cpython-310.pyc | Bin 7510 -> 7597 bytes .../static/gestion_salle/js/index.js | 8 +++++ .../parts/modalDetailResevation.html | 2 +- gestion_salle/views.py | 30 ++++++++---------- staticfiles/gestion_salle/js/index.js | 2 +- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a7264b..4ee86cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,6 +39,7 @@ pipeline python manage.py makemigrations python manage.py migrate + echo $SUDO_PASSWORD | sudo -S rm -r staticfiles python manage.py collectstatic --noinput echo $SUDO_PASSWORD | sudo -S chown -R www-data:www-data /var/www/sirh diff --git a/gestion_projet/__pycache__/views.cpython-310.pyc b/gestion_projet/__pycache__/views.cpython-310.pyc index a986bd00b17164d29c519269eaf160e4c5c43dde..6b014969d40fa10b10979c4a928de38484bb804e 100644 GIT binary patch delta 5300 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 JBcRc1!+%+z1-}3Q delta 966 zcmcgqyNlF77@u#F&1Uo3_a^(gLpVGR5rk`epdzTKg%1u921SH#_qdoS=3?dUZE@S4 zCh*%5)Aj3T3u_iQywMdV1BB!t(8F60ZV^f%l=b}Pv2`jdRt+)|6u`67K z^N|-9MNwfhD#c|{R=5yV;;N_;w$P4h@u)89zSSPnNpWQ%T&2GAUokHeXWVS`9pK=;gmGLmsoLV@l`pz)sx(#{ybA z@{#?-^%9R#B&%7uAiK`U3khy6QSrDA=IoWTT=2dV9k7tjm%iPXpX*|j^iw-@F^?u0 zURZp_u%J+hkd>BGEv!%&KHy<>3Z&VDYLhxTicyHLF=rkzpL&XWnI6!3&2_-i4qcwq zn6w5A%b7lDPZ@Pp_O$8jP2&bYM>@etI3su4r{y@f2ut#P;OhnjmtTTI-lu=uVvtIYnLa>@<4l4mV={e59joJ=DY|R@<+RBd?m7} zcC?i3h{IK|z}R;T{acbtKuXPU^N62=V9CdyFCig9< Pc)U>p-lS2a5!B!}+$`KW diff --git a/gestion_salle/static/gestion_salle/js/index.js b/gestion_salle/static/gestion_salle/js/index.js index 91591b1..6950c0e 100644 --- a/gestion_salle/static/gestion_salle/js/index.js +++ b/gestion_salle/static/gestion_salle/js/index.js @@ -78,6 +78,11 @@ $("bouton-annuler").addEventListener("click", (e) => { const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value; const url_annuler = $("formulaire-details").dataset.urlannuler; + console.log("URL d'annulation :"); + console.log($("formulaire-details")) + + e.preventDefault(); + fetch( url_annuler, { @@ -128,6 +133,9 @@ if($("refuserReservation")){ const url = e.currentTarget.dataset.lienrefus; const idRes = $("id_reservation_detail").value; + console.log(idRes); + e.preventDefault(); + fetch(url, { method: "POST", headers: { diff --git a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html index 20bf762..0d09ef3 100644 --- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html +++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html @@ -12,7 +12,7 @@
{% csrf_token %} - +
diff --git a/gestion_salle/views.py b/gestion_salle/views.py index af34438..84903ae 100644 --- a/gestion_salle/views.py +++ b/gestion_salle/views.py @@ -1,4 +1,5 @@ from datetime import timedelta +import json from django.contrib import messages from django.contrib.auth.decorators import login_required from django.shortcuts import redirect, render @@ -19,8 +20,6 @@ def index(request: HttpRequest): messages.error(request, "Profil employé introuvable.") return redirect('gestion_conges:conge') - - if request.method == "POST": form = ReservationForm(request.POST) @@ -108,6 +107,7 @@ def liste_reservation(request:HttpRequest): reservations = Reservation.objects.filter(statut = "validee") liste_reservation = [] for reservation in reservations: + print(reservation.statut) color = None if reservation.statut == "en_attente": color = "#ffc107" @@ -220,12 +220,11 @@ def valider_reservation(request: HttpRequest): reservation.statut = 'validee' reservation.save() - if fonctions_utilitaire.EMAIL_ASSISTANTE_DE_DIRECTION: - fonctions_utilitaire.envoyer_mail( - sujet = "Reservation de salle", - message = f"""Bonjour {request.user.first_name} {request.user.last_name}, votre reservation de la salle {dict(Reservation.TYPE_CHOICES).get(reservation.salle)} du {reservation.date_debut.strftime('%d/%m/%Y')} au {reservation.date_fin.strftime('%d/%m/%Y')} pour motif "{reservation.motif_reservation}" a été validée. Veuillez vous connecter à la plateforme pour plus de détails.""", - destinataires = [reservation.employe.user.email] - ) + fonctions_utilitaire.envoyer_mail( + sujet = "Reservation de salle", + message = f"""Bonjour {request.user.first_name} {request.user.last_name}, votre reservation de la salle {dict(Reservation.TYPE_CHOICES).get(reservation.salle)} du {reservation.date_debut.strftime('%d/%m/%Y')} au {reservation.date_fin.strftime('%d/%m/%Y')} pour motif "{reservation.motif_reservation}" a été validée. Veuillez vous connecter à la plateforme pour plus de détails.""", + destinataires = [reservation.employe.user.email] + ) messages.success(request, f"Réservation de {reservation.employe.get_full_name()} validée avec succès.") return redirect('gestion_salle:reservation-salle') @@ -234,22 +233,21 @@ def valider_reservation(request: HttpRequest): def refuser_reservation(request: HttpRequest): """Refuser une réservation""" if request.method == 'POST': - reservation_id = request.POST.get('id_reservation') + reservation_id = json.loads(request.body).get('id_reservation') try: reservation = Reservation.objects.get(id=reservation_id) except Reservation.DoesNotExist: messages.error(request, "La réservation n'existe pas.") - return redirect("salle") + return JsonResponse({"message": "Une erreur s'est produite lors de l'annulation de la reservation."}) reservation.statut = 'refusee' reservation.save() - if fonctions_utilitaire.EMAIL_ASSISTANTE_DE_DIRECTION: - fonctions_utilitaire.envoyer_mail( - sujet = "Reservation de salle", - message = f"""Bonjour {request.user.first_name} {request.user.last_name}, votre reservation de la salle {dict(Reservation.TYPE_CHOICES).get(reservation.salle)} du {reservation.date_debut.strftime('%d/%m/%Y')} au {reservation.date_fin.strftime('%d/%m/%Y')} pour motif "{reservation.motif_reservation}" a été refusée. Veuillez vous connecter à l'Assistante de Direction pour plus de détails.""", - destinataires = [reservation.employe.user.email] - ) + fonctions_utilitaire.envoyer_mail( + sujet = "Reservation de salle", + message = f"""Bonjour {request.user.first_name} {request.user.last_name}, votre reservation de la salle {dict(Reservation.TYPE_CHOICES).get(reservation.salle)} du {reservation.date_debut.strftime('%d/%m/%Y')} au {reservation.date_fin.strftime('%d/%m/%Y')} pour motif "{reservation.motif_reservation}" a été refusée. Veuillez vous connecter à l'Assistante de Direction pour plus de détails.""", + destinataires = [reservation.employe.user.email] + ) return JsonResponse({"message": "Réservation refusée avec succès."}) diff --git a/staticfiles/gestion_salle/js/index.js b/staticfiles/gestion_salle/js/index.js index 8b5bff8..4f69d09 100644 --- a/staticfiles/gestion_salle/js/index.js +++ b/staticfiles/gestion_salle/js/index.js @@ -190,4 +190,4 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => { const modal = new bootstrap.Modal($("modalDetailReservation")); bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide(); modal.show(); -}) \ No newline at end of file +})