Merge branch 'main' into feature/suppression_demande_conge

Reviewed-on: #37

.gitignore

@@ -0,0 +1,8 @@
+venv/
+media/
+staticfiles/
+.env
+migrations/
+__pycache__/
+*.pyc
+db.sqlite3

Jenkinsfile

@@ -0,0 +1,51 @@
+pipeline 
+{ 
+    agent any
+    options {
+        skipDefaultCheckout(true)
+    }
+
+    environment
+    {
+        SUDO_PASSWORD = credentials('sudo-password')
+    }
+
+    stages 
+    { 
+        stage ( 'checkout' )
+        { 
+            steps 
+            { 
+                sh 'echo "Debut du pipeline test"'
+                cleanWs()
+                checkout scm 
+            } 
+        }
+        stage ( 'Deploiement' ) 
+        { 
+            when { branch 'main' }
+            steps {
+                sh '''
+                cd /var/www/sirh
+                echo $SUDO_PASSWORD | sudo -S chown -R jenkins:jenkins /var/www/sirh
+
+                git fetch origin main
+                git reset --hard origin/main
+
+                python3 -m venv venv 
+                . venv/bin/activate
+                pip install -r requirements.txt
+
+                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
+                echo "Deploiement reussi"
+                echo $SUDO_PASSWORD | sudo -S supervisorctl restart sirh
+                '''
+            }
+        } 
+    }
+}

SIRH/settings.py

@@ -13,20 +13,22 @@ https://docs.djangoproject.com/en/5.2/ref/settings/
 import os
 from pathlib import Path
 
+from decouple import config
+
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure--wdb9t(77rvyac$_q!n5gw86&0r(0&&j171v9h!-_$jahsza*5'
+SECRET_KEY = config('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = config('DEBUG', default=False, cast=bool)
 
-ALLOWED_HOSTS = ["https://support.cerfig.org", "support.cerfig.org"]
+ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=[]).split(',') 
+#CSRF_TRUSTED_ORIGINS = config("CSRF_TRUSTED_ORIGINS", default=[]).split(",")
 
 # Application definition
 
@@ -40,12 +42,9 @@ INSTALLED_APPS = [
     'gestion_employe',
     'gestion_conge',
     'gestion_projet',
-    'gestion_salle',
+    'gestion_salle'
-    'simple_sso.sso_server'
 ]
 
-LOGIN_URL = 'login'  
-
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -68,6 +67,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'contexte_universel.contexte_universel',
             ],
         },
     },
@@ -80,16 +80,15 @@ WSGI_APPLICATION = 'SIRH.wsgi.application'
 # https://docs.djangoproject.com/en/5.2/ref/settings/#databases
 
 DATABASES = {
-    'default': {
+        'default': {
-        'ENGINE': 'django.db.backends.mysql',
+            'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'sirh',
+            'NAME': config("DB_NAME"),
-        'USER': 'sirh',
+            'USER': config("DB_USER"),
-        'PASSWORD': 'sirh-cerfig',
+            'PASSWORD': config("DB_PASSWORD"),
-        'HOST': 'localhost',  # Or the server IP
+            'HOST': config("DB_HOST"),
-        'PORT': '3306',       # Default MySQL port
+            'PORT': config("DB_PORT", cast=int),
+        }
     }
-}
-
 
 # Password validation
 # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
@@ -142,11 +141,21 @@ MEDIA_ROOT = BASE_DIR / "media"
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
+# Connexion sso
+# LOGIN_URL = '/client/'
+LOGIN_URL = 'simple-sso-login'
+
+SSO_PRIVATE_KEY = config('SSO_PRIVATE_KEY') 
+SSO_PUBLIC_KEY = config('SSO_PUBLIC_KEY')
+SSO_SERVER  = config('SSO_SERVER')
+#SSO_LOGOUT_URL = 'http://test-authentification.cerfig.org:89/deconnexion'
+
+# Configuration de l'email
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'ssl0.ovh.net'
 EMAIL_PORT = 465
 EMAIL_USE_SSL = True
 EMAIL_USE_TLS = False
-EMAIL_HOST_USER = 'support.it@cerfig.org'
+EMAIL_HOST_USER = config("EMAIL_HOST_USER")
-EMAIL_HOST_PASSWORD = 'Cerfig2025'
+EMAIL_HOST_PASSWORD = config("EMAIL_HOST_PASSWORD")
 DEFAULT_FROM_EMAIL = EMAIL_HOST_USER

SIRH/sso.py

@@ -0,0 +1,38 @@
+# SGL/sso.py
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Group
+from simple_sso.sso_client.client import Client
+
+from gestion_employe.models import Departement, Employe
+
+User = get_user_model()
+
+class SIRHClient(Client):
+    def build_user(self, user_data):
+        """Crée le User et son Profile avec les infos reçues du serveur."""
+        user_data_copy = user_data.copy()
+
+        user_data.pop("departement", None)
+        user_data.pop("chef_departement", None)
+        user_data.pop("groups", None)
+
+        user = super().build_user(user_data)
+        departement = None
+
+        if "departement" in user_data_copy:
+            departement = Departement.objects.get_or_create(
+                nom=user_data_copy.get("departement", ""))[0]
+
+        Employe.objects.update_or_create(
+            user = user,
+            defaults = {
+                "departement": departement,
+                "chef": user_data_copy.get("chef_departement", None),
+            }
+        )
+
+        for group_name in user_data_copy.get("groups", []):
+            group, _ = Group.objects.get_or_create(name=group_name)
+            user.groups.add(group)
+
+        return user

SIRH/templates/SIRH/BASE.html

@@ -14,9 +14,10 @@
     </head>
     <body>
         <div class="container-fluid">
+            {% include 'parts/menu_application.html' %}
             <div class="row flex-nowrap">
                 {% include 'parts/menu_principal.html' %}
-                <div class="col-9 p-4">
+                <div class="col p-4">
                     {% block 'contenu' %} {% endblock %}
                 </div>
             </div>

SIRH/templates/SIRH/login.html

@@ -24,15 +24,16 @@
                         {% endfor %}
                     {% endif %}
                     {% csrf_token %}
+                    <input type="hidden" name="next" value="{{ next }}">
                     <div class="mb-3">
-                    <label for="mail">Votre adresse email :</label>
+                        <label for="mail">Votre adresse email :</label>
-                    <input type="text" name="mail" class="form-control" placeholder="Entrez votre e-mail" required>
+                        <input type="text" name="mail" class="form-control" placeholder="Entrez votre e-mail" required>
                     </div>
                     <div class="mb-3">
-                    <label for="mot_de_passe">Mot de passe</label>
+                        <label for="mot_de_passe">Mot de passe</label>
-                    <input type="password" name="mot_de_passe" class="form-control" placeholder="Entrez votre mot de passe" required>
+                        <input type="password" name="mot_de_passe" class="form-control" placeholder="Entrez votre mot de passe" required>
-                    <i class="bi bi-eye toggle-password" onclick="togglePassword()" 
+                        <i class="bi bi-eye toggle-password" onclick="togglePassword()" 
-                        style="position:absolute; right:10px; top:38px; cursor:pointer;"></i>
+                            style="position:absolute; right:10px; top:38px; cursor:pointer;"></i>
                     </div>
                     <button type="submit" class="btn btn-primary w-100">Se connecter</button>
                 </form>

SIRH/templates/SIRH/parts/menu_application.html

@@ -0,0 +1,24 @@
+{% load static %}
+<nav class="navbar navbar-expand-lg bg-body-tertiary">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="#">
+            <img src="{% static 'img/cerfig.jpg' %}" alt="Logo" width="85" height="30" class="d-inline-block align-text-top">
+        </a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarNav">
+            <ul class="nav nav-tabs justify-content-end w-100">
+                <li class="nav-item">
+                    <a class="nav-link active" aria-current="page" href="{{ SIRH_LIEN }}">SIRH</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="{{ SGL_LIEN }}">SGL</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#">Laboratoire</a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>

