From ae5d2127041cbbbfdbcbc93776a41ab5c52e03c9 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 19 Jan 2026 16:08:41 +0000
Subject: [PATCH] frt

---
 Vue/Ajaxdetailretrait/index.php    |  78 ++++++++++++++--------
 Vue/Ajaxselectionretrait/index.php | 103 +++++++++++++++--------------
 2 files changed, 102 insertions(+), 79 deletions(-)

diff --git a/Vue/Ajaxdetailretrait/index.php b/Vue/Ajaxdetailretrait/index.php
index 6c401aa..d05e8ad 100644
--- a/Vue/Ajaxdetailretrait/index.php
+++ b/Vue/Ajaxdetailretrait/index.php
@@ -6,35 +6,55 @@
 <div class="card shadow-sm border-0 mb-4 animate__animated animate__fadeIn">
     <div class="card-body p-0">
         <div class="table-responsive">
-            <table class="table table-borderless align-middle mb-0 text-center" style="font-size: 8.5pt;">
-                <thead class="bg-light text-muted text-uppercase" style="font-size: 7.5pt;">
-                    <tr>
-                        <th class="py-3"><?= _("P. Nette Comm") ?></th>
-                        <th class="py-3"><?= _("Comm Courtage") ?></th>
-                        <th class="py-3"><?= _("Comm Commerc") ?></th>
-                        <th class="py-3"><?= _("Accessoires") ?></th>
-                        <th class="py-3 fw-bold text-dark"><?= _("Primes Nettes") ?></th>
-                        <th class="py-3"><?= $taxLabel ?></th>
-                        <th class="py-3"><?= _("Cartes") ?></th>
-                        <th class="py-3 text-primary fw-bold"><?= _("TTC") ?></th>
-                        <th class="py-3"><?= _("P. Nette Stat") ?></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr class="fw-bold border-bottom">
-                        <td><?= format_N($this->nettoyer($avenant['primeNette'])) ?></td>
-                        <td><?= format_N($this->nettoyer($avenant['commission'])) ?></td>
-                        <td><?= format_N($this->nettoyer($avenant['commissionAutre'])) ?></td>
-                        <td><?= format_N($this->nettoyer($avenant['accessoire'])) ?></td>
-                        <td class="bg-light-subtle"><?= format_N($this->nettoyer($avenant['primeHt'])) ?></td>
-                        <td><?= format_N($this->nettoyer($avenant['taxe'])) ?></td>
-                        <td><?= format_N($this->nettoyer($avenant['fraisCarte'])) ?></td>
-                        <td class="text-primary fs-6"><?= format_N($this->nettoyer($avenant['primeTtcInitial'])) ?></td>
-                        <td><?= format_N($this->nettoyer($avenant['primeNetteStat'])) ?></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
+			<table id="table_retrait_assures" class="table table-striped table-hover align-middle border" style="width:100%; font-size:8pt;">
+				<thead class="table-dark text-nowrap">
+					<tr>
+						<th class="text-center small"><?= _("Cat") ?></th>
+						<th class="text-start"><?= _("Nom & Prénoms") ?></th>
+						<th class="text-center">Type</th>
+						<th class="text-center">No</th>
+						<th class="text-center"><?= _("Entrée") ?></th>
+						<th class="text-center"><?= _("Durée") ?></th>
+						<th class="text-center"><?= _("Dur Rist") ?></th>
+						<th class="text-center"><?= _("Ratio") ?></th>
+						<th class="text-center"><?= _("S/P") ?></th>
+						<th class="text-center"><?= _("P. Non Acquise") ?></th>
+						<th class="text-center"><?= _("P. Nette Rist") ?></th>
+						<th class="text-center"><?= $taxLabel ?></th>
+						<th class="text-center"><?= _("Ttc Rist") ?></th>
+						<th class="text-center no-export" width="5%"><?= _("Choix") ?></th>
+					</tr>
+				</thead>
+				<tbody>
+					<?php foreach ($beneficiaires as $beneficiaire): ?>
+						<tr class="text-nowrap">
+							<td class="text-center"><?= $this->nettoyer($beneficiaire['codeProduit']) ?></td>
+							<td class="text-start fw-bold"><?= $this->nettoyer($beneficiaire['nomBeneficiaire']) ?></td>
+							<td class="text-center"><?= $this->nettoyer($beneficiaire['codeLienParente']) ?></td>
+							<td class="text-center text-muted small"><?= $this->nettoyer($beneficiaire['numeroBeneficiaire']) ?></td>
+							<td class="text-center"><?= dateLang($this->nettoyer($beneficiaire['dateEntree']), $_SESSION['lang']) ?></td>
+							<td class="text-center"><?= $this->nettoyer($beneficiaire['duree']) ?></td>
+							<td class="text-center"><?= $this->nettoyer($beneficiaire['duree_non_acquise']) ?></td>
+							<td class="text-center small"><?= $this->nettoyer($beneficiaire['ratioNonAcquise']) ?></td>    
+							<td class="text-center"><?= $this->nettoyer($beneficiaire['rapportsp']) ?>%</td>  
+							<td class="text-center fw-bold text-danger"><?= format_N($this->nettoyer($beneficiaire['primeNonAcquise'])) ?></td>
+							<td class="text-center"><?= format_N($this->nettoyer($beneficiaire['primeHt'])) ?></td>
+							<td class="text-center"><?= format_N($this->nettoyer($beneficiaire['taxe'])) ?></td>
+							<td class="text-center fw-bold text-primary"><?= format_N($this->nettoyer($beneficiaire['primeTtc'])) ?></td>
+							
+							<td class="text-center">
+								<div class="form-check form-switch d-inline-block">
+									<input class="form-check-input" type="checkbox" 
+										value="<?= ($beneficiaire['choix'] == '1') ? '1' : '0' ?>" 
+										<?= ($beneficiaire['choix'] == '1') ? 'checked' : '' ?>
+										onchange="toggleBeneficiaireSelection(this, <?= $beneficiaire['idBeneficiaire_temp'] ?>);">
+								</div>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div>
         
         <div class="bg-light p-3 d-flex flex-wrap gap-2 justify-content-center border-top">
             <button type="button" class="btn btn-outline-info px-4 fw-bold shadow-sm rounded-pill" onclick="pop_afficher_selection_retrait();">
