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 ""; - array_push($userModulesUID, $module['id']); + array_push($userModulesUID, $module['id'].'-'.$semestre['id']); } } } @@ -254,7 +254,7 @@ if( permission('admin') ){ echo "