diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..1f1ae9b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/manager/conf*.json \ No newline at end of file diff --git a/manager/database.php b/manager/database.php index 0438585..1f7d2c0 100755 --- a/manager/database.php +++ b/manager/database.php @@ -38,12 +38,11 @@ class DataBase{ /* retourne une instance de la classe */ public static function getInstance(){ if( DataBase::$instance == null ){ - if( $_SERVER['HTTP_HOST'] == 'sid' ) // si co en local (xdrm) - DataBase::$instance = new DataBase("localhost", "sid2", "php", "Qt358nUdyeTxLDM8"); - else if( $_SERVER['HTTP_HOST'] == 'localhost' ) // si co en local (autres) - DataBase::$instance = new DataBase("localhost", "sid2", "root", ""); - else // si co en ligne - DataBase::$instance = new DataBase("mysql.hostinger.fr", "u712664263_sid", "u712664263_php", "Qt358nUdyeTxLDM8"); + + // chargement de la configuration du server SQL + $conf = json_decode(file_get_contents(__ROOT__.'/manager/conf.json'), true); + DataBase::$instance = new DataBase($conf['host'], $conf['dbname'], $conf['user'], $conf['password']); + } return DataBase::$instance; diff --git a/manager/index.php b/manager/index.php new file mode 100755 index 0000000..eff6aaf --- /dev/null +++ b/manager/index.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/manager/repo/index.php b/manager/repo/index.php new file mode 100755 index 0000000..0982349 --- /dev/null +++ b/manager/repo/index.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/page/career.php b/page/career.php index 271472b..bd10955 100755 --- a/page/career.php +++ b/page/career.php @@ -1118,6 +1118,8 @@ if( (permission('master') || permission('admin')) && $etudiantOpt != null ){ //////////////////////////////////////////////////////////////////////////////// echo "
"; + + // on récupère $semestreOpt original $semestreOpt = $semestreOptBis; @@ -1149,6 +1151,9 @@ if( (permission('master') || permission('admin')) && $etudiantOpt != null ){ /* ON GENERE LE DU PARCOURS */ displayParcours( $parcoursChart, $semestreOpt); + // echo "
Importer le dossier
"; + + // pour chaque semestres (tous si aucun semestreOpt, sinon uniquement le selectionné) foreach($answer->parcours as $semestre){ if( $semestreOpt == null || $semestreOpt == $semestre['id'] ){ diff --git a/page/groups.php b/page/groups.php index f14ce52..5e3942c 100755 --- a/page/groups.php +++ b/page/groups.php @@ -693,7 +693,6 @@ if( permission('master') || permission('admin') ){ echo ""; echo "
"; - // echo "
Importer une liste
"; echo "
Importer une liste
"; diff --git a/page/index.php b/page/index.php new file mode 100755 index 0000000..eff6aaf --- /dev/null +++ b/page/index.php @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/files/admin2_export_jury.xlsx b/src/files/admin2_export_jury.xlsx old mode 100644 new mode 100755 diff --git a/src/files/admin2_export_liste_etudiants.xlsx b/src/files/admin2_export_liste_etudiants.xlsx new file mode 100644 index 0000000..0fedb28 Binary files /dev/null and b/src/files/admin2_export_liste_etudiants.xlsx differ diff --git a/src/files/modele_import_notes.xlsx b/src/files/modele_import_notes.xlsx old mode 100644 new mode 100755 diff --git a/test.php b/test.php index 6c8ec92..0828f11 100755 --- a/test.php +++ b/test.php @@ -53,15 +53,18 @@ debug(); // 35 = UE1, // on veut que l'ue d'id 35 compte pour le semestre 252 et que les semestres de même rang et formation soient ignorés -$request = new stdClass; $answer = new stdClass; -$request->level_1 = 'capitaliser'; -$request->ue = 37; -$request->semestre = 276; -$request->etudiant = 'Etud100'; +/*******************************************************/ +// $request = new stdClass; $answer = new stdClass; +// $request->level_1 = 'capitaliser'; +// $request->ue = 37; +// $request->semestre = 276; +// $request->etudiant = 'Etud100'; -careerManager::switch_level_1($request, $answer); -var_dump( $answer ); +// careerManager::switch_level_1($request, $answer); +// var_dump( $answer ); +/*******************************************************/ +var_dump( $_SERVER['HTTP_HOST'] ); // $ts = time(); // $date1 = date('Y-m-d', $ts); // $date2 = date('Y-m-d', strtotime($date1.' - 1 year')); diff --git a/xdoc/MCD.png b/xdoc/MCD.png index 4a4fd30..e796996 100755 Binary files a/xdoc/MCD.png and b/xdoc/MCD.png differ diff --git a/xdoc/git.graph b/xdoc/git.graph old mode 100644 new mode 100755