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 a986bd0..6b01496 100644 Binary files a/gestion_projet/__pycache__/views.cpython-310.pyc and b/gestion_projet/__pycache__/views.cpython-310.pyc differ diff --git a/gestion_projet/views.py b/gestion_projet/views.py index 80a4ba4..f0e2f10 100644 --- a/gestion_projet/views.py +++ b/gestion_projet/views.py @@ -2,7 +2,6 @@ from datetime import date from decimal import Decimal, InvalidOperation from django.http import JsonResponse from django.shortcuts import redirect, render -from django.urls import reverse from django.utils import timezone from django.contrib import messages from django.contrib.auth.decorators import login_required diff --git a/gestion_salle/__pycache__/views.cpython-310.pyc b/gestion_salle/__pycache__/views.cpython-310.pyc index cf85ac6..ac650fc 100644 Binary files a/gestion_salle/__pycache__/views.cpython-310.pyc and b/gestion_salle/__pycache__/views.cpython-310.pyc differ 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 +})