Ajout de la liste des affectations d'un employé

gestion_employe/static/gestion_employe/js/index.js

@@ -14,6 +14,20 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
     responsiveLayout : "hide"
 })
 
+const tableauToutesAffectations = new Tabulator("#tableauToutesAffectations", {
+    layout: "fitColumns",
+    pagination: "local",
+    paginationSize: 10,
+    placeholder: "Aucune affectation enregistrée pour cet employé.",
+    columns: [
+        {title: "Projet", field: "projet"},
+        {title: "Rôle", field: "role"},
+        {title: "Pourcentage", field: "pourcentage_temps_affectation", formatter: cell => `${cell.getValue()} %`},
+        {title: "Date de début", field: "date_affectation"},
+        {title: "Date de fin", field: "date_fin_daffectation", formatter: cell => cell.getValue() || "Non définie"},
+    ],
+})
+
 fetch(url_liste_employe)
     .then(response => response.json())
     .then(data => {
@@ -29,7 +43,6 @@ tableau_liste_employe.on("rowClick", function (row, rowData) {
     const data = rowData.getData(); 
     
     document.getElementById('detail-id').value = data.id;
-    document.querySelector("#modalContratsEmploye").dataset.employeId = data.id;
     document.getElementById('detail-matricule').value = data.matricule;
     document.getElementById('detail-employe').value = data.employe;
     document.getElementById('detail-fonction').value = data.fonction;
@@ -150,6 +163,9 @@ tableau_liste_employe.on("rowClick", function (row, rowData) {
     document.getElementById("affectation-nom-employe").textContent = data.employe || "Employé inconnu";
     document.getElementById("affecter_employe_id").value = data.id;
 
+    $("liste-affectations-nom-employe").textContent = data.employe || "Employé inconnu";
+    tableauToutesAffectations.setData(data.toutes_affectations);
+
     document.getElementById("affectations-list").innerHTML = "";
     for (const affectation of data.affectations) {
         document.getElementById("affectations-list").innerHTML += `
@@ -206,6 +222,23 @@ tableau_liste_employe.on("rowClick", function (row, rowData) {
     modal.show();
 })
 
+$("btnAfficherToutesAffectations").addEventListener("click", function() {
+    const modalDetail = $("modalDetailEmploye");
+    const modalAffectations = $("modalListeAffectations");
+
+    modalDetail.addEventListener("hidden.bs.modal", function ouvrirListe() {
+        modalDetail.removeEventListener("hidden.bs.modal", ouvrirListe);
+        bootstrap.Modal.getOrCreateInstance(modalAffectations).show();
+    }, {once: true});
+
+    modalAffectations.addEventListener("hidden.bs.modal", function revenirAuDetail() {
+        modalAffectations.removeEventListener("hidden.bs.modal", revenirAuDetail);
+        bootstrap.Modal.getOrCreateInstance(modalDetail).show();
+    }, {once: true});
+
+    bootstrap.Modal.getOrCreateInstance(modalDetail).hide();
+})
+
 $("enregistrerDetail").addEventListener("click", function() {
     const id_ = document.getElementById('detail-id').value;
     const fonction = document.getElementById('detail-fonction').value;
@@ -271,86 +304,68 @@ const listeContratExpirant = new Tabulator("#listeContratExpirant", {
     ajaxURL: $("boutonContratExpirants").dataset.urlexpirants,
 })
 
-let tabContrats = null;
+/* let tabContrats = null;
+
+document.getElementById("modalContratsEmploye").addEventListener("show.bs.modal", function () {
+
+    const employeId = document.getElementById("detail-id").value;
 
-$("boutonVoirContrats").addEventListener("click", function () {
-    const employeId = $("detail-id").value;
     if (!employeId) {
-        $("nom-employe-contrat").textContent = "Aucun employé sélectionné.";
+        alert("Aucun employé sélectionné");
         return;
     }
 
-    $("modalContratsEmploye").dataset.employeId = employeId;
-
-    const modalDetail = $("modalDetailEmploye");
-    modalDetail.addEventListener(
-        "hidden.bs.modal",
-        () => bootstrap.Modal.getOrCreateInstance($("modalContratsEmploye")).show(),
-        {once: true}
-    );
-    bootstrap.Modal.getOrCreateInstance(modalDetail).hide();
-});
-
-$("modalContratsEmploye").addEventListener("shown.bs.modal", function () {
-    const employeId = this.dataset.employeId;
-    const urlTemplate = this.dataset.urlTemplate;
-    const tableElement = $("table-contrats-tabulator");
-
-    if (tabContrats) {
-        tabContrats.destroy();
-        tabContrats = null;
-    }
-
-    if (!employeId) {
-        $("nom-employe-contrat").textContent = "Aucun employé sélectionné.";
-        return;
-    }
-
-    tableElement.replaceChildren();
-    $("nom-employe-contrat").textContent = "Chargement...";
-    const url = urlTemplate.replace("123456789", employeId);
-
-    fetch(url)
+    fetch(`/employé/employe/${employeId}/contrats/`)
         .then(response => {
             if (!response.ok) {
-                throw new Error(`Erreur HTTP ${response.status}`);
+                throw new Error("Erreur HTTP " + response.status);
             }
             return response.json();
         })
         .then(data => {
-            $("nom-employe-contrat").textContent = data.employe;
 
-            tabContrats = new Tabulator(tableElement, {
-                data: data.contrats,
-                layout: "fitColumns",
-                pagination: true,
-                paginationSize: 10,
-                placeholder: "Aucun contrat",
-                columns: [
-                    {title: "Numéro", field: "numero_contrat"},
-                    {title: "Type", field: "type_contrat"},
-                    {title: "Date début", field: "date_debut"},
-                    {title: "Date fin", field: "date_fin"},
-                    {title: "Salaire", field: "salaire_mensuel"},
-                    {title: "Statut", field: "statut"},
-                    {
-                        title: "Contrat",
-                        field: "fichier",
-                        formatter: "link",
-                        formatterParams: {target: "_blank"},
-                    },
-                ],
-            });
+            document.getElementById("nom-employe-contrat").innerText =
+                data.employe;
+
+            if (tabContrats) {
+                tabContrats.destroy();
+            }
+
+            tabContrats = new Tabulator(
+                "#table-contrats-tabulator",
+                {
+                    data: data.contrats,
+                    layout: "fitColumns",
+                    placeholder: "Aucun contrat",
+
+                    columns: [
+                        { title: "Numéro", field: "numero_contrat" },
+                        { title: "Type", field: "type_contrat" },
+                        { title: "Date début", field: "date_debut" },
+                        { title: "Date fin", field: "date_fin" },
+                        { title: "Salaire", field: "salaire_mensuel" },
+                        { title: "Statut", field: "statut" },
+
+                        {
+                            title: "Contrat",
+                            field: "fichier",
+                            formatter: function(cell) {
+                                const url = cell.getValue();
+
+                                if (!url) {
+                                    return "<span class='text-danger'>Aucun fichier</span>";
+                                }
+
+                                return `<a href="${url}" target="_blank" class="btn btn-sm btn-primary">
+                                            <i class="bi bi-file-earmark-pdf"></i> Ouvrir
+                                        </a>`;
+                            }
+                        }
+                    ]
+                }
+            );
         })
         .catch(error => {
-            console.error("Erreur lors du chargement des contrats :", error);
-            $("nom-employe-contrat").textContent =
-                "Impossible de charger les contrats.";
-            tableElement.textContent =
-                "Une erreur est survenue lors du chargement des contrats.";
+            console.error("Erreur :", error);
         });
-});
-
-$("modalContratsEmploye").addEventListener("hidden.bs.modal", function () {
-    bootstrap.Modal.getOrCreateInstance($("modalDetailEmploye")).show();
-});
+}); */

gestion_employe/templates/gestion_employe/index.html

@@ -58,10 +58,10 @@
 {% block 'modal' %}
     {% include "gestion_employe/parts/modalDetailEmploye.html" %}
     {% include "gestion_employe/parts/modalCreationContrat.html" %}
-    {% include "gestion_employe/parts/modalContratsEmploye.html" %}
     {% include "gestion_employe/parts/modalAffectationProjet.html" %}
     {% include "gestion_employe/parts/modalDocument.html" %}
     {% include "gestion_employe/parts/modalListeContratExpirants.html" %}
+    {% include "gestion_employe/parts/modalListeAffectations.html" %}
 {% endblock %}
 {% block 'js' %}
 <script type="text/javascript" src="{% static 'gestion_employe/js/index.js' %}"></script>

gestion_employe/templates/gestion_employe/parts/modalContratsEmploye.html

@@ -1,4 +1,4 @@
-<div class="modal fade" id="modalContratsEmploye" data-url-template="{% url 'gestion_employe:contrats-employe' 123456789 %}" tabindex="-1">
+<div class="modal fade" id="modalContratsEmploye" tabindex="-1">
     <div class="modal-dialog modal-xl">
         <div class="modal-content">
 
@@ -14,3 +14,4 @@
         </div>
     </div>
 </div>
+

gestion_employe/templates/gestion_employe/parts/modalDetailEmploye.html

@@ -97,15 +97,11 @@
                                 <i class="bi bi-file-earmark-text me-2"></i> Liste des Contrats
                             </h5>
                             {% if user|has_group:"ressource_humaine"  %}
-                                <div class="d-flex gap-2">
-                                    <button type="button" class="btn btn-outline-primary" id="boutonVoirContrats">
-                                        <i class="bi bi-files"></i> Voir tous les contrats
-                                    </button>
-                                    <button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#modalContrat">
+                                <div>
+                                    <button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#modalContrat{{ item.employe.id }}">
                                         <i class="bi bi-file-earmark-text"></i> Créer contrat
                                     </button>
                                 </div>
-                               
                             {% endif %}
                         </div>
                         {% csrf_token %}
@@ -116,11 +112,16 @@
                 <div class="row d-flex g-3">
                     <div class="d-flex justify-content-between">
                         <h5><i class="bi bi-pin-angle me-2"></i> Affectations</h5>
-                        {% if user|has_group:"ressource_humaine"  %}
-                            <button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#modalAffectation" onclick="setEmployeId()">
-                                <i class="bi bi-file-earmark-text"></i>Affecter 
+                        <div class="d-flex gap-2">
+                            <button type="button" class="btn btn-outline-primary" id="btnAfficherToutesAffectations">
+                                <i class="bi bi-list-ul"></i> Voir toutes les affectations
                             </button>
-                      {% endif %}
+                            {% if user|has_group:"ressource_humaine"  %}
+                                <button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#modalAffectation" onclick="setEmployeId()">
+                                    <i class="bi bi-file-earmark-text"></i> Affecter
+                                </button>
+                            {% endif %}
+                        </div>
                     </div>
                     <div class="row">
                         <div id="affectations-list"></div>

gestion_employe/templates/gestion_employe/parts/modalListeAffectations.html

@@ -0,0 +1,20 @@
+<div class="modal fade" id="modalListeAffectations" tabindex="-1" aria-labelledby="modalListeAffectationsLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="modalListeAffectationsLabel">
+                    Toutes les affectations de <span id="liste-affectations-nom-employe"></span>
+                </h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Fermer"></button>
+            </div>
+            <div class="modal-body">
+                <div id="tableauToutesAffectations"></div>
+            </div>
+            <div class="modal-footer bg-light">
+                <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">
+                    <i class="bi bi-x-circle"></i> Fermer
+                </button>
+            </div>
+        </div>
+    </div>
+</div>

gestion_employe/urls.py

@@ -90,10 +90,5 @@ urlpatterns = [
         "liste-contrat-expirants",
         views.liste_contrat_expirants,
         name='liste-contrat-expirants'
-    ),
-   path(
-           "liste-contrats-employe/<int:id_employe>/",
-           views.liste_contrats_employe,
-           name="liste-contrats-employe"       
-       )
+    )
 ]

gestion_employe/views.py

@@ -1,8 +1,9 @@
 import json
 from datetime import datetime, timedelta
 
+import requests
 from dateutil.relativedelta import relativedelta
-from django.contrib.auth import update_session_auth_hash
+from decouple import config
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
@@ -299,8 +300,6 @@ def creation_contrat(request):
 
 @login_required
 def contrats_employe(request, employe_id):
-    if not request.user.groups.filter(name="ressource_humaine").exists():
-        return JsonResponse({"error": "Accès non autorisé"}, status=403)
 
     try:
         employe = Employe.objects.get(id=employe_id)
@@ -419,6 +418,16 @@ def liste_employe(request):
                     date_fin_daffectation__gte=timezone.now().date()
                 )
             ]
+            toutes_affectations = [
+                {
+                    "projet": affectation.projet.nom_projet,
+                    "role": dict(Affectation.ROLE_CHOICES).get(affectation.role, affectation.role),
+                    "pourcentage_temps_affectation": affectation.pourcentage_temps_affectation,
+                    "date_affectation": affectation.date_affectation,
+                    "date_fin_daffectation": affectation.date_fin_daffectation,
+                }
+                for affectation in Affectation.objects.filter(employe=employe).select_related("projet")
+            ]
 
             data.append(
                 {
@@ -428,6 +437,7 @@ def liste_employe(request):
                     "email": employe.user.email,
                     "formations": formations,
                     "affectations": affectations,
+                    "toutes_affectations": toutes_affectations,
                     "projet": projets,
                     "contrats": contrats,
                     "departement": employe.departement.id if employe.departement else "",
@@ -507,55 +517,42 @@ def supprimer_formation(request, id_formation):
 def modifier_mot_passe(request):
     """Vue pour permettre à un employé de modifier son mot de passe"""
     if request.method == "POST":
+        username = request.user.username
         ancien_mdp = request.POST.get("ancien-mdp")
         nouveau_mdp = request.POST.get("nouveau-mdp")
         confirmation_mdp = request.POST.get("confirmation-mdp")
 
-        if not request.user.check_password(ancien_mdp):
-            messages.error(request, "L'ancien mot de passe est incorrect.")
-            return redirect("gestion_employe:mon-profil")
-
-        if nouveau_mdp != confirmation_mdp:
-            messages.error(request, "Les nouveaux mots de passe ne correspondent pas.")
-            return redirect("gestion_employe:mon-profil")
-
         try:
             validate_password(nouveau_mdp, user=request.user)
         except ValidationError as e:
             messages.error(request, f"Erreur : {' '.join(e.messages)}")
             return redirect("gestion_employe:mon-profil")
 
-        request.user.set_password(nouveau_mdp)
-        request.user.save(update_fields=["password"])
-        update_session_auth_hash(request, request.user)
-        messages.success(request, "Mot de passe modifié avec succès.")
+        donnees = {
+            "username": username,
+            "ancien_mdp": ancien_mdp,
+            "nouveau_mdp": nouveau_mdp,
+            "confirmation_mdp": confirmation_mdp
+        }
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+        }
+
+        response = requests.post(
+            f"{config('SERVEUR_AUTHENTIFICATION')}modifier-mot-de-passe/",
+            json=donnees,
+            headers=headers
+        )
+
+        data = response.json()
+        cle = next(iter(data.keys()))
+        valeur = next(iter(data.values()))
+
+        if cle == "success":
+            messages.success(request, valeur)
+        else:
+            messages.error(request, valeur)
 
         return redirect("gestion_employe:mon-profil")
-
-def liste_contrats_employe(request, id_employe):
-    """Vue pour retourner la liste des contrats d'un employé spécifique"""
-    try:
-        employe = Employe.objects.get(id=id_employe)
-    except Employe.DoesNotExist:
-        return JsonResponse({"error": "Employé non trouvé"}, status=404)
-
-    contrats = Contrat.objects.filter(employe=employe).order_by("-date_debut")
-
-    data = [
-        {
-            "id": contrat.id,
-            "numero_contrat": contrat.numero_contrat,
-            "type_contrat": dict(Contrat.TYPE_CONTRAT).get(contrat.type_contrat),
-            "date_debut": contrat.date_debut.strftime("%Y-%m-%d"),
-            "date_fin": contrat.date_fin.strftime("%Y-%m-%d") if contrat.date_fin else "",
-            "salaire_mensuel": contrat.salaire_mensuel,
-            "statut": dict(Contrat.STATUT_CONTRAT).get(contrat.statut),
-            "fichier_contrat": contrat.fichier_contrat.url if contrat.fichier_contrat else "",
-        }
-        for contrat in contrats
-    ]
-
-    return JsonResponse({
-        "employe": f"{employe.user.first_name} {employe.user.last_name}",
-        "contrats": data
-    })