From 5b9d5283b21967db4f0f89088afd2dd3328b6868 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 5 Jan 2016 23:03:10 +0100
Subject: [PATCH] =?UTF-8?q?[x]=20Permettre=20d'ajouter=20un=20m=C3=AAme=20?=
 =?UTF-8?q?module=20pour=20un=20correcteur=20mais=20pour=20un=20autre=20se?=
 =?UTF-8?q?mestre=20(afficher=20dans=20le=20<select>)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/database.php | 1 -
 page/settings.php    | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/manager/database.php b/manager/database.php
index 66d7408..5a6df8d 100755
--- a/manager/database.php
+++ b/manager/database.php
@@ -863,7 +863,6 @@ class DataBase{
 
 		}
 
-
 		return $semestreList;
 	}
 
diff --git a/page/settings.php b/page/settings.php
index e76dae9..03e823b 100755
--- a/page/settings.php
+++ b/page/settings.php
@@ -186,7 +186,7 @@ if( permission('admin') ){
 				foreach($semestre['UElist'] as $UE){ if( $ueOpt == null || $UE['id'] == $ueOpt ){
 					// on définit la liste des modules en fonction de ça
 					foreach($UE['modules'] as $mod)
-						array_push( $completeModuleList, $mod );
+						array_push( $completeModuleList, array_merge($mod, ['id_semestre'=>$semestre['id']]) );
 				}}
 
 			}}
@@ -243,7 +243,7 @@ if( permission('admin') ){
 										}
 									echo "</td>";
 
-									array_push($userModulesUID, $module['id']);
+									array_push($userModulesUID, $module['id'].'-'.$semestre['id']);
 								}
 							}
 						}
@@ -254,7 +254,7 @@ if( permission('admin') ){
 					echo "<tr class='grayscale'>";
 						echo "<td><select name='modules'>";
 							if( count($completeModuleList) > 0 ){ // si au moins 1 module
-								foreach($completeModuleList as $MOD){ if( !in_array($MOD['id'], $userModulesUID) ){
+								foreach($completeModuleList as $MOD){ if( !in_array($MOD['id'].'-'.$MOD['id_semestre'], $userModulesUID) ){
 									echo "<option value='".$MOD['id_mcc_module']."'>".$MOD['nom']." - ".$MOD['libelle']."</option>";
 								}}
 							}else // si aucun module