diff --git a/Controleur/ControleurAjaxsituationproformahospit.php b/Controleur/ControleurAjaxsituationproformahospit.php index 0c6ce6c..999fdee 100755 --- a/Controleur/ControleurAjaxsituationproformahospit.php +++ b/Controleur/ControleurAjaxsituationproformahospit.php @@ -18,7 +18,8 @@ class ControleurAjaxsituationproformahospit extends Controleur { $codeActe = $this->requete->getParametreFormulaire("codeActe"); $datePrestation = $this->requete->getParametreDate("datePrestation"); - $idBeneficiaire = $this->requete->getParametreFormulaire("idBeneficiaire"); + // $idBeneficiaire = $this->requete->getParametreFormulaire("idBeneficiaire"); + $idBeneficiaire = $_SESSION['p_idBeneficiaire_C']; $codeGarantie = "HOS"; $this->garantie->getsourcebaremegarantienew($idBeneficiaire, $codeGarantie, $datePrestation); diff --git a/Controleur/ControleurAjaxstatutacte.php b/Controleur/ControleurAjaxstatutacte.php index 3328e1b..03394a4 100755 --- a/Controleur/ControleurAjaxstatutacte.php +++ b/Controleur/ControleurAjaxstatutacte.php @@ -53,7 +53,7 @@ class ControleurAjaxstatutacte extends Controleur { "codeGarantie_2" => $codeGarantie, ) ); - exit(); + // exit(); if($statut!="1"){ $motif = $this->garantie->getlibellemotifdepassement($statut); diff --git a/Js/fonctions.js b/Js/fonctions.js index 91049ce..2be970a 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -23213,8 +23213,6 @@ function getstatutacte(codeActe="") function isStatut(codeActe) { - - var myVar = ''; if(codeActe==""){ @@ -23225,7 +23223,6 @@ function isStatut(codeActe) donnee_a_affciher = ""; - if (codeActe<=" ") { v_msg="Veuillez s\u00e9lectionner un acte!"; @@ -26494,6 +26491,10 @@ function messageSituationProformaHospit(){ var estcouvert = $('#estcouvert').val(); var estsorti = $('#estsorti').val(); + alert("optionHospitalisation => "+optionHospitalisation); + alert("datePrestation => "+datePrestation); + alert("idBeneficiaire => "+idBeneficiaire); + if(optionHospitalisation == "option-1"){ codeActe = "HHM"; }else if (optionHospitalisation == "option-3"){ @@ -26518,11 +26519,59 @@ function messageSituationProformaHospit(){ return; } - alert("idBeneficiaire => "+idBeneficiaire); // ajax_beneficiaire_contexte(idBeneficiaire); + // getstatutactedate(codeActe, datePrestation); + // contenu de getstatutactedate + donnee_a_affciher = ""; + donnees = 'codeActe='+codeActe+'&datePrestation='+datePrestation; + donnees = charger_csrf_token(donnees); - getstatutactedate(codeActe, datePrestation); - + alert(donnees); + return; + + $.ajax({ + url: $("#racineWeb").val()+"Ajaxstatutacte/", + type : 'post', + data: donnees, + error: function(errorData) { + }, + success: function(data) { + donnee_a_affciher = data; + }, + complete: function() { + $("#div_statutacte").html(donnee_a_affciher); + + var statut = $("#statut").val(); + var libelleMotif = $("#libelleMotif").val(); + var libelleMotifEng = $("#libelleMotifEng").val(); + + faireDefileMessage(libelleMotif, libelleMotifEng); + + // var donnees = 'codeActe='+codeActe+'&datePrestation='+datePrestation+'&idBeneficiaire='+idBeneficiaire; + var donnees2 = 'codeActe='+codeActe+'&datePrestation='+datePrestation; + + alert("donnees Ajaxsituationproformahospit => "+donnees2); + + $("#div_reponse").html('
' + '
'); + + $.ajax({ + url: $("#racineWeb").val()+"Ajaxsituationproformahospit/", + type : 'post', + data: donnees2, + error: function(errorData) { + }, + success: function(data) + { + $("#div_reponse").html(data); + }, + complete: function(data) + { + } + }); + } + }); + +/* var donnees = 'codeActe='+codeActe+'&datePrestation='+datePrestation+'&idBeneficiaire='+idBeneficiaire; $("#div_reponse").html('
' + '
'); @@ -26541,6 +26590,7 @@ function messageSituationProformaHospit(){ { } }); +*/ } function ajaxbeneficiairecouvert(id)