dut
/
sid
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[x] Les contrôles n’ayant pas encore de note doivent afficher "pas encore de note" 

[x] Enlever le nom du module à l’affichage de chaque contrôle car il est déjà affiché au dessus.
[x] Afficher le poids des modules mais aussi des UEs
This commit is contained in:
xdrm-brackets 2015-12-01 20:00:37 +01:00
parent f62e14c45a
commit f6d40ff903
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manager/repo/module.php
View File

@ -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

6
manager/repo/ue.php
View File

@ -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

4
page/career.php
View File

@ -109,11 +109,11 @@ if( permission('student') ){ // si l'utilisateur est connecté et que c'est un
echo '<td><span class=link>'.$controle['libelle'].'</span></td>';
if( $controle['publication'] == '0' || count($controle['notes']) == 0 ) // si aucune note pour ce controle on affiche 'Pas de note'
echo '<td><span class=unstressed>Pas de note</span></td>';
echo '<td><span class=unstressed>Pas encore de note</span></td>';
else // si une note, alors on l'affiche
echo '<td>'.number_format($controle['notes'][0]['valeur'], 2).' <span class=unstressed>/</span> '.$controle['base'].'</td>';
echo "<td>".$module['nom']." - ".$module['libelle']."</td>";
echo "<td>".$UE['nom']." - ".$UE['libelle']."</td>";
echo '<td>Coefficient '.number_format($controle['coefficient'], 2).'</td>';
echo '</tr>';
}

17
page/modules.php
View File

@ -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 "<section name='studentsmodules' data-title='Mes modules' class='basic'>";
@ -94,8 +95,10 @@ if( permission('student') ){ // si l'utilisateur est connecté et que c'est un
echo '<tbody>';
foreach($UE['modules'] as $MODULE){
echo '<tr>';
echo '<td>'.$MODULE['nom'].'</td>';
echo '<td>'.$MODULE['libelle'].'</td>';
echo '<td>'.$MODULE['nom'].' - '.$MODULE['libelle'].'</td>';
echo '<td>Coefficient <strong>'.$MODULE['coefficient'].'</strong></td>';
echo '<td>'.$UE['nom'].' - '.$UE['libelle'].'</td>';
echo '<td>Coefficient <strong>'.$UE['coefficient'].'</strong></td>';
echo '</tr>';
}
@ -258,9 +261,10 @@ if( permission('teacher') ){ // si l'utilisateur est un prof
echo '<tbody>';
foreach($UE['modules'] as $MODULE){
echo '<tr>';
echo '<td>'.$MODULE['nom'].'</td>';
echo '<td>'.$MODULE['libelle'].'</td>';
echo '<td>'.$MODULE['nom'].' - '.$MODULE['libelle'].'</td>';
echo '<td>Coefficient <strong>'.$MODULE['coefficient'].'</strong></td>';
echo '<td>'.$UE['nom'].' - '.$UE['libelle'].'</td>';
echo '<td>Coefficient <strong>'.$UE['coefficient'].'</strong></td>';
echo '</tr>';
}
@ -436,9 +440,10 @@ if( permission('master') || permission('admin') ){ // si l'utilisateur est un ad
echo '<tbody>';
foreach($UE['modules'] as $MODULE){
echo '<tr>';
echo '<td>'.$MODULE['nom'].'</td>';
echo '<td>'.$MODULE['libelle'].'</td>';
echo '<td>'.$MODULE['nom'].' - '.$MODULE['libelle'].'</td>';
echo '<td>Coefficient <strong>'.$MODULE['coefficient'].'</strong></td>';
echo '<td>'.$UE['nom'].' - '.$UE['libelle'].'</td>';
echo '<td>Coefficient <strong>'.$UE['coefficient'].'</strong></td>';
echo '</tr>';
}