SIRH/templates/SIRH/parts/menu_principal.html

@@ -2,40 +2,47 @@
 {% load tags_personnaliser %}
 
 <div class="col-3 bg-danger d-flex flex-column vh-100 pt-5 sticky-top">
-    <a href="{% url 'gestion_employe:mon-profil' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
+    <div class="text-center mb-4">
+        {% if user.employe.photo %}
+            <img src="{{ user.employe.photo.url }}" 
+                class="rounded-circle" 
+                width="100" 
+                height="100"
+                style="object-fit:cover;">
+        {% else %}
+            <i class="bi bi-person-circle text-white" style="font-size:60px;"></i>
+        {% endif %}
+        <div class="text-white mt-2 fw-bold fs-5">
+            {{ user.first_name }} {{ user.last_name }}
+        </div>
+    </div>
+
+    <a href="{% url 'gestion_employe:mon-profil' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
         <i class="bi bi-person-circle"></i> Mon profil
     </a>
     {% if user|has_group:"ressource_humaine" or user|has_group:"direction" %}
-    <a href="{% url 'gestion_employe:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
+    <a href="{% url 'gestion_employe:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
         <i class="bi bi-speedometer2"></i> Tableau de bord
     </a>
     {% endif %}
     {% if user|has_group:"ressource_humaine" or user|has_group:"direction" %}
-    <a href="{% url 'gestion_projet:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
+    <a href="{% url 'gestion_projet:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
         <i class="bi bi-folder"></i> Gestion des Projets
     </a>
     {% endif %}
-    <a href="{% url 'gestion_conges:conge' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
+    <a href="{% url 'gestion_conges:conge' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
         <i class="bi bi-airplane"></i> Gestion des congés
     </a>
     {% if user|is_chef_projet %}
-    <a href="{% url 'gestion_projet:activites-projet' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
+    <a href="{% url 'gestion_projet:activites-projet' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
         <i class="bi bi-list-task"></i> Suivi des Activités
     </a>
     {% endif %}
-    <a href="{% url 'gestion_salle:reservation-salle' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
+    <a href="{% url 'gestion_salle:reservation-salle' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
         <i class="bi bi-calendar-check"></i> Réservation
     </a>
-    {% comment %} <a href="{% url 'rapport-rh' %}" class="text-white fw-bold text-decoration-none mb-2" style="font-size:1.2em">
+    {% comment %} {% url 'deconnexion' %} {% endcomment %}
-        <i class="bi bi-graph-up"></i> Rapports et Statistiques
+    <a href="{% url 'deconnexion' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
-    </a> {% endcomment %}
-    {% comment %} <a href="" class="text-white fw-bold text-decoration-none mb-2" style="font-size:1.2em">
-        <i class="bi bi-person-gear"></i> Gestion des Utilisateurs
-    </a> {% endcomment %}
-    {% comment %} <a href="{% url 'gestion_employe:departement' %}" class="text-white fw-bold text-decoration-none mb-2" style="font-size:1.2em">
-        <i class="bi bi-gear"></i> Paramètres
-    </a> {% endcomment %}
-    <a href="{% url 'deconnexion' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
         <i class="bi bi-box-arrow-right"></i> Déconnexion
     </a>
 </div>

SIRH/urls.py

@@ -14,34 +14,31 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+from django.conf import settings
 from django.contrib import admin
 from django.urls import include, path
-from django.conf.urls.static import static
-from django.conf import settings
-# from simple_sso.sso_server.server import Server
 
 from . import views
+from .sso import SIRHClient
 
