a

Controleur/ControleurAjaxactesmedicauxmiseenobservation.php

@@ -32,4 +32,13 @@ class ControleurAjaxactesmedicauxmiseenobservation extends Controleur {
 		$this->executerAction("index");
     }		
 	
+    public function majvaleuracte() 
+	{
+		$idDetail = $this->requete->getParametre("idDetail");	
+		$valeurActe = $this->requete->getParametreFormulaire("valeurActe", "numerique");
+		
+        $this->obs->majvaleuracte($idDetail, $valeurActe);
+		
+		$this->executerAction("index");
+    }		
 }

Js/fonctions.js

@@ -15554,46 +15554,6 @@ async function supprimer_acte_medical_miseenobservation(idDetail) {
 }
 
 
-function ajax_maj_qte_acte_miseenobservation(idDetail, quantite, controle)
-{
-	
-	quantite=quantite.replace(",",".");
-	controle.value=quantite;
-	
-	if(controle_numerique(controle))
-	{
-		if(quantite==0)
-		{
-			controle.focus();
-			v_msg="Veuillez saisir la quantit\u00e9!";
-			v_msgEng="Please enter the quantity!";
-			alert_ebene(v_msg, v_msgEng);
-			
-			return;
-		}
-			
-		donnees = 'idDetail='+idDetail+"&quantite="+quantite;
-		
-		donnee_a_affciher = "";
-
-		//donnees = 'idDetail='+idDetail+"&quantite="+quantite;;
-		
-		$.ajax({
-			url: $("#racineWeb").val()+"Ajaxactesmedicauxmiseenobservation/majquantite/",			
-			type: 'POST',			
-			data: donnees,
-			success: function(data) {
-				donnee_a_affciher = data;
-			},
-			error: function(data) {
-			},
-			complete: function() {
-				$("#div_prestations").html(donnee_a_affciher);
-				controle.focus();
-			}
-		});
-	}
-}
 
 /**
  * Valide la sélection d'un acte médical avec vérification des prérequis
@@ -28775,3 +28735,85 @@ function ajax_maj_prix_acte_hospitalisation(idPrestationactes, valeurActe, contr
 		});
 	}
 }
+
+
+function ajax_maj_qte_acte_miseenobservation(idDetail, quantite, controle)
+{
+	quantite=quantite.replace(",",".");
+	controle.value=quantite;
+	
+	if(controle_numerique(controle))
+	{
+		if(quantite==0)
+		{
+			controle.focus();
+			v_msg="Veuillez saisir la quantit\u00e9!";
+			v_msgEng="Please enter the quantity!";
+			alert_ebene(v_msg, v_msgEng);
+			
+			return;
+		}
+			
+		donnees = 'idDetail='+idDetail+"&quantite="+quantite;
+		
+		donnee_a_affciher = "";
+
+		//donnees = 'idDetail='+idDetail+"&quantite="+quantite;;
+		
+		$.ajax({
+			url: $("#racineWeb").val()+"Ajaxactesmedicauxmiseenobservation/majquantite/",			
+			type: 'POST',			
+			data: donnees,
+			success: function(data) {
+				donnee_a_affciher = data;
+			},
+			error: function(data) {
+			},
+			complete: function() {
+				$("#div_prestations").html(donnee_a_affciher);
+				controle.focus();
+			}
+		});
+	}
+}
+
+function ajax_maj_prix_acte_miseenobservation(idDetail, valeurActe, controle)
+{
+	valeurActe=valeurActe.replace(",",".");
+	controle.value=valeurActe;
+	
+	if(controle_numerique(controle))
+	{
+		if(valeurActe==0)
+		{
+			controle.focus();
+			v_msg="Rien à faire!";
+			v_msgEng="Nothing to do!";
+			alert_ebene(v_msg, v_msgEng);
+			return;
+		}
+			
+		donnees = 'idDetail='+idDetail+"&valeurActe="+valeurActe;
+
+		alert("ajax_maj_prix_acte_miseenobservation => "+donnees);
+		return;
+		
+		donnee_a_affciher = "";
+		
+		$.ajax({
+			url: $("#racineWeb").val()+"Ajaxactesmedicauxmiseenobservation/majvaleuracte/",			
+			type: 'POST',			
+			data: donnees,
+			success: function(data) {
+				donnee_a_affciher = data;
+			},
+			error: function(data) {
+			},
+			complete: function() {
+				$("#div_prestations").html(donnee_a_affciher);
+				controle.focus();
+			}
+		});
+	}
+}
+

Modele/Miseenobservation.php

@@ -156,4 +156,28 @@ class Miseenobservation extends Modele {
 		$idAdherent, $numeroAdherent, $idBeneficiaire, $numeroBeneficiaire, $ententePrealable, $autorisation, $idMiseEnObservation, 
 		$prixBase, $tm, $datePrestation));
     }	
+
+	public function majvaleuracte($idDetail, $valeurActe)
+	{
+		$tm = $_SESSION['p_tm_C'];
+		
+		$sql = 'call sp_p_maj_valeuracte_acte_miseenobservation(?, ?, ?)';
+		
+		
+		$this->executerRequete($sql, array($idDetail, $valeurActe, $tm));
+	}	
+
+	/*
+	public function majvaleuractehospitalisation($idPrestationactes, $valeurActe)
+	{
+		$user 		= $_SESSION['p_login'];
+		$idSaisie 	= $_SESSION['p_idSaisie'];
+		$tm 		= $_SESSION['p_tm_C'];
+		
+		$sql = 'call sp_p_maj_valeuracte_hospitalisation_newversion(?, ?, ?, ?, ?)';
+		
+		$this->executerRequete($sql, array($idPrestationactes, $valeurActe, $tm, $idSaisie, $user));
+	}	
+	*/
+
 }

