diff --git a/Controleur/ControleurAjaxinsererbaremegarantie.php b/Controleur/ControleurAjaxinsererbaremegarantie.php index 0b549bd7..f998a255 100755 --- a/Controleur/ControleurAjaxinsererbaremegarantie.php +++ b/Controleur/ControleurAjaxinsererbaremegarantie.php @@ -4,7 +4,6 @@ require_once 'Modele/Garantiesbaremepriseencharge.php'; class ControleurAjaxinsererbaremegarantie extends Controleur { private $garantie; - public function __construct() { diff --git a/Modele/Garantiesbaremepriseencharge.php b/Modele/Garantiesbaremepriseencharge.php index 9bfe0bb1..000ac230 100755 --- a/Modele/Garantiesbaremepriseencharge.php +++ b/Modele/Garantiesbaremepriseencharge.php @@ -657,11 +657,10 @@ class Garantiesbaremepriseencharge extends Modele { { $codeSociete = $_SESSION['codeSociete']; - $sql = "SELECT * FROM garantiesbaremeinitial WHERE codeSociete=? - AND idBaremePriseEnCharge=? AND codeGarantie=? ORDER BY dateEffet DESC, id DESC;"; + $sql = 'call sp_get_garantiesbaremepriseenchargeinitial(?, ?, ?)'; + $resultat = $this->executerRequete($sql, array($codeSociete, $idBaremePriseEnCharge, $codeGarantie)); - - + return $resultat->fetchAll(PDO::FETCH_ASSOC); } @@ -670,11 +669,9 @@ class Garantiesbaremepriseencharge extends Modele { $codeSociete = $_SESSION['codeSociete']; $idCollege = $_SESSION['idCollege_C']; - $sql = "SELECT * FROM garantiesbaremepriseencharge WHERE codeSociete=? - AND idBaremePriseEnCharge=? AND codeGarantie=? - AND idCollege =? ORDER BY dateEffet DESC, id DESC;"; - $resultat = $this->executerRequete($sql, array($codeSociete, $idBaremePriseEnCharge, $codeGarantie, $idCollege)); - + $sql = 'call sp_get_garantiesbaremepriseencharge(?, ?, ?, ?)'; + + $resultat = $this->executerRequete($sql, array($codeSociete, $idCollege, $idBaremePriseEnCharge, $codeGarantie)); return $resultat->fetchAll(PDO::FETCH_ASSOC); } @@ -682,12 +679,10 @@ class Garantiesbaremepriseencharge extends Modele { public function getFamilleActeGarantieBaremeTemp($idBaremePriseEnCharge,$codeGarantie, $idCollegeTemp) { $codeSociete = $_SESSION['codeSociete']; - - $sql = "SELECT * FROM garantiesbaremepriseencharge_temp WHERE codeSociete=? - AND idBaremePriseEnCharge=? AND codeGarantie=? - AND idCollegeTemp =? ORDER BY dateEffet DESC, id DESC;"; - $resultat = $this->executerRequete($sql, array($codeSociete, $idBaremePriseEnCharge, $codeGarantie, $idCollegeTemp)); - + + $sql = 'call sp_get_garantiesbaremepriseencharge_temp(?, ?, ?)'; + + $resultat = $this->executerRequete($sql, array($idCollegeTemp, $idBaremePriseEnCharge, $codeGarantie)); return $resultat->fetchAll(PDO::FETCH_ASSOC); } @@ -892,6 +887,7 @@ class Garantiesbaremepriseencharge extends Modele { return $resultat->fetchAll(PDO::FETCH_ASSOC); } + // KANE 05/04/2026 public function getActesGarantieBaremeLienParente($idBaremePriseEnCharge, $codeGarantie) { $idCollege = $_SESSION['idCollege_C']; @@ -905,15 +901,9 @@ class Garantiesbaremepriseencharge extends Modele { public function getActesGarantieBaremeLienParenteTemp($idBaremePriseEnCharge,$codeGarantie,$idCollegeTemp) { - $sql = "SELECT a.*, b.libelle, b.libelleEng - FROM actesbaremepriseenchargelienparente_temp a - JOIN p_acte b ON (a.codeActe=b.codeActe) - WHERE a.codeGarantie = ? - AND a.idBaremePriseEnCharge = ? - AND a.idCollegeTemp = ? - ORDER BY codeLienParente, b.libelle, a.dateEffet DESC, a.id DESC;"; - $resultat = $this->executerRequete($sql, array($codeGarantie,$idBaremePriseEnCharge,$idCollegeTemp)); - + $sql = 'call sp_get_actesbaremepriseenchargelienparente_temp(?, ?, ?)'; + + $resultat = $this->executerRequete($sql, array($idCollegeTemp, $idBaremePriseEnCharge, $codeGarantie)); return $resultat->fetchAll(PDO::FETCH_ASSOC); }