Bug: Correction du refus des reservations et d'envoi de mail

.gitignore

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

Jenkinsfile

@@ -0,0 +1,52 @@
+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
+                '''
+            }
+        } 
+    }
+}

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',
-    'simple_sso.sso_server'
+    'gestion_salle'
 ]
 
-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',
             ],
         },
     },
@@ -79,24 +79,16 @@ 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.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        '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),
+        }
     }
-}
-
 
 # Password validation
 # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
@@ -149,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_PASSWORD = 'Cerfig2025'
+EMAIL_HOST_USER = config("EMAIL_HOST_USER")
+EMAIL_HOST_PASSWORD = config("EMAIL_HOST_PASSWORD")
 DEFAULT_FROM_EMAIL = EMAIL_HOST_USER

SIRH/sso.py

@@ -0,0 +1,40 @@
+# 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()
+        
+        print("Un petit test", 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

@@ -15,8 +15,9 @@
     <body>
         <div class="container-fluid">
             <div class="row flex-nowrap">
+                {% include 'parts/menu_application.html' %}
                 {% 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>
-                    <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>

SIRH/templates/SIRH/parts/menu_application.html

@@ -0,0 +1,8 @@
+<div class="col-1 bg-danger border d-flex flex-column vh-100 pt-5 sticky-top">
+	<a href="{{ SIRH_LIEN }}" 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="{{ SGL_LIEN }}" 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>

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">
-        <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">
+    {% comment %} {% url 'deconnexion' %} {% endcomment %}
+    <a href="{% url 'deconnexion' %}" class="text-white fw-bold text-decoration-none mb-4" style="font-size: 1.2em;">
         <i class="bi bi-box-arrow-right"></i> Déconnexion
     </a>
-</div>
+</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'
-    ), 
-    
+urlpatterns = [    
     path('login/',
-        views.login_view,
+        views.connexion,
         name='login'
     ),
     path(
         'deconnexion/',
-        views.deconnexion_view,
+        views.deconnexion,
         name='deconnexion'
     ),
     path(
-        'employé/',
+        'gestion-employe/',
         include("gestion_employe.urls")
     ),
     path(
@@ -59,9 +56,6 @@ urlpatterns = [
     path(
         'admin/',
         admin.site.urls
-    ),  
-    # path(
-    #     'sso',
-    #     include(server_sso.get_urls())
-    # )
-] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    ), 
+    path("client/", include(client_sirh.get_urls())),
+]

SIRH/views.py

@@ -1,37 +1,13 @@
-from django.contrib.auth import authenticate, login, logout
-from django.shortcuts import render, redirect
-from django.contrib import messages
+from django.contrib.auth import logout
+from django.shortcuts import redirect
+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):
-            messages.error(request, "Veuillez remplir tous les champs.")
-            return render(request, 'login.html')
+def connexion(request):
+    """Redirige vers le serveur SSO pour l'authentification."""
+    return redirect(reverse_lazy("simple-sso-login"))
 
-        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."""
+def deconnexion(request):
+    """Gérez la déconnexion des utilisateurs."""
     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,12 +1,18 @@
 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
+EMAIL_ASSISTANTE_DE_DIRECTION = list(Employe.objects.filter(fonction="assistant_direction").values_list('user__email', flat=True))
+
+try:
+    EMAIL_ASSISTANTE_DE_DIRECTION = list(Employe.objects.filter(fonction="assistant_direction").values_list('user__email', flat=True))
+except:
+    pass
 
 def solde_conge(employe):
     """Fonction de calcul du solde de congé restant l'employé"""
@@ -31,4 +37,13 @@ def solde_conge(employe):
         "success": True,
         "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))

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,16 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+# Generated by Django 5.2.13 on 2026-06-16 11:06
+=======
 # Generated by Django 5.2.13 on 2026-04-17 12:03
+>>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil)
+=======
+# Generated by Django 5.2.13 on 2026-04-17 12:03
+>>>>>>> f6b90e7 (Verification du statut avant la creation d'un contrat)
+=======
+# Generated by Django 5.2.13 on 2026-04-17 12:03
+>>>>>>> 6026af5 (Bug : Affichages des conges)
 
 import django.db.models.deletion
 from django.db import migrations, models