Modification structure de données (BDD) + rectifications associées
This commit is contained in:
xdrm-brackets
parent
7ee26924e3
commit
86c643f9d6
|
|
@ -35,6 +35,13 @@ $notifNotifNum = 5;
|
||||||
</head>
|
</head>
|
||||||
<body><!-- CORPS DE LA PAGE -->
|
<body><!-- CORPS DE LA PAGE -->
|
||||||
|
|
||||||
|
<?php
|
||||||
|
if( $_SESSION['identifiant'] != null ){
|
||||||
|
echo "<input type='hidden' name='identifiant' value='".$_SESSION['identifiant']."'>";
|
||||||
|
echo "<input type='hidden' name='semestre' value='".$_SESSION['semestre']."' >";
|
||||||
|
echo "<input type='hidden' name='annee' value='".$_SESSION['annee']."' >";
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
|
||||||
<div id='DRAGNDROP'></div>
|
<div id='DRAGNDROP'></div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ class DataBase{
|
||||||
|
|
||||||
/* retourne une instance de la classe */
|
/* retourne une instance de la classe */
|
||||||
public static function getInstance(){
|
public static function getInstance(){
|
||||||
return new DataBase("localhost", "sid2", "root", "");
|
return new DataBase("localhost", "sid2", "php", "Qt358nUdyeTxLDM8");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1141,10 +1141,11 @@ class DataBase{
|
||||||
|
|
||||||
|
|
||||||
// si on a l'UID utilisateur & l'UID groupe => on récupère les modules
|
// si on a l'UID utilisateur & l'UID groupe => on récupère les modules
|
||||||
$getModuleList = $this->pdo->prepare("SELECT m.nom as module, m.libelle as modulelib, note.intitule, note.valeur, note.base, note.coefficient ".
|
$getModuleList = $this->pdo->prepare("SELECT m.nom as module, m.libelle as modulelib, ctrl.intitule, note.valeur, ctrl.base, ctrl.coefficient ".
|
||||||
"FROM note, appartenance as app, semestre as s, module as m, mcc_ue, mcc_module as mcc_m ".
|
"FROM note, appartenance as app, semestre as s, module as m, mcc_ue, mcc_module as mcc_m, controle as ctrl ".
|
||||||
"WHERE note.id_appartenance = app.id_appartenance ".
|
"WHERE note.id_appartenance = app.id_appartenance ".
|
||||||
"AND note.id_mcc_module = mcc_m.id_mcc_module ".
|
"AND ctrl.id_controle = note.id_controle ".
|
||||||
|
"AND ctrl.id_mcc_module = mcc_m.id_mcc_module ".
|
||||||
|
|
||||||
"AND mcc_ue.id_semestre = app.id_semestre ".
|
"AND mcc_ue.id_semestre = app.id_semestre ".
|
||||||
"AND mcc_ue.id_semestre = s.id_semestre ".
|
"AND mcc_ue.id_semestre = s.id_semestre ".
|
||||||
|
|
@ -1156,7 +1157,7 @@ class DataBase{
|
||||||
"AND m.id_module = :moduleUID ".
|
"AND m.id_module = :moduleUID ".
|
||||||
"AND app.id_etudiant = :etudiantUID ".
|
"AND app.id_etudiant = :etudiantUID ".
|
||||||
"AND s.id_semestre = :semestreUID ".
|
"AND s.id_semestre = :semestreUID ".
|
||||||
"ORDER BY note.valeur, note.base ASC");
|
"ORDER BY ctrl.date_publication ASC");
|
||||||
$getModuleList->execute(array(
|
$getModuleList->execute(array(
|
||||||
':moduleUID' => $moduleUID,
|
':moduleUID' => $moduleUID,
|
||||||
':etudiantUID' => $etudiantUID,
|
':etudiantUID' => $etudiantUID,
|
||||||
|
|
@ -1230,10 +1231,11 @@ class DataBase{
|
||||||
return 'unknown_UE';
|
return 'unknown_UE';
|
||||||
|
|
||||||
// si on a l'UID utilisateur & l'UID UE => on récupère les notes
|
// si on a l'UID utilisateur & l'UID UE => on récupère les notes
|
||||||
$getUEList = $this->pdo->prepare("SELECT m.nom as module, m.libelle as modulelib, note.intitule, note.valeur, note.base, note.coefficient ".
|
$getUEList = $this->pdo->prepare("SELECT m.nom as module, m.libelle as modulelib, ctrl.intitule, note.valeur, ctrl.base, ctrl.coefficient ".
|
||||||
"FROM note, appartenance as app, semestre as s, module as m, ue, mcc_ue, mcc_module as mcc_m ".
|
"FROM note, appartenance as app, semestre as s, module as m, ue, mcc_ue, mcc_module as mcc_m, controle as ctrl ".
|
||||||
"WHERE note.id_appartenance = app.id_appartenance ".
|
"WHERE note.id_appartenance = app.id_appartenance ".
|
||||||
"AND note.id_mcc_module = mcc_m.id_mcc_module ".
|
"AND ctrl.id_mcc_module = mcc_m.id_mcc_module ".
|
||||||
|
"AND ctrl.id_controle = note.id_controle ".
|
||||||
|
|
||||||
"AND mcc_ue.id_ue = ue.id_ue ".
|
"AND mcc_ue.id_ue = ue.id_ue ".
|
||||||
"AND mcc_ue.id_semestre = app.id_semestre ".
|
"AND mcc_ue.id_semestre = app.id_semestre ".
|
||||||
|
|
@ -1246,7 +1248,7 @@ class DataBase{
|
||||||
"AND ue.id_ue = :UEUID ".
|
"AND ue.id_ue = :UEUID ".
|
||||||
"AND app.id_etudiant = :etudiantUID ".
|
"AND app.id_etudiant = :etudiantUID ".
|
||||||
"AND s.id_semestre = :semestreUID ".
|
"AND s.id_semestre = :semestreUID ".
|
||||||
"ORDER BY m.nom, note.valeur, note.base ASC");
|
"ORDER BY m.nom, ctrl.date_publication ASC");
|
||||||
$getUEList->execute(array(
|
$getUEList->execute(array(
|
||||||
':UEUID' => $UEUID,
|
':UEUID' => $UEUID,
|
||||||
':etudiantUID' => $etudiantUID,
|
':etudiantUID' => $etudiantUID,
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ if( permission('student') ){ // si l'utilisateur est connecté et que c'est un
|
||||||
echo "<td><span class=link>".$note['module']." - ".$note['modulelib']."</span></td>";
|
echo "<td><span class=link>".$note['module']." - ".$note['modulelib']."</span></td>";
|
||||||
echo '<td><span class=unstressed>"</span>'.$note['intitule'].'<span class=unstressed>"</span></td>';
|
echo '<td><span class=unstressed>"</span>'.$note['intitule'].'<span class=unstressed>"</span></td>';
|
||||||
echo '<td>'.number_format($note['valeur'], 2).' <span class=unstressed>/</span> '.$note['base'].'</td>';
|
echo '<td>'.number_format($note['valeur'], 2).' <span class=unstressed>/</span> '.$note['base'].'</td>';
|
||||||
echo '<td>Coefficient '.$note['coefficient'].'</td>';
|
echo '<td>Coefficient '.number_format($note['coefficient'], 2).'</td>';
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
}
|
}
|
||||||
echo '</tbody>';
|
echo '</tbody>';
|
||||||
|
|
@ -112,7 +112,7 @@ if( permission('student') ){ // si l'utilisateur est connecté et que c'est un
|
||||||
echo "<td><span class=link>".$note['module']." - ".$note['modulelib']."</span></td>";
|
echo "<td><span class=link>".$note['module']." - ".$note['modulelib']."</span></td>";
|
||||||
echo '<td><span class=unstressed>"</span>'.$note['intitule'].'<span class=unstressed>"</span></td>';
|
echo '<td><span class=unstressed>"</span>'.$note['intitule'].'<span class=unstressed>"</span></td>';
|
||||||
echo '<td>'.number_format($note['valeur'], 2).' <span class=unstressed>/</span> '.$note['base'].'</td>';
|
echo '<td>'.number_format($note['valeur'], 2).' <span class=unstressed>/</span> '.$note['base'].'</td>';
|
||||||
echo '<td>'.$note['coefficient'].'</td>';
|
echo '<td>Coefficient '.number_format($note['coefficient'], 2).'</td>';
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
}
|
}
|
||||||
echo '</tbody>';
|
echo '</tbody>';
|
||||||
|
|
|
||||||
0
src/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
Normal file → Executable file
0
src/phpexcel/Classes/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
Normal file → Executable file
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue