diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php index ed27fa94..1589095e 100644 --- a/WEB/Config/Config.php +++ b/WEB/Config/Config.php @@ -26,6 +26,7 @@ $vues['modifEnigmeSolo'] = 'View/src/pages/Admin/ModifEnigmeSolo.php'; $vues['adminSolo'] = 'View/src/pages/Admin/AdminSolo.php'; $vues['seeOrdre'] = 'View/src/pages/Admin/SeeOrdre.php'; $vues['modifOrdre'] = 'View/src/pages/Admin/ModifOrdre.php'; +$vues['partie'] = 'View/src/pages/Multijoueur/Partie.php'; // Enigme $vues['enigme'] = 'View/src/pages/Enigme/Palindrome.html'; $vues['enigmePage'] = 'View/src/pages/Enigme/EnigmePage.php'; diff --git a/WEB/Controller/AdminController.php b/WEB/Controller/AdminController.php index f56c6e0a..0d3d0168 100644 --- a/WEB/Controller/AdminController.php +++ b/WEB/Controller/AdminController.php @@ -90,6 +90,9 @@ class AdminController extends UserController case "deleteEnigme": $this->deleteEnigme(); break; + case "modifOrdre": + $this->modifOrdre(); + break; default: $error = "Action non valide"; require($rep . $vues['erreur']); @@ -242,6 +245,24 @@ class AdminController extends UserController require($rep . $vues['erreur']); } } + public function modifOrdre(){ + try{ + global $rep, $vues; + $model = new AdminModel(); + $lesOrdres = []; + $lesEnigmes=$model->getEnigmesSolo(); + foreach ($lesEnigmes as $enigme) { + $lesOrdres[] = array($enigme->getIdEnigme(),$_POST['ordre'.$enigme->getIdEnigme()]); + } + $model->modifOrdre($lesOrdres); + echo ''; + $this->goToSeeOrdre(); + } + catch (Exception $e) { + $error = $e->getMessage(); + require($rep . $vues['erreur']); + } + } public function addNewEnigmeSolo() { diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index 4199c5d7..a2c28017 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -49,11 +49,14 @@ class UserController $this->goToNext(); break; case "goToQueue": - $this->goToQueue()(); + $this->goToQueue(); break; case "logout": $this->logout(); break; + case "launchGame": + $this->launchGame(); + break; default: $error = "Action non valide"; require($rep . $vues['erreur']); @@ -202,11 +205,26 @@ class UserController //require($rep . $vues['Queue']); $model = new UserModel(); $model->addToQueue(); + echo + ''; } - public function AddUserToQueueEvent() + public function launchGame() { - $userGroup = $this->utilisateur_gateway->findUsersInQueue(); - if ($userGroup . count() >= 4) { - $this->utilisateur_gateway->launchGame(); - } + $this->utilisateur_gateway->launchGame($_SESSION['utilisateur']); } public function logout() diff --git a/WEB/View/src/pages/Admin/ModifOrdre.php b/WEB/View/src/pages/Admin/ModifOrdre.php index 550b03d6..e0aed53d 100644 --- a/WEB/View/src/pages/Admin/ModifOrdre.php +++ b/WEB/View/src/pages/Admin/ModifOrdre.php @@ -21,7 +21,7 @@