From 88ad99fcac0080fdb4a4d2910c78294044746c12 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Tue, 7 Apr 2026 12:48:11 +0000
Subject: [PATCH] dert

---
 Js/fonctions.js                          |  5 ++--
 Vue/Ajaxnbrelignebareme/detailbareme.php |  5 +++-
 Vue/Detailbaremepriseencharge/index.php  | 36 +++++++++++++++++++++---
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index 3a92e46b..de23cb66 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -63682,9 +63682,9 @@ function afficherDetailBareme()
 		init_saisie_detailbareme();
 		actualiser_detailbareme();
 	}
-	
-	afficheNombreLigneBareme('detailbareme');
 	*/
+
+	afficheNombreLigneBareme('detailbareme');
 	init_saisie_detailbareme();
 	actualiser_detailbareme();
 }
@@ -75839,7 +75839,6 @@ function inserer_bareme_college()
 
 function afficher_actes_garantiebareme_college(idBaremePriseEnCharge, codeGarantie){
 	
-	
 	donnees  = 'codeGarantie='+codeGarantie;
 	donnees += '&idBaremePriseEnCharge='+idBaremePriseEnCharge;
 	
diff --git a/Vue/Ajaxnbrelignebareme/detailbareme.php b/Vue/Ajaxnbrelignebareme/detailbareme.php
index 54adbd6f..b792db99 100755
--- a/Vue/Ajaxnbrelignebareme/detailbareme.php
+++ b/Vue/Ajaxnbrelignebareme/detailbareme.php
@@ -1 +1,4 @@
-<span id="detailbareme" class="badge rounded-pill bg-primary-ghost bg-opacity-10 text-primary ms-2"><?= $nbdetail; ?></span>
\ No newline at end of file
+<?php 
+    $txt_nbdetail = ($nbdetail < 10) ? "0".$nbdetail : $nbdetail;
+?>
+<span id="detailbareme" class="badge rounded-pill bg-primary-ghost bg-opacity-10 text-primary ms-2"><?= $txt_nbdetail; ?></span>
\ No newline at end of file
diff --git a/Vue/Detailbaremepriseencharge/index.php b/Vue/Detailbaremepriseencharge/index.php
index 5c5fa4f4..8ab2460c 100755
--- a/Vue/Detailbaremepriseencharge/index.php
+++ b/Vue/Detailbaremepriseencharge/index.php
@@ -2,6 +2,8 @@
     $idBareme = $_SESSION['idBaremePriseEnCharge'];
     $libelleBareme = $this->nettoyer($bareme['libelle']);
     $isAnglais = est_anglophone();
+
+    $txt_nbdetail = ($nbdetail < 10) ? "0".$nbdetail : $nbdetail;
 ?>
 
 <div class="page-content animate__animated animate__fadeIn">
@@ -22,7 +24,11 @@
         </div>
     </div>
 
-    <input type="hidden" id="idBaremePriseEnCharge" value="<?= $idBareme ?>">
+    <input type="hidden" id="nomForm" name="nomForm" value="frmDetailBareme">
+    <input type="hidden" id="idBaremePriseEnCharge" name="idBaremePriseEnCharge" value="<?= $idBareme ?>">
+    <input type="hidden" id="ligne2" name="ligne2" value="<?= count($garantiesajoutees); ?>">
+    <input type="hidden" id="masquerBareme" name="masquerBareme" value="1">
+    <input type="hidden" id="maxDateEffetBareme" name="maxDateEffetBareme" value="<?= $maxDateEffetBareme ?>">
 
     <div class="row g-3">
         <div class="col-xl-4 col-lg-5">
@@ -36,11 +42,12 @@
                         </li>
                         <li class="nav-item">
                             <button class="nav-link small fw-bold text-uppercase" id="history-tab" data-bs-toggle="tab" data-bs-target="#history-zone" type="button" onclick="afficherDetailBareme();">
-                                <i class="fas fa-history me-1"></i> <?= _("Historique taux") ?><span id="detailbareme" class="badge rounded-pill bg-primary-ghost bg-opacity-10 text-primary ms-2"><?= $nbdetail; ?></span>
+                                <i class="fas fa-history me-1"></i> <?= _("Historique taux") ?><span id="detailbareme" class="badge rounded-pill bg-primary-ghost bg-opacity-10 text-primary ms-2"><?= $txt_nbdetail; ?></span>
                             </button>
                         </li>
                     </ul>
                 </div>
+
                 <div class="card-body tab-content p-3">
                     <div class="tab-pane fade show active" id="update-zone" role="tabpanel">
                         <div class="mb-3">
@@ -75,6 +82,9 @@
         </div>
 
         <div class="col-xl-8 col-lg-7">
+            
+            <div id="div_patienter"></div>
+
             <div class="card border-0 shadow-sm">
                 <div class="card-header bg-white py-2 d-flex justify-content-between align-items-center">
                     <h6 class="mb-0 fw-bold text-uppercase small text-primary">
@@ -91,7 +101,8 @@
                                 <tr class="small text-uppercase">
                                     <th class="ps-3 py-2"><?= _("Code") ?></th>
                                     <th class="py-2"><?= _("Désignation") ?></th>
-                                    <th class="text-center py-2"><?= _("Config") ?></th>
+                                    <th class="text-center py-3" width="10%"><?= _("Actives") ?></th>
+                                    <th class="text-center py-3" width="10%"><?= _("Inactives") ?></th>
                                     <th class="text-end pe-3 py-2"><?= _("Action") ?></th>
                                 </tr>
                             </thead>
@@ -99,15 +110,30 @@
                                 <?php foreach ($garantiesajoutees as $v): 
                                     $codeG = $this->nettoyer($v['codeGarantie']);  
                                     $nomG  = $isAnglais ? $this->nettoyer($v['libelleEng']) : $this->nettoyer($v['libelle']);
+
+                                    // Réintégration des compteurs formatés (ex: 01, 02...)
+                                    $actives = (int)$v['nbre_lignes_actives'];
+                                    $inactives = (int)$v['nbre_lignes_inactives'];
+                                    $txt_actives = ($actives < 10) ? "0".$actives : $actives;
+                                    $txt_inactives = ($inactives < 10) ? "0".$inactives : $inactives;
                                 ?>
                                 <tr class="row-hover" ondblclick="afficher_actes_garantiebareme(<?= $idBareme ?>,'<?= $codeG ?>');">
                                     <td class="ps-3 fw-mono small"><?= $codeG ?></td>
                                     <td>
                                         <div class="fw-bold small"><?= $nomG ?></div>
                                     </td>
+
                                     <td class="text-center">
-                                        <span class="badge bg-success rounded-pill"><?= (int)$v['nbre_lignes_actives'] ?></span>
+                                        <span class="badge rounded-pill <?= $actives > 0 ? 'bg-success-ghost' : 'bg-light text-muted' ?> px-3 py-1 fs-6">
+                                            <?= $txt_actives ?>
+                                        </span>
                                     </td>
+                                    <td class="text-center">
+                                        <span class="badge rounded-pill <?= $inactives > 0 ? 'bg-danger-ghost text-danger' : 'bg-light text-muted' ?> px-3 py-1 fs-6">
+                                            <?= $txt_inactives ?>
+                                        </span>
+                                    </td>
+
                                     <td class="text-end pe-3">
                                         <button class="btn btn-xs btn-outline-primary" onclick="afficher_actes_garantiebareme(<?= $idBareme ?>,'<?= $codeG ?>');">
                                             <i class="fas fa-cog"></i>
@@ -124,6 +150,8 @@
     </div>
 </div>
 
+<div class="modal fade" id="div_actesgarantiebareme" role="dialog" data-bs-backdrop="static" data-bs-keyboard="false"></div>
+
 <style>
     /* Assure que la zone AJAX est bien visible une fois l'onglet actif */
     #history-zone.active #div_bareme {display: block !important;min-height: 200px;}