Merge branch 'main' of https://jenkins.cerfig.org/CERFIG/sirh

2026-09-03 14:25:28 +00:00
parent 3c5c58b5d1 3b587d2a1a
commit 900343a4f8
36 changed files with 292 additions and 252 deletions
--- a/staticfiles/gestion_employe/js/index.js
+++ b/staticfiles/gestion_employe/js/index.js
@@ -12,6 +12,7 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
    // ajaxURL: url_liste_employe,
    pagination: true,
    paginationSize: 10,
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -22,6 +23,9 @@ const tableau_liste_employe = new Tabulator("#tableau_liste_employe", {
 >>>>>>> f6b90e7 (Verification du statut avant la creation d'un contrat)
 =======
 >>>>>>> 6026af5 (Bug : Affichages des conges)
+=======
+    responsiveLayout : "hide"
+>>>>>>> 3b587d2a1a4376551b4b694a38e0e24a1c4cf4c5
 })

 fetch(url_liste_employe)