diff --git a/manager/excel.php b/manager/excel.php index 93ec7d3..4ecfa67 100755 --- a/manager/excel.php +++ b/manager/excel.php @@ -512,7 +512,7 @@ class excelManager{ $jury = array(); // contiendra le tableau de retour - $mentionsPossibles = array('ADM', 'ADJ', 'RDB', 'RFS'); + $mentionsPossibles = array('ADM', 'ADJ', 'ATT', 'NAR', 'DEM', 'AJ'); /****************************/ /* TRAITEMENT SUR LES CASES */ diff --git a/page/_JS/career.js b/page/_JS/career.js index 3186f56..f49c958 100755 --- a/page/_JS/career.js +++ b/page/_JS/career.js @@ -617,6 +617,21 @@ if( publicationControles.length > 0 ){ var studentCase = document.querySelector('#CONTAINER > section[name=studentcase]'); if( studentCase != null ){ + // liens vers les contrôles + var controleLinks = document.querySelectorAll('#CONTAINER > section[name=studentcase] td span.link.ctrl[data-ctrl]'); + + // pour chaque lien, on créé l'évènement qui redirige sur le contrôle + for( var i = 0 ; i < controleLinks.length ; i++ ){ + + controleLinks[i].addEventListener('click', function(e){ + pageM.vars = ['allcontroles', 'c:'+e.target.dataset.ctrl]; + reload(); + }, false); + + } + + + // liens vers les semestres var semestreLinks = document.querySelectorAll('#CONTAINER > section[name=studentcase] .semestre_circle'); // pour chaque semestre, on créé l'évènement diff --git a/page/career.php b/page/career.php index c0b9fca..30f2db6 100755 --- a/page/career.php +++ b/page/career.php @@ -1108,7 +1108,7 @@ if( (permission('master') || permission('admin')) && $etudiantOpt != null ){ foreach($module['controles'] as $controle){ // pour chaque contrôle echo ''; - echo ''.$controle['libelle'].''; + echo "".$controle['libelle'].""; if( count($controle['notes']) == 0 ) // si aucune note pour ce controle on affiche 'Pas de note' echo 'Pas de note'; diff --git a/src/files/admin2_export_jury.xlsx b/src/files/admin2_export_jury.xlsx index fafef1f..a599ba1 100644 Binary files a/src/files/admin2_export_jury.xlsx and b/src/files/admin2_export_jury.xlsx differ diff --git a/src/files/admin2_import_jury.xlsx b/src/files/admin2_import_jury.xlsx index df45791..b2ad4a2 100755 Binary files a/src/files/admin2_import_jury.xlsx and b/src/files/admin2_import_jury.xlsx differ diff --git a/src/svg.php b/src/svg.php index d3729ff..23e2e9e 100755 --- a/src/svg.php +++ b/src/svg.php @@ -78,7 +78,7 @@ function displayParcours($parcours, $selected){ elseif( $val < 10 ) $themeColor = '#f59555'; else $themeColor = '#2dcc70'; }else // si pas de note, on met la couleur par défaut - $themeColor = '#000000'; + $themeColor = $normColor; // (1) nom du semestre echo "".$parcours[$i]['nom']."";