From 23877ebfdbbfb4902619c0639128f3cffcc7e896 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Sun, 29 Nov 2015 22:13:37 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20du=20bug=20de=20phpexcel@import=5F?=
 =?UTF-8?q?mcc=20importe=20maintenant=20les=20UE/modules=20fusionn=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.php                         |   1 +
 manager/phpExcel.php              |  93 +++++++++++++++---------------
 src/files/modele_import_jury.xlsx | Bin
 src/files/modele_import_mcc.xlsx  | Bin 9169 -> 9131 bytes
 test.php                          |  39 +++++++------
 5 files changed, 70 insertions(+), 63 deletions(-)
 mode change 100644 => 100755 src/files/modele_import_jury.xlsx

diff --git a/index.php b/index.php
index 153ca43..199a976 100755
--- a/index.php
+++ b/index.php
@@ -13,6 +13,7 @@ $notifNotifNum = 5;
 		<title>Système d'Information du Département Informatique</title>
 
 		<!-- Informations de la page -->
+		<meta name='Content-Type' content='text/html; charset=utf-8'>
 		<meta charset='utf-8'>
 		<meta name='author'      content='Adrien MARQUES {xdrm}; Aurélien CLERAC; Adrien MARQUES {xdrm}; Cédric ELOUNDOU; Adrien MARQUES {xdrm}; Guillaume FAUVET; Adrien MARQUES {xdrm}'>
 		<meta name='desctiption' content="Système d'Information du Département Informatique"                        >
