feature: ajout photo de profil

.gitignore

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

Jenkinsfile

@@ -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
-                '''
-            }
-        } 
-    }
-}

SIRH/settings.py

@@ -12,21 +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=False, cast=bool)
+DEBUG = False
 
-ALLOWED_HOSTS = config('ALLOWED_HOSTS', default=[]).split(',')
+ALLOWED_HOSTS = ["https://support.cerfig.org", "support.cerfig.org"]
 
 # Application definition
 
@@ -79,25 +79,24 @@ 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',
+#     }
+# }
 
-if config('ENVIRONMENT') == 'local':
-    DATABASES = {
+DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
-    }
-else:
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.mysql',
-            'NAME': config('DATABASE_NAME'),
-            'USER': config('DATABASE_USER'),
-            'PASSWORD': config('DATABASE_PASSWORD'),
-            'HOST': config('DATABASE_HOST'),
-            'PORT': config('DATABASE_PORT'),
-        }
-    }
+}
+
 
 # Password validation
 # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
@@ -150,7 +149,6 @@ MEDIA_ROOT = BASE_DIR / "media"
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-# Configuration de l'email
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'ssl0.ovh.net'
 EMAIL_PORT = 465

SIRH/templates/SIRH/parts/menu_principal.html

@@ -6,13 +6,13 @@
         {% 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">
+        <div class="text-white mt-2">
             {{ user.username }}
         </div>
     </div>
@@ -41,6 +41,15 @@
     <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 %} <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>

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é"""
@@ -33,25 +32,3 @@ def solde_conge(employe):
         "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))

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,71 +123,61 @@ 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")
 
 @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=request.user)
+        employe = Employe.objects.get(user__username = request.user)
     except Employe.DoesNotExist:
         return JsonResponse({
             "success": False,
-            "message": "Profil employé introuvable"
+            "message": "Votre profil Utilisateur n'est lié à aucun profil Employé. Veuillez contacter l'administrateur."
         })
 
-    affectation = Affectation.objects.filter(
+    try:
+        affectation = Affectation.objects.get(
             employe=employe,
             date_fin_daffectation__gte=timezone.now().date()
-    ).first()
-
-    is_direction = employe.user.groups.filter(name='direction').exists()
+        )
+    except Affectation.DoesNotExist:
+        affectation = None
 
     if employe.chef:
-
-        conges = Conge.objects.filter(
-            Q(employe__departement=employe.departement) |
-            Q(employe=employe)
+        print("chef")
+        conges_en_attente = Conge.objects.filter(
+            employe__departement = employe.departement,
+            validation_hierarchique = None
         ).order_by('-date_demande')
 
     elif affectation and affectation.role == "chef_projet":
-
         employes_du_projet = Affectation.objects.filter(
-            projet=affectation.projet,
-            date_fin_daffectation__gte=timezone.now().date()
-        ).values_list('employe', flat=True)
+            projet = affectation.projet,
+            date_fin_daffectation__gte = timezone.now().date()
+        ).values('employe')
 
-        conges = Conge.objects.filter(
-            Q(employe__in=employes_du_projet) |
-            Q(employe=employe)
+        conges_en_attente = Conge.objects.filter(
+            employe__in = employes_du_projet,
+            validation_hierarchique = None
         ).order_by('-date_demande')
 
-   
-    elif is_direction:
-
-        conges = Conge.objects.filter(
-            Q(validation_hierarchique=True) |
-            Q(employe__user__groups__name='direction')
-        ).distinct().order_by('-date_demande')
+    elif 'direction' in employe.user.groups.values_list('name', flat=True):
+        conges_en_attente = Conge.objects.filter(
+            validation_hierarchique = True,
+            validation_direction = None
+        ).order_by('-date_demande')
 
     else:
-
-        conges = Conge.objects.filter(
-            employe=employe
+        conges_en_attente = Conge.objects.filter(
+            employe__user__username = request.user
         ).order_by('-date_demande')
 
     return JsonResponse({
         "success": True,
-        "data": [
+        "data":[
         {
             **model_to_dict(conge), 
             "prenom_nom": f"{conge.employe.user.first_name} {conge.employe.user.last_name}",
@@ -195,9 +186,9 @@ def liste_demande_conges(request):
             "type": dict(conge.TYPE_CHOICES).get(conge.type),
             "solde_conge": fonctions_utilitaire.solde_conge(conge.employe)["quota_annuel"]
         }
-            for conge in conges
-        ]
-    })
+        for conge in conges_en_attente]}, 
+        safe=False
+    )
 
 @login_required
 def validation_de_conge(request):