Merge branch 'staging'

gestion_conge/migrations/0001_initial.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.2.13 on 2026-06-16 11:06
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('gestion_employe', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Conge',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date_debut', models.DateField(verbose_name='Date de Début')),
+                ('date_fin', models.DateField(verbose_name='Date de Fin')),
+                ('type', models.CharField(choices=[('conge_annuel', 'Conge Annuel')], max_length=100, verbose_name='Type de Congé')),
+                ('date_demande', models.DateField(auto_now_add=True, verbose_name='Date de Demande')),
+                ('validation_hierarchique', models.BooleanField(default=None, null=True)),
+                ('validation_direction', models.BooleanField(default=None, null=True)),
+                ('motif_refus', models.TextField(blank=True, null=True)),
+                ('employe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='employe', to='gestion_employe.employe')),
+            ],
+        ),
+    ]

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"},
+        {"title": "Date de la demande", "field": "date_demande", responsive: 1},
         {"title": "Validation par supérieur hiérarchique", "field": "validation_hierarchique", formatter:"tickCross", formatterParams :{ 
             allowEmpty : true , 
         }},
@@ -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");

gestion_conge/templates/gestion_conge/index.html

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