From 87def5505a48a736ad5dfb8a0ca5a38300f50a0f Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Sun, 29 Nov 2015 23:29:54 +0100
Subject: [PATCH] =?UTF-8?q?Premi=C3=A8re=20mise=20en=20beaut=C3=A9=20+=20?=
 =?UTF-8?q?=C3=A9v=C3=A8nement=20sur=20<svg>=20pour=20le=20dossier=20?=
 =?UTF-8?q?=C3=A9tudiant=20+=20d=C3=A9ploiement=20et=20impl=C3=A9mentation?=
 =?UTF-8?q?=20compl=C3=A8te=20de=20toutes=20les=20informations=20qui=20d?=
 =?UTF-8?q?=C3=A9coulent=20du=20parcours=20semestres>ues>modules>controles?=
 =?UTF-8?q?(+note)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/career.php               |  17 +++++---
 manager/database.php             |  30 +++++++++++++++
 manager/repo/semestre.php        |  23 +++++++++++
 page/_JS/career.js               |  35 +++++++++++++++++
 page/career.php                  |  64 ++++++++++++++++---------------
 src/files/admin2_import_mcc.xlsx | Bin 0 -> 9131 bytes
 svg.php                          |  22 +++++++++--
 test.php                         |  38 +++++++++---------
 8 files changed, 170 insertions(+), 59 deletions(-)
 create mode 100755 src/files/admin2_import_mcc.xlsx

diff --git a/manager/career.php b/manager/career.php
index 3d642d1..d212eb1 100755
--- a/manager/career.php
+++ b/manager/career.php
@@ -189,15 +189,20 @@ require_once __ROOT__.'/manager/database.php';
 			/**********************************************/
 			/* informations relatives au dossier étudiant */
 			/**********************************************/