-# server_sso = Server()
+client_sirh = SIRHClient(
+    settings.SSO_SERVER,
+    settings.SSO_PUBLIC_KEY,
+    settings.SSO_PRIVATE_KEY
+)
 
 urlpatterns = [    
-    path(
-        '',
-        views.login_view,
-        name='index'
-    ), 
-    
     path('login/',
-        views.login_view,
+        views.connexion,
         name='login'
     ),
     path(
         'deconnexion/',
-        views.deconnexion_view,
+        views.deconnexion,
         name='deconnexion'
     ),
     path(
-        'employé/',
+        '',
         include("gestion_employe.urls")
     ),
     path(
@@ -60,8 +57,5 @@ urlpatterns = [
         'admin/',
         admin.site.urls
     ), 
-    # path(
+    path("client/", include(client_sirh.get_urls())),
-    #     'sso',
+]
-    #     include(server_sso.get_urls())
-    # )
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

SIRH/views.py

@@ -1,37 +1,13 @@
-from django.contrib.auth import authenticate, login, logout
+from django.contrib.auth import logout
-from django.shortcuts import render, redirect
+from django.shortcuts import redirect
-from django.contrib import messages
+from django.urls import reverse_lazy
 
-def login_view(request):
-    """
-    Gère la connexion des utilisateurs avec redirection selon le rôle et 
-    vérification de l'acceptation de la politique d'utilisation.
-    """
-    if request.method == 'POST':
-        email = request.POST.get('mail')
-        password = request.POST.get('mot_de_passe')
 
-        if not (email and password):
+def connexion(request):
-            messages.error(request, "Veuillez remplir tous les champs.")
+    """Redirige vers le serveur SSO pour l'authentification."""
-            return render(request, 'login.html')
+    return redirect(reverse_lazy("simple-sso-login"))
 
-        user = authenticate(request, username=email, password=password)
+def deconnexion(request):
-
+    """Gérez la déconnexion des utilisateurs."""
-        if user is None:
-            messages.error(request, "Nom d’utilisateur ou mot de passe incorrect.")
-            return render(request, 'login.html')
-
-        if not user.is_active:
-            messages.error(request, "Compte inactif. Contactez l'administrateur.")
-            return render(request, 'login.html')
-
-        login(request, user)
-
-        return redirect("gestion_conges:conge")
-
-    return render(request, 'login.html')
-
-def deconnexion_view(request):
-    """Gère la déconnexion de l'utilisateur."""
     logout(request)
-    return redirect('login')
+    return redirect("http://authentification.cerfig.org/login")

contexte_universel.py

@@ -0,0 +1,7 @@
+from decouple import config
+
+def contexte_universel(request):
+    return {
+            "SIRH_LIEN": config("SIRH_LIEN"),
+            "SGL_LIEN": config("SGL_LIEN")
+    }

fonction_utilitaire/fonctions_utilitaire.py

@@ -1,13 +1,35 @@
+from django.conf import settings
+from django.core.mail import send_mail
 from django.utils import timezone
-from gestion_employe.models import Contrat
-from gestion_conge.models import Conge
 
+from gestion_conge.models import Conge
+from gestion_employe.models import Contrat, Employe
 
 QUOTA_CONGE_ANNUEL = 30
 NOMBRE_PAGINATION = 8
 DEBUT_RAPPEL = 60
 DUREE_FIN_CONTRAT = 90
 
+try:
+    EMAIL_ASSISTANTE_DE_DIRECTION = list(Employe.objects.filter(fonction="assistant_direction").values_list('user__email', flat=True))
+except:
+    pass
+
+try:
+    EMAIL_EQUIPE_INFORMATIQUE = list(
+        Employe.objects.filter(departement__nom="Systeme informatique").values_list('user__email', flat=True)
+    ) or ["support@cerfig.org"]
+except:
+    EMAIL_EQUIPE_INFORMATIQUE = ["support@cerfig.org"]
+
+def est_equipe_informatique(employe):
+    """Vérifie si un employé appartient au département informatique"""
+    return employe.departement and employe.departement.nom == "Systeme informatique"
+
+def est_assistante_direction(employe):
+    """Vérifie si un employé est l'assistante de direction"""
+    return employe.fonction == "assistant_direction"
+
 def solde_conge(employe):
     """Fonction de calcul du solde de congé restant l'employé"""
     contrat = Contrat.objects.filter(employe=employe, statut='actif').order_by('-date_debut').first()
@@ -32,3 +54,23 @@ def solde_conge(employe):
         "quota_annuel": QUOTA_CONGE_ANNUEL - jours_conges_valider,
         "nombre_jours_valide": jours_conges_valider
     }