diff --git a/Vue/Ajaxselectionretrait/index.php b/Vue/Ajaxselectionretrait/index.php
index 35b6f9e..201ed11 100644
--- a/Vue/Ajaxselectionretrait/index.php
+++ b/Vue/Ajaxselectionretrait/index.php
@@ -1,51 +1,54 @@
-<table class="table table-striped table-bordered table-hover table-condensed table-responsive" style="font-size:8pt;">
-	<thead>
-		<tr>
-		<th> <?= _("Cat") ?> </th>
-		<th> <?= _("Nom") ?> </th>
-		<th style='text-align:center'> Type </th>
-		<th style='text-align:center'> <?= _("No") ?> </th>
-		<th style='text-align:center'> <?= _("Entrée") ?> </th>
-		<th style='text-align:center'> <?= _("Durée") ?> </th>
-		<th style='text-align:center'> <?= _("Dur Rist") ?> </th>
-		<th style='text-align:center'> <?= _("Ratio") ?> </th>
-		<th style='text-align:center'> <?= _("S/P") ?> </th>
-		<th style='text-align:center'> <?= _("P Nette An") ?> </th>
-		<th style='text-align:center'> <?= _("Ttc An") ?> </th>
-		<th style='text-align:center'> <?= _("P Non Acquise") ?> </th>
-		<th style='text-align:center'> <?= _("P Nette Rist") ?> </th>
-		<th style='text-align:center'> <?= (isset($_SESSION['composanteprime']['Taxes'])) ? _($_SESSION['composanteprime']['Taxes']) : _("Taxes") ?> </th>
-		<th style='text-align:center'> <?= _("Ttc Rist") ?> </th>
-		<th width="5%" style='text-align:center'> <?= _("Choix") ?> </th>
-	</tr>
-	</thead>
+<?php 
+    $taxLabel = (isset($_SESSION['composanteprime']['Taxes'])) ? _($_SESSION['composanteprime']['Taxes']) : _("Taxes");
+?>
 
