From f6d40ff90341c0e0c9ef3c9b3d148991920abf4e Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Tue, 1 Dec 2015 20:00:37 +0100 Subject: [PATCH] =?UTF-8?q?[x]=20Les=20contr=C3=B4les=20n=E2=80=99ayant=20?= =?UTF-8?q?pas=20encore=20de=20note=20doivent=20afficher=20"pas=20encore?= =?UTF-8?q?=20de=20note"=20[x]=20Enlever=20le=20nom=20du=20module=20=C3=A0?= =?UTF-8?q?=20l=E2=80=99affichage=20de=20chaque=20contr=C3=B4le=20car=20il?= =?UTF-8?q?=20est=20d=C3=A9j=C3=A0=20affich=C3=A9=20au=20dessus.=20[x]=20A?= =?UTF-8?q?fficher=20le=20poids=20des=20modules=20mais=20aussi=20des=20UEs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/repo/module.php | 6 +++--- manager/repo/ue.php | 6 +++--- page/career.php | 4 ++-- page/modules.php | 17 +++++++++++------ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/manager/repo/module.php b/manager/repo/module.php index 1b5bb94..3849c6c 100755 --- a/manager/repo/module.php +++ b/manager/repo/module.php @@ -58,7 +58,7 @@ class moduleRepo extends DBAccess{ */ public static function forStudent($UEUID, $semestre){ // on récupère les modules - $getModulesForStudent = DataBase::getPDO()->prepare("SELECT DISTINCT m.id_module as id, m.nom, m.libelle, mcc_m.id_mcc_module + $getModulesForStudent = DataBase::getPDO()->prepare("SELECT DISTINCT m.id_module as id, m.nom, m.libelle, mcc_m.id_mcc_module, mcc_m.coefficient FROM module as m, semestre as s, mcc_ue, mcc_module as mcc_m WHERE mcc_ue.id_semestre = s.id_semestre AND mcc_m.id_mcc_ue = mcc_ue.id_mcc_ue @@ -87,7 +87,7 @@ class moduleRepo extends DBAccess{ public static function forTeacher($enseignant, $UEUID, $semestre){ // on récupère les modules - $getModulesForTeacher = DataBase::getPDO()->prepare("SELECT DISTINCT m.id_module as id, m.nom, m.libelle, mcc_m.id_mcc_module + $getModulesForTeacher = DataBase::getPDO()->prepare("SELECT DISTINCT m.id_module as id, m.nom, m.libelle, mcc_m.id_mcc_module, mcc_m.coefficient FROM module as m, mcc_module as mcc_m, mcc_ue, enseignement as ens WHERE ens.id_mcc_module = mcc_m.id_mcc_module AND mcc_m.id_module = m.id_module @@ -116,7 +116,7 @@ class moduleRepo extends DBAccess{ */ public static function forYear($UEUID, $semestre){ // on récupère les modules - $getModulesForYear = DataBase::getPDO()->prepare("SELECT DISTINCT m.id_module as id, m.nom, m.libelle, mcc_m.id_mcc_module + $getModulesForYear = DataBase::getPDO()->prepare("SELECT DISTINCT m.id_module as id, m.nom, m.libelle, mcc_m.id_mcc_module, mcc_m.coefficient FROM module as m, mcc_module as mcc_m, mcc_ue, semestre as s WHERE m.id_module = mcc_m.id_module AND mcc_m.id_mcc_ue = mcc_ue.id_mcc_ue diff --git a/manager/repo/ue.php b/manager/repo/ue.php index 378c99f..1e9b9e8 100755 --- a/manager/repo/ue.php +++ b/manager/repo/ue.php @@ -57,7 +57,7 @@ class ueRepo extends DBAccess{ */ public static function forStudent($etudiant, $semestre){ // on récupère les modules - $getUesForStudent = DataBase::getPDO()->prepare("SELECT DISTINCT ue.id_ue as id, s.id_semestre, s.nom as semestre, s.annee, ue.nom, ue.libelle + $getUesForStudent = DataBase::getPDO()->prepare("SELECT DISTINCT ue.id_ue as id, s.id_semestre, s.nom as semestre, s.annee, ue.nom, ue.libelle, mcc_ue.coefficient FROM appartenance as app, semestre as s, mcc_ue, ue WHERE app.id_semestre = s.id_semestre AND mcc_ue.id_semestre = s.id_semestre @@ -83,7 +83,7 @@ class ueRepo extends DBAccess{ */ public static function forTeacher($enseignant, $semestre){ // on récupère les modules - $getUesForTeacher = DataBase::getPDO()->prepare("SELECT DISTINCT ue.id_ue as id, s.id_semestre, s.nom as semestre, s.annee, ue.nom, ue.libelle + $getUesForTeacher = DataBase::getPDO()->prepare("SELECT DISTINCT ue.id_ue as id, s.id_semestre, s.nom as semestre, s.annee, ue.nom, ue.libelle, mcc_ue.coefficient FROM enseignement as ens, semestre as s, ue, mcc_ue, mcc_module as mcc_m WHERE ens.id_mcc_module = mcc_m.id_mcc_module AND ens.correcteur = 1 @@ -112,7 +112,7 @@ class ueRepo extends DBAccess{ */ public static function forYear($semestre){ // on récupère les modules - $getUEList = DataBase::getPDO()->prepare("SELECT DISTINCT ue.id_ue as id, s.id_semestre, s.nom as semestre, s.annee, ue.nom, ue.libelle + $getUEList = DataBase::getPDO()->prepare("SELECT DISTINCT ue.id_ue as id, s.id_semestre, s.nom as semestre, s.annee, ue.nom, ue.libelle, mcc_ue.coefficient FROM ue, mcc_ue, semestre as s WHERE ue.id_ue = mcc_ue.id_ue AND mcc_ue.id_semestre = s.id_semestre diff --git a/page/career.php b/page/career.php index ee4f801..ecefe33 100755 --- a/page/career.php +++ b/page/career.php @@ -109,11 +109,11 @@ if( permission('student') ){ // si l'utilisateur est connecté et que c'est un echo ''.$controle['libelle'].''; if( $controle['publication'] == '0' || count($controle['notes']) == 0 ) // si aucune note pour ce controle on affiche 'Pas de note' - echo 'Pas de note'; + echo 'Pas encore de note'; else // si une note, alors on l'affiche echo ''.number_format($controle['notes'][0]['valeur'], 2).' / '.$controle['base'].''; - echo "".$module['nom']." - ".$module['libelle'].""; + echo "".$UE['nom']." - ".$UE['libelle'].""; echo 'Coefficient '.number_format($controle['coefficient'], 2).''; echo ''; } diff --git a/page/modules.php b/page/modules.php index 1e70ea3..9c74d6f 100755 --- a/page/modules.php +++ b/page/modules.php @@ -66,6 +66,7 @@ if( permission('student') ){ // si l'utilisateur est connecté et que c'est un modules_switch_level_1($request, $answer); + if( $answer->request == 'success' ){ // si on a bien récupéré les membres du groupe //////////////////////////////////////////////////////////////////////////////// echo "
"; @@ -94,8 +95,10 @@ if( permission('student') ){ // si l'utilisateur est connecté et que c'est un echo ''; foreach($UE['modules'] as $MODULE){ echo ''; - echo ''.$MODULE['nom'].''; - echo ''.$MODULE['libelle'].''; + echo ''.$MODULE['nom'].' - '.$MODULE['libelle'].''; + echo 'Coefficient '.$MODULE['coefficient'].''; + echo ''.$UE['nom'].' - '.$UE['libelle'].''; + echo 'Coefficient '.$UE['coefficient'].''; echo ''; } @@ -258,9 +261,10 @@ if( permission('teacher') ){ // si l'utilisateur est un prof echo ''; foreach($UE['modules'] as $MODULE){ echo ''; - echo ''.$MODULE['nom'].''; - echo ''.$MODULE['libelle'].''; + echo ''.$MODULE['nom'].' - '.$MODULE['libelle'].''; + echo 'Coefficient '.$MODULE['coefficient'].''; echo ''.$UE['nom'].' - '.$UE['libelle'].''; + echo 'Coefficient '.$UE['coefficient'].''; echo ''; } @@ -436,9 +440,10 @@ if( permission('master') || permission('admin') ){ // si l'utilisateur est un ad echo ''; foreach($UE['modules'] as $MODULE){ echo ''; - echo ''.$MODULE['nom'].''; - echo ''.$MODULE['libelle'].''; + echo ''.$MODULE['nom'].' - '.$MODULE['libelle'].''; + echo 'Coefficient '.$MODULE['coefficient'].''; echo ''.$UE['nom'].' - '.$UE['libelle'].''; + echo 'Coefficient '.$UE['coefficient'].''; echo ''; }