Merge branch 'main' into feature/suppression_reservation

gestion_conge/static/gestion_conge/js/index.js

@@ -2,34 +2,6 @@ const $ = (element) => document.getElementById(element);
 
 const url_liste_conge_attente = $("liste-demande-conges").dataset.url
 
-function supprimerDemandeConge(congeId) {
-    if (!window.confirm("Voulez-vous vraiment supprimer cette demande de congé en attente ?")) {
-        return;
-    }
-
-    const form = $("form-detail-conge");
-    const csrftoken = new FormData(form).get("csrfmiddlewaretoken");
-    const url = $("bouton-supprimer-demande-conge").dataset.url.replace(
-        "/0/",
-        `/${congeId}/`
-    );
-
-    fetch(url, {
-        method: "POST",
-        headers: {"X-CSRFToken": csrftoken},
-    })
-        .then(response => response.json().then(data => ({response, data})))
-        .then(({response, data}) => {
-            window.alert(data.message);
-            if (response.ok && data.success) {
-                window.location.reload();
-            }
-        })
-        .catch(() => {
-            window.alert("La suppression a échoué. Veuillez réessayer.");
-        });
-}
-
 const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
     columns: [
         {"title": "Nom et Prénom", "field": "prenom_nom"},
@@ -49,31 +21,12 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
         {"title": "Validation par supérieur hiérarchique", "field": "validation_direction", formatter:"tickCross", formatterParams :{ 
             allowEmpty : true , 
         }},
-        {
-            title: "Action",
-            hozAlign: "center",
-            formatter: (cell) => {
-                const data = cell.getRow().getData();
-                if (!data.est_proprietaire || !data.en_attente) {
-                    return "";
-                }
-                return '<button type="button" class="btn btn-danger btn-sm">Supprimer</button>';
-            },
-            cellClick: (event, cell) => {
-                const data = cell.getRow().getData();
-                if (data.est_proprietaire && data.en_attente) {
-                    event.stopPropagation();
-                    supprimerDemandeConge(data.id);
-                }
-            },
-        },
     ],
     pagination: true,
     paginationSize: 5,
 })
 
 const bouton_demande_conges = $("bouton-demande-conge");
