diff --git a/Controleur/ControleurAjaxinsererbaremeactecollege.php b/Controleur/ControleurAjaxinsererbaremeactecollege.php index eef91bc9..1bbf1f5f 100755 --- a/Controleur/ControleurAjaxinsererbaremeactecollege.php +++ b/Controleur/ControleurAjaxinsererbaremeactecollege.php @@ -17,7 +17,7 @@ class ControleurAjaxinsererbaremeactecollege extends Controleur { $codeGarantie = $this->requete->getParametreFormulaire("codeGarantie"); $idBaremePriseEnCharge = $this->requete->getParametreFormulaire("idBaremePriseEnCharge"); - $actes = $this->garantie->getActesGarantieBareme($idBaremePriseEnCharge,$codeGarantie); + $actes = $this->garantie->getActesGarantieBareme($idBaremePriseEnCharge, $codeGarantie); $this->genererVueAjax(array ( diff --git a/Js/fonctions.js b/Js/fonctions.js index adf726ea..58f05357 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -62656,13 +62656,9 @@ function inserer_bareme_acte() function intit_saisie_actebareme() { $("#codeActe").selectpicker('val', ''); - - $("#codeActe").val(''); $("#searchInputActe").val(''); $("#zone").val(''); - - $("#dateEffetActe").val(""); $("#forfaitPlafondActeAdherent").val("0"); $("#codePeriodicitePlafondActeAdherent").val("A"); @@ -62672,17 +62668,13 @@ function intit_saisie_actebareme() $("#codePeriodicitePlafondActe").val("A"); $("#nbreTransactionActe").val("0"); $("#codePeriodiciteActe").val("A"); - //$("#codeObservationActe").val("VD"); $("#delaiCarenceActe").val("0"); - //$("#ticketModerateurActe").val("0"); $("#ageMinimumActe").val("0"); $("#ageMaximumActe").val("0"); $("#actifActe").val("1"); - $("#forfaitTmActe").val("0"); } - function actualiser_bareme_acte_lienparente() { codeGarantie = $("#codeGarantie").val(); @@ -76408,8 +76400,6 @@ function actualiser_bareme_acte_college() { codeGarantie = $("#codeGarantie").val(); idBaremePriseEnCharge = $("#idBaremePriseEnCharge").val(); - - donnees = 'codeGarantie='+codeGarantie; donnees += '&idBaremePriseEnCharge='+idBaremePriseEnCharge; @@ -76423,14 +76413,11 @@ function actualiser_bareme_acte_college() success: function(data) { //alert("Success : "+data); $('#div_actes_bareme').html(data); - - }, complete: function() { } }); - } diff --git a/Modele/Garantiesbaremepriseencharge.php b/Modele/Garantiesbaremepriseencharge.php index 3ffab06a..20b54250 100755 --- a/Modele/Garantiesbaremepriseencharge.php +++ b/Modele/Garantiesbaremepriseencharge.php @@ -1662,4 +1662,25 @@ class Garantiesbaremepriseencharge extends Modele { $this->executerRequete($sql, array($idCollege, $idCollegeTemp)); } + public function getLettreclesGarantieBaremeCollege($idBaremePriseEnCharge) + { + $idCollege = $_SESSION['idCollege']; + + $sql = 'CALL sp_afficher_lettre_cle_bareme_college(?, ?);'; + + $resultat = $this->executerRequete($sql, array($idBaremePriseEnCharge, $idCollege)); + + return $resultat->fetchAll(PDO::FETCH_ASSOC); + } + + public function getActesGarantieBaremeLettreCleDetailacteCollege($idActesbaremepriseenchargelettrecle) + { + // $sql = "call sp_afficher_lettre_cle_bareme_detail_actes_temp(?);"; + $sql = "call sp_afficher_lettre_cle_bareme_detail_actes_college(?);"; + + $resultat = $this->executerRequete($sql, array($idActesbaremepriseenchargelettrecle)); + + return $resultat->fetchAll(PDO::FETCH_ASSOC); + } + }