+
+def destinataire_mail_demande_conges(employe):
+    """Fonction de récupération des destinataires pour les mails de demande de congés"""
+    if employe.chef:
+        return EMAIL_ASSISTANTE_DE_DIRECTION
+    else:
+        if employe.departement:
+            chefs_departement = Employe.objects.filter(departement=employe.departement, chef=True)
+            return list(chefs_departement.values_list('user__email', flat=True))
+
+def envoyer_mail(sujet, message, destinataires):
+    """Fonction d'envoi de mail"""
+
+    send_mail(
+        sujet,
+        message,
+        settings.EMAIL_HOST_USER,
+        destinataires,
+        fail_silently=False,
+    )

gestion_conge/forms.py

@@ -1,11 +1,13 @@
 from django import forms
+
 from .models import Conge
 
+
 class CongeForm(forms.ModelForm):
     """Formulaire de demande de congé."""
     class Meta:
         model = Conge
-        fields =['type', 'date_debut', 'date_fin']
+        fields =('type', 'date_debut', 'date_fin')
         widgets = {
             'date_debut': forms.DateInput(attrs={'type': 'date', 'class': 'form-control'}),
             'date_fin': forms.DateInput(attrs={'type': 'date', 'class': 'form-control'}),

gestion_conge/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.2.13 on 2026-04-17 12:03
+# Generated by Django 5.2.13 on 2026-09-03 14:33
 
 import django.db.models.deletion
 from django.db import migrations, models

gestion_conge/models.py

@@ -1,19 +1,14 @@
 import pandas as pd
 from django.db import models
+
 from gestion_employe.models import Employe
 
+
 class Conge(models.Model):
     """Modèle de création des congés"""
-    TYPE_CHOICES = [
+    TYPE_CHOICES = (
-        # ('maladie', 'Maladie'),
         ('conge_annuel', 'Conge Annuel'),
-        # ('conge_maternite', 'Conge Maternité'),
+    )
-        # ('conge_mariage', 'Conge Mariage'),
-        # ('conge_naissance', 'Conge de Naissance'),
-        # ('conge_deces_proche', 'Conge de décès d\'un proche'),
-        # ('conge_mariage_proche', 'Conge de mariage d\'un proche'),
-        # ('autre', 'Autre'),
-    ]
     
     employe = models.ForeignKey(
         Employe, 

gestion_conge/static/gestion_conge/js/index.js

@@ -2,8 +2,35 @@ 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", {
-    layout : "fitColumns",
     columns: [
         {"title": "Nom et Prénom", "field": "prenom_nom"},
         {"title": "Date de début", "field": "date_debut", formatter:"datetime", formatterParams:{
@@ -15,19 +42,38 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
             outputFormat:"dd/MM/yy",
         }},
         {"title": "Type de congé", "field": "type"},
-        {"title": "Date de la demande", "field": "date_demande"},
+        {"title": "Date de la demande", "field": "date_demande", responsive: 1},
         {"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{ 
             allowEmpty : true , 
         }},
         {"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
+    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'));
@@ -45,6 +91,11 @@ 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;
@@ -60,6 +111,10 @@ 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/index.html

@@ -7,6 +7,7 @@
             <div class="alert alert-{% if message.tags == 'error' %}danger{% else %}success{% endif %}">{{message}}</div>
         {% endfor %}
     {% endif %}    
+
     <div class="row d-flex justify-content-center mb-4">              
         <div class="col text-white bg-danger d-flex flex-column justify-content-center align-items-center border rounded p-4">
             <div class="card-header fw-bold">
@@ -32,11 +33,17 @@
                 <h5 class="fw-bold">{{ nombre_conges_valide }}</h5>
             </div>
         </div>
-        <div class="d-flex justify-content-between my-4">
+    </div>
+
+    <div class="row mb-3">
+        <div class="col d-flex justify-content-between align-items-center">
             <h3><i class="bi bi-list-ul"></i> Liste des demandes de congé</h3>
             <button class='btn btn-primary' id="bouton-demande-conge">Demande de congé</button>
         </div>
-        <div class="table-responsive">
+    </div>
+
+    <div class="row">
+        <div class="col">
             <div id="liste-demande-conges" data-url="{% url 'gestion_conges:liste-des-conges' %}"></div>
         </div>
     </div>

gestion_conge/templates/gestion_conge/parts/modalDetailConge.html

@@ -83,6 +83,13 @@
         </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,4 +24,9 @@ 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

@@ -1,16 +1,20 @@
 import json
-from django.http import JsonResponse
+
-from django.shortcuts import redirect, render
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.db.models import Q
+from django.forms.models import model_to_dict
+from django.http import JsonResponse
+from django.shortcuts import redirect, render
+from django.utils import timezone
+
+from fonction_utilitaire import fonctions_utilitaire
 from gestion_conge.forms import CongeForm
 from gestion_employe.models import Affectation, Employe
-from django.forms.models import model_to_dict
+
-from django.utils import timezone
-from django.db.models import Q
-from fonction_utilitaire import fonctions_utilitaire 
 from .models import Conge
 
+
 @login_required
 def index(request):  
     """Vue de gestion de l'index"""  
@@ -83,7 +87,6 @@ def index(request):
             Q(validation_hierarchique = True) | Q(validation_hierarchique = False)
         ).order_by('-date_demande')
 
-
     return render(request, 'gestion_conge/index.html', {
         "nombre_conges_valide": nombre_conges_valide, 
         "nombre_conges_refuse": nombre_conges_refuse, 
@@ -116,79 +119,88 @@ def demander_conge(request):
             conge_obj = form.save(commit=False)
             conge_obj.employe = employe
 
-            if conge_obj.type == "conge_annuel":
+            if conge_obj.type == "conge_annuel" and retour_quota["nombre_jours_valide"] + conge_obj.nombre_jours > quota_annuel:
-                if retour_quota["nombre_jours_valide"] + conge_obj.nombre_jours > quota_annuel:
+                messages.error(request, "Quota annuel dépassé (30 jours max).")
-                    messages.error(request, "Quota annuel dépassé (30 jours max).")
+                return redirect("gestion_conges:conge")
-                    return redirect("gestion_conges:conge")
                 
             conge_obj.save()
             messages.success(request, "Votre demande de congé a été enregistrée.")
+
+            fonctions_utilitaire.envoyer_mail(
+                sujet = "Demande de congé",
+                message = f"""Bonjour {employe.user.first_name} {employe.user.last_name}, votre demande de congé a été enregistrée. Veuillez consulter votre profil pour plus de détails.""",
+                destinataires = fonctions_utilitaire.destinataire_mail_demande_conges(employe)
+            )
+            
             return redirect("gestion_conges:conge")
     
     return redirect("gestion_conges:conge")
 
 @login_required
 def liste_demande_conges(request):
-    """Vue de liste des demandes de congés en attente de validation selon le statut de l'utilisateur actuel"""
+
     try:
-        employe = Employe.objects.get(user__username = request.user)
+        employe = Employe.objects.get(user=request.user)
     except Employe.DoesNotExist:
         return JsonResponse({
             "success": False,
-            "message": "Votre profil Utilisateur n'est lié à aucun profil Employé. Veuillez contacter l'administrateur."
+            "message": "Profil employé introuvable"
         })
 
-    try:
+    affectation = Affectation.objects.filter(
-        affectation = Affectation.objects.get(
+        employe=employe,
-            employe=employe,
+        date_fin_daffectation__gte=timezone.now().date()
-            date_fin_daffectation__gte=timezone.now().date()
+    ).first()
-        )
+
-    except Affectation.DoesNotExist:
+    is_direction = employe.user.groups.filter(name='direction').exists()
-        affectation = None
 
     if employe.chef:
-        print("chef")
+
-        conges_en_attente = Conge.objects.filter(
+        conges = Conge.objects.filter(
-            employe__departement = employe.departement,
+            Q(employe__departement=employe.departement) |
-            validation_hierarchique = None
+            Q(employe=employe)
         ).order_by('-date_demande')
 
     elif affectation and affectation.role == "chef_projet":
+
         employes_du_projet = Affectation.objects.filter(
-            projet = affectation.projet,
+            projet=affectation.projet,
-            date_fin_daffectation__gte = timezone.now().date()
+            date_fin_daffectation__gte=timezone.now().date()
-        ).values('employe')
+        ).values_list('employe', flat=True)
 
-        conges_en_attente = Conge.objects.filter(
+        conges = Conge.objects.filter(
-            employe__in = employes_du_projet,
+            Q(employe__in=employes_du_projet) |
-            validation_hierarchique = None
+            Q(employe=employe)
         ).order_by('-date_demande')
 
-    elif 'direction' in employe.user.groups.values_list('name', flat=True):
+   
-        conges_en_attente = Conge.objects.filter(
+    elif is_direction:
-            validation_hierarchique = True,
+
-            validation_direction = None
+        conges = Conge.objects.filter(
-        ).order_by('-date_demande')
+            Q(validation_hierarchique=True) |
+            Q(employe__user__groups__name='direction')
+        ).distinct().order_by('-date_demande')
 
     else:
-        conges_en_attente = Conge.objects.filter(
+
-            employe__user__username = request.user
+        conges = Conge.objects.filter(
+            employe=employe
         ).order_by('-date_demande')
 
     return JsonResponse({
         "success": True,
-        "data":[
+        "data": [
-        {
+            {
-            **model_to_dict(conge), 
+                **model_to_dict(conge),
-            "prenom_nom": f"{conge.employe.user.first_name} {conge.employe.user.last_name}",
+                "prenom_nom": f"{conge.employe.user.first_name} {conge.employe.user.last_name}",
-            "date_demande": conge.date_demande,
+                "date_demande": conge.date_demande,
-            "nombre_jours": conge.nombre_jours,
+                "nombre_jours": conge.nombre_jours,
-            "type": dict(conge.TYPE_CHOICES).get(conge.type),
+                "type": dict(conge.TYPE_CHOICES).get(conge.type),
-            "solde_conge": fonctions_utilitaire.solde_conge(conge.employe)["quota_annuel"]
+                "solde_conge": fonctions_utilitaire.solde_conge(conge.employe)["quota_annuel"]
-        }
+            }
-        for conge in conges_en_attente]}, 
+            for conge in conges
-        safe=False
+        ]
-    )
+    })
 
 @login_required
 def validation_de_conge(request):
@@ -210,16 +222,68 @@ def validation_de_conge(request):
         motif_refus = request_data.get("motif_refus", "")
 
         if validation_hierarchique is not None:
-            conge.validation_hierarchique = True if validation_hierarchique == "valide" else False
+            conge.validation_hierarchique = validation_hierarchique == "valide"
             if validation_hierarchique == "refuse" and not motif_refus:
                 return JsonResponse({"message": "Veuillez fournir un motif de refus."})
             conge.motif_refus = motif_refus if validation_hierarchique == "refuse" else ""
         
         if validation_direction is not None:
-            conge.validation_direction = True if validation_direction == "valide" else False
+            conge.validation_direction = validation_direction == "valide"
             if validation_direction == "refuse" and not motif_refus:
                 return JsonResponse({"message": "Veuillez fournir un motif de refus."})
             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."})
+
+
+
+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."}
+    )
+