-const bouton_supprimer_conge = $("bouton-supprimer-demande-conge");
 
 bouton_demande_conges.addEventListener("click", (e) => {
     var modalDemandeConge = new bootstrap.Modal(document.getElementById('modalDemandeConge'));
@@ -91,11 +44,6 @@ tableau_liste_demande_conge.on("rowClick", function(row, rowData) {
     $("nombre_jours").value = data.nombre_jours;
     $("solde_restant").value = data.solde_conge;
     $("motif_refus").value = data.motif_refus;
-    bouton_supprimer_conge.classList.toggle(
-        "d-none",
-        !(data.est_proprietaire && data.en_attente)
-    );
-    bouton_supprimer_conge.dataset.congeId = data.id;
 
     if($("validation_hierarchique_valide") & $("validation_hierarchique_refuse")){
         $("validation_hierarchique_valide").checked = data.validation_hierarchique === true;
@@ -111,10 +59,6 @@ tableau_liste_demande_conge.on("rowClick", function(row, rowData) {
     modal.show();
 });
 
-bouton_supprimer_conge.addEventListener("click", () => {
-    supprimerDemandeConge(bouton_supprimer_conge.dataset.congeId);
-});
-
 fetch(url_liste_conge_attente)
     .then(response => response.json())
     .then(data => {

gestion_conge/templates/gestion_conge/parts/modalDetailConge.html

@@ -83,13 +83,6 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Fermer</button>
-            {% if conge.validation_hierarchique == None and conge.validation_direction == None%}
-            <button type="button" class="btn btn-danger " id="bouton-supprimer-demande-conge"
-                data-url="{% url 'gestion_conges:supprimer-demande-conge' 0 %}"
-            >
-                Supprimer ma demande
-            </button>
-            {% endif %}
             {% if employe_est_il_chef or membre_de_la_direction or est_chef_projet %}
                 <button type="button" class="btn btn-success" id="bouton-enregistrer-detail-conge">Enregistrer</button>
             {% endif %}

gestion_conge/urls.py

@@ -24,9 +24,4 @@ urlpatterns = [
         views.validation_de_conge, 
         name='validation-des-conges'
     ),
-    path(
-        'demande/<int:conge_id>/supprimer/',
-        views.supprimer_demande_conge,
-        name='supprimer-demande-conge',
-    ),
 ]

gestion_conge/views.py

@@ -234,56 +234,4 @@ def validation_de_conge(request):
             conge.motif_refus = motif_refus if validation_direction == "refuse" else ""
 
         conge.save()
-        return JsonResponse({"message": "La décision a été enregistrée avec succès."})
+        return JsonResponse({"message": "La décision a été enregistrée avec succès."})
-
-
-
-def _conge_est_en_attente(conge):
-    return (
-        conge.validation_hierarchique is not False
-        and conge.validation_direction is not False
-        and not (
-            conge.validation_hierarchique is True
-            and conge.validation_direction is True
-        )
-    )
-
-
-@login_required
-def supprimer_demande_conge(request, conge_id):
-    if request.method != "POST":
-        return JsonResponse(
-            {"success": False, "message": "Méthode non autorisée."},
-            status=405,
-        )
-
-    try:
-        employe = Employe.objects.get(user=request.user)
-    except Employe.DoesNotExist:
-        return JsonResponse(
-            {"success": False, "message": "Profil employé introuvable."},
-            status=403,
-        )
-
-    try:
-        conge = Conge.objects.get(pk=conge_id, employe=employe)
-    except Conge.DoesNotExist:
-        return JsonResponse(
-            {"success": False, "message": "Demande introuvable ou accès non autorisé."},
-            status=404,
-        )
-
-    if not _conge_est_en_attente(conge):
-        return JsonResponse(
-            {
-                "success": False,
-                "message": "Seules les demandes en attente peuvent être supprimées.",
-            },
-            status=400,
-        )
-
-    conge.delete()
-    return JsonResponse(
-        {"success": True, "message": "Votre demande de congé en attente a été supprimée."}
-    )
-    

gestion_salle/static/gestion_salle/js/index.js

@@ -2,7 +2,71 @@ const $ = (element) => document.getElementById(element);
 const { Schedule } = calendarjs;
 
 let dateAUtiliser = new Date().toISOString().split('T')[0];
-let currentReservationId = null;
+
+function afficherDetailsReservation(data) {
+    const reservationId = data.id_reservation || data.id;
+    $("id_reservation_detail").value = reservationId;
+    $("id_reservation_refus").value = reservationId;
+    $("id_reservation_zoom").value = reservationId;
+    $("employe").value = data.employe;
+    $("salle").value = data.salle;
+    $("statut-reservation").textContent = data.statut;
+    $("date_evenement").value = data.date_evenement || data.date_debut;
+    $("heure_debut").value = data.heure_debut;
+    $("heure_fin").value = data.heure_fin;
+    $("motif_reservation").value = data.motif_reservation;
+    $("besoin_zoom").checked = data.besoin_zoom;
+    $("besoin_ordinateur").checked = data.besoin_ordinateur ?? data.besoin_ordi;
+    $("lien_zoom").value = data.lien_zoom || "";
+    $("lien_zoom_container").classList.toggle("d-none", !data.besoin_zoom);
+
+    const currentUserId = $("current-user-id").dataset.userId;
+    const isOwner = data.est_proprietaire === true
+        || String(data.employe_id) === currentUserId;
+    const isPending = data.est_en_attente === true
+        || data.statut === "En attente"
+        || data.statut === "en_attente";
+
+    $("bouton-supprimer-reservation").classList.toggle(
+        "d-none",
+        !(isOwner && isPending)
+    );
+
+    for (const id of ["refuserReservation", "refuserReservationInfo", "bouton-valider", "bouton-valider-info"]) {
+        const button = $(id);
+        if (button) {
+            button.style.display = isPending && !isOwner ? "inline-block" : "none";
+        }
+    }
+}
+
+function supprimerReservation(reservationId) {
+    if (!window.confirm("Voulez-vous vraiment supprimer cette demande de réservation en attente ?")) {
+        return;
+    }
+
+    const form = $("formulaire-details");
+    const csrf = form.querySelector("[name=csrfmiddlewaretoken]").value;
+    const url = $("bouton-supprimer-reservation").dataset.url.replace(
+        "/0/",
+        `/${reservationId}/`
+    );
+
+    fetch(url, {
+        method: "POST",
+        headers: {"X-CSRFToken": csrf},
+    })
+        .then(response => response.json().then(data => ({response, data})))
+        .then(({response, data}) => {
+            window.alert(data.message);
+            if (response.ok && data.success) {
+                window.location.reload();
+            }
+        })
+        .catch(() => {
+            window.alert("La suppression a échoué. Veuillez réessayer.");
+        });
+}
 
 const calendrier = Schedule(document.getElementById('planning-reservation'), {
     type: 'weekdays',
@@ -19,31 +83,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
             return response.json();
         })
         .then(data => {
-            currentReservationId = data.id_reservation;
+            afficherDetailsReservation(data);
-            $("id_reservation_detail").value = data.id_reservation;
-            $("id_reservation_refus").value = data.id_reservation;
-            $("id_reservation_zoom").value = data.id_reservation;
-            $("employe").value=data.employe;
-            $("salle").value=data.salle;
-            $("statut-reservation").innerHTML=data.statut;
-            $("date_evenement").value=data.date_evenement;
-            $("heure_debut").value=data.heure_debut;
-            $("heure_fin").value=data.heure_fin;
-            $("motif_reservation").value=data.motif_reservation;
-            $("besoin_zoom").checked=data.besoin_zoom;
-            $("besoin_ordinateur").checked=data.besoin_ordinateur;
-            $("lien_zoom").value=data.lien_zoom;    
-            
-            const zoomContainer = $("lien_zoom_container");
-                if (!data.besoin_zoom) {
-                    zoomContainer.classList.add("d-none");
-                } else {
-                    zoomContainer.classList.remove("d-none");
-                }
-            if (data.besoin_zoom === false){
-                $("lien_zoom_container").className = "d-none";
-            }
-
         })
         .catch(error => console.error("Impossible de charger les détails de la réservation :", error));
     }
@@ -58,6 +98,10 @@ $('semaineDate').addEventListener('change', () => {
     calendrier.render();
 })
 
+$("bouton-supprimer-reservation").addEventListener("click", () => {
+    supprimerReservation($("id_reservation_detail").value);
+});
+
 evenement_defini = null
 
 $("liste-salle").addEventListener("change", (e) => {
@@ -76,39 +120,22 @@ $("liste-salle").addEventListener("change", (e) => {
 function chargement_evenement(){
     const url = $("planning-reservation").dataset.url;
     fetch (url)
-    .then(response => response.json())
+    .then(response => {
+        if (!response.ok) {
+            throw new Error(`Erreur HTTP ${response.status}`);
+        }
+        return response.json();
+    })
     .then(data => {
         calendrier.setData(data);
     })
+    .catch(error => console.error("Impossible de charger les réservations :", error));
 }
 
 document.addEventListener("DOMContentLoaded", function () {
     chargement_evenement()
 })
 
-$("bouton-annuler").addEventListener("click", (e) => {
-    e.preventDefault();
-    
-    const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
-    const url_annuler = $("formulaire-details").dataset.urlannuler;
-
-    e.preventDefault();
-
-    fetch(
-        url_annuler,
-        {
-            method: "POST",
-            headers: {
-                "X-Requested-With": "XMTHttpRequest",
-                "X-CSRFToken": csrf
-            },
-            body: new FormData($("formulaire-details"))
-        }
-    )
-    .then(response => response.json())
-    .then(data => console.log(data))
-})
-
 if($("bouton-valider")){
     $("bouton-valider").addEventListener("click", (e) => {
         const csrf = document.querySelector("[name=csrfmiddlewaretoken]").value;
@@ -180,40 +207,7 @@ const tableau_reservation_attente = new Tabulator("#tableau-reservation-attente"
 tableau_reservation_attente.on("rowClick", (row, rowData) => {
     const data = rowData.getData();
 
-    console.log(data);
+    afficherDetailsReservation(data);
-
-    if(data.besoin_zoom === false){
-        $("lien_zoom_container").className = 'd-none';
-    }
-
-    const id_user = $("current-user-id").dataset.userId;
-
-    $("id_reservation_detail").value = data.id;
-    $("id_reservation_refus").value = data.id;
-    $("id_reservation_zoom").value = data.id;
-
-    $("employe").value=data.employe;
-    $("salle").value=data.salle;
-    $("statut-reservation").innerHTML=data.statut;
-    $("date_evenement").value = data.date_evenement;
-    $("heure_debut").value=data.heure_debut;
-    $("heure_fin").value=data.heure_fin;
-    $("motif_reservation").value=data.motif_reservation;
-    $("besoin_zoom").checked=data.besoin_zoom;
-    $("besoin_ordinateur").checked=data.besoin_ordi;
-    $("lien_zoom").value=data.lien_zoom;
-
-    const refuserReservation = document.querySelector("#refuserReservation");
-    const bouton_valider = document.querySelector("#bouton-valider");
-    
-    if((refuserReservation | bouton_valider) && data.statut === "En attente"){
-        refuserReservation.style.display = "inline-block";
-        bouton_valider.style.display = "inline-block";
-    }
-
-    if (id_user != data.employe_id){
-        $("bouton-annuler").className = "d-none";
-    }
 
     const modal = new bootstrap.Modal($("modalDetailReservation"));
     bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();

gestion_salle/templates/gestion_salle/index.html

@@ -55,5 +55,5 @@
 {% block 'js' %}
 <script src="https://cdn.jsdelivr.net/npm/lemonadejs/dist/lemonade.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@calendarjs/ce/dist/index.min.js"></script>
-<script src="{% static 'gestion_salle/js/index.js' %}?v=3"></script>
+<script src="{% static 'gestion_salle/js/index.js' %}?v=5"></script>
 {% endblock %}

gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html

@@ -10,7 +10,7 @@
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
-                <form method="POST" data-urlannuler="{% url 'gestion_salle:annuler-reservation' %}" data-urlvalider="{% url 'gestion_salle:valider-reservation' %}" id="formulaire-details">
+                <form method="POST" data-urlvalider="{% url 'gestion_salle:valider-reservation' %}" id="formulaire-details">
                      {% csrf_token %} 
                     <input type='' class="form-control" id="id_reservation_detail" name='id_reservation' hidden>
                     <div class="form-group mb-2">
@@ -63,7 +63,18 @@
                             <button class="btn btn-success me-1" id="bouton-valider-info">Valider</button>
                         {% endif %}
                         <span id="current-user-id" data-user-id="{{ user.id }}"></span>
-                        <button class="btn btn-danger" id="bouton-annuler">Annuler</button>
+                        <button
+                            type="button"
+                            class="btn btn-outline-danger d-none"
+                            id="bouton-supprimer-reservation"
+                            data-url="{% url 'gestion_salle:supprimer-reservation' 0 %}"
+                        >
+                            Supprimer ma demande
+                        </button>
+
+                         <button type="button" class="btn btn-secondary" id="bouton-annuler" data-bs-dismiss="modal">
+                            Fermer
+                        </button>
                     </div>
                 </form>
             </div>

gestion_salle/urls.py

@@ -45,5 +45,10 @@ urlpatterns = [
         'liste-reservation-attente',
         views.liste_reservation_attente,
         name="liste-reservation-attente"
+    ),
+    path(
+        'reservation/<int:reservation_id>/supprimer',
+        views.supprimer_reservation,
+        name="supprimer-reservation",
     )
 ]

gestion_salle/views.py

@@ -125,19 +125,25 @@ Veuillez vous connecter à la plateforme pour traiter cette demande.""",
 
     return render(request, "gestion_salle/index.html", context)
  
+@login_required
 def liste_reservation(request:HttpRequest):
     """Vue d'affichage des creneaux disponibles"""
-    reservations = Reservation.objects.filter(statut = "validee")
+    try:
+        employe = Employe.objects.get(user=request.user)
+        reservations = Reservation.objects.filter(
+            Q(statut="validee")
+            | Q(statut="en_attente", employe=employe)
+        )
+    except Employe.DoesNotExist:
+        reservations = Reservation.objects.filter(statut="validee")
+
     liste_reservation = []
 
     for reservation in reservations:
-        color = None
         if reservation.statut == "en_attente":
             color = "#ffc107"
-        elif reservation.statut == "validee":
-            color = "#198754"
         else:
-            color = "#dc3545"
+            color = "#198754"
 
         liste_reservation.append({ 
             "guid": reservation.pk, 
@@ -146,6 +152,7 @@ def liste_reservation(request:HttpRequest):
             "start": reservation.heure_debut, 
             "end": reservation.heure_fin, 
             "color": color,
+            "statut": dict(Reservation.STATUT).get(reservation.statut),
         })
     return JsonResponse(liste_reservation, safe=False)
 
@@ -183,6 +190,7 @@ def liste_reservation_attente(request):
     liste_reservation = [
         {
             **model_to_dict(reservation),
+            "id": reservation.pk,
             "employe": f"{reservation.employe.user.first_name} {reservation.employe.user.last_name}",
             "employe_id": reservation.employe.user.id,
             "salle": dict(Reservation.TYPE_CHOICES).get(reservation.salle),
@@ -193,6 +201,49 @@ def liste_reservation_attente(request):
 
     return JsonResponse(liste_reservation, safe=False)
 
+
+@login_required
+def supprimer_reservation(request: HttpRequest, reservation_id: int):
+    if request.method != "POST":
+        return JsonResponse(
+            {"success": False, "message": "Méthode non autorisée."},
+            status=405,
+        )
+
+    try:
+        employe = Employe.objects.get(user=request.user)
+    except Employe.DoesNotExist:
+        return JsonResponse(
+            {"success": False, "message": "Profil employé introuvable."},
+            status=403,
+        )
+
+    try:
+        reservation = Reservation.objects.get(
+            pk=reservation_id,
+            employe=employe,
+        )
+    except Reservation.DoesNotExist:
+        return JsonResponse(
+            {"success": False, "message": "Réservation introuvable ou accès non autorisé."},
+            status=404,
+        )
+
+    if reservation.statut != "en_attente":
+        return JsonResponse(
+            {
+                "success": False,
+                "message": "Seules les réservations en attente peuvent être supprimées.",
+            },
+            status=400,
+        )
+
+    reservation.delete()
+    return JsonResponse(
+        {"success": True, "message": "Votre réservation en attente a été supprimée."}
+    )
+
+
 def detail_reservation(request:HttpRequest, reservation_id:int):
     reservation = Reservation.objects.get(id=reservation_id)
     employe = reservation.employe.user
@@ -209,6 +260,8 @@ def detail_reservation(request:HttpRequest, reservation_id:int):
         'besoin_zoom': reservation.besoin_zoom,
         'besoin_ordinateur': reservation.besoin_ordi,
         'lien_zoom': reservation.lien_zoom or '',
+        'est_proprietaire': request.user.is_authenticated and reservation.employe.user_id == request.user.id,
+        'est_en_attente': reservation.statut == "en_attente",
     }
 
     return JsonResponse(reservation_json, safe=True)