From 72bd6e5c4c15f6b9bc77d6af738944448141e514 Mon Sep 17 00:00:00 2001
From: KANE LAZENI <lkane@ebene.info>
Date: Mon, 13 Apr 2026 09:40:58 +0000
Subject: [PATCH] a

---
 Js/fonctions.js                               |  6 +-
 .../Tarifs/Controleur/Ajaxmajcollege.php      |  8 ---
 Societes/ebene/Tarifs/Vue/Ajaxmajcollege.php  | 72 ++++++++++++-------
 Societes/ebene/Tarifs/Vue/Creercollege.php    | 43 +++++------
 Vue/gabarit.php                               |  2 +-
 5 files changed, 72 insertions(+), 59 deletions(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index d1293901..f9f7ceb2 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -29939,15 +29939,12 @@ function ajax_maj_plafond_individu_temp(plafond)
 
 function change_categorie_college_temp()
 {
-	
-	
 	codeProduit 		 = $('#codeProduit').val();
 	
 	codeLienParente 	 = "A";
 	
 	codeBaseTarification = $('#codeBaseTarification').val();
 	
-	
 	if($('#codeProduit').val()<=" ")
 	{
 		v_msg="Veuillez sélectionner un produit!";
@@ -29988,7 +29985,7 @@ function change_categorie_college_temp()
 		},
 		complete: function(data) 
 		{
-				
+			// recapitulercollege();
 		}
 	});
 }