-			case 'studentcase': if( permission('teacher') || permission('master') || permission('admin') ){
+			case 'studentcase': if( permission('master') || permission('admin') ){
 
-					$areSetParam = isset($request->etudiant) && isset($request->controle) && isset($request->note); // les arguments existent
-					$typeOkParam = $areSetParam && is_string($request->etudiant); // si c'est des strings
-					$nEmptyParam = $typeOkParam && strlen($request->etudiant) > 0 && is_numeric($request->controle) && is_numeric($request->note); // des bon types
-						$etudiantCheck = $nEmptyParam     && preg_match('/^[\w -]{3,50}$/i', $request->etudiant); // nom bon format
+					$areSetParam = isset($request->etudiant) ;                                                // les arguments existent
+					$typeOkParam = $areSetParam && is_string($request->etudiant);                             // si c'est des strings
+						$etudiantCheck = $typeOkParam && preg_match('/^[\w -]{3,50}$/i', $request->etudiant); // nom bon format
 					
 					if( $etudiantCheck ){ // si tout les paramètres sont bons
-						$answer->request = DataBase::getInstance()->saisieNote($request->etudiant, $request->controle, $request->note);
+						$parcours = DataBase::getInstance()->getParcoursEtudiant($request->etudiant);
+
+						if( is_array($parcours) ){
+							$answer->parcours = $parcours;
+							$answer->request = 'success';
+						}else
+							$answer->request = $parcours;
 					}else
 						$answer->request = 'param_error';
 
diff --git a/manager/database.php b/manager/database.php
index 631b903..b0b12e4 100755
--- a/manager/database.php
+++ b/manager/database.php
@@ -740,6 +740,36 @@ class DataBase{
 	}
 
 
+
+	/*************************************************/
+	/* retourne les informations du dossier étudiant */
+	/*************************************************/
+	public function getParcoursEtudiant($etudiant){
+		// on vérifie l'existence de l'étudiant
+		if( !($etudiantUID=userRepo::UID($etudiant)) ) return 'unknown_user';
+
+
+		$parcours = semestreRepo::getParcours($etudiantUID);
+		foreach($parcours as $iter_s=>$semestre){
+			$parcours[$iter_s]['UEs'] = ueRepo::forStudent($etudiantUID, $semestre['id']);
+
+			foreach($parcours[$iter_s]['UEs'] as $iter_ue=>$UE){
+				$parcours[$iter_s]['UEs'][$iter_ue]['modules'] = moduleRepo::forStudent($UE['id'], $semestre['id']);
+
+				foreach($parcours[$iter_s]['UEs'][$iter_ue]['modules'] as $iter_mod=>$MOD){
+					$parcours[$iter_s]['UEs'][$iter_ue]['modules'][$iter_mod]['controles'] = controleRepo::forStudent($MOD['id'], $semestre['id']);
+				
+					foreach($parcours[$iter_s]['UEs'][$iter_ue]['modules'][$iter_mod]['controles'] as $iter_ct=>$CONTROLE)
+						$parcours[$iter_s]['UEs'][$iter_ue]['modules'][$iter_mod]['controles'][$iter_ct]['notes'] = noteRepo::forStudent($etudiantUID, $CONTROLE['id']);
+				
+				}
+			} 
+		}
+
+		return $parcours;
+	}
+
+
 	/*******************************************/
 	/*** retourne les notes d'un enseignant  ***/
 	/*******************************************/
diff --git a/manager/repo/semestre.php b/manager/repo/semestre.php
index 6fad16c..2f7f9d5 100755
--- a/manager/repo/semestre.php
+++ b/manager/repo/semestre.php
@@ -231,6 +231,29 @@ class semestreRepo extends DBAccess{
 	}
 
 
+	/* retourne le parcours d'un étudiant sous forme d'un tableau de semestres
+	*
+	* @etudiant<String>					l'UID de l'étudiant en question
+	*
+	*
+	* @return semestres<Array>			retourne la liste des semestres du parcours de l'étudiant (ordre chronologique)
+	*
+	*/
+	public static function getParcours($etudiant){
+		$getSemestreListe = DataBase::getPDO()->prepare("SELECT DISTINCT s.id_semestre as id, f.id_formation, f.code, f.nom as formation, f.nb_semestres, s.nom as semestre, s.rang, s.annee
+			FROM formation as f, semestre as s, appartenance as app
+			WHERE s.id_formation = f.id_formation
+			AND   app.id_semestre = s.id_semestre
+			AND   app.id_etudiant = :etudiant
+			ORDER BY s.annee, s.rang");
+		$getSemestreListe->execute(array( ':etudiant' => $etudiant ));
+
+
+		return DataBase::delNumeric( $getSemestreListe->fetchAll() );
+	}
+
+
+
 
 	/* retourne la liste des semestres qu'à un enseignant
 	*
diff --git a/page/_JS/career.js b/page/_JS/career.js
index 881d88f..e208ce1 100755
--- a/page/_JS/career.js
+++ b/page/_JS/career.js
@@ -394,5 +394,40 @@ if( document.querySelector('#CONTAINER section[name=allcontroles]') != null ){ /
 
 
 
+/*******************************/
+/* GESTION DU DOSSIER ETUDIANT */
+/*******************************/
+var studentCase = document.querySelector('#CONTAINER > section[name=studentcase]');
+if( studentCase != null ){
+
+	var semestreLinks = document.querySelectorAll('#CONTAINER > section[name=studentcase] .semestre_circle');
+
+	// pour chaque semestre, on créé l'évènement
+	for( var i = 0 ; i < semestreLinks.length ; i++ ){
+
+		semestreLinks[i].addEventListener('click', function(e){
+			if( e.target.getAttribute('class') == 'semestre_circle' && e.target.getAttribute('data-stre') != null ){
+				console.log(e.target);
+				pageM.vars[2] = 's:'+e.target.getAttribute('data-stre');
+				reload();
+			}
+
+		}, false);
+
+	}
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
 
 -->
\ No newline at end of file
diff --git a/page/career.php b/page/career.php
index 6b94880..cc4af6e 100755
--- a/page/career.php
+++ b/page/career.php
@@ -849,11 +849,8 @@ if( (permission('master') || permission('admin')) && $etudiantOpt != null ){
 
 	$request = new stdClass(); $answer  = new stdClass();
 
-	$request->level_1 = 'getNotesEtudiant';
+	$request->level_1 = 'studentcase';
 	$request->etudiant = $etudiantOpt;
-	$request->formation = '1'; // ITINN1 2015
-	$request->semestre = '1';  // S1 ITINN1 2015
-	$request->annee    = $_SESSION['annee'];
 	
 	career_switch_level_1($request, $answer);
 
@@ -861,38 +858,45 @@ if( (permission('master') || permission('admin')) && $etudiantOpt != null ){
 	////////////////////////////////////////////////////////////////////////////////
 		echo "<section name='studentcase' data-title='Dossier étudiant' class='basic'>";
 
-		$parcours = array('ITINN1 S1', 'ITINN1 S2', 'ITINN2 S3', 'ITINN2 S4'); 
-		displayParcours( $parcours );
+		$parcoursChart = array(); 
+		foreach($answer->parcours as $semestre) array_push($parcoursChart, array('id'=>$semestre['id'], 'nom' => $semestre['formation'].' '.$semestre['semestre']) );
+
+		displayParcours( $parcoursChart );
 		
 
-		foreach($answer->UEs as $UE){ // pour chaque UE
-			echo "<table class='basic col4'>";
-			
-			echo "<thead><tr><th colspan=5 style='font-size:1.5em; text-align:center;'>".$UE['nom'].' - '.$UE['libelle'].'</th></tr>';
-			
-			echo '</thead></table>';
-			foreach($UE['modules'] as $module){  // pour chaque module
-				echo '<table class=basic><thead>';
-				echo '<tr><th colspan=5>'.$module['nom'].' - '.$module['libelle'].'</th></tr></thead><tbody>';
+		// pour chaque semestres (tous si aucun semestreOpt, sinon uniquement le selectionné)
+		foreach($answer->parcours as $semestre){ if( $semestreOpt == null || $semestreOpt == $semestre['id'] ){
 
-				foreach($module['controles'] as $controle){ // pour chaque contrôle
-					echo '<tr>';
-						echo '<td><span class=link>'.$controle['libelle'].'</span></td>';
+			foreach($semestre['UEs'] as $UE){ // pour chaque UE
+				echo "<table class='basic col4'>";
+				
+				echo "<thead><tr><th colspan=5 style='font-size:1.5em; text-align:center;'>".$UE['nom'].' - '.$UE['libelle'].'</th></tr>';
+				
+				echo '</thead></table>';
+				foreach($UE['modules'] as $module){  // pour chaque module
+					echo '<table class=basic><thead>';
+					echo '<tr><th colspan=5>'.$module['nom'].' - '.$module['libelle'].'</th></tr></thead><tbody>';
 
-						if( 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>';
-						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>Coefficient '.number_format($controle['coefficient'], 2).'</td>';
-					echo '</tr>';
+					foreach($module['controles'] as $controle){ // pour chaque contrôle
+						echo '<tr>';
+							echo '<td><span class=link>'.$controle['libelle'].'</span></td>';
+
+							if( 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>';
+							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>Coefficient '.number_format($controle['coefficient'], 2).'</td>';
+						echo '</tr>';
+					}
+					echo '</tbody>';
 				}
-				echo '</tbody>';
-			}
-			echo '</table>';
+				echo '</table>';
 
-		}
+			}
+
+		}}
 	////////////////////////////////////////////////////////////////////////////////
 		echo '</section>';
 	}else
diff --git a/src/files/admin2_import_mcc.xlsx b/src/files/admin2_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 fdfa572..e69d143 100644
--- a/svg.php
+++ b/svg.php
@@ -6,7 +6,7 @@ function displayParcours($parcours){
 	/* paramètres de texte */
 	$lettrePixel = 10;                               // taille d'une lettre pour centrer le texte
 	$maxLettres = 0;
-	foreach($parcours as $p) if( strlen($p) > $maxLettres ) $maxLettres = strlen($p); // on récupère le libellé le plus long
+	foreach($parcours as $p) if( strlen($p['nom']) > $maxLettres ) $maxLettres = strlen($p['nom']); // on récupère le libellé le plus long
 
 
 	/* calcul du positionnement */	
@@ -57,9 +57,9 @@ function displayParcours($parcours){
 		
 		// [3] points d'ancrages
 		for($i = 0 ; $i < $n ; $i++){
-			$ti = $lettrePixel * strlen( $parcours[$i] ); // longueur du texte actuel
-			echo "<text x='".($M+2*$M*$i - $ti/2)."' y='".$text['y']."' fill='".$themeColor."' style='font-family:Ubuntu;font-size:20px;'>".$parcours[$i]."</text>";
-			echo "<circle cx='".($M+2*$M*$i)."' cy='".$dot['y']."' r='".$dot['r']."' stroke='".$themeColor."' stroke-width='".(.8*$dot['r'])."' fill='#ecf0f1'/>";
+			$ti = $lettrePixel * strlen( $parcours[$i]['nom'] ); // longueur du texte actuel
+			echo "<text x='".($M+2*$M*$i - $ti/2)."' y='".$text['y']."' fill='".$themeColor."' style='font-family:Ubuntu;font-size:16px;'>".$parcours[$i]['nom']."</text>";
+			echo "<circle class='semestre_circle' data-stre='".$parcours[$i]['id']."' cx='".($M+2*$M*$i)."' cy='".$dot['y']."' r='".$dot['r']."' stroke='".$themeColor."' stroke-width='".(.8*$dot['r'])."' fill='#ecf0f1'/>";
 		}
 
 	echo "</svg>";
@@ -67,4 +67,18 @@ function displayParcours($parcours){
 	/* FIN DU SVG */
 	/**************/
 }
+
+
+
+
+
+// exemple
+// displayParcours(array(
+// 	array('id'=>1, 'nom'=>'S1'),
+// 	array('id'=>2, 'nom'=>'S2'),
+// 	array('id'=>3, 'nom'=>'S3'),
+// 	array('id'=>4, 'nom'=>'S4')
+// ));
+
+
 ?>
\ No newline at end of file
diff --git a/test.php b/test.php
index 846ecbf..5622478 100755
--- a/test.php
+++ b/test.php
@@ -48,35 +48,35 @@ debug();
 
 // $_SESSION['annee'] = 2015;
 
-require_once __ROOT__.'/manager/phpExcel.php';
-require_once __ROOT__.'/manager/groups.php';
+// require_once __ROOT__.'/manager/phpExcel.php';
+// require_once __ROOT__.'/manager/groups.php';
 
-$_SESSION['identifiant'] = 'modele'; // afin de lire le fichier
+// $_SESSION['identifiant'] = 'modele'; // afin de lire le fichier
 
-$r1 = new stdClass(); $a1 = new stdClass();
-$r1->level_1 = 'import_mcc';
+// $r1 = new stdClass(); $a1 = new stdClass();
+// $r1->level_1 = 'import_mcc';
 
-xlsx_switch_lvl1($r1, $a1);
+// xlsx_switch_lvl1($r1, $a1);
 
-if( $a1->request == 'success' ){
+// if( $a1->request == 'success' ){
 
-	$mcc = $a1->mcc;
-		$ue11 = $mcc[0]; $ue11mods = $ue11['modules'];
-		$ue12 = $mcc[1]; $ue12mods = $ue12['modules'];
+// 	$mcc = $a1->mcc;
+// 		$ue11 = $mcc[0]; $ue11mods = $ue11['modules'];
+// 		$ue12 = $mcc[1]; $ue12mods = $ue12['modules'];
 
 
-	var_dump( $ue11mods[0]['controles'] );
+// 	var_dump( $ue11mods[0]['controles'] );
 
-	// $r2 = new stdClass(); $a2 = new stdClass();
-	// $r2->level_1 = 'addUserlist';
-	// $r2->rang = 1;
-	// $r2->annee = 2018;
-	// $r2->formationList = $a1->formationList;
+// 	// $r2 = new stdClass(); $a2 = new stdClass();
+// 	// $r2->level_1 = 'addUserlist';
+// 	// $r2->rang = 1;
+// 	// $r2->annee = 2018;
+// 	// $r2->formationList = $a1->formationList;
 
-	// groups_switch_level_1($r2, $a2);
+// 	// groups_switch_level_1($r2, $a2);
 
-	// var_dump( $a2 );
-}
+// 	// var_dump( $a2 );
+// }