-	<tbody>
-		<?php foreach ($beneficiaires as $beneficiaire):?>
-			<tr valign="top">
-				<td align='center'><?= $this->nettoyer($beneficiaire['codeProduit']) ?></td>
-				<td><?= $this->nettoyer($beneficiaire['nomBeneficiaire']) ?></td>
-				<td align='center'><?= $this->nettoyer($beneficiaire['codeLienParente']) ?></td>
-				<td align='center'><?= $this->nettoyer($beneficiaire['numeroBeneficiaire']) ?></td>
-				<td align='center'><?= dateLang($this->nettoyer($beneficiaire['dateEntree']), $_SESSION['lang']) ?></td>
-				<td align='center'><?= $this->nettoyer($beneficiaire['duree']) ?></td>
-				<td align='center'><?= $this->nettoyer($beneficiaire['duree_non_acquise']) ?></td>
-				<td align='center'><?= $this->nettoyer($beneficiaire['ratioNonAcquise']) ?></td>	
-				<td align='center'><?= $this->nettoyer($beneficiaire['rapportsp']) ?></td>	
-				<td align='center'><?= format_N($this->nettoyer($beneficiaire['primeNetteStat_an'])) ?></td>
-				<td align='center'><?= format_N($this->nettoyer($beneficiaire['primeTtc_an'])) ?></td>
-				<td align='center'><?= format_N($this->nettoyer($beneficiaire['primeNonAcquise'])) ?></td>					
-				<td align='center'><?= format_N($this->nettoyer($beneficiaire['primeHt'])) ?></td>
-				<td align='center'><?= format_N($this->nettoyer($beneficiaire['taxe'])) ?></td>
-				<td align='center'><?= format_N($this->nettoyer($beneficiaire['primeTtc'])) ?></td>
-				
-				<?php if($beneficiaire['choix']=='1'): ?>
-				<td align='center'> <input type="checkbox" checked value="<?= $beneficiaire['choix'] ?>"  onClick="javascript:if(this.value=='1'){this.value='0'}else{this.value='1'};beneficiaire_a_retirer(this.value, <?= $beneficiaire['idBeneficiaire_temp'] ?>);"></td> 
-				<?php else: ?>
-				<td align='center'> <input type="checkbox" value="<?= $beneficiaire['choix'] ?>"  onClick="javascript:if(this.value=='1'){this.value='0'}else{this.value='1'};beneficiaire_a_retirer(this.value, <?= $beneficiaire['idBeneficiaire_temp'] ?>);"></td> 
-				<?php endif; ?>
-				
-			</tr>
-		<?php endforeach; ?>
-	</tbody>
-</table>
+<div class="table-responsive">
+    <table id="table_retrait_assures" class="table table-striped table-hover align-middle border" style="width:100%; font-size:8pt;">
+        <thead class="table-dark text-nowrap">
+            <tr>
+                <th class="text-center small"><?= _("Cat") ?></th>
+                <th class="text-start"><?= _("Nom & Prénoms") ?></th>
+                <th class="text-center">Type</th>
+                <th class="text-center">No</th>
+                <th class="text-center"><?= _("Entrée") ?></th>
+                <th class="text-center"><?= _("Durée") ?></th>
+                <th class="text-center"><?= _("Dur Rist") ?></th>
+                <th class="text-center"><?= _("Ratio") ?></th>
+                <th class="text-center"><?= _("S/P") ?></th>
+                <th class="text-center"><?= _("P. Non Acquise") ?></th>
+                <th class="text-center"><?= _("P. Nette Rist") ?></th>
+                <th class="text-center"><?= $taxLabel ?></th>
+                <th class="text-center"><?= _("Ttc Rist") ?></th>
+                <th class="text-center no-export" width="5%"><?= _("Choix") ?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($beneficiaires as $beneficiaire): ?>
+                <tr class="text-nowrap">
+                    <td class="text-center"><?= $this->nettoyer($beneficiaire['codeProduit']) ?></td>
+                    <td class="text-start fw-bold"><?= $this->nettoyer($beneficiaire['nomBeneficiaire']) ?></td>
+                    <td class="text-center"><?= $this->nettoyer($beneficiaire['codeLienParente']) ?></td>
+                    <td class="text-center text-muted small"><?= $this->nettoyer($beneficiaire['numeroBeneficiaire']) ?></td>
+                    <td class="text-center"><?= dateLang($this->nettoyer($beneficiaire['dateEntree']), $_SESSION['lang']) ?></td>
+                    <td class="text-center"><?= $this->nettoyer($beneficiaire['duree']) ?></td>
+                    <td class="text-center"><?= $this->nettoyer($beneficiaire['duree_non_acquise']) ?></td>
+                    <td class="text-center small"><?= $this->nettoyer($beneficiaire['ratioNonAcquise']) ?></td>    
+                    <td class="text-center"><?= $this->nettoyer($beneficiaire['rapportsp']) ?>%</td>  
+                    <td class="text-center fw-bold text-danger"><?= format_N($this->nettoyer($beneficiaire['primeNonAcquise'])) ?></td>
+                    <td class="text-center"><?= format_N($this->nettoyer($beneficiaire['primeHt'])) ?></td>
+                    <td class="text-center"><?= format_N($this->nettoyer($beneficiaire['taxe'])) ?></td>
+                    <td class="text-center fw-bold text-primary"><?= format_N($this->nettoyer($beneficiaire['primeTtc'])) ?></td>
+                    
+                    <td class="text-center">
+                        <div class="form-check form-switch d-inline-block">
+                            <input class="form-check-input" type="checkbox" 
+                                   value="<?= ($beneficiaire['choix'] == '1') ? '1' : '0' ?>" 
+                                   <?= ($beneficiaire['choix'] == '1') ? 'checked' : '' ?>
+                                   onchange="toggleBeneficiaireSelection(this, <?= $beneficiaire['idBeneficiaire_temp'] ?>);">
+                        </div>
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
\ No newline at end of file