diff --git a/Modele/Garantiesbaremepriseencharge.php b/Modele/Garantiesbaremepriseencharge.php index 8962def0..935e3a85 100755 --- a/Modele/Garantiesbaremepriseencharge.php +++ b/Modele/Garantiesbaremepriseencharge.php @@ -747,13 +747,8 @@ class Garantiesbaremepriseencharge extends Modele { public function getActesGarantieBaremeInitial($idBaremePriseEnCharge,$codeGarantie) { - - $sql = "SELECT a.*, b.libelle, b.libelleEng - FROM actesbaremeinitial a - JOIN p_acte b ON (a.codeActe=b.codeActe) - WHERE a.codeGarantie = ? - AND a.idBaremePriseEnCharge = ? - ORDER BY b.libelle, a.dateEffet DESC, a.id desc;"; + $sql = "CALL sp_get_actes_garantie_bareme_initial(?, ?);"; + $resultat = $this->executerRequete($sql, array($codeGarantie,$idBaremePriseEnCharge)); diff --git a/Vue/Ajaxinsererbaremeacte/index.php b/Vue/Ajaxinsererbaremeacte/index.php index a65a49cd..34a80815 100755 --- a/Vue/Ajaxinsererbaremeacte/index.php +++ b/Vue/Ajaxinsererbaremeacte/index.php @@ -7,16 +7,16 @@ - - - - - + + + + + - - - - + + + + @@ -36,10 +36,21 @@ nettoyer($v['id']); - $supprime = $v['supprime']; - $libelle = est_anglophone() ? $this->nettoyer($v['libelleEng']) : $this->nettoyer($v['libelle']); - $isActif = ($this->nettoyer($v['actif']) == "1"); + $idActe = $this->nettoyer($v['id']); + $supprime = $v['supprime']; + $libelle = est_anglophone() ? $this->nettoyer($v['libelleEng']) : $this->nettoyer($v['libelle']); + $isActif = ($this->nettoyer($v['actif']) == "1"); + + $plafondFamille = ($this->nettoyer($v['forfaitPlafondFamille'])=="9999999999") ? _("Illimité"): format_N($this->nettoyer($v['forfaitPlafondFamille'])); + $transacFamille = ($this->nettoyer($v['nbreTransactionFamille'])=="999") ? _("Illimité"): format_N($this->nettoyer($v['nbreTransactionFamille'])); + + $plafond = ($this->nettoyer($v['forfaitPlafond'])=="9999999999") ? _("Illimité"): format_N($this->nettoyer($v['forfaitPlafond'])); + $transac = ($this->nettoyer($v['nbreTransaction'])=="999") ? _("Illimité"): format_N($this->nettoyer($v['nbreTransaction'])); + + $periodicitePlafondFamille = est_anglophone() ? $this->nettoyer($v['periodicitePlafondFamilleEng']) : $this->nettoyer($v['periodicitePlafondFamille']); + $periodiciteFamille = est_anglophone() ? $this->nettoyer($v['periodiciteFamilleEng']) : $this->nettoyer($v['periodiciteFamille']); + $periodicitePlafond = est_anglophone() ? $this->nettoyer($v['periodicitePlafondEng']) : $this->nettoyer($v['periodicitePlafond']); + $periodicite = est_anglophone() ? $this->nettoyer($v['periodiciteEng']) : $this->nettoyer($v['periodicite']); ?>