From a96b884ba095dfdd965642f07b2e1be5d6357c85 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Tue, 24 Mar 2026 17:14:13 +0000
Subject: [PATCH] dazs

---
 Modele/Ged.php                     |   7 +-
 Vue/Ajaxlistegedadherent/index.php | 102 +++++++++++++++--------------
 Vue/Gedadherent/index.php          |  16 ++++-
 3 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/Modele/Ged.php b/Modele/Ged.php
index 29a29ba..db1d20f 100755
--- a/Modele/Ged.php
+++ b/Modele/Ged.php
@@ -72,16 +72,15 @@ class Ged extends Modele {
 	public function getgedadherent($d1, $d2, $nomOrigine, $codeNaturePiece)
 	{
 		$idAdherent = $_SESSION['idAdherent_C'];
+		$lang 		= $_SESSION['lang'];
 
 		$codeNaturePiece = contruireParamLike($codeNaturePiece);
 
-		$sql = 'call sp_get_ged_adherent_rh(?, ?, ?, ?, ?);';
+		$sql = 'call sp_get_ged_adherent_rh(?, ?, ?, ?, ?, ?);';
 		
 		//var_dump(array($idAdherent, $d1, $d2, $nomOrigine, $codeNaturePiece)); die();
 		
-	
-		
-		$resultat = $this->executerRequete($sql, array($idAdherent, $d1, $d2, $nomOrigine, $codeNaturePiece));
+		$resultat = $this->executerRequete($sql, array($idAdherent, $d1, $d2, $nomOrigine, $codeNaturePiece, $lang));
 		
 		return $resultat->fetchAll(PDO::FETCH_ASSOC);
     }	
diff --git a/Vue/Ajaxlistegedadherent/index.php b/Vue/Ajaxlistegedadherent/index.php
index c0b8ce3..8e834e0 100644
--- a/Vue/Ajaxlistegedadherent/index.php
+++ b/Vue/Ajaxlistegedadherent/index.php
@@ -1,50 +1,54 @@
-<div id="div_ged" class="card border-0 shadow-sm">
-    <?php if((isset($msgErreur)) && ($msgErreur > " ")) : ?>
-        <div class="alert alert-danger m-3 border-0 shadow-xs"><?= $msgErreur ?></div>
-    <?php endif; ?>
-
-    <div class="table-responsive">
-        <table id="table_ged_famille" class="table table-hover align-middle mb-0" style="font-size:8.5pt; width:100%;">
-            <thead class="table-dark text-nowrap">
-                <tr>
-                    <th class="text-center">Date</th>
-                    <th class="text-center">Src</th>
-                    <th><?= _("Souscripteur / Police") ?></th>
-                        <th><?= _("Bénéficiaire (Adhérent)") ?></th>
-                    <th><?= _("Type du Document") ?></th>
-                    <th><?= _("Nom du Document") ?></th>
-                    <th class="text-center no-export"><?= _("Action") ?></th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach ($geds as $ged):
-                    $idGed = $this->nettoyer($ged['idGed']);
-                    $cheminFichier = $this->nettoyer($ged['cheminFichier']);
-                ?>
-                <tr class="text-nowrap">
-                    <td class="text-center small text-muted"><?= dateheureLang($this->nettoyer($ged['dateSysteme'])) ?></td>
-                    <td class="text-center"><span class="badge bg-light text-dark border small fw-normal"><?= $this->nettoyer($ged['source']) ?></span></td>				
-                    <td>
-                        <div class="fw-bold"><?= $this->nettoyer($ged['souscripteur']) ?></div>
-                        <div class="small text-primary">N° <?= $this->nettoyer($ged['numeroPolice']) ?></div>
-                    </td>
-                    <td>
-                        <div class="fw-bold"><?= $this->nettoyer($ged['beneficiaire']) ?></div>
-                        <div class="small text-muted italic"><?= $this->nettoyer($ged['adherent']) ?></div>
-                    </td>
-                    <td class="small"><?= $this->nettoyer($ged['libelleDocument']) ?></td>
-                    
-                    <td class="small text-truncate" style="max-width: 200px;" title="<?= $this->nettoyer($ged['nomOrigine']) ?>">
-                        <i class="far fa-file-alt me-1 text-secondary"></i> <?= $this->nettoyer($ged['nomOrigine']) ?>
-                    </td>				
-                    <td class="text-center">
-                        <a class="btn btn-xs btn-outline-danger shadow-sm fw-bold px-3" href="<?= $cheminFichier ?>" target="_blank">
-                            <i class="fas fa-download me-1"></i> <?= _("Télécharger") ?>
-                        </a>
-                    </td>
-                </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-    </div>
+<div class="table-responsive">
+    <table id="table_ged_famille" class="table table-hover align-middle mb-0" style="font-size:8.5pt; width:100%;">
+        <thead class="table-dark text-nowrap">
+            <tr>
+                <th class="text-center">Date</th>
+                <th class="text-center">Src</th>
+                <th><?= _("Souscripteur / Police") ?></th>
+                    <th><?= _("Bénéficiaire / Adhérent") ?></th>
+                <th><?= _("Type du Document") ?></th>
+                <th><?= _("Nom du Document") ?></th>
+                <th class="text-center no-export"><?= _("Action") ?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($geds as $ged):
+                $idGed         = $this->nettoyer($ged['idGed']);
+                $cheminFichier = $this->nettoyer($ged['cheminFichier']);
+                
+                if($ged['codeNaturePiece'] == "AUT")
+                {
+                    $libelleType   = $this->nettoyer($ged['libelleAutre']);
+                } else
+                {
+                    $libelleType   = $this->nettoyer($ged['libelleType']);
+                }
+                
+            ?>
+            <tr class="text-nowrap">
+                <td class="text-center small text-muted"><?= dateheureLang($this->nettoyer($ged['dateSysteme'])) ?></td>
+                <td class="text-center"><span class="badge bg-light text-dark border small fw-normal"><?= $this->nettoyer($ged['source']) ?></span></td>				
+                <td>
+                    <div class="fw-bold"><?= $this->nettoyer($ged['souscripteur']) ?></div>
+                    <div class="small text-primary">N° <?= $this->nettoyer($ged['numeroPolice']) ?></div>
+                </td>
+                <td>
+                    <div class="fw-bold"><?= $this->nettoyer($ged['beneficiaire']) ?></div>
+                    <div class="small text-muted italic"><?= $this->nettoyer($ged['adherent']) ?></div>
+                </td>
+                
+                <td class="small"><?= $libelleType; ?></td>
+                
+                <td class="small text-truncate" style="max-width: 200px;" title="<?= $this->nettoyer($ged['nomOrigine']) ?>">
+                    <i class="far fa-file-alt me-1 text-secondary"></i> <?= $this->nettoyer($ged['nomOrigine']) ?>
+                </td>				
+                <td class="text-center">
+                    <a class="btn btn-xs btn-outline-danger shadow-sm fw-bold px-3" href="<?= $cheminFichier ?>" target="_blank">
+                        <i class="fas fa-download me-1"></i> <?= _("Télécharger") ?>
+                    </a>
+                </td>
+            </tr>
+            <?php endforeach; ?>
+        </tbody>
+    </table>
 </div>
\ No newline at end of file
diff --git a/Vue/Gedadherent/index.php b/Vue/Gedadherent/index.php
index c940c7b..60fc2bf 100644
--- a/Vue/Gedadherent/index.php
+++ b/Vue/Gedadherent/index.php
@@ -91,7 +91,7 @@
                                 <th class="text-center">Date</th>
                                 <th class="text-center">Src</th>
                                 <th><?= _("Souscripteur / Police") ?></th>
-                                 <th><?= _("Bénéficiaire (Adhérent)") ?></th>
+                                 <th><?= _("Bénéficiaire / Adhérent") ?></th>
                                 <th><?= _("Type du Document") ?></th>
                                 <th><?= _("Nom du Document") ?></th>
                                 <th class="text-center no-export"><?= _("Action") ?></th>
@@ -99,8 +99,17 @@
                         </thead>
                         <tbody>
                             <?php foreach ($geds as $ged):
-                                $idGed = $this->nettoyer($ged['idGed']);
+                                $idGed         = $this->nettoyer($ged['idGed']);
                                 $cheminFichier = $this->nettoyer($ged['cheminFichier']);
+                                
+                                if($ged['codeNaturePiece'] == "AUT")
+                                {
+                                    $libelleType   = $this->nettoyer($ged['libelleAutre']);
+                                } else
+                                {
+                                    $libelleType   = $this->nettoyer($ged['libelleType']);
+                                }
+                                
                             ?>
                             <tr class="text-nowrap">
                                 <td class="text-center small text-muted"><?= dateheureLang($this->nettoyer($ged['dateSysteme'])) ?></td>
@@ -113,7 +122,8 @@
                                     <div class="fw-bold"><?= $this->nettoyer($ged['beneficiaire']) ?></div>
                                     <div class="small text-muted italic"><?= $this->nettoyer($ged['adherent']) ?></div>
                                 </td>
-                                <td class="small"><?= $this->nettoyer($ged['libelleDocument']) ?></td>
+
+                                <td class="small"><?= $libelleType; ?></td>
                                 
                                 <td class="small text-truncate" style="max-width: 200px;" title="<?= $this->nettoyer($ged['nomOrigine']) ?>">
                                     <i class="far fa-file-alt me-1 text-secondary"></i> <?= $this->nettoyer($ged['nomOrigine']) ?>