diff --git a/manager/phpExcel.php b/manager/phpExcel.php
index 3a4abc5..1fa6b90 100755
--- a/manager/phpExcel.php
+++ b/manager/phpExcel.php
@@ -336,8 +336,7 @@ function xlsx_switch_lvl1($request, $answer){
 			/* TRAITEMENT SUR LES CASES */
 			/****************************/
 			foreach($mccData as $line){
-
-				if( $line[0] != null ){
+				if( $line[6] != null ){ // uniquement les lignes non vides
 
 
 					/* [1] On récupère les données de l'UE, si les champs sont définis
@@ -360,52 +359,54 @@ function xlsx_switch_lvl1($request, $answer){
 							array_push($ueuid, $line[0]); // on dis qu'on a déjà enregistré l'ue
 						}
 
-						if( $line[0] != null )
-							$ueIndex = array_search($line[0], $ueuid);
-
-						/* [2] On récupère les données du module, si les champs sont définis
-						=========================================================================*/
-						if( /*$line[3] != null && */ $line[4] != null && $line[5] != null ){
-							
-							if( $line[3] != null && !in_array($line[3], $mcc[$ueIndex]['moduid']) ){ // on créé le module dans la liste de cet UE s'il n'y est pas déjà
-								array_push( // on ajoute l'UE
-									$mcc[$ueIndex]['modules'],
-									array(
-										'nom'         => $line[3],
-										'libelle'     => $line[4],
-										'coefficient' => $line[5],
-										'controles'   => array(),
-										'ctrluid'     => array()
-									)
-								);
-
-								array_push($mcc[$ueIndex]['moduid'], $line[3]); // on dis qu'on a déjà enregistré le module
-							}
-						}
-
-						if( $line[3] != null )
-							$modIndex = array_search($line[3], $mcc[$ueIndex]['moduid']);
-
-						/* [3] On récupère les contrôles du module, si les champs sont définis
-						=========================================================================*/
-						if( $line[6] != null && $line[7] != null && $line[8] != null ){
-							
-							if( !in_array($line[6], $mcc[$ueIndex]['modules'][$modIndex]['ctrluid']) ){ // on créé le contrôle dans la liste de ce module s'il n'y est pas déjà
-								array_push( // on ajoute l'UE
-									$mcc[$ueIndex]['modules'][$modIndex]['controles'],
-									array(
-										'nom'         => $line[6],
-										'libelle'     => $line[7],
-										'coefficient' => $line[8]
-									)
-								);
-
-								array_push($mcc[$ueIndex]['modules'][$modIndex]['ctrluid'], $line[6]); // on dis qu'on a déjà enregistré le module
-							}
-						}
-
 					}
+
+					if( $line[0] != null )
+						$ueIndex = array_search($line[0], $ueuid);
+
+					/* [2] On récupère les données du module, si les champs sont définis
+					=========================================================================*/
+					if( /*$line[3] != null && */ $line[4] != null && $line[5] != null ){
+						
+						if( $line[3] != null && !in_array($line[3], $mcc[$ueIndex]['moduid']) ){ // on créé le module dans la liste de cet UE s'il n'y est pas déjà
+							array_push( // on ajoute l'UE
+								$mcc[$ueIndex]['modules'],
+								array(
+									'nom'         => $line[3],
+									'libelle'     => $line[4],
+									'coefficient' => $line[5],
+									'controles'   => array(),
+									'ctrluid'     => array()
+								)
+							);
+
+							array_push($mcc[$ueIndex]['moduid'], $line[3]); // on dis qu'on a déjà enregistré le module
+						}
+					}
+
+					if( $line[3] != null )
+						$modIndex = array_search($line[3], $mcc[$ueIndex]['moduid']);
+
+					/* [3] On récupère les contrôles du module, si les champs sont définis
+					=========================================================================*/
+					if( $line[6] != null && $line[7] != null && $line[8] != null ){
+						
+						if( !in_array($line[6], $mcc[$ueIndex]['modules'][$modIndex]['ctrluid']) ){ // on créé le contrôle dans la liste de ce module s'il n'y est pas déjà
+							array_push( // on ajoute l'UE
+								$mcc[$ueIndex]['modules'][$modIndex]['controles'],
+								array(
+									'nom'         => $line[6],
+									'libelle'     => $line[7],
+									'coefficient' => $line[8]
+								)
+							);
+
+							array_push($mcc[$ueIndex]['modules'][$modIndex]['ctrluid'], $line[6]); // on dis qu'on a déjà enregistré le module
+						}
+					}
+
 				}
+
 			}
 
 			/* [4] Affinage des données, on supprime les données temporaires
diff --git a/src/files/modele_import_jury.xlsx b/src/files/modele_import_jury.xlsx
old mode 100644
new mode 100755
diff --git a/src/files/modele_import_mcc.xlsx b/src/files/modele_import_mcc.xlsx
index 5570669a3389d8b2356847c9c3364567c508125f..7c391af2a18ded33e187b3b4e85dba37f93af75c 100755
GIT binary patch
delta 6584
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

delta 6705
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
Rc@wdw1hTOc`hjm|{|AkETt)x@

diff --git a/test.php b/test.php
index 72ce93a..846ecbf 100755
--- a/test.php
+++ b/test.php
@@ -46,32 +46,37 @@ require_once __ROOT__.'/manager/security.php';
 
 debug();
 
-var_dump($_SESSION);
-
 // $_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';
 
-// $r1 = new stdClass(); $a1 = new stdClass();
-// $r1->level_1 = 'import_inscrits';
-// $r1->docPath = __ROOT__.'/src/files/modele_import_inscrits.xlsx';
+$_SESSION['identifiant'] = 'modele'; // afin de lire le fichier
 
-// xlsx_switch_lvl1($r1, $a1);
+$r1 = new stdClass(); $a1 = new stdClass();
+$r1->level_1 = 'import_mcc';
+
+xlsx_switch_lvl1($r1, $a1);
+
+if( $a1->request == 'success' ){
+
+	$mcc = $a1->mcc;
+		$ue11 = $mcc[0]; $ue11mods = $ue11['modules'];
+		$ue12 = $mcc[1]; $ue12mods = $ue12['modules'];
 
 
-// if( $a1->request == 'success' ){
+	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 );
+}