diff --git a/Website/class/Administrator.php b/Website/classes/Administrator.php similarity index 95% rename from Website/class/Administrator.php rename to Website/classes/Administrator.php index cd6afb9..ec4364d 100644 --- a/Website/class/Administrator.php +++ b/Website/classes/Administrator.php @@ -1,5 +1,6 @@ mdChapter->getChapters(); echo $this->twig->render($this->vues["themeChoice"], [ 'chapters' => $chapters, @@ -125,12 +135,10 @@ class ControllerUser $difficultyIsOk = TRUE; $chapterIsOk = TRUE; if (!($difficulty == 1 or $difficulty == 2 or $difficulty == 3)) { - $_SESSION["error"] = "Valeur de difficulté invalide"; $difficultyIsOk = FALSE; } if ($this->mdChapter->verifyChapter($chapter) == NULL) { - $_SESSION["error"] = "Valeur de chapitre invalide"; $chapterIsOk = FALSE; } @@ -148,8 +156,13 @@ class ControllerUser 'answerss' => $_SESSION["Answers"], ]); } else { + $chapters = $this->mdChapter->getChapters(); $_SESSION["error"] = "Valeur de choix de thème invalide"; - header("Location:/themeChoice"); + echo $this->twig->render($this->vues["themeChoice"], [ + 'error' => $_SESSION["error"], + 'chapters' => $chapters, + ]); + $_SESSION["error"] = ""; } } @@ -159,14 +172,17 @@ class ControllerUser $_SESSION["CurrTime"] = new DateTime('now'); $answerNumber = $_POST["answer"]; $numQuestion = $_POST["numQuestion"]; - if (!($answerNumber == 0 or $answerNumber == 1 or $answerNumber == 2 or $answerNumber == 3)) { + if (!($answerNumber == 1 or $answerNumber == 2 or $answerNumber == 3 or $answerNumber == 4)) { $_SESSION["error"] = "Valeur de choix de réponse invalide"; echo $this->twig->render($this->vues["singleplayer"], [ 'questions' => $_SESSION["Questions"], 'numQuestion' => $numQuestion, 'answerss' => $_SESSION["Answers"], + 'error' => $_SESSION["error"], ]); + $_SESSION["error"] = ""; } else { + $answerNumber=$answerNumber-1; $answerContent = $_SESSION["Answers"][$numQuestion][$answerNumber]->getContent(); $_SESSION["playerAnswersContent"][$numQuestion] = $answerContent; if ($_SESSION["Questions"][$numQuestion]->getIdAnswerGood() == $_SESSION["Answers"][$numQuestion][$answerNumber]->getId()) { @@ -260,6 +276,7 @@ class ControllerUser $Final[$c]["PlayerAnswer"] = $answer; $c = $c + 1; } + $_SESSION["Score"] = (int)$_SESSION["Score"]; echo $this->twig->render($this->vues["viewScore"], [ 'score' => $_SESSION["Score"], 'Final' => $Final, diff --git a/Website/controllers/ControllerUserLobby.php b/Website/controllers/ControllerUserLobby.php index 7e81d03..4269698 100644 --- a/Website/controllers/ControllerUserLobby.php +++ b/Website/controllers/ControllerUserLobby.php @@ -1,5 +1,9 @@ false, ]); - -$controller = new FrontController(); +$controller = new controllers\FrontController(); diff --git a/Website/models/ModelAdministrator.php b/Website/models/ModelAdministrator.php index cde7618..5c83c66 100644 --- a/Website/models/ModelAdministrator.php +++ b/Website/models/ModelAdministrator.php @@ -1,5 +1,7 @@
{{ error }}
diff --git a/Website/templates/themeChoice.twig b/Website/templates/themeChoice.twig index 2bc6323..6c2a72d 100644 --- a/Website/templates/themeChoice.twig +++ b/Website/templates/themeChoice.twig @@ -35,6 +35,7 @@{{ error }}