From 31b5fd6acb05ca8583f885533998cd0ef5453c7c Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 20 Nov 2015 09:58:40 +0100
Subject: [PATCH] =?UTF-8?q?admin@role=20retourne=20maintenant=20uniquement?=
 =?UTF-8?q?=20les=20non-=C3=A9l=C3=A8ves?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/database.php  |  4 ++--
 manager/repo/user.php | 13 +++++--------
 manager/user.php      |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/manager/database.php b/manager/database.php
index 814cae1..5a56bdb 100755
--- a/manager/database.php
+++ b/manager/database.php
@@ -143,8 +143,8 @@ class DataBase{
 	* @return enseignants<Array>		retourne la liste des enseignants de la bdd
 	*
 	*/
-	public static function listeEnseignants(){
-		return userRepo::getTeachers();
+	public static function listeUtilisateursRole(){
+		return userRepo::getRoleUsers();
 	}
 
 
diff --git a/manager/repo/user.php b/manager/repo/user.php
index 2e874ee..7fccd23 100755
--- a/manager/repo/user.php
+++ b/manager/repo/user.php
@@ -94,14 +94,11 @@ class userRepo extends DBAccess{
 	* @return FALSE<Boolean>			retourne FAUX si aucun résultat
 	*
 	*/
-	public static function getTeachers(){
-		$getListeEnseignants = DataBase::getPDO()->query("SELECT DISTINCT ens.id_enseignant as id, u.nom, u.prenom, m.id_module, m.nom as module 
-			FROM utilisateur as u, enseignement as ens, mcc_module as mcc_m, module as m
-			WHERE u.identifiant = ens.id_enseignant
-			AND   ens.id_mcc_module = mcc_m.id_mcc_module
-			AND   mcc_m.id_module = m.id_module
-			GROUP BY ens.id_enseignant
-			ORDER BY u.identifiant, m.nom ASC");
+	public static function getRoleUsers(){
+		$getListeEnseignants = DataBase::getPDO()->query("SELECT DISTINCT identifiant as id, nom, prenom
+			FROM utilisateur
+			WHERE droits <> 'student'
+			ORDER BY identifiant ASC");
 
 		return DataBase::delNumeric( $getListeEnseignants->fetchAll() );
 	}
diff --git a/manager/user.php b/manager/user.php
index b90dc70..6e206d1 100755
--- a/manager/user.php
+++ b/manager/user.php
@@ -99,7 +99,7 @@ require_once __ROOT__.'/manager/database.php';
 			/* liste des enseignants */
 			/*************************/
 			case 'getListeEnseignants': if( permission('admin') ){
-					$answer->userlist = DataBase::getInstance()->listeEnseignants();
+					$answer->userlist = DataBase::getInstance()->listeUtilisateursRole();
 					$answer->request = 'success';
 				}else
 					$answer->request = 'permission_error';