diff --git a/Controleur/ControleurPrestataires.php b/Controleur/ControleurPrestataires.php index 3c88847..052da5a 100755 --- a/Controleur/ControleurPrestataires.php +++ b/Controleur/ControleurPrestataires.php @@ -1,11 +1,9 @@ menuvue = new Menuvueutilisateur(); $this->menuvue->getMenuVue("Prestataires"); @@ -40,7 +39,7 @@ class ControleurPrestataires extends Controleur // $typeprestataire = $this->typeprestataire->getListeTous(); $typeprestataire = $this->typeprestataire->getListeReseau(); - // $reseausoins = $this->reseausoins->getReseausoinsFamille(); + $reseausoins = $this->reseausoins->getListe(); // $codeReseau = $this->reseausoins->getReseauFamille(); @@ -56,7 +55,7 @@ class ControleurPrestataires extends Controleur 'ville' => $ville, 'listelocalite' => $localite, 'typeprestataire' => $typeprestataire, - // 'reseausoins' => $reseausoins, + 'reseausoins' => $reseausoins // 'codeReseau' => $codeReseau ) ); diff --git a/Modele/Reseausoins.php b/Modele/Reseausoins.php index 82fc4b4..0f39ccf 100755 --- a/Modele/Reseausoins.php +++ b/Modele/Reseausoins.php @@ -55,12 +55,21 @@ class Reseausoins extends Modele { public function getListe() { - $sql = 'SELECT codeReseau as code, libelle FROM reseausoins WHERE (codeSociete=?) - AND (typeSysteme != "1") AND (actif = "1") order by libelle'; + if (est_anglophone()) + { + $sql = 'SELECT codeReseau as `code`, libelleEng as libelle FROM reseausoins WHERE (codeSociete=?) + AND (typeSysteme != "1") AND (actif = "1") order by libelle'; + } + else + { + $sql = 'SELECT codeReseau as `code`, libelle FROM reseausoins WHERE (codeSociete=?) + AND (typeSysteme != "1") AND (actif = "1") order by libelle'; + } $liste = $this->executerRequete($sql,array($_SESSION['codeSociete'])); + return $liste->fetchAll(PDO::FETCH_ASSOC); - } + } public function getReseausoinsFamille() { diff --git a/Vue/Prestataires/index.php b/Vue/Prestataires/index.php index dfffc20..7a10481 100755 --- a/Vue/Prestataires/index.php +++ b/Vue/Prestataires/index.php @@ -1,222 +1,174 @@ titre = "Intersanté - Réseau de soins"; ?> -