diff --git a/Project/php/controller/StudentController.php b/Project/php/controller/StudentController.php index 2b5697a..a8eed32 100755 --- a/Project/php/controller/StudentController.php +++ b/Project/php/controller/StudentController.php @@ -36,12 +36,13 @@ class StudentController extends UserController echo $twig->render('manageVocabView.html', ['vocabularies' => $vocab]); } - public function memoryChoice(): void { + public function ListVocChoice(): void { global $twig; global $user; + $jeu = $_POST['jeu']; $model = new MdlStudent(); $voc = $model->getAll(); - echo $twig->render('vocabList.html', ['vocabularies' => $voc, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); + echo $twig->render('vocabList.html', ['jeu' => $jeu, 'vocabularies' => $voc, 'userID' => $user->getId(), 'userRole' => $user->getRoles()]); } public function gameChoice(): void { diff --git a/Project/php/templates/erreur.html b/Project/php/templates/erreur.html index ac7cb81..a3f9ccf 100755 --- a/Project/php/templates/erreur.html +++ b/Project/php/templates/erreur.html @@ -3,6 +3,7 @@ + Erreur diff --git a/Project/php/templates/gamesList.html b/Project/php/templates/gamesList.html index efe1cb9..ec4ac79 100755 --- a/Project/php/templates/gamesList.html +++ b/Project/php/templates/gamesList.html @@ -4,40 +4,49 @@ Users - - + table { + margin-top: 20px; + } + + {% include 'navBar.twig' %} -{% if vocabularies is defined %}
- {% for row in vocabularies %} + + + - {% endfor %}
-
- - + + + +
+
+
+ +
-{% endif %} - \ No newline at end of file + diff --git a/Project/php/templates/login.html b/Project/php/templates/login.html index 8326876..249104c 100755 --- a/Project/php/templates/login.html +++ b/Project/php/templates/login.html @@ -4,8 +4,10 @@ - + + + Login diff --git a/Project/php/templates/manageGroupView.html b/Project/php/templates/manageGroupView.html index 07e1fe5..fda30a5 100755 --- a/Project/php/templates/manageGroupView.html +++ b/Project/php/templates/manageGroupView.html @@ -6,7 +6,7 @@ - + diff --git a/Project/php/templates/manageVocabListView.html b/Project/php/templates/manageVocabListView.html index 0c2914d..3fa2584 100755 --- a/Project/php/templates/manageVocabListView.html +++ b/Project/php/templates/manageVocabListView.html @@ -6,7 +6,6 @@ - @@ -16,7 +15,7 @@ rel="stylesheet" /> - + @@ -28,7 +33,7 @@ {% for row in vocabularies %} -
+