From 4ed2b3521ef79e6fd55b7b1df909b1dee845504c Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Mon, 30 Nov 2015 17:25:33 +0100 Subject: [PATCH] =?UTF-8?q?Correction=20des=20moyennes=20par=20modules,=20?= =?UTF-8?q?prise=20en=20compte=20des=20coefficients=20des=20contr=C3=B4les?= =?UTF-8?q?=20reste=20=C3=A0=20d=C3=A9ployer=20le=20reste=20des=20moyennes?= =?UTF-8?q?=20=C3=A0=20travers=20le=20MCC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/actionScript.js | 3 +++ manager/repo/note.php | 2 +- page/career.php | 15 +++++++++++++-- page/groups.php | 3 ++- page/modules.php | 5 ++++- src/files/admin2_import_inscrits.xlsx | Bin 0 -> 24511 bytes src/files/admin_import_mcc.xlsx | Bin 0 -> 9131 bytes svg.php | 4 ++-- test.php | 1 + 9 files changed, 26 insertions(+), 7 deletions(-) create mode 100755 src/files/admin2_import_inscrits.xlsx create mode 100755 src/files/admin_import_mcc.xlsx diff --git a/js/actionScript.js b/js/actionScript.js index ccd7ea5..1bd1b87 100755 --- a/js/actionScript.js +++ b/js/actionScript.js @@ -130,6 +130,9 @@ var connected = !( DOM.AUTH.children[0].innerHTML == 'Connexion' ); pageM.setPage( section.dataset.link ); /* on active les sous-parties */ + pageM.container.innerHTML = ''; + pageM.container.style.background= 'url(../src/loader.gif) center center no-repeat'; + pageM.container.style.backgroundSize= '100% auto'; pageM.xhr[pageM.xhr.length-1].addEventListener('load', function(){ // on récupère les sections du document diff --git a/manager/repo/note.php b/manager/repo/note.php index 2453de0..9e25fef 100755 --- a/manager/repo/note.php +++ b/manager/repo/note.php @@ -226,7 +226,7 @@ class noteRepo extends DBAccess{ * */ public static function moyenneModule($etudiant, $module, $semestre){ - $getMoyenneModule = DataBase::getPDO()->prepare("SELECT AVG(note.valeur) as moyenne, ctrl.base + $getMoyenneModule = DataBase::getPDO()->prepare("SELECT SUM(note.valeur*ctrl.coefficient)/SUM(ctrl.coefficient) as moyenne, ctrl.base FROM note, appartenance as app, controle as ctrl, mcc_module as mcc_m, mcc_ue, semestre as s WHERE note.id_controle = ctrl.id_controle AND ctrl.id_mcc_module = mcc_m.id_mcc_module diff --git a/page/career.php b/page/career.php index 405be61..c8a18ed 100755 --- a/page/career.php +++ b/page/career.php @@ -318,9 +318,9 @@ if( permission('teacher') && $controleOpt == null ){ // si c'est un enseignant e } //////////////////////////////////////////////////////////////////////////////// echo ''; - }else + }/*else echo "
Aucun contrôle trouvé
"; - + */ } @@ -861,6 +861,17 @@ if( (permission('master') || permission('admin')) && $etudiantOpt != null ){ $parcoursChart = array(); foreach($answer->parcours as $semestre) array_push($parcoursChart, array('id'=>$semestre['id'], 'nom' => $semestre['formation'].' '.$semestre['semestre']) ); + // $parcoursChart = array( + // array('id' => 1, 'nom' => 'ITINN1 - S1' ), + // array('id' => 2, 'nom' => 'ITINN1 - S2' ), + // array('id' => 1, 'nom' => 'ITINN1 - S1' ), + // array('id' => 2, 'nom' => 'ITINN1 - S2' ), + // array('id' => 1, 'nom' => 'ITINN2 - S3' ), + // array('id' => 1, 'nom' => 'ITINN2 - S4' ), + // array('id' => 1, 'nom' => 'ITINN2 - S3' ), + // array('id' => 1, 'nom' => 'ITINN2 - S4' ) + // ); + displayParcours( $parcoursChart ); // pour chaque semestres (tous si aucun semestreOpt, sinon uniquement le selectionné) diff --git a/page/groups.php b/page/groups.php index 7e9820f..2b7e0b9 100755 --- a/page/groups.php +++ b/page/groups.php @@ -342,8 +342,9 @@ if( permission('teacher') ){ // si l'utilisateur est connecté et que c'est un } echo ''; //////////////////////////////////////////////////////////////////////////////// - }else + }/*else echo "
Aucun groupe trouvé
"; + */ } ?> diff --git a/page/modules.php b/page/modules.php index bf0e4f2..eacc0e1 100755 --- a/page/modules.php +++ b/page/modules.php @@ -155,6 +155,7 @@ if( permission('teacher') ){ // si l'utilisateur est un prof //////////////////////////////////////////////////////////////////////////////// echo "
"; + /* ON RECUPERE UNE LISTE UNIQUE DES SEMESTRES */ $ListeUIDFormations = array(); $ListeUIDSemestres = array(); @@ -277,8 +278,10 @@ if( permission('teacher') ){ // si l'utilisateur est un prof echo "
Aucun module trouvé
"; //////////////////////////////////////////////////////////////////////////////// echo '
'; - }else + }/*else echo "
Aucun module trouvé
"; + */ + } ?> diff --git a/src/files/admin2_import_inscrits.xlsx b/src/files/admin2_import_inscrits.xlsx new file mode 100755 index 0000000000000000000000000000000000000000..bb8094e300700b58c37baa9de6c036b25ddf9cdb GIT binary patch literal 24511 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 literal 0 HcmV?d00001 diff --git a/src/files/admin_import_mcc.xlsx b/src/files/admin_import_mcc.xlsx new file mode 100755 index 0000000000000000000000000000000000000000..7c391af2a18ded33e187b3b4e85dba37f93af75c GIT binary patch literal 9131 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 literal 0 HcmV?d00001 diff --git a/svg.php b/svg.php index c795651..ddd9975 100644 --- a/svg.php +++ b/svg.php @@ -4,7 +4,7 @@ function displayParcours($parcours){ /* paramètres de texte */ - $lettrePixel = 10; // taille d'une lettre pour centrer le texte + $lettrePixel = 7; // taille d'une lettre pour centrer le texte $maxLettres = 0; foreach($parcours as $p) if( strlen($p['nom']) > $maxLettres ) $maxLettres = strlen($p['nom']); // on récupère le libellé le plus long @@ -16,7 +16,7 @@ function displayParcours($parcours){ // n = nombre d'éléments (points du parcours) // t = longueur du libellé le plus long - $m = 10; // marge de manoeuvre + $m = 30; // marge de manoeuvre $t = $maxLettres * $lettrePixel; // longueur du libellé le plus long (px) $n = count($parcours); // nombre d'élements du parcours $M = $m + $t/2; // taille de la marge diff --git a/test.php b/test.php index 5622478..93207a4 100755 --- a/test.php +++ b/test.php @@ -45,6 +45,7 @@ require_once __ROOT__.'/manager/security.php'; debug(); +$_SESSION['annee'] = 2019; // $_SESSION['annee'] = 2015;