Vue/Ajaxselectactesmedicauxobservation/index.php

@@ -6,9 +6,10 @@
 	
 	$datePrestation = $_SESSION['datePrestation'];
 	$codeActeGratuit = $_SESSION['p_codeActeConsultationGratuite'];
-?>
 
-Vue/Ajaxselectactesmedicauxobservation/index.php
+	$prixActeModifiable = $_SESSION['p_prixActeModifiable'];
+
+?>
 
 <INPUT class="sr-only" id="datePrestation" name="datePrestation" type="text" value="<?= datefr($datePrestation); ?>">
 
@@ -146,8 +147,7 @@ Vue/Ajaxselectactesmedicauxobservation/index.php
 			<th colspan="2" style="text-align:center"> <?= _("Acte")." (".count($obs).")" ?> </th>
 			<th width="5%" style="text-align:center"> <?= _("Accord") ?> </th>
 			<th style="text-align:center"> <?= _("PU") ?> </th>
-			<th width="5%" style="text-align:center"> <?= _("Qté") ?> </th>
+			<th width="5%" style="text-align:center"> <?= _("Qté") ?> </th>			
-			
 			<th style="text-align:center"> <?= _("PT") ?> </th>
 			<th style="text-align:center"> <?= _("TM") ?> </th>
 			<th style="text-align:center"> <?= _("Mt TM") ?> </th>
@@ -227,18 +227,24 @@ Vue/Ajaxselectactesmedicauxobservation/index.php
 					<?php endif; ?>
 					
 					<td align='center'> 
-						<button type="button" class="span_link" title="<?= _("Voir le tarif appliqué") ?>" onClick='javascript:tarif_applique("<?= $tarif ?>");'>
+						<?php if ($prixActeModifiable=="0" || $bonCaduc=="1" || $facture=="1" || $codeActe==$codeActeGratuit || $ententePrealable=='1'): ?>
-							<?= format_N($this->nettoyer($v['valeurActe'])) ?>
+							<button type="button" class="span_link" title="<?= _("Voir le tarif appliqué") ?>" onClick='javascript:tarif_applique("<?= $tarif ?>");'>
-						</button>
+								<?= format_N($this->nettoyer($v['valeurActe'])) ?>
+							</button>
+						<?php else: ?>	
+							<INPUT class="form-control" style='text-align:center; font-size:10pt;'  TYPE="number"  value="<?= $valeurActeManuel ?>" 
+							onChange="this.value=supprimer_espace_nombre(this.value);if(controle_numerique(this)){ajax_maj_prix_acte_hospitalisation('<?=$idPrestationactes?>', this.value, this);}">
+						<?php endif; ?>
+
 					</td>
 					
 					<?php if ($bonCaduc=="1" || $facture=="1" || $codeActe==$codeActeGratuit || $ententePrealable=='1'): ?>
-					<td align='center'> <?= format_N($this->nettoyer($v['quantite'])) ?></td>
+						<td align='center'> <?= format_N($this->nettoyer($v['quantite'])) ?></td>
 					<?php else: ?>
-					<td align='center'> 
+						<td align='center'> 
-						<INPUT style='text-align:center' class="form-control" TYPE="text" value="<?= $this->nettoyer($v['quantite'])  ?>"
+							<INPUT style='text-align:center' class="form-control" TYPE="text" value="<?= $this->nettoyer($v['quantite'])  ?>"
-						onBlur="ajax_maj_qte_acte_miseenobservation('<?=$idDetail?>', this.value, this);">
+							onBlur="ajax_maj_qte_acte_miseenobservation('<?=$idDetail?>', this.value, this);">
-					</td>
+						</td>
 					<?php endif; ?>
 					<td align='center'> <?= format_N($this->nettoyer($v['fraisReel'])) ?></td>
 					<td align='center'> <?= $this->nettoyer($v['tm'])?></td>

Vue/gabarit.php

@@ -908,7 +908,7 @@
     <!--<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.css" integrity="sha512-3pIirOrwegjM6erE5gPSwkUzO+3cTjpnV9lexlNZqvupR64iZBnOOTiiLPb9M36zpMScbmUNIcHUqKD47M719g==" crossorigin="anonymous" referrerpolicy="no-referrer" />-->
     <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.03.14.07"></script> 
+    <script src="Js/fonctions.js?ver=2026.03.15.00"></script> 
     <script src="Bootstrap/js/bootstrap.min.js"></script>
     
 	<script src="https://unpkg.com/vue@3/dist/vue.global.prod.js"></script>