@@ -52105,7 +52102,6 @@ function recapitulerconsultercollege(){
 }
 
 function actualisercollege_temp(){
-	
 	donnees = ""
 	$.ajax({
 		url: $("#racineWeb").val()+"Ajaxmajcollege/",
diff --git a/Societes/ebene/Tarifs/Controleur/Ajaxmajcollege.php b/Societes/ebene/Tarifs/Controleur/Ajaxmajcollege.php
index f314d973..ce43a184 100755
--- a/Societes/ebene/Tarifs/Controleur/Ajaxmajcollege.php
+++ b/Societes/ebene/Tarifs/Controleur/Ajaxmajcollege.php
@@ -7,28 +7,20 @@
 	$this->capitalfraisfuneraire 	= (new Capitalfraisfuneraire())->getListe();
 	$this->lienparente_societe 		= (new Lienparente_societe())->getListe();
 	
-
 	$idPolice 				= ($_SESSION['modeDevis'] == "0") ? $_SESSION['idPolice_C'] : $_SESSION['idPolice_d_C'];
 	$codeGcAssureur 		= ($_SESSION['modeDevis'] == "0") ? $_SESSION['codeGcAssureur'] : $_SESSION['codeGcAssureur_d'];
 	
-	
-	
 	$idCollegeTemp 			= $_SESSION['idCollegeTemp'];
 	
-	//var_dump($idCollegeTemp);
-	
 	$budgetDefini			= ($_SESSION['modeDevis'] == "0") ? $_SESSION['budgetDefini_C'] : "0";
 	$codeTypeGarant			= $_SESSION['codeTypeGarant'];
 	
-	
-	
 	$codeProduit 		    = $_SESSION['codeProduit'];
 	
 	$codeTypeTarifActe 		= "TCOL";
 	
 	$typeTarifActe			= $this->college_temp->getTypeTarifActe(); 
 
-
 	$tarifacte 				= $this->tarifacte->getTarifActeByType($codeTypeTarifActe);
 
 	$produit 			 	= $this->produit->getProduitGarant($codeGcAssureur);
diff --git a/Societes/ebene/Tarifs/Vue/Ajaxmajcollege.php b/Societes/ebene/Tarifs/Vue/Ajaxmajcollege.php
index c1654a3b..d990720a 100755
--- a/Societes/ebene/Tarifs/Vue/Ajaxmajcollege.php
+++ b/Societes/ebene/Tarifs/Vue/Ajaxmajcollege.php
@@ -1,14 +1,24 @@
+<?php 
+	$controlPlafondAdherent 	= $_SESSION['controlPlafondAdherent'];
+	$controlPlafondBeneficiaire = $_SESSION['controlPlafondBeneficiaire'];
+
+	$_SESSION['imposerPlafond'] = "1";
+	
+	$garant = $_SESSION['codeGcAssureur_C'];
+	
+	$idCollegeTemp = $this->nettoyer($collegeTemp['idCollegeTemp']);
+	
+	$idCollege = $this->nettoyer($collegeTemp['idCollege']);
+?>
+
 <INPUT class="sr-only" TYPE="text" id="idPolice" name="idPolice" value="<?= $_SESSION['idPolice_C'] ?>">
-<INPUT class="sr-only" TYPE="text" id="idCollegeTemp" name="idCollegeTemp" value="<?= $this->nettoyer($collegeTemp['idCollegeTemp']); ?>">
+<INPUT class="sr-only" TYPE="text" id="idCollegeTemp" name="idCollegeTemp" value="<?= $idCollegeTemp; ?>">
 <INPUT class="sr-only" TYPE="text" id="nomForm" name="nomForm" value="creercollege">
 <INPUT class="sr-only" TYPE="text" id="primeTtcCollege" name="primeTtcCollege" value="<?=$collegeTemp['primeTtcCollege']?>">
 <INPUT class="sr-only" TYPE="text" id="plafondFamille0" name="plafondFamille0" value="<?=$plafondFamille?>">
 <INPUT class="sr-only" TYPE="text" id="plafondIndividu0" name="plafondIndividu0" value="<?=$plafondIndividu?>">
 <INPUT class="sr-only" TYPE="text" id="codeLienParente" name="codeLienParente" value="A">
-<?php 
-	$idCollege = $this->nettoyer($collegeTemp['idCollege']); 
-?>
-
+<INPUT class="sr-only" id="accessoireManuel" NAME="accessoireManuel" type="text" value="<?= $this->nettoyer($collegeTemp['accessoireManuel']); ?>" > 
 
 <table class="table table-responsive table-condensed" style='font-size:9pt;'>
 	<tbody>	
@@ -16,7 +26,15 @@
 		<INPUT class="sr-only" TYPE="text" id="numeroOptionTarif" NAME="numeroOptionTarif" value="0">
 		<INPUT class="sr-only" TYPE="text" id="codeProduit" name="codeProduit" value="<?=$collegeTemp['codeProduit']?>">
 		<INPUT class="sr-only" TYPE="text" id="idBaremePriseEnCharge" name="idBaremePriseEnCharge" value="<?=$collegeTemp['idBaremePriseEnCharge']?>">
-
+		
+		<tr>
+			<td width="12%">Option</td>
+			<td colspan="12">
+				<SELECT style='font-size:9pt;' class="form-select" disabled >
+					<?php liste_options($optionstarif, $this->nettoyer($collegeTemp['numeroOptionTarif']), true); ?>	
+				</SELECT>
+			</td>
+		</tr>
 		<tr> 
 			<td width="12%"> <?= _("Produit") ?> </td>
 			<td colspan="3">
@@ -45,12 +63,13 @@
 			<td width="10%" class="required" align="center"> <?= _("Barème Initial") ?> </td>
 			<td colspan="7">
 				<div id="div_bareme">
-					<SELECT style='font-size:9pt;' class="form-control" id="idBaremePriseEnCharge" NAME="idBaremePriseEnCharge" required AUTOCOMPLETE="OFF"
+					<SELECT style='font-size:9pt;' class="form-select" id="idBaremePriseEnCharge" NAME="idBaremePriseEnCharge" required AUTOCOMPLETE="OFF"
 						onChange="libelleBaremeCollege(this);filtreTicketModerateur();enregistrer_college_temp();">
 						<?php liste_options($bareme,$this->nettoyer($collegeTemp['idBaremePriseEnCharge']), false); ?>
 					</SELECT>
 				</div>
 			</td>
+			
 		</tr>
 		<?php endif;?>
 		<tr >
@@ -65,7 +84,7 @@
 			
 			<td width="10%" align="center" class="required"> <?= _("Collège Type") ?> </td>
 			<td colspan="5">
-				<SELECT style='font-size:9pt;' class="form-control" id="codeCollegeType" NAME="codeCollegeType" required AUTOCOMPLETE="OFF" 
+				<SELECT style='font-size:9pt;' class="form-control selectpicker" data-live-search="true" id="codeCollegeType" NAME="codeCollegeType" required AUTOCOMPLETE="OFF" 
 					onChange="libelleTypeCollege(this);enregistrer_college_temp();">
 					<?php liste_options($collegetype, $this->nettoyer($collegeTemp['codeCollegeType']), false); ?>	
 				</SELECT>
@@ -82,7 +101,7 @@
 			<td align="center" class="required"> <?= _("Réseau") ?> </td>
 			<td colspan="7">
 				<div id="div_codeReseau">
-					<SELECT style="font-size:9pt;" class="form-control" id="codeReseau" NAME="codeReseau" 
+					<SELECT style="font-size:9pt;" class="form-select" id="codeReseau" NAME="codeReseau" 
 					onChange="enregistrer_college_temp();" required AUTOCOMPLETE="OFF">
 						<?php liste_options($reseausoins,$this->nettoyer($collegeTemp['codeReseau']), false); ?>						
 					</SELECT>
@@ -96,7 +115,7 @@
 			<td width="6%"  class="required"> <?= _("Territoire") ?> </td>
 			<td colspan="3">
 				<div id="div_territoire">
-					<SELECT style="font-size:9pt;" class="form-control" id="codeTerritoire" NAME="codeTerritoire" 
+					<SELECT style="font-size:9pt;" class="form-select" id="codeTerritoire" NAME="codeTerritoire" 
 					onChange="enregistrer_college_temp();" required AUTOCOMPLETE="OFF">
 						<?php liste_options($etendueterritoire,$this->nettoyer($collegeTemp['codeTerritoire']), false); ?>						
 					</SELECT>
@@ -113,7 +132,7 @@
 			
 			<td align="center" width="10%"> <?= _("TM Hors Réseau (%)") ?> </td>
 			<td >
-				<INPUT style='text-align:center; font-size:9pt;'  class="form-control" type="number" id="ticketModerateurHorsReseau" value="<?= round($this->nettoyer($collegeTemp['ticketModerateurHorsReseau'])); ?>"  
+				<INPUT style='text-align:center; font-size:9pt;'  class="form-control" type="number" id="ticketModerateurHorsReseau" value="<?= $this->nettoyer($collegeTemp['ticketModerateurHorsReseau']); ?>"  
 				NAME="ticketModerateurHorsReseau" onChange="enregistrer_college_temp();">
 			</td>
 			
@@ -133,17 +152,23 @@
 				<INPUT style='text-align:center; font-size:9pt;'  class="form-control" TYPE="text" id="accessoireCalcul" NAME="accessoireCalcul" value="<?= format_N($this->nettoyer($collegeTemp['accessoireCalcul'])); ?>" readonly >
 			</td>
 			
-			<td width="8%" align='center'> <?= _("Accessoires Manuels") ?></td>
-			<td colspan="5"> 
-				<INPUT style='text-align:center; font-size:9pt;' class="form-control" id="accessoireManuel" NAME="accessoireManuel" 
-				type="text" value="<?= format_N($this->nettoyer($collegeTemp['accessoireManuel'])); ?>" onkeyup="controle_numerique(this);" onblur="formatMonetaire(this);"> 
+			<td width="8%" align='center'> <?= _("Frais carte") ?></td>
+			<td> 
+				<INPUT style='text-align:center; font-size:9pt;' class="form-control" id="fraisCarte" NAME="fraisCarte" 
+				type="text" value="<?= format_N($this->nettoyer($collegeTemp['fraisCarte'])); ?>" onkeyup="controle_numerique(this);" onblur="formatMonetaire(this);" onChange="enregistrer_college_temp();"> 
+			</td>
+
+			<td align='center'> <?= _("Renouvellement") ?></td>
+			<td> 
+				<INPUT style='text-align:center; font-size:9pt;' class="form-control" id="fraisCarteRen" NAME="fraisCarteRen" 
+				type="text" value="<?= format_N($this->nettoyer($collegeTemp['fraisCarteRen'])); ?>" onkeyup="controle_numerique(this);" onblur="formatMonetaire(this);" onChange="enregistrer_college_temp();"> 
 			</td>
 		</tr>
 		<tr>
 			<?php if($collegeTemp['rachatTm']=='1'): ?>
 				<td width="6%"> <?= _("Rachat T M") ?> </td>
 				<td>
-					<SELECT class="form-control" id="rachatTm" NAME="rachatTm" onChange="javascript:activeRachatTm();">
+					<SELECT class="form-select" id="rachatTm" NAME="rachatTm" onChange="javascript:activeRachatTm();">
 						<?php liste_options($rachattm, $collegeTemp['rachatTm'], true); ?>						
 					</SELECT>						
 				</td>
@@ -159,7 +184,7 @@
 			<?php else: ?>
 				<td width="6%"> <?= _("Rachat T M") ?> </td>
 				<td>
-					<SELECT class="form-control text-center" id="rachatTm" NAME="rachatTm" onChange="" readonly>
+					<SELECT class="form-select text-center" id="rachatTm" NAME="rachatTm" onChange="" readonly>
 						<?php liste_options($rachattm,$collegeTemp['rachatTm'], true); ?>						
 					</SELECT>						
 				</td>
@@ -183,20 +208,20 @@
 		<tr>
 			<td width="6%" > <?= _("Type Tarif Acte") ?> </td>
 			<td colspan="3">
-				<SELECT style="font-size:9pt;" class="form-control" id="codeTypeTarifActe" NAME="codeTypeTarifActe" 
+				<SELECT style="font-size:9pt;" class="form-control selectpicker" data-live-search="true" id="codeTypeTarifActe" NAME="codeTypeTarifActe" 
 				onChange="filtreTarifActeParType();enregistrer_college_temp();" disabled>
 					<?php liste_options($typeTarifActe,"TCOL",true); ?>						
 				</SELECT>
 			</td>
 			
-			<td width="8%" align="center"> <?= _("Age Limite Elève") ?> </td>
+			<td width="8%" align="center"> <?= _("Âge Limite Elève") ?> </td>
 			<td width="8%"> 
 				<INPUT class="form-control text-center" id="ageLimiteEnfantEleve" NAME="ageLimiteEnfantEleve" type="number" min="0" value="<?=$collegeTemp['ageLimiteEnfantEleve']?>" onChange="enregistrer_college_temp();">
 			</td>
 			
 			<td align="center"> <?= _("Tarif Acte") ?> </td>
 			<td colspan="5">
-				<SELECT style="font-size:9pt;" class="form-control" id="codeTarifActe" NAME="codeTarifActe" 
+				<SELECT style="font-size:9pt;" class="form-control selectpicker" data-live-search="true" id="codeTarifActe" NAME="codeTarifActe" 
 				onChange="enregistrer_college_temp();">
 					<?php liste_options($tarifacte,$this->nettoyer($collegeTemp['codeTarifActe']), false); ?>						
 				</SELECT>
@@ -207,7 +232,7 @@
 		<tr>
 			<td width="6%" class="required"> <?= _("Type Remboursement") ?> </td>
 			<td colspan="3">
-				<SELECT style="font-size:9pt;" class="form-control" id="codeTypeRemboursement" NAME="codeTypeRemboursement" 
+				<SELECT style="font-size:9pt;" class="form-select" id="codeTypeRemboursement" NAME="codeTypeRemboursement" 
 				onChange="accesReseauSoin();enregistrer_college_temp();" required AUTOCOMPLETE="OFF">
 					<?php liste_options($typeremboursement,$collegeTemp['codeTypeRemboursement'],false); ?>						
 				</SELECT>
@@ -231,7 +256,7 @@
 		<tr>
 			<td class="required"> <?= _("Base Tarifaire") ?> </td>
 			<td colspan="3">
-				<SELECT style="font-size:9pt;" class="form-control" id="codeBaseTarification" NAME="codeBaseTarification" 
+				<SELECT style="font-size:9pt;" class="form-select" id="codeBaseTarification" NAME="codeBaseTarification" 
 				onChange="enregistrer_college_temp(); init_prime_college_base_tarif(); change_categorie_college_temp();" required AUTOCOMPLETE="OFF">
 					<?php liste_options($baseTarif, $this->nettoyer($collegeTemp['codeBaseTarification']), true); ?>						
 				</SELECT>
@@ -242,6 +267,5 @@
 				<input  onclick="javascript:bareme_college_temp();" style='font-size:12pt;' id="btn_bareme" name="btn_bareme" class = "form-control btn btn-info" type="button" value="<?= _("Barème prise en charge collège") ?>">
 			</td>
 		</tr>
-							
 	</tbody>
-</table>		
+</table>	
diff --git a/Societes/ebene/Tarifs/Vue/Creercollege.php b/Societes/ebene/Tarifs/Vue/Creercollege.php
index 1960ebb7..d6d34ed5 100755
--- a/Societes/ebene/Tarifs/Vue/Creercollege.php
+++ b/Societes/ebene/Tarifs/Vue/Creercollege.php
@@ -1,28 +1,29 @@
-<?php 
-	$controlPlafondAdherent 	= $_SESSION['controlPlafondAdherent'];
-	$controlPlafondBeneficiaire = $_SESSION['controlPlafondBeneficiaire'];
-
-	$_SESSION['imposerPlafond'] = "1";
-	
-	$garant = $_SESSION['codeGcAssureur_C'];
-	
-	$idCollegeTemp = $this->nettoyer($collegeTemp['idCollegeTemp']);
-	
-	$idCollege = $this->nettoyer($collegeTemp['idCollege']);
-?>
-<INPUT class="sr-only" TYPE="text" id="idPolice" name="idPolice" value="<?= $_SESSION['idPolice_C'] ?>">
-<INPUT class="sr-only" TYPE="text" id="idCollegeTemp" name="idCollegeTemp" value="<?= $idCollegeTemp; ?>">
-<INPUT class="sr-only" TYPE="text" id="nomForm" name="nomForm" value="creercollege">
-<INPUT class="sr-only" TYPE="text" id="primeTtcCollege" name="primeTtcCollege" value="<?=$collegeTemp['primeTtcCollege']?>">
-<INPUT class="sr-only" TYPE="text" id="plafondFamille0" name="plafondFamille0" value="<?=$plafondFamille?>">
-<INPUT class="sr-only" TYPE="text" id="plafondIndividu0" name="plafondIndividu0" value="<?=$plafondIndividu?>">
-<INPUT class="sr-only" TYPE="text" id="codeLienParente" name="codeLienParente" value="A">
-<INPUT class="sr-only" id="accessoireManuel" NAME="accessoireManuel" type="text" value="<?= $this->nettoyer($collegeTemp['accessoireManuel']); ?>" > 
-
 <form id="frmcreercollege" >
 	<legend><?= _("Nouveau college") ?></legend>
 	<div class="row">
 		<div id="div_majcollege" class="tab-container col-12">
+			<?php 
+				$controlPlafondAdherent 	= $_SESSION['controlPlafondAdherent'];
+				$controlPlafondBeneficiaire = $_SESSION['controlPlafondBeneficiaire'];
+
+				$_SESSION['imposerPlafond'] = "1";
+				
+				$garant = $_SESSION['codeGcAssureur_C'];
+				
+				$idCollegeTemp = $this->nettoyer($collegeTemp['idCollegeTemp']);
+				
+				$idCollege = $this->nettoyer($collegeTemp['idCollege']);
+			?>
+
+			<INPUT class="sr-only" TYPE="text" id="idPolice" name="idPolice" value="<?= $_SESSION['idPolice_C'] ?>">
+			<INPUT class="sr-only" TYPE="text" id="idCollegeTemp" name="idCollegeTemp" value="<?= $idCollegeTemp; ?>">
+			<INPUT class="sr-only" TYPE="text" id="nomForm" name="nomForm" value="creercollege">
+			<INPUT class="sr-only" TYPE="text" id="primeTtcCollege" name="primeTtcCollege" value="<?=$collegeTemp['primeTtcCollege']?>">
+			<INPUT class="sr-only" TYPE="text" id="plafondFamille0" name="plafondFamille0" value="<?=$plafondFamille?>">
+			<INPUT class="sr-only" TYPE="text" id="plafondIndividu0" name="plafondIndividu0" value="<?=$plafondIndividu?>">
+			<INPUT class="sr-only" TYPE="text" id="codeLienParente" name="codeLienParente" value="A">
+			<INPUT class="sr-only" id="accessoireManuel" NAME="accessoireManuel" type="text" value="<?= $this->nettoyer($collegeTemp['accessoireManuel']); ?>" > 
+
 			<table class="table table-responsive table-condensed" style='font-size:9pt;'>
 				<tbody>	
 					<?php if($idCollege > "0"):?>
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index 7bef7125..aca4d35b 100755
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -976,7 +976,7 @@
 		
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js" integrity="sha512-VEd+nq25CkR676O+pLBnDW09R7VQX9Mdiij052gVCp5yVH3jGtH70Ho/UUv4mJDsEdTvqRCFZg0NKGiojGnUCw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
-		<script src="Js/fonctions.js?ver=2026.04.13.08"></script> 
+		<script src="Js/fonctions.js?ver=2026.04.13.10"></script> 
 		
 		<script src="https://unpkg.com/vue@3/dist/vue.global.prod.js"></script>