feature: Affichage du message sur l'tat du contrat

feature: Affichage de la lite des conges en fonction des profil
feature: Affichage de la liste des bailleur
2026-04-30 17:00:00 +02:00 · 2026-04-30 15:10:40 +02:00 · 2026-04-30 14:16:42 +02:00 · 2026-04-30 13:59:00 +02:00 · 2026-04-30 13:33:39 +02:00 · 2026-04-30 13:28:57 +02:00
69 changed files with 454 additions and 397 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
+# db.sqlite3
+# venv/*
+# media/*
+
+__pycache__/
+*.pyc
+
 db.sqlite3
 venv/
-media/
-staticfiles/
-.env
-migrations/
-*.pyc
+.env
--- a/52
+++ b/52
@@ -1,52 +0,0 @@
-pipeline 
-{ 
-    agent any
-    options {
-        // This is required if you want to clean before build
-        skipDefaultCheckout(true)
-    }
-
-    environment
-    {
-        SUDO_PASSWORD = credentials('sudo-password')
-    }
-
-    stages 
-    { 
-        stage ( 'checkout' )
-        { 
-            steps 
-            { 
-                sh 'echo "Debut du pipeline"'
-                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
-                '''
-            }
-        } 
-    }
-}
--- a/SIRH/pycache/init.cpython-310.pyc
+++ b/SIRH/pycache/init.cpython-310.pyc
--- a/SIRH/pycache/settings.cpython-310.pyc
+++ b/SIRH/pycache/settings.cpython-310.pyc
--- a/SIRH/pycache/urls.cpython-310.pyc
+++ b/SIRH/pycache/urls.cpython-310.pyc
--- a/SIRH/pycache/views.cpython-310.pyc
+++ b/SIRH/pycache/views.cpython-310.pyc
--- a/SIRH/pycache/wsgi.cpython-310.pyc
+++ b/SIRH/pycache/wsgi.cpython-310.pyc
--- a/SIRH/settings.py
+++ b/SIRH/settings.py
@@ -12,22 +12,21 @@ 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 = config('SECRET_KEY')
+SECRET_KEY = 'django-insecure--wdb9t(77rvyac$_q!n5gw86&0r(0&&j171v9h!-_$jahsza*5'

 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = config('DEBUG', default=True, cast=bool)
+DEBUG = False

-ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=[]).split(',') 
-CSRF_TRUSTED_ORIGINS = config("CSRF_TRUSTED_ORIGINS", default=[]).split(",")
+ALLOWED_HOSTS = ["https://support.cerfig.org", "support.cerfig.org"]

 # Application definition

@@ -41,9 +40,12 @@ 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',
@@ -77,18 +79,25 @@ WSGI_APPLICATION = 'SIRH.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/5.2/ref/settings/#databases

+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.mysql',
+#         'NAME': 'sirh',
+#         'USER': 'sirh',
+#         'PASSWORD': 'sirh-cerfig',
+#         'HOST': 'localhost',
+#         'PORT': '3306',
+#     }
+# }

 DATABASES = {
-        'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': config("DB_NAME"),
-        'USER': config("DB_USER"),
-        'PASSWORD': config("DB_PASSWORD"),
-        'HOST': config("DB_HOST"),
-        'PORT': config("DB_PORT", cast=int),
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
    }
 }

+
 # Password validation
 # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators

@@ -140,21 +149,11 @@ 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 = 'D2brFY3LnNDLQBBnvYPXAn185Wi9EpPvnHsUosjEZ9vZMyEtXqkcVfFWkVbN0xpG'
-SSO_PUBLIC_KEY = 'm9JDP3uGPmGG9ULqPw2BY3ryBNMTGRsuukgIOhk7lIN9lT0wlr2zhoRZiNZ28UCM'
-SSO_SERVER  = 'http://test-authentification.cerfig.org:89/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 = config("EMAIL_HOST_USER")
-EMAIL_HOST_PASSWORD = config("EMAIL_HOST_PASSWORD")
+EMAIL_HOST_USER = 'support.it@cerfig.org'
+EMAIL_HOST_PASSWORD = 'Cerfig2025'
 DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
--- a/SIRH/sso.py
+++ b/SIRH/sso.py
@@ -1,33 +0,0 @@
-# SGL/sso.py
-from gestion_employe.models import Employe, Departement
-from simple_sso.sso_client.client import Client
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group
-
-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")
-        user_data.pop("chef_departement")
-        user_data.pop("groups")
-
-        user = super().build_user(user_data)
-        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", ""),
-            }
-        )
-
-        for group_name in user_data_copy.get("groups", []):
-            group, _ = Group.objects.get_or_create(name=group_name)
-            user.groups.add(group)
-
-        return user
--- a/SIRH/templates/SIRH/BASE.html
+++ b/SIRH/templates/SIRH/BASE.html
@@ -15,9 +15,8 @@
    <body>
        <div class="container-fluid">
            <div class="row flex-nowrap">
-                {% include 'parts/menu_application.html' %}
                {% include 'parts/menu_principal.html' %}
-                <div class="col p-4">
+                <div class="col-9 p-4">
                    {% block 'contenu' %} {% endblock %}
                </div>
            </div>
--- a/SIRH/templates/SIRH/login.html
+++ b/SIRH/templates/SIRH/login.html
@@ -24,16 +24,15 @@
                        {% endfor %}
                    {% endif %}
                    {% csrf_token %}
-                    <input type="hidden" name="next" value="{{ next }}">
                    <div class="mb-3">
-                        <label for="mail">Votre adresse email :</label>
-                        <input type="text" name="mail" class="form-control" placeholder="Entrez votre e-mail" required>
+                    <label for="mail">Votre adresse email :</label>
+                    <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>
-                        <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()" 
-                            style="position:absolute; right:10px; top:38px; cursor:pointer;"></i>
+                    <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>
+                    <i class="bi bi-eye toggle-password" onclick="togglePassword()" 
+                        style="position:absolute; right:10px; top:38px; cursor:pointer;"></i>
                    </div>
                    <button type="submit" class="btn btn-primary w-100">Se connecter</button>
                </form>
--- a/SIRH/templates/SIRH/parts/menu_application.html
+++ b/SIRH/templates/SIRH/parts/menu_application.html
@@ -1,8 +0,0 @@
-<div class="col-1 bg-danger border d-flex flex-column vh-100 pt-5 sticky-top">
-    <a href="http://test-sirh.cerfig.org:89/" class="text-white text-center fw-bold text-decoration-none mb-4" style="font-size:1.4em">
-        <i class="bi bi-people-fill fs-1 d-block"></i>SIRH
-    </a>
-    <a href="http://test-sgl.cerfig.org:89/" class="text-white text-center fw-bold text-decoration-none mb-4" style="font-size:1.4em">
-        <i class="bi bi-building-gear fs-1 d-block"></i> SGL
-    </a>
-</div>
--- a/SIRH/templates/SIRH/parts/menu_principal.html
+++ b/SIRH/templates/SIRH/parts/menu_principal.html
@@ -6,43 +6,51 @@
        {% if user.employe.photo %}
            <img src="{{ user.employe.photo.url }}" 
                class="rounded-circle" 
-                width="100" 
-                height="100"
+                width="80" 
+                height="80"
                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 class="text-white mt-2">
+            {{ user.username }}
        </div>
    </div>

-    <a href="{% url 'gestion_employe:mon-profil' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
+    <a href="{% url 'gestion_employe:mon-profil' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
        <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.2em;">
+    <a href="{% url 'gestion_employe:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
        <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.2em;">
+    <a href="{% url 'gestion_projet:index' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
        <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.2em;">
+    <a href="{% url 'gestion_conges:conge' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
        <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.2em;">
+    <a href="{% url 'gestion_projet:activites-projet' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
        <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.2em;">
+    <a href="{% url 'gestion_salle:reservation-salle' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size:1.4em">
        <i class="bi bi-calendar-check"></i> Réservation
    </a>
-    {% comment %} {% url 'deconnexion' %} {% endcomment %}
-    <a href="http://test-authentification.cerfig.org:89/deconnexion" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
+    {% comment %} <a href="{% url 'rapport-rh' %}" class="text-white fw-bold text-decoration-none mb-2" style="font-size:1.2em">
+        <i class="bi bi-graph-up"></i> Rapports et Statistiques
+    </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>
+</div>
--- a/SIRH/urls.py
+++ b/SIRH/urls.py
@@ -16,29 +16,32 @@ Including another URLconf
 """
 from django.contrib import admin
 from django.urls import include, path
-# from django.conf.urls.static import static
+from django.conf.urls.static import static
 from django.conf import settings
+# from simple_sso.sso_server.server import Server

-from .sso import SIRHClient
+from . import views

-client_sirh = SIRHClient(
-    settings.SSO_SERVER,
-    settings.SSO_PUBLIC_KEY,
-    settings.SSO_PRIVATE_KEY
-)
+# server_sso = Server()

-urlpatterns = [    
-    # path('login/',
-    #     views.login_view,
-    #     name='login'
-    # ),
-    # path(
-    #     'deconnexion/',
-    #     views.deconnexion_view,
-    #     name='deconnexion'
-    # ),
+urlpatterns = [
    path(
        '',
+        views.login_view,
+        name='index'
+    ), 
+    
+    path('login/',
+        views.login_view,
+        name='login'
+    ),
+    path(
+        'deconnexion/',
+        views.deconnexion_view,
+        name='deconnexion'
+    ),
+    path(
+        'employé/',
        include("gestion_employe.urls")
    ),
    path(
@@ -56,7 +59,9 @@ urlpatterns = [
    path(
        'admin/',
        admin.site.urls
-    ), 
-    path("client/", include(client_sirh.get_urls())),
-]
-#  + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    ),  
+    # path(
+    #     'sso',
+    #     include(server_sso.get_urls())
+    # )
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
--- a/SIRH/views.py
+++ b/SIRH/views.py
@@ -0,0 +1,37 @@
+from django.contrib.auth import authenticate, login, logout
+from django.shortcuts import render, redirect
+from django.contrib import messages
+
+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):
+            messages.error(request, "Veuillez remplir tous les champs.")
+            return render(request, 'login.html')
+
+        user = authenticate(request, username=email, password=password)
+
+        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')
--- a/fonction_utilitaire/pycache/fonctions_utilitaire.cpython-310.pyc
+++ b/fonction_utilitaire/pycache/fonctions_utilitaire.cpython-310.pyc
--- a/fonction_utilitaire/fonctions_utilitaire.py
+++ b/fonction_utilitaire/fonctions_utilitaire.py
@@ -1,5 +1,5 @@
 from django.utils import timezone
-from gestion_employe.models import Contrat, Employe
+from gestion_employe.models import Contrat
 from gestion_conge.models import Conge


@@ -7,7 +7,6 @@ QUOTA_CONGE_ANNUEL = 30
 NOMBRE_PAGINATION = 8
 DEBUT_RAPPEL = 60
 DUREE_FIN_CONTRAT = 90
-# EMAIL_ASSISTANTE_DE_DIRECTION = list(Employe.objects.filter(fonction="assistant_direction").values_list('user__email', flat=True))

 def solde_conge(employe):
    """Fonction de calcul du solde de congé restant l'employé"""
@@ -32,26 +31,4 @@ def solde_conge(employe):
        "success": True,
        "quota_annuel": QUOTA_CONGE_ANNUEL - jours_conges_valider,
        "nombre_jours_valide": jours_conges_valider
-    }
-
-def envoyer_mail(sujet, message, destinataires):
-    """Fonction d'envoi de mail"""
-    from django.core.mail import send_mail
-    from django.conf import settings
-
-    send_mail(
-        sujet,
-        message,
-        settings.EMAIL_HOST_USER,
-        destinataires,
-        fail_silently=False,
-    )
-
-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))
+    }
--- a/gestion_conge/pycache/init.cpython-310.pyc
+++ b/gestion_conge/pycache/init.cpython-310.pyc
--- a/gestion_conge/pycache/admin.cpython-310.pyc
+++ b/gestion_conge/pycache/admin.cpython-310.pyc
--- a/gestion_conge/pycache/apps.cpython-310.pyc
+++ b/gestion_conge/pycache/apps.cpython-310.pyc
--- a/gestion_conge/pycache/forms.cpython-310.pyc
+++ b/gestion_conge/pycache/forms.cpython-310.pyc
--- a/gestion_conge/pycache/models.cpython-310.pyc
+++ b/gestion_conge/pycache/models.cpython-310.pyc
--- a/gestion_conge/pycache/urls.cpython-310.pyc
+++ b/gestion_conge/pycache/urls.cpython-310.pyc
--- a/gestion_conge/pycache/views.cpython-310.pyc
+++ b/gestion_conge/pycache/views.cpython-310.pyc
--- a/gestion_conge/migrations/0001_initial.py
+++ b/gestion_conge/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.2.13 on 2026-06-16 11:06
+# Generated by Django 5.2.13 on 2026-04-17 12:03

 import django.db.models.deletion
 from django.db import migrations, models
--- a/gestion_conge/static/gestion_conge/js/index.js
+++ b/gestion_conge/static/gestion_conge/js/index.js
@@ -3,7 +3,7 @@ const $ = (element) => document.getElementById(element);
 const url_liste_conge_attente = $("liste-demande-conges").dataset.url

 const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
-    // layout : "fitColumns",
+    layout : "fitColumns",
    columns: [
        {"title": "Nom et Prénom", "field": "prenom_nom"},
        {"title": "Date de début", "field": "date_debut", formatter:"datetime", formatterParams:{
@@ -15,7 +15,7 @@ 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", responsive: 1},
+        {"title": "Date de la demande", "field": "date_demande"},
        {"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{ 
            allowEmpty : true , 
        }},
@@ -24,7 +24,7 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
        }},
    ],
    pagination: true,
-    paginationSize: 5,
+    paginationSize: 5
 })

 const bouton_demande_conges = $("bouton-demande-conge");
--- a/gestion_conge/templates/gestion_conge/index.html
+++ b/gestion_conge/templates/gestion_conge/index.html
@@ -7,7 +7,6 @@
            <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">
@@ -33,17 +32,11 @@
                <h5 class="fw-bold">{{ nombre_conges_valide }}</h5>
            </div>
        </div>
-    </div>
-
-    <div class="row mb-3">
-        <div class="col d-flex justify-content-between align-items-center">
+        <div class="d-flex justify-content-between my-4">
            <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>
-
-    <div class="row">
-        <div class="col">
+        <div class="table-responsive">
            <div id="liste-demande-conges" data-url="{% url 'gestion_conges:liste-des-conges' %}"></div>
        </div>
    </div>
--- a/gestion_conge/views.py
+++ b/gestion_conge/views.py
@@ -83,6 +83,7 @@ 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, 
@@ -122,13 +123,6 @@ def demander_conge(request):
                
            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.user.email]
-            )
-            
            return redirect("gestion_conges:conge")
    
    return redirect("gestion_conges:conge")
--- a/gestion_employe/pycache/init.cpython-310.pyc
+++ b/gestion_employe/pycache/init.cpython-310.pyc
--- a/gestion_employe/pycache/admin.cpython-310.pyc
+++ b/gestion_employe/pycache/admin.cpython-310.pyc
--- a/gestion_employe/pycache/forms.cpython-310.pyc
+++ b/gestion_employe/pycache/forms.cpython-310.pyc
--- a/gestion_employe/pycache/models.cpython-310.pyc
+++ b/gestion_employe/pycache/models.cpython-310.pyc
--- a/gestion_employe/pycache/urls.cpython-310.pyc
+++ b/gestion_employe/pycache/urls.cpython-310.pyc
--- a/gestion_employe/pycache/views.cpython-310.pyc
+++ b/gestion_employe/pycache/views.cpython-310.pyc
--- a/gestion_employe/migrations/0001_initial.py
+++ b/gestion_employe/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.2.13 on 2026-06-16 11:06
+# Generated by Django 5.2.13 on 2026-04-17 12:03

 import django.db.models.deletion
 from django.conf import settings
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
            fields=[
                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                ('matricule', models.CharField(blank=True, max_length=10, null=True, unique=True)),
-                ('fonction', models.CharField(blank=True, choices=[('directeur', 'Directeur'), ('assistant_direction', 'Assistante de direction'), ('assistant_technique_recherche', 'Assistant technique de recherche'), ('comptable', 'Comptable'), ('raf', 'RAF'), ('data_manager', 'Data Manager'), ('logisticien', 'Logisticien'), ('post_doctorant', 'Post-Doctorant'), ('qualiticien', 'Qualiticien'), ('technicien_surface', 'Technicien de surface'), ('chauffeur', 'Chauffeur')], max_length=50, null=True)),
+                ('fonction', models.CharField(blank=True, choices=[('directeur', 'Directeur'), ('assistant_direction', 'Assistante de direction'), ('comptable', 'Comptable'), ('raf', 'RAF'), ('data_manager', 'Data Manager'), ('logisticien', 'Logisticien'), ('post_doctorant', 'Post-Doctorant'), ('qualiticien', 'Qualiticien'), ('technicien_surface', 'Technicien de surface'), ('chauffeur', 'Chauffeur')], max_length=50, null=True)),
                ('date_embauche', models.DateField(blank=True, null=True)),
                ('adresse', models.CharField(blank=True, max_length=100, null=True)),
                ('telephone', models.CharField(blank=True, max_length=15, null=True)),
@@ -48,7 +48,7 @@ class Migration(migrations.Migration):
            fields=[
                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                ('numero_contrat', models.CharField(max_length=100, unique=True)),
-                ('type_contrat', models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage'), ('convention_bourse_entretien', "Convention de bourse d'entretien")], max_length=50)),
+                ('type_contrat', models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage')], max_length=50)),
                ('date_debut', models.DateField()),
                ('date_fin', models.DateField(blank=True, null=True)),
                ('salaire_mensuel', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
--- a/gestion_employe/migrations/0002_alter_contrat_type_contrat.py
+++ b/gestion_employe/migrations/0002_alter_contrat_type_contrat.py
@@ -0,0 +1,18 @@
+# Generated by Django 6.0.4 on 2026-04-29 10:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gestion_employe', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contrat',
+            name='type_contrat',
+            field=models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage'), ('convention_bourse_entretien', "Convention de bourse d'entretien")], max_length=50),
+        ),
+    ]
--- a/gestion_employe/models.py
+++ b/gestion_employe/models.py
@@ -15,7 +15,6 @@ class Employe(models.Model):
    FONCTION_LISTE = [
        ('directeur', 'Directeur'),
        ('assistant_direction', 'Assistante de direction'),
-        ('assistant_technique_recherche', 'Assistant technique de recherche'),
        ('comptable', 'Comptable'),
        ('raf', 'RAF'),
        ('data_manager', 'Data Manager'),
--- a/gestion_employe/static/gestion_employe/js/index.js
+++ b/gestion_employe/static/gestion_employe/js/index.js
@@ -12,7 +12,6 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
    // ajaxURL: url_liste_employe,
    pagination: true,
    paginationSize: 10,
-    responsiveLayout : "hide"
 })

 fetch(url_liste_employe)
--- a/gestion_employe/templates/gestion_employe/monprofil.html
+++ b/gestion_employe/templates/gestion_employe/monprofil.html
@@ -19,12 +19,13 @@
    {% endfor %}
 {% endif %}

-{% if not expiration_contrat %}
-    <div class="alert alert-danger fade show alert-dismissible mt-2">
+{% if not has_contrat %}
+    <div class="alert alert-danger mt-2">
        <strong>Important :</strong> Les informations sur votre contrat n'ont pas été renseignées, veuillez contacter les ressources humaines.
    </div>
-{% elif contrat_nb_jours_restant %}
-    <div class="alert alert-danger fade show alert-dismissible mt-2">
+
+{% elif expiration_contrat %}
+    <div class="alert alert-warning mt-2">
        <strong>Important :</strong> Votre contrat de travail expire dans {{ contrat_nb_jours_restant }} jours, veuillez contacter les ressources humaines.
    </div>
 {% endif %}
@@ -42,7 +43,7 @@
                    {% csrf_token %}
                    <div class="col">
                        <div class="form-group mb-2">
-                            <label>Photo</label>
+                            <label>photo</label>
                            {% if employe.photo %}
                                <span>Fichier actuel : <a href="{{ employe.photo.url }}">{{employe.photo}}</a></span>
                            {% endif %}
--- a/gestion_employe/templatetags/pycache/tags_personnaliser.cpython-310.pyc
+++ b/gestion_employe/templatetags/pycache/tags_personnaliser.cpython-310.pyc
--- a/gestion_employe/urls.py
+++ b/gestion_employe/urls.py
@@ -79,6 +79,21 @@ urlpatterns = [
        views.modifier_mot_passe, 
        name='modifier-mot-passe'
    ),
+    # path(
+    #     'creation-departement/',
+    #     views.creation_departement,
+    #     name='creation-departement'
+    # ),
+    # path(
+    #     'modifier-departement/',
+    #     views.modifier_departement,
+    #     name='modifier-departement'
+    # ),
+    # path(
+    #     'suppression-departement/',
+    #     views.supprimer_departement,
+    #     name='suppression-departement/'
+    # ),
    path(
        "liste-contrat-expirants",
        views.liste_contrat_expirants,
--- a/gestion_employe/views.py
+++ b/gestion_employe/views.py
@@ -109,13 +109,6 @@ def affecter_employe_projet(request):
                }
            )
            messages.success(request, f"L'employé {employe.user.first_name} {employe.user.last_name} a été affecté au projet {projet.nom_projet}.")
-
-            fonctions_utilitaire.envoyer_mail(
-                sujet = "Affectation à un projet",
-                message = f"""Bonjour {employe.user.first_name} {employe.user.last_name}, vous avez été affecté au projet {projet.nom_projet.upper()} pour la période du {form.cleaned_data['date_affectation'].strftime('%d/%m/%Y')} au {date_fin_affectation.strftime('%d/%m/%Y')} en tant que {dict(Affectation.ROLE_CHOICES).get(form.cleaned_data['role'])}. 
-Veuillez consulter votre profil pour plus de détails.""",
-                destinataires = [employe.user.email]
-            )
            return redirect('gestion_employe:index')
        else:
            messages.error(request, "Erreur : Formulaire non valide.")
@@ -129,26 +122,41 @@ def mon_profil(request):
    try:
        employe = Employe.objects.get(user__username=request.user)
    except Employe.DoesNotExist:
-        messages.error(request, "Impossible d'acceder au menu 'Mon profil' car votre profil Utilisateur n'est lié à aucun profil Employé. Veuillez contacter l'Administrateur.")
+        messages.error(
+            request,
+            "Impossible d'acceder au menu 'Mon profil' car votre profil Utilisateur n'est lié à aucun profil Employé. Veuillez contacter l'Administrateur."
+        )
        return redirect("gestion_conges:conge")
-    
+
    contrats = Contrat.objects.filter(employe=employe, statut='actif').first()
+
    projets = Affectation.objects.filter(
-        employe = employe, 
-        date_fin_daffectation__gte = timezone.now().date()
+        employe=employe,
+        date_fin_daffectation__gte=timezone.now().date()
    ).select_related('projet')

+    has_contrat = contrats is not None
+    expiration_contrat = False
+    contrat_nb_jours_restant = None
+
+    if contrats:
+        nb_jours = contrats.nombre_jours_restant 
+        contrat_nb_jours_restant = nb_jours
+        expiration_contrat = nb_jours <= fonctions_utilitaire.DUREE_FIN_CONTRAT
+
    return render(
-        request, 
-        'gestion_employe/monprofil.html', 
+        request,
+        'gestion_employe/monprofil.html',
        {
            'employe': employe,
+
            'contrats': [{
                **model_to_dict(contrats),
                "type_contrat": dict(Contrat.TYPE_CONTRAT).get(contrats.type_contrat),
                "statut": dict(Contrat.STATUT_CONTRAT).get(contrats.statut),
                "fichier_contrat": contrats.fichier_contrat.url if contrats.fichier_contrat else "",
-            } if contrats else []],
+            }] if contrats else [],
+
            'projets': [
                {
                    **model_to_dict(a.projet),
@@ -158,12 +166,13 @@ def mon_profil(request):
                    "pourcentage_temps_affectation": a.pourcentage_temps_affectation
                } for a in projets
            ],
+
            "formation_form": FormationForm(),
-            "expiration_contrat": contrats.nombre_jours_restant <= fonctions_utilitaire.DUREE_FIN_CONTRAT if contrats else False,
-            "contrat_nb_jours_restant": contrats.nombre_jours_restant if contrats else None
+            "has_contrat": has_contrat,
+            "expiration_contrat": expiration_contrat,
+            "contrat_nb_jours_restant": contrat_nb_jours_restant
        }
    )
-
@login_required
 def modifier_mot_passe(request):
    """Vue pour permettre à un utilisateur de modifier son mot de passe et ses informations de profil"""
@@ -183,7 +192,6 @@ def modifier_mot_passe(request):
            messages.success(request, "Mot de passe modifié avec succès.")

    return redirect("gestion_employe:mon-profil")
-
 def modifier_employer(request):
    """Vue pour permettre à un utilisateur de modifier les informations d'un employé"""
    try:
@@ -212,19 +220,13 @@ def modifier_employer(request):
        return JsonResponse({"message": "Profil mis à jour avec succès."})

 def enregistrement_document(request):
-    """Vue pour permettre à un utilisateur de télécharger et enregistrer des documents liés à son profil"""
    employe = Employe.objects.get(user=request.user)
    if request.method == "POST":
-        if request.FILES.get("photo"): 
-            employe.photo = request.FILES["photo"]
-        if "cv" in request.FILES:
-            employe.CV = request.FILES["cv"]
-        if "diplome" in request.FILES: 
-            employe.diplome = request.FILES["diplome"]
-        if "rib" in request.FILES: 
-            employe.rib = request.FILES["rib"]
-        if "casier_judiciaire" in request.FILES:
-            employe.casier_judiciaire = request.FILES["casier_judiciaire"]
+        if request.FILES.get("photo"):employe.photo = request.FILES["photo"]
+        if "cv" in request.FILES:employe.CV = request.FILES["cv"]
+        if "diplome" in request.FILES: employe.diplome = request.FILES["diplome"]
+        if "rib" in request.FILES: employe.rib = request.FILES["rib"]
+        if "casier_judiciaire" in request.FILES:employe.casier_judiciaire = request.FILES["casier_judiciaire"]
        employe.save()
        messages.success(request, "Documents enregistrés avec succès.")

@@ -436,3 +438,41 @@ def supprimer_formation(request, id_formation):
        formation.delete()
        messages.success(request, "Formation supprimée ")
    return redirect("mes_formations")
+
+# @login_required
+# def creation_departement(request):
+#     """Gère la création d'un nouveau département via un formulaire."""
+#     if request.method == 'POST':
+#         form_departement = DepartementForm(request.POST)
+#         if form_departement.is_valid():
+#             form_departement.save()
+#             messages.success(request, "Département ajouté avec succès.")
+#         else:
+#             messages.error(request, "Erreur lors de l'ajout du département.")
+#     return redirect('parametres-rh')
+
+# @login_required
+# def modifier_departement(request, id):
+#     """Gère la modification d'un département existant via un formulaire pré-rempli."""
+#     departement = Departement.objects.get(id=id)
+#     form = DepartementForm(instance=departement)
+#     if request.method == 'POST':
+#         nouveau_nom_departement = request.POST.get('nom')
+#         if nouveau_nom_departement:
+#             departement.nom = nouveau_nom_departement
+#             departement.save()
+#             messages.success(request, "Département modifié avec succès.")
+#         return redirect('parametres-rh')
+#     return render(request, 'gestion_employe/edit_departement.html', {
+#         'form': form,
+#         'departement': departement
+#     })    
+
+# @login_required
+# def supprimer_departement(request, id):
+#     """Gère la suppression d'un département existant."""
+#     if request.method == "POST":
+#         departement = Departement.objects.get(id=id)
+#         departement.delete()
+#         messages.success(request, "Département supprimé avec succès !")
+#     return redirect('parametres-rh')
--- a/gestion_projet/pycache/init.cpython-310.pyc
+++ b/gestion_projet/pycache/init.cpython-310.pyc
--- a/gestion_projet/pycache/admin.cpython-310.pyc
+++ b/gestion_projet/pycache/admin.cpython-310.pyc
--- a/gestion_projet/pycache/forms.cpython-310.pyc
+++ b/gestion_projet/pycache/forms.cpython-310.pyc
--- a/gestion_projet/pycache/models.cpython-310.pyc
+++ b/gestion_projet/pycache/models.cpython-310.pyc
--- a/gestion_projet/pycache/urls.cpython-310.pyc
+++ b/gestion_projet/pycache/urls.cpython-310.pyc
--- a/gestion_projet/pycache/views.cpython-310.pyc
+++ b/gestion_projet/pycache/views.cpython-310.pyc
--- a/gestion_projet/migrations/0001_initial.py
+++ b/gestion_projet/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.2.13 on 2026-06-16 11:06
+# Generated by Django 5.2.13 on 2026-04-17 12:03

 import django.db.models.deletion
 from django.db import migrations, models
--- a/gestion_projet/views.py
+++ b/gestion_projet/views.py
@@ -2,6 +2,7 @@ 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
--- a/gestion_salle/pycache/init.cpython-310.pyc
+++ b/gestion_salle/pycache/init.cpython-310.pyc
--- a/gestion_salle/pycache/admin.cpython-310.pyc
+++ b/gestion_salle/pycache/admin.cpython-310.pyc
--- a/gestion_salle/pycache/apps.cpython-310.pyc
+++ b/gestion_salle/pycache/apps.cpython-310.pyc
--- a/gestion_salle/pycache/forms.cpython-310.pyc
+++ b/gestion_salle/pycache/forms.cpython-310.pyc
--- a/gestion_salle/pycache/models.cpython-310.pyc
+++ b/gestion_salle/pycache/models.cpython-310.pyc
--- a/gestion_salle/pycache/urls.cpython-310.pyc
+++ b/gestion_salle/pycache/urls.cpython-310.pyc
--- a/gestion_salle/pycache/views.cpython-310.pyc
+++ b/gestion_salle/pycache/views.cpython-310.pyc
--- a/gestion_salle/migrations/0001_initial.py
+++ b/gestion_salle/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.2.13 on 2026-06-16 11:06
+# Generated by Django 5.2.13 on 2026-04-17 12:03

 import django.db.models.deletion
 from django.db import migrations, models
--- a/gestion_salle/models.py
+++ b/gestion_salle/models.py
@@ -30,4 +30,4 @@ class Reservation(models.Model):
    statut = models.CharField(choices=STATUT, default='en_attente', max_length=25)

    def __str__(self):
-        return f"{self.salle} - {self.employe.user.first_name} {self.employe.user.last_name}"
+        return f"{self.salle} - {self.employe.user.first_name} {self.employe.user.last_name} le {self.date_reservation}"
--- a/gestion_salle/static/gestion_salle/js/index.js
+++ b/gestion_salle/static/gestion_salle/js/index.js
@@ -15,6 +15,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
        .then(response => response.json())
        .then(data => {
            currentReservationId = data.id_reservation;
+            console.log(data);
            $("id_reservation_detail").value = data.id_reservation;
            $("id_reservation_refus").value = data.id_reservation;
            $("id_reservation_zoom").value = data.id_reservation;
@@ -29,10 +30,11 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
            $("besoin_ordinateur").checked=data.besoin_ordinateur;
            $("lien_zoom").value=data.lien_zoom;

-            if (data.besoin_zoom === false){
-                $("lien_zoom_container").className = "d-none";
+            if(data.statut !== "annulee"){
+                $("motif_refus_container").className = "d-none";
+            }else{
+                $("motif_refus").value=data.motif_refus;
            }
-
        })
    }
 });
@@ -78,11 +80,6 @@ $("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,
        {
@@ -133,9 +130,6 @@ if($("refuserReservation")){
        const url = e.currentTarget.dataset.lienrefus; 
        const idRes = $("id_reservation_detail").value;

-        console.log(idRes);
-        e.preventDefault();
-
        fetch(url, {
            method: "POST",
            headers: {
@@ -167,11 +161,16 @@ const tableau_reservation_attente = new Tabulator("#tableau-reservation-attente"
 tableau_reservation_attente.on("rowClick", (row, rowData) => {
    const data = rowData.getData();

+    console.log(data);
+
    if(data.besoin_zoom === false){
        $("lien_zoom_container").className = 'd-none';
    }

-    const id_user = $("current-user-id").dataset.userid;
+    // if(data.statut !== "refusee"){
+    //     $("motif_refus_container").className = 'd-none';
+    // }
+
    $("id_reservation_detail").value = data.id;
    $("id_reservation_refus").value = data.id;
    $("id_reservation_zoom").value = data.id;
@@ -187,10 +186,7 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
    $("besoin_zoom").checked=data.besoin_zoom;
    $("besoin_ordinateur").checked=data.besoin_ordi;
    $("lien_zoom").value=data.lien_zoom;
-
-    if (id_user != data.employe_id){
-        $("bouton-annuler").className = "d-none";
-    }
+    // $("motif_refus").value=data.motif_refus;

    const modal = new bootstrap.Modal($("modalDetailReservation"));
    bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();
--- a/gestion_salle/templates/gestion_salle/index.html
+++ b/gestion_salle/templates/gestion_salle/index.html
@@ -26,9 +26,9 @@
                <div class="form-group col-5 me-2">
                    <label>Selectionner une salle :</label>
                    <select class = "form-select" id="liste-salle">
-                        <option value='Salle de formation'>Salle de formation</option>
-                        <option value='Salle de réunion'>Salle de réunion</option>
-                        <option value='Lien Zoom'>Lien Zoom</option>
+                        <option value='formation'>Salle de formation</option>
+                        <option value='reunion'>Salle de réunion</option>
+                        <option value='lien_zoom'>Lien Zoom</option>
                    </select>
                </div>
            </div>
--- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
+++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html
@@ -1,5 +1,4 @@
 <!-- Modal d'affichage des détails d'une reservation -->
-{% load tags_personnaliser %}
 <div class="modal fade" id="modalDetailReservation" tabindex="-1" aria-labelledby="modalDetailReservationLabel" aria-hidden="true">
    <div class="modal-dialog">
        <div class="modal-content">
@@ -57,12 +56,12 @@
                        {% if appartient_au_departement_informatique %}
                        <button class="btn btn-primary" id="ajoutZoom">Ajout du lien zoom</button>
                        {% endif %}
-                        {% if user|has_group:'direction' %}
+                        {% if appartient_direction  and  reservation.statut == "en_attente" %}
                        <button class="btn btn-danger" id="refuserReservation" data-lienrefus="{% url 'gestion_salle:refuser-reservation' %}">Refuser</button>
                        <button class="btn btn-success" id="bouton-valider">Valider</button>
                        {% endif %}
-                        <span id="current-user-id" data-userid="{{ request.user.id }}"></span>
-                        <button class="btn btn-danger" id="bouton-annuler">Annuler</button>
+                        <span id="current-user-id" data-user-id="{{ request.user.id }}"></span>
+                            <button class="btn btn-danger" id="bouton-annuler">Annuler</button>
                    </div>
                </form>
            </div>
--- a/gestion_salle/views.py
+++ b/gestion_salle/views.py
@@ -1,14 +1,15 @@
-from datetime import timedelta
 import json
+from datetime import timedelta
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect, render
 from django.http import JsonResponse, HttpRequest
 from django.forms import model_to_dict
-from fonction_utilitaire import fonctions_utilitaire
 from gestion_employe.models import Employe
 from gestion_salle.forms import ReservationForm
 from .models import Reservation
+from datetime import timedelta
+from django.contrib.auth.models import User


@login_required
@@ -20,10 +21,13 @@ def index(request: HttpRequest):
        messages.error(request, "Profil employé introuvable.")
        return redirect('gestion_conges:conge')

+
+
    if request.method == "POST":
        form = ReservationForm(request.POST)

        if form.is_valid():
+
            date_debut = form.cleaned_data['date_debut']
            date_fin = form.cleaned_data['date_fin']
            salle = form.cleaned_data['salle']
@@ -70,15 +74,6 @@ def index(request: HttpRequest):
                current_date += timedelta(days=1)

            messages.success(request, "Réservation(s) créée(s) avec succès.")
-            
-            if fonctions_utilitaire.EMAIL_ASSISTANTE_DE_DIRECTION:
-                fonctions_utilitaire.envoyer_mail(
-                    sujet = "Reservation de salle",
-                    message = f"""
-Une nouvelle demande de réservation de la {dict(Reservation.TYPE_CHOICES).get(salle)} a été effectuée par {employe.user.first_name} {employe.user.last_name} du {form.cleaned_data.get('date_debut').strftime('%d/%m/%Y')} au {form.cleaned_data.get('date_fin').strftime('%d/%m/%Y')} pour motif "{motif}". 
-Veuillez vous connecter à la plateforme pour plus de détails.""",
-                    destinataires = fonctions_utilitaire.EMAIL_ASSISTANTE_DE_DIRECTION
-                )
            return redirect('gestion_salle:reservation-salle')

    formulaire_reservation = ReservationForm()
@@ -100,12 +95,10 @@ Veuillez vous connecter à la plateforme pour plus de détails.""",
    }

    return render(request, "gestion_salle/index.html", context)
-
 def liste_reservation(request:HttpRequest):
    """Vue d'affichage des creneaux disponibles"""
    reservations = Reservation.objects.filter(statut = "validee")
    liste_reservation = []
-
    for reservation in reservations:
        color = None
        if reservation.statut == "en_attente":
@@ -115,8 +108,6 @@ def liste_reservation(request:HttpRequest):
        else:
            color = "#dc3545"

-        print(dict(Reservation.TYPE_CHOICES).get(reservation.salle))
-
        liste_reservation.append({ 
            "guid": reservation.pk, 
            "title": dict(Reservation.TYPE_CHOICES).get(reservation.salle),
@@ -134,9 +125,7 @@ def liste_reservation_attente(request):
        {
            **model_to_dict(reservation),
            "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),
-            'statut': dict(Reservation.STATUT).get(reservation.statut),
+            "salle": dict(Reservation.TYPE_CHOICES).get(reservation.salle)
        } for reservation in reservations
    ]

@@ -152,8 +141,9 @@ def detail_reservation(request:HttpRequest, reservation_id:int):
        'id_reservation': reservation_id,
        'employe': f"{employe.first_name} {employe.last_name}",
        'salle': reservation.salle,
-        'statut': dict(Reservation.STATUT).get(reservation.statut),
-        'date_evenement': reservation.date_debut.strftime('%Y-%m-%d'),
+        'statut': reservation.statut,
+        'date_debut': reservation.date_debut.strftime('%Y-%m-%d'),
+        'date_fin': reservation.date_fin.strftime('%Y-%m-%d'),
        'heure_debut': reservation.heure_debut.strftime('%H:%M'),
        'heure_fin': reservation.heure_fin.strftime('%H:%M'),
        'motif_reservation': reservation.motif_reservation,
@@ -161,7 +151,6 @@ def detail_reservation(request:HttpRequest, reservation_id:int):
        'besoin_ordinateur': reservation.besoin_ordi,
        'lien_zoom': reservation.lien_zoom or '',
    }
-
    return JsonResponse(reservation_json, safe=True)

@login_required
@@ -221,34 +210,21 @@ def valider_reservation(request: HttpRequest):
        reservation.statut = 'validee'
        reservation.save()

-        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"La réservation de {request.user.first_name} {request.user.last_name} validée avec succès.")
    return redirect('gestion_salle:reservation-salle')

@login_required
 def refuser_reservation(request: HttpRequest):
    """Refuser une réservation"""
    if request.method == 'POST':
-        reservation_id = json.loads(request.body).get('id_reservation')
+        reservation_id = request.POST.get('id_reservation')

        try:
            reservation = Reservation.objects.get(id=reservation_id)
        except Reservation.DoesNotExist:
            messages.error(request, "La réservation n'existe pas.")
-            return JsonResponse({"message": "Une erreur s'est produite lors de l'annulation de la reservation."})
+            return redirect("salle")

        reservation.statut = 'refusee'
        reservation.save()

-        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."})
+    return redirect('gestion_salle:reservation-salle')
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,22 +1,152 @@
-asgiref==3.11.1
-certifi==2026.4.22
+anyio==4.13.0
+argon2-cffi==25.1.0
+argon2-cffi-bindings==25.1.0
+arrow==1.4.0
+asgiref==3.11.0
+asttokens==3.0.1
+async-lru==2.3.0
+attrs==26.1.0
+Automat==20.2.0
+babel==2.18.0
+bcrypt==3.2.0
+beautifulsoup4==4.14.3
+bleach==6.3.0
+blinker==1.4
+certifi==2026.2.25
+cffi==2.0.0
+chardet==4.0.0
 charset-normalizer==3.4.7
-Django==5.2.13
-django-simple-sso==1.3.0
-idna==3.13
-itsdangerous==0.24
-mysqlclient==2.2.8
+click==8.0.3
+cloud-init==25.3
+colorama==0.4.4
+comm==0.2.3
+command-not-found==0.3
+configobj==5.0.6
+constantly==15.1.0
+cryptography==3.4.8
+dbus-python==1.2.18
+debugpy==1.8.20
+decorator==5.2.1
+defusedxml==0.7.1
+distlib==0.4.0
+distro==1.7.0
+distro-info==1.1+ubuntu0.2
+Django==5.2.10
+et_xmlfile==2.0.0
+exceptiongroup==1.3.1
+executing==2.2.1
+fastjsonschema==2.21.2
+filelock==3.20.3
+fqdn==1.5.1
+h11==0.16.0
+httpcore==1.0.9
+httplib2==0.20.2
+httpx==0.28.1
+hyperlink==21.0.0
+idna==3.3
+importlib-metadata==4.6.4
+incremental==21.3.0
+ipykernel==7.2.0
+ipython==8.39.0
+isoduration==20.11.0
+jedi==0.19.2
+jeepney==0.7.1
+Jinja2==3.0.3
+json5==0.14.0
+jsonpatch==1.32
+jsonpointer==2.0
+jsonschema==4.26.0
+jsonschema-specifications==2025.9.1
+jupyter-events==0.12.0
+jupyter-lsp==2.3.1
+jupyter_client==8.8.0
+jupyter_core==5.9.1
+jupyter_server==2.17.0
+jupyter_server_terminals==0.5.4
+jupyterlab==4.5.6
+jupyterlab_pygments==0.3.0
+jupyterlab_server==2.28.0
+keyring==23.5.0
+lark==1.3.1
+launchpadlib==1.10.16
+lazr.restfulclient==0.14.4
+lazr.uri==1.0.6
+MarkupSafe==2.0.1
+matplotlib-inline==0.2.1
+mistune==3.2.0
+more-itertools==8.10.0
+nbclient==0.10.4
+nbconvert==7.17.0
+nbformat==5.10.4
+nest-asyncio==1.6.0
+netifaces==0.11.0
+notebook_shim==0.2.4
 numpy==2.2.6
+oauthlib==3.2.0
+openpyxl==3.1.5
+overrides==7.7.0
+packaging==26.0
 pandas==2.3.3
-pillow==12.2.0
+pandocfilters==1.5.1
+parso==0.8.6
+pexpect==4.9.0
+platformdirs==4.5.1
+prometheus_client==0.24.1
+prompt_toolkit==3.0.52
+psutil==7.2.2
+ptyprocess==0.7.0
+pure_eval==0.2.3
+pyasn1==0.4.8
+pyasn1-modules==0.2.1
+pycparser==3.0
+pycurl==7.44.1
+Pygments==2.20.0
+PyGObject==3.42.1
+PyHamcrest==2.0.2
+PyJWT==2.3.0
+pyOpenSSL==21.0.0
+pyparsing==2.4.7
+pyrsistent==0.18.1
+pyserial==3.5
+python-apt==2.4.0+ubuntu4.1
 python-dateutil==2.9.0.post0
-python-decouple==3.8
-pytz==2026.1.post1
+python-json-logger==4.1.0
+pytz==2022.1
+PyYAML==5.4.1
+pyzmq==27.1.0
+referencing==0.37.0
 requests==2.33.1
-six==1.17.0
+rfc3339-validator==0.1.4
+rfc3986-validator==0.1.1
+rfc3987-syntax==1.1.0
+rpds-py==0.30.0
+SecretStorage==3.3.1
+Send2Trash==2.1.0
+service-identity==18.1.0
+six==1.16.0
+soupsieve==2.8.3
 sqlparse==0.5.5
+ssh-import-id==5.11
+stack-data==0.6.3
+systemd-python==234
+terminado==0.18.1
+tinycss2==1.4.0
+tomli==2.4.1
+tornado==6.5.5
+traitlets==5.14.3
+Twisted==22.1.0
 typing_extensions==4.15.0
-tzdata==2026.2
-urllib3==2.6.3
-webservices==0.7
-webservices.naudit==0.7.2
+tzdata==2025.3
+ubuntu-pro-client==8001
+ufw==0.36.1
+unattended-upgrades==0.1
+uri-template==1.3.0
+urllib3==1.26.5
+virtualenv==20.13.0+ds
+wadllib==1.3.6
+wcwidth==0.6.0
+webcolors==25.10.0
+webencodings==0.5.1
+websocket-client==1.9.0
+zipp==1.0.0
+zope.interface==5.4.0
--- a/staticfiles/gestion_conge/js/index.js
+++ b/staticfiles/gestion_conge/js/index.js
@@ -3,7 +3,7 @@ const $ = (element) => document.getElementById(element);
 const url_liste_conge_attente = $("liste-demande-conges").dataset.url

 const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
-    // layout : "fitColumns",
+    layout : "fitColumns",
    columns: [
        {"title": "Nom et Prénom", "field": "prenom_nom"},
        {"title": "Date de début", "field": "date_debut", formatter:"datetime", formatterParams:{
@@ -15,7 +15,7 @@ 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", responsive: 1},
+        {"title": "Date de la demande", "field": "date_demande"},
        {"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{ 
            allowEmpty : true , 
        }},
@@ -24,7 +24,7 @@ const tableau_liste_demande_conge = new Tabulator("#liste-demande-conges", {
        }},
    ],
    pagination: true,
-    paginationSize: 5,
+    paginationSize: 5
 })

 const bouton_demande_conges = $("bouton-demande-conge");
--- a/staticfiles/gestion_employe/js/index.js
+++ b/staticfiles/gestion_employe/js/index.js
@@ -12,7 +12,6 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
    // ajaxURL: url_liste_employe,
    pagination: true,
    paginationSize: 10,
-    responsiveLayout : "hide"
 })

 fetch(url_liste_employe)
--- a/staticfiles/gestion_employe/js/mon_profil.js
+++ b/staticfiles/gestion_employe/js/mon_profil.js
@@ -16,31 +16,27 @@ const tableau_certificat = new Tabulator("#tableau-certificat", {
    ],
    ajaxURL: url_certificat,
 })
+
 const enregistrerProfil = $("enregistrerProfil");
-
 enregistrerProfil.addEventListener("click", (e) => {
-
    const url = $("information-personnelles").dataset.url;
    const csrftoken = document.querySelector("[name='csrfmiddlewaretoken']").value;
-
-    const formData = new FormData();
-
-    formData.append("nom", $("nom").value);
-    formData.append("prenom", $("prenom").value);
-    formData.append("email", $("email").value);
-    formData.append("telephone", $("telephone").value);
-    formData.append("adresse", $("adresse").value);
-    formData.append("sexe", $("sexe").value);
-    formData.append("date_naissance", $("date_naissance").value);
-
    fetch(url, {
-        method: "POST",
+        method: 'POST',
        headers: {
-            "X-CSRFToken": csrftoken
+            'Content-Type': 'application/json',
+            'X-CSRFToken': csrftoken
        },
-        body: formData
+        body: JSON.stringify({ 
+            "nom": $("nom").value,
+            "prenom": $("prenom").value,
+            "email": $("email").value,
+            "telephone": $("telephone").value,
+            "adresse": $("adresse").value,
+            "sexe": $("sexe").value,
+            "date_naissance": $("date_naissance").value,
+        })
    })
    .then(response => response.json())
    .then(data => alert(data.message))
-    .catch(error => console.error("Erreur:", error));
-});
+})
--- a/staticfiles/gestion_projet/js/enregistrement_bailleur.js
+++ b/staticfiles/gestion_projet/js/enregistrement_bailleur.js
@@ -1,5 +1,4 @@
 const btnEnregistrerBailleur = document.getElementById('btnEnregistrerBailleur');
-let table;

 btnEnregistrerBailleur.addEventListener('click', function() {
    const form = document.getElementById('formBailleur');
@@ -21,31 +20,4 @@ btnEnregistrerBailleur.addEventListener('click', function() {
            alert('Ce bailleur existe déjà dans la base de données.');
        }
    });
-});
-
-document.addEventListener("DOMContentLoaded", function () {
-
-    table = new Tabulator("#table-bailleurs", {
-        ajaxURL: "/gestion-projet/bailleurs/",
-        layout: "fitColumns",
-        pagination: "local",
-        paginationSize: 5,
-
-        columns: [
-            {title: "#", formatter: "rownum", width: 60},
-            {title: "Organisme", field: "nom_organisme"},
-            {title: "Contact", field: "contact"},
-            {title: "Email", field: "email"},
-            {title: "Pays", field: "pays"},
-        ],
-        rowDblClick: function(e, row) {
-            const data = row.getData();
-
-            if (confirm(`Voulez-vous vraiment supprimer ${data.nom_organisme} ?`)) {
-                supprimerBailleur(data.id);
-            }
-        }
-    });
-
-});
-
+});
--- a/staticfiles/gestion_salle/js/index.js
+++ b/staticfiles/gestion_salle/js/index.js
@@ -15,6 +15,7 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
        .then(response => response.json())
        .then(data => {
            currentReservationId = data.id_reservation;
+            console.log(data);
            $("id_reservation_detail").value = data.id_reservation;
            $("id_reservation_refus").value = data.id_reservation;
            $("id_reservation_zoom").value = data.id_reservation;
@@ -29,10 +30,11 @@ const calendrier = Schedule(document.getElementById('planning-reservation'), {
            $("besoin_ordinateur").checked=data.besoin_ordinateur;
            $("lien_zoom").value=data.lien_zoom;

-            if (data.besoin_zoom === false){
-                $("lien_zoom_container").className = "d-none";
+            if(data.statut !== "annulee"){
+                $("motif_refus_container").className = "d-none";
+            }else{
+                $("motif_refus").value=data.motif_refus;
            }
-
        })
    }
 });
@@ -78,11 +80,6 @@ $("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,
        {
@@ -133,9 +130,6 @@ if($("refuserReservation")){
        const url = e.currentTarget.dataset.lienrefus; 
        const idRes = $("id_reservation_detail").value;

-        console.log(idRes);
-        e.preventDefault();
-
        fetch(url, {
            method: "POST",
            headers: {
@@ -167,11 +161,16 @@ const tableau_reservation_attente = new Tabulator("#tableau-reservation-attente"
 tableau_reservation_attente.on("rowClick", (row, rowData) => {
    const data = rowData.getData();

+    console.log(data);
+
    if(data.besoin_zoom === false){
        $("lien_zoom_container").className = 'd-none';
    }

-    const id_user = $("current-user-id").dataset.userid;
+    if(data.statut !== "refusee"){
+        $("motif_refus_container").className = 'd-none';
+    }
+
    $("id_reservation_detail").value = data.id;
    $("id_reservation_refus").value = data.id;
    $("id_reservation_zoom").value = data.id;
@@ -179,18 +178,14 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => {
    $("employe").value=data.employe;
    $("salle").value=data.salle;
    $("statut-reservation").innerHTML=data.statut;
-    $("date_debut").value = data.date_debut;
-    $("date_fin").value = data.date_fin;
+    $("date_evenement").value=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_ordi;
    $("lien_zoom").value=data.lien_zoom;
-
-    if (id_user != data.employe_id){
-        $("bouton-annuler").className = "d-none";
-    }
+    $("motif_refus").value=data.motif_refus;

    const modal = new bootstrap.Modal($("modalDetailReservation"));
    bootstrap.Modal.getOrCreateInstance($("modalReservationAttente")).hide();
Author	SHA1	Message	Date
fatima	c1dc44d223	feature: Affichage du message sur l'tat du contrat	2026-04-30 17:00:00 +02:00
fatima	cea67c7057	feature: Affichage de la lite des conges en fonction des profil	2026-04-30 15:10:40 +02:00
fatima	741519c341	feature: Affichage de la liste des bailleur	2026-04-30 14:16:42 +02:00
fatima	48f069506a	feature: Affichage des details de la reservation	2026-04-30 13:59:00 +02:00
fatima	3693ef29f9	feature: statut creation contrat	2026-04-30 13:33:39 +02:00
fatima	c28b14fb98	clean: remove pycache from tracking	2026-04-30 13:28:57 +02:00
fatima	29a93e9bfe	clean: remove pycache from tracking	2026-04-30 13:28:53 +02:00
fatima	a97c233ddb	feature: ajout photo de profil	2026-04-30 13:21:16 +02:00