Interface import/export MCC + création de semestre
This commit is contained in:
xdrm-brackets
parent
facc912144
commit
53f6db18cb
|
|
@ -24,6 +24,15 @@ span.stressed{ font-weight: bold; }
|
|||
|
||||
thead.normal > tr > th{ font-weight: normal; }
|
||||
|
||||
|
||||
/* input dans import/export */
|
||||
div.p.center input{
|
||||
margin: .2em;
|
||||
padding: .8em;
|
||||
border-radius: 3px;
|
||||
border: 1px solid #989898
|
||||
}
|
||||
|
||||
/*************************/
|
||||
/*** TITLE PERSONALISÉ ***/
|
||||
/*************************/
|
||||
|
|
@ -216,7 +225,8 @@ select{
|
|||
}
|
||||
|
||||
/* select grisé => selection modules existants par exemple */
|
||||
tr.grayscale select{
|
||||
tr.grayscale select,
|
||||
select.grayscale{
|
||||
border-color: #bdbdbd;
|
||||
background-image: url(../src/expand@grayscale.svg);
|
||||
color: #4e4e4e;
|
||||
|
|
|
|||
|
|
@ -82,4 +82,15 @@ for( var i = 0 ; i < selectList.length ; i++ ){
|
|||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* LIEN VERS LA PAGE "CREER UN SEMESTRE" */
|
||||
var creerSemestre = document.getElementById('creer_semestre');
|
||||
creerSemestre.addEventListener('click', function(e){
|
||||
|
||||
pageM.vars[0] = 'createsemestre';
|
||||
reload();
|
||||
|
||||
}, false);
|
||||
|
||||
-->
|
||||
148
page/modules.php
148
page/modules.php
|
|
@ -493,11 +493,11 @@ if( permission('admin') ){ // si l'utilisateur est un admin
|
|||
|
||||
|
||||
|
||||
function anneeScolaire($year){ return $year.' - '.($year+1); }
|
||||
|
||||
|
||||
|
||||
if( permission('admin') ){
|
||||
function anneeScolaire($year){ return $year.' - '.($year+1); }
|
||||
// require_once __ROOT__.'/manager/phpExcel.php';
|
||||
// require_once __ROOT__.'/manager/database.php';
|
||||
|
||||
|
|
@ -554,7 +554,7 @@ function anneeScolaire($year){ return $year.' - '.($year+1); }
|
|||
/*************************/
|
||||
/* AFFINAGE PAR SEMESTRE */
|
||||
/*************************/
|
||||
foreach($answer->yearList as $annee){ if( $anneeOpt == $annee['annee'] ){ // on récupère la liste des ids
|
||||
foreach($answer->yearList as $annee){ if( in_array($annee['annee'], $anneesListe) ){ // on récupère la liste des ids
|
||||
foreach($annee['semestres'] as $semestre){ if( !in_array($semestre['id'], $semestresListe) ){
|
||||
array_push($semestresListe, $semestre['id']);
|
||||
}}
|
||||
|
|
@ -563,35 +563,45 @@ function anneeScolaire($year){ return $year.' - '.($year+1); }
|
|||
// si semestreOpt n'est pas cohérent (pas pour cette année)
|
||||
if( !in_array($semestreOpt, $semestresListe) ) $semestreOpt = null;
|
||||
|
||||
echo "<div class='partlist' name='semestre'>";
|
||||
if( $semestreOpt == null ) echo "<span data-stre='*' class='active'>Tous</span>";
|
||||
else echo "<span data-stre='*'>Tous</span>";
|
||||
|
||||
$count = 0;
|
||||
echo "<div class='partlist' name='semestre'>";
|
||||
/* On récupère la liste des SEMESTRES en accord avec l'ANNEE sélectionnée */
|
||||
foreach($answer->yearList as $annee){ if( $anneeOpt == $annee['annee'] ){
|
||||
foreach($annee['semestres'] as $semestre){ if( in_array($semestre['id'], $semestresListe) ){
|
||||
$count++;
|
||||
|
||||
if( $semestreOpt == null ) $semestreOpt = $semestre['id'];
|
||||
|
||||
if( $semestre['id'] == $semestreOpt ) // si c'est le semestre séléctionné
|
||||
echo "<span data-year='".$annee['annee']."' data-stre='".$semestre['id']."' class='active'>".$semestre['formation']." - ".$semestre['nom'].'</span>';
|
||||
else // sinon on affiche normalement
|
||||
echo "<span data-year='".$annee['annee']."' data-stre='".$semestre['id']."'>".$semestre['formation']." - ".$semestre['nom'].'</span>';
|
||||
|
||||
}}
|
||||
}}
|
||||
echo "</div><br><br>";
|
||||
|
||||
|
||||
// si on a selectionné un semestre
|
||||
if( $semestreOpt != null )
|
||||
foreach($answer->yearList as $annee){ if( $anneeOpt == $annee['annee'] ){ foreach($annee['semestres'] as $semestre){ if( $semestreOpt == $semestre['id'] ){
|
||||
echo "<span class='unstressed'>".$semestre['nb_etudiants']." étudiants</span><br><br>";
|
||||
}}}}
|
||||
else{ // si on a selectionné "Tous"
|
||||
$nbTotal = 0;
|
||||
foreach($answer->yearList as $annee){ if( $anneeOpt == $annee['annee'] ){ foreach($annee['semestres'] as $semestre){
|
||||
$nbTotal += $semestre['nb_etudiants'];
|
||||
}}}
|
||||
echo "<span class='unstressed'>".$nbTotal." étudiants</span><br><br>";
|
||||
if( $count == 0 ) // si on a trouvé aucun semestre
|
||||
echo "<span class='unstressed'>Aucun semestre pour cette année</span><br><br>";
|
||||
else{
|
||||
|
||||
// si on a selectionné un semestre
|
||||
if( $semestreOpt != null )
|
||||
foreach($answer->yearList as $annee){ if( $anneeOpt == $annee['annee'] ){ foreach($annee['semestres'] as $semestre){ if( $semestreOpt == $semestre['id'] ){
|
||||
echo "<span class='unstressed'>".$semestre['nb_etudiants']." étudiants</span><br><br>";
|
||||
}}}}
|
||||
else{ // si on a selectionné "Tous"
|
||||
$nbTotal = 0;
|
||||
foreach($answer->yearList as $annee){ if( $anneeOpt == $annee['annee'] ){ foreach($annee['semestres'] as $semestre){
|
||||
$nbTotal += $semestre['nb_etudiants'];
|
||||
}}}
|
||||
echo "<span class='unstressed'>".$nbTotal." étudiants</span><br><br>";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
echo "<div data-year='".$anneeOpt."' data-stre='".$semestreOpt."' class='confirm active center'>Générer le fichier</div>";
|
||||
|
|
@ -600,10 +610,6 @@ function anneeScolaire($year){ return $year.' - '.($year+1); }
|
|||
|
||||
echo "</div>";
|
||||
|
||||
}else
|
||||
echo "<p>Erreur interne</p>";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -625,15 +631,14 @@ function anneeScolaire($year){ return $year.' - '.($year+1); }
|
|||
|
||||
// if( $answer->request == 'success' ){ // si pas d'erreur
|
||||
echo "<div class='p center'>";
|
||||
|
||||
$anneesListe = array();
|
||||
|
||||
/**********************/
|
||||
/* AFFINAGE PAR ANNEE */
|
||||
/**********************/
|
||||
echo "Importation des MCC d'un semestre<br>";
|
||||
echo "<span style='font-size:.8em;'>(Fichier .xlsx suivant le modèle : <a href='".__ROOT__."/src/import_mcc.xlsx'>modèle de fichier</a>)</span><br>";
|
||||
|
||||
|
||||
/**********************/
|
||||
/**********************/
|
||||
/* AFFINAGE PAR ANNEE */
|
||||
|
||||
/* AFFINAGE POUR LES 5 ANNEES SUIVANTES */
|
||||
echo "<select name='annee'>";
|
||||
for($i = 0 ; $i < 5 ; $i++){
|
||||
|
|
@ -648,38 +653,111 @@ function anneeScolaire($year){ return $year.' - '.($year+1); }
|
|||
/*************************/
|
||||
/* AFFINAGE PAR SEMESTRE */
|
||||
/*************************/
|
||||
echo "<div class='partlist' name='semestre'>";
|
||||
if( $semestreOpt == null ) echo "<span data-stre='*' class='active'>Tous</span>";
|
||||
else echo "<span data-stre='*'>Tous</span>";
|
||||
|
||||
/* On récupère la liste des SEMESTRES en accord avec l'ANNEE sélectionnée */
|
||||
$count = 0;
|
||||
|
||||
foreach($answer->yearList as $annee){ if( $anneeOpt == $annee['annee'] ){
|
||||
$count++;
|
||||
|
||||
echo "<div class='partlist' name='semestre'>";
|
||||
foreach($annee['semestres'] as $semestre){ if( in_array($semestre['id'], $semestresListe) ){
|
||||
|
||||
if( $semestreOpt == null ) $semestreOpt = $semestre['id'];
|
||||
|
||||
if( $semestre['id'] == $semestreOpt ) // si c'est le semestre séléctionné
|
||||
echo "<span data-year='".$annee['annee']."' data-stre='".$semestre['id']."' class='active'>".$semestre['formation']." - ".$semestre['nom'].'</span>';
|
||||
else // sinon on affiche normalement
|
||||
echo "<span data-year='".$annee['annee']."' data-stre='".$semestre['id']."'>".$semestre['formation']." - ".$semestre['nom'].'</span>';
|
||||
|
||||
}}
|
||||
echo "</div><br><br>";
|
||||
}}
|
||||
echo "</div><br><br>";
|
||||
|
||||
if( $count == 0 )
|
||||
echo "<span class='link' id='creer_semestre'>Créer un semestre</span><br><br>";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
echo "<div data-year='".$anneeOpt."' class='confirm active center'>Importer les MCC</div>";
|
||||
|
||||
echo "</div>";
|
||||
|
||||
echo "</div>";
|
||||
}else
|
||||
echo "<div class='p center>Erreur interne...</div>";
|
||||
|
||||
|
||||
|
||||
// }else
|
||||
// echo "<p>Erreur interne</p>";
|
||||
|
||||
echo "<section>";
|
||||
echo "</section>";
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if( permission('admin') ){
|
||||
|
||||
echo "<section name='createsemestre' data-title='Créer un semestre'>";
|
||||
|
||||
echo "<div class='p center'>";
|
||||
|
||||
echo "<br>Création de semestre<br>";
|
||||
|
||||
/* CHOIX DE L'ANNEE */
|
||||
echo "<select name='annee' class='grayscale'>";
|
||||
for($i = 0 ; $i < 5 ; $i++)
|
||||
echo "<option value='".($_SESSION['annee']+$i)."'>".anneeScolaire($_SESSION['annee']+$i)."</option>";
|
||||
echo "</select><br>";
|
||||
|
||||
echo "<input type='text' placeholder='cursur, ex: ITINN1'><br>";
|
||||
echo "<input type='text' placeholder='libellé, ex: DUT INFORMATIQUE 1A'><br>";
|
||||
echo "<input type='text' placeholder='semestre, ex: S1'><br>";
|
||||
echo "<input type='number' min=0 max=6 step=1 placeholder='rang, ex: 1'><br>";
|
||||
|
||||
echo "<div class='confirm active center'>Créer le semestre</div>";
|
||||
|
||||
|
||||
|
||||
echo "</div>";
|
||||
|
||||
echo "</section>";
|
||||
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue