diff --git a/Controleur/ControleurAjaxinsererbaremegarantielienparente.php b/Controleur/ControleurAjaxinsererbaremegarantielienparente.php index 451a4dbc..8dabb845 100755 --- a/Controleur/ControleurAjaxinsererbaremegarantielienparente.php +++ b/Controleur/ControleurAjaxinsererbaremegarantielienparente.php @@ -22,7 +22,7 @@ class ControleurAjaxinsererbaremegarantielienparente extends Controleur { $this->genererVueAjax(array ( - 'garantielienparente' => $garantielienparente + 'garantielienparente' => $garantielienparente )); } diff --git a/Modele/Garantiesbaremepriseencharge.php b/Modele/Garantiesbaremepriseencharge.php index e1074d63..8962def0 100755 --- a/Modele/Garantiesbaremepriseencharge.php +++ b/Modele/Garantiesbaremepriseencharge.php @@ -840,11 +840,10 @@ class Garantiesbaremepriseencharge extends Modele { { $codeSociete = $_SESSION['codeSociete']; - $sql = "SELECT * FROM garantiesbaremeinitiallienparente WHERE codeSociete=? - AND idBaremePriseEnCharge=? AND codeGarantie=? ORDER BY codeLienParente, dateEffet DESC, id DESC;"; + $sql = "CALL sp_get_garantie_lien_parente_bareme_initial(?, ?, ?);"; + $resultat = $this->executerRequete($sql, array($codeSociete, $idBaremePriseEnCharge, $codeGarantie)); - return $resultat->fetchAll(PDO::FETCH_ASSOC); } diff --git a/Vue/Ajaxactesgarantiebareme/index.php b/Vue/Ajaxactesgarantiebareme/index.php index ab9d0a66..df3b399d 100755 --- a/Vue/Ajaxactesgarantiebareme/index.php +++ b/Vue/Ajaxactesgarantiebareme/index.php @@ -148,7 +148,7 @@
- +
@@ -319,7 +319,7 @@
- +
diff --git a/Vue/Ajaxinsererbaremegarantielienparente/index.php b/Vue/Ajaxinsererbaremegarantielienparente/index.php index 04a83c30..40ab1fa5 100755 --- a/Vue/Ajaxinsererbaremegarantielienparente/index.php +++ b/Vue/Ajaxinsererbaremegarantielienparente/index.php @@ -35,23 +35,30 @@ $idGarantie = $v['id']; $supprime = $v['supprime']; $isActif = ($this->nettoyer($v['actif']) == "1"); + + $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'])); + + $lienparente = est_anglophone() ? $this->nettoyer($v['lienparenteEng']) : $this->nettoyer($v['lienparente']); + $periodicitePlafond = est_anglophone() ? $this->nettoyer($v['periodicitePlafondEng']) : $this->nettoyer($v['periodicitePlafond']); + $periodicite = est_anglophone() ? $this->nettoyer($v['periodiciteEng']) : $this->nettoyer($v['periodicite']); ?> nettoyer($v['dateEffet'])); ?> - nettoyer($v['codeLienParente']);?> + - nettoyer($v['forfaitPlafond']));?> - nettoyer($v['codePeriodicitePlafond']);?> - nettoyer($v['nbreTransaction']);?> - nettoyer($v['codePeriodicite']); ?> + + + + nettoyer($v['codeTypeRemboursement']); ?> - nettoyer($v['delaiCarenceFamilleActe']);?> m + nettoyer($v['delaiCarenceFamilleActe']);?> nettoyer($v['ticketModerateur']);?> % nettoyer($v['forfaitTm']));?>