a

Controleur/ControleurDentisterie.php

@@ -6,7 +6,7 @@ require_once 'Modele/Prescription.php';
 require_once 'Modele/Medecin.php';
 require_once 'Modele/Feuillemaladie.php';
 
-class ControleurDentisterie extends Controleur {
+class ControleurDentisterie extends Controleur {
 	private $menuvue;
     private $obs;
 	private $medecin;
@@ -61,9 +61,6 @@ class ControleurDentisterie extends Controleur {
 		
 		$prestations 			= $this->obs->getdetaildentaire($numeroFeuilleMaladie, $codePrestataire);
 		
-		//var_dump($prestations);
-		//die();
-		
 		$prestations_total 		= $this->obs->getdetaildentaire_total($numeroFeuilleMaladie, $codePrestataire);
 		
 		$_SESSION['bool'] 		= "0";

Js/fonctions.js

@@ -26102,8 +26102,6 @@ function dentisterie()
 
 function ajoute_dentaire()
 {
-	
-	
 	var codeActe		= $('#codeActe').val();
 	
 	var ententePrealable = $('#ententePrealable').val();

Vue/Ajaxdetaildentisterie/index.php

@@ -11,12 +11,17 @@
 ?>
 <input class="sr-only" id="bool" name="bool" type="text" value= "<?= $_SESSION['bool'] ?>"> 
 
+<!-- div_prestations -->
+ 
+div_prestations => INCLUDED
+
 <table class="table table-striped table-bordered table-hover table-condensed table-responsive" style="font-size:10pt;">
 	<thead>
-	  <tr>
+		<tr>
 		<th width="5%" style='text-align:center'> <?= _("Suppr") ?> </th>
 		<th style="text-align:center">  <?= _("Actes (".count($prestations).")") ?>  </th>
 		<th style="text-align:center">  <?= _("N° Dent") ?>  </th>
+		<th style="text-align:center">  <?= _("Accord") ?>  </th>
 		<th style="text-align:center">  <?= _("Prix Unitaire") ?>   </th>
 		<th width="10%" style="text-align:center"> <?= _("Qté") ?>    </th>
 		<th style="text-align:center"> <?= _("Prix Total") ?>  </th>
@@ -29,7 +34,7 @@
 	
 	<tfoot>
 		<tr>
-			<td colspan="5" style='text-align:center'> Total </td>
+			<td colspan="6" style='text-align:center'> Total </td>
 			<td align='center'><?= format_N($this->nettoyer($prestations_total['fraisReel'])) ?></td>
 			<td align='center'><?= format_N($this->nettoyer($prestations_total['montantTm'])) ?></td>
 			<td align='center'><?= format_N($this->nettoyer($prestations_total['montantArembourser'])) ?></td>
@@ -40,7 +45,10 @@
 
 	<tbody>
 	
-		<?php foreach ($prestations as $prestation):
+		<?php 
+		$existeEntentePrealable = '0';
+		$envoyeSms = '0';
+		foreach ($prestations as $prestation):
 			$idPrestationactes=$this->nettoyer($prestation['id']);
 			$supprimable = $prestation['supprimable'];
 			$codeTypePrestation=$this->nettoyer($prestation['codeTypePrestation']);	
@@ -71,6 +79,15 @@
 			$tarif = $this->nettoyer($prestation['tarif']);
 			
 			$prixTarif = $this->nettoyer($prestation['prixTarif']);
+			
+			$ententePrealable 	= $this->nettoyer($prestation['ententePrealable']);
+			$envoyeSms 			= $this->nettoyer($prestation['envoyeSms']);
+			
+			if($ententePrealable == "2"){
+				$existeEntentePrealable = $ententePrealable;
+			}
+			
+			$envoyeSms++;
 		?>
 				<?php if($ententePrealable=='2' || $autorisation=='2'): ?>
 					<tr valign="top" style="background-color: yellow;">
@@ -82,43 +99,48 @@
 					<tr valign="top">
 				<?php endif; ?>
 		
-				<?php if ($supprimable=="1" || $ententePrealable=='1'  || $autorisation=='1'): ?>
+				<?php if ($ententePrealable!='1' && $ententePrealable!='9'): ?>
-					<td> </td>	
-				<?php else: ?>
 					<td> <input class = "form-control btn btn-danger" type="button" value="X" onClick="javascript:supprimer_acte_dentaire_selection('<?= $idPrestationactes ?>');"> </td>
+				<?php else: ?>
+					<td> </td>	
 				<?php endif; ?>
 
 				<td align='center'>  <?= $libelleActe ?> </td>
 				
 				<td align='center'>  <?= $this->nettoyer($prestation['numeroDent']) ?> </td>
+				
+				<?php if($ententePrealable<>"0"): ?>
+					<?php if($ententePrealable=='2'): ?>
+						<td align='center' style="background-color: yellow;"> <input type="checkbox" checked disabled> </td>
+					<?php elseif($ententePrealable=='1'): ?>
+						<td align='center' style="background-color: #00ff00;"> <input type="checkbox" checked disabled> </td>
+					<?php elseif($ententePrealable=='9'): ?>
+						<td align='center' style="background-color: red;color:white;"> <input type="checkbox" checked disabled> </td>
+					<?php else: ?>
+						<td align='center'> <input type="checkbox" checked disabled> </td>
+					<?php endif; ?>
+				<?php else: ?>
+					<td align='center' > <input type="checkbox" disabled></td>
+				<?php endif; ?>
 
 				<?php if($facture=='1' || $bonCaduc=='1'): ?>
-				
-				<td align='center'>
-					<button type="button" class="span_link" title="<?= _("Voir le tarif appliqué") ?>" onClick='javascript:tarif_applique("<?= $tarif ?>");'>
-						<?= format_N($this->nettoyer($prestation['valeurActe'])); ?>
-					</button>
-				</td>
-				
-				<td align='center'><?= $this->nettoyer($prestation['quantite'])  ?></td>
-				
-				<?php else: ?>
-					<?php if ($prixTarif>"0"): ?>
 					<td align='center'>
 						<button type="button" class="span_link" title="<?= _("Voir le tarif appliqué") ?>" onClick='javascript:tarif_applique("<?= $tarif ?>");'>
 							<?= format_N($this->nettoyer($prestation['valeurActe'])); ?>
 						</button>
 					</td>
-					<?php else: ?>
+					
-					<td align='center'> 
+					<td align='center'><?= $this->nettoyer($prestation['quantite'])  ?></td>
-						<INPUT style='text-align:center' class="form-control" TYPE="text" value="<?= format_N($this->nettoyer($prestation['valeurActe']))  ?>"
+				<?php else: ?>
-						onChange="ajax_maj_prixacte_dentaire('<?=$idPrestationactes?>', this.value, this);" onBlur="formatMonetaire(this);" onkeyup="controle_numerique(this);" onFocus="formatNumerique(this);">
+					<td align='center'>
+						<button type="button" class="span_link" title="<?= _("Voir le tarif appliqué") ?>" onClick='javascript:tarif_applique("<?= $tarif ?>");'>
+							<?= format_N($this->nettoyer($prestation['valeurActe'])); ?>
+						</button>
+					</td>
+					
+					<td align='center'> 
+						<?= $this->nettoyer($prestation['quantite'])  ?>
 					</td>
-					<?php endif; ?>
-				<td align='center'> 
-					<INPUT style='text-align:center' class="form-control" TYPE="text" value="<?= $this->nettoyer($prestation['quantite'])  ?>"
-					onChange="ajax_maj_qte_acte_dentaire('<?=$idPrestationactes?>', this.value, this);">
-				</td>
 				<?php endif; ?>
 				
 				<td align='center'> <?= format_N($this->nettoyer($prestation['fraisReel'])) ?></td>
@@ -137,7 +159,12 @@
 			</tr>
 		<?php endforeach; ?>
 			<tr style='background-color:white'> 
-				<td colspan="10" height="8"></td>
+				<td colspan="11" height="8"></td>
 			</tr>
 	</tbody>
 </table>
+
+<input class="sr-only" type="text" id="existeEntentePrealable" name="existeEntentePrealable" value="<?= $existeEntentePrealable ?>" > 
+<input class="sr-only" type="text" id="envoyeSms" name="envoyeSms" value="<?= $envoyeSms ?>" >
+
+<!-- div_prestations -->

Vue/Dentisterie/index.php

@@ -36,24 +36,6 @@
 
 <table class="table table-responsive table-condensed" style='font-size:9pt;' >
 	<tbody>	
-	<!--
-		<tr> 
-			<td width="8%" > <?= _("Souscripteur") ?> </td>
-			<td width="20%"> 
-				<INPUT style='text-align:center; font-size:11pt;' class="form-control" TYPE="text" id="nomClient" name="nomClient" 
-				value="<?= $_SESSION['p_nomClient_C'] ?>" onChange="" readonly >
-			</td>
-
-			<td width="5%" align="center" > <?= _("Adhérent") ?> </td>
-			<td width="20%" > <INPUT class="form-control" TYPE="text" value="<?= $_SESSION['p_adherent_C']; ?>" readonly style="text-align: center; font-size:9pt;" > </td>
-
-			<td width="5%" align="center"> <?= _("Patient") ?> </td>
-			<td width="22%"> <INPUT class="form-control" TYPE="text" value="<?= $_SESSION['p_beneficiaire_C']; ?>" readonly style='font-size:9pt;'>	</td>
-
-			<td width="7%" align="center"> <?= _("Tél Patient") ?> </td>
-			<td width="13%"> <INPUT class="form-control" TYPE="text" value="<?= $_SESSION['p_telephonePortableBeneficiaire_C']; ?>" readonly style='font-size:9pt;'>	</td>
-		</tr>
-	-->
 		<tr> 
 			<td colspan="8"> 
 				<INPUT style='font-size:12pt; font-weight: bold; background-color:#f5deb3 !important; color:#a0522d; text-align:center;' class="form-control" TYPE="text" id="nomClient" name="nomClient" 
@@ -166,6 +148,11 @@
 </div>
 				
 <div id="div_prestations" >
+	A INCLURE ICI
+
+	<!--
+ 	<?php require "Vue/Ajaxlistefacturesabonnement/index.php";?>
+		
 	<table class="table table-striped table-bordered table-hover table-condensed table-responsive" style="font-size:10pt;">
 		<thead>
 		  <tr>
@@ -262,30 +249,27 @@
 					
 					<?php if($ententePrealable<>"0"): ?>
 						<?php if($ententePrealable=='2'): ?>
-						<td align='center' style="background-color: yellow;"> <input type="checkbox" checked disabled> </td>
+							<td align='center' style="background-color: yellow;"> <input type="checkbox" checked disabled> </td>
 						<?php elseif($ententePrealable=='1'): ?>
-						<td align='center' style="background-color: #00ff00;"> <input type="checkbox" checked disabled> </td>
+							<td align='center' style="background-color: #00ff00;"> <input type="checkbox" checked disabled> </td>
 						<?php elseif($ententePrealable=='9'): ?>
-						<td align='center' style="background-color: red;color:white;"> <input type="checkbox" checked disabled> </td>
+							<td align='center' style="background-color: red;color:white;"> <input type="checkbox" checked disabled> </td>
 						<?php else: ?>
-						<td align='center'> <input type="checkbox" checked disabled> </td>
+							<td align='center'> <input type="checkbox" checked disabled> </td>
 						<?php endif; ?>
 					<?php else: ?>
 						<td align='center' > <input type="checkbox" disabled></td>
 					<?php endif; ?>
 
 					<?php if($facture=='1' || $bonCaduc=='1'): ?>
-					
+						<td align='center'>
-					<td align='center'>
+							<button type="button" class="span_link" title="<?= _("Voir le tarif appliqué") ?>" onClick='javascript:tarif_applique("<?= $tarif ?>");'>
-						<button type="button" class="span_link" title="<?= _("Voir le tarif appliqué") ?>" onClick='javascript:tarif_applique("<?= $tarif ?>");'>
+								<?= format_N($this->nettoyer($prestation['valeurActe'])); ?>
-							<?= format_N($this->nettoyer($prestation['valeurActe'])); ?>
+							</button>
-						</button>
+						</td>
-					</td>
-					
-					<td align='center'><?= $this->nettoyer($prestation['quantite'])  ?></td>
-					
-					<?php else: ?>
 						
+						<td align='center'><?= $this->nettoyer($prestation['quantite'])  ?></td>
+					<?php else: ?>
 						<td align='center'>
 							<button type="button" class="span_link" title="<?= _("Voir le tarif appliqué") ?>" onClick='javascript:tarif_applique("<?= $tarif ?>");'>
 								<?= format_N($this->nettoyer($prestation['valeurActe'])); ?>
@@ -320,6 +304,7 @@
 	
 	<input class="sr-only" type="text" id="existeEntentePrealable" name="existeEntentePrealable" value="<?= $existeEntentePrealable ?>" > 
 	<input class="sr-only" type="text" id="envoyeSms" name="envoyeSms" value="<?= $envoyeSms ?>" >
+	-->
 </div>