Merge pull request 'pipeline 4' (#25) from pipeline4 into main

Reviewed-on: #25

.gitignore

@@ -1,10 +1,3 @@
-# db.sqlite3
-# venv/*
-# media/*
-
-__pycache__/
-*.pyc
-
 db.sqlite3
-venv/
-.env
+venv/*
+media/*

Jenkinsfile

@@ -0,0 +1,31 @@
+pipeline 
+{ 
+    agent any
+
+    stages 
+    { 
+        stage ( 'checkout' )
+        { 
+            steps 
+            { 
+                sh 'echo "Debut du pipeline"'
+                checkout scm 
+            } 
+        }
+        stage ( 'Deploiement' ) 
+        { 
+            when { branch 'main' }
+            steps {
+                sh '''
+                cd /jenkins_test/sirh && git pull origin main
+                python3 -m venv venv 
+                source venv/bin/activate
+                pip install -r requirements.txt
+                python manage.py makemigrations
+                python manage.py migrate
+                echo "Deploiement reussi"
+                '''
+            }
+        } 
+    }
+}

SIRH/templates/SIRH/parts/menu_principal.html

@@ -2,21 +2,6 @@
 {% load tags_personnaliser %}
 
 <div class="col-3 bg-danger d-flex flex-column vh-100 pt-5 sticky-top">
-    <div class="text-center mb-4">
-        {% if user.employe.photo %}
-            <img src="{{ user.employe.photo.url }}" 
-                class="rounded-circle" 
-                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">
-            {{ 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.4em">
         <i class="bi bi-person-circle"></i> Mon profil
     </a>

gestion_conge/views.py

@@ -129,53 +129,50 @@ def demander_conge(request):
 
 @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)
+        ).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({
@@ -189,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):