From a6cbdb03152d9aaa7b261e56b10ce4a918b8fa67 Mon Sep 17 00:00:00 2001
From: "jade.van_brabandt" <jade.van_brabandt@etu.uca.fr>
Date: Mon, 20 Nov 2023 15:23:38 +0100
Subject: [PATCH] feat : error UwU :fire:

---
 Website/controllers/ControllerUser.php | 17 ++++++++++++-----
 Website/index.php                      |  1 +
 Website/templates/singleplayer.twig    |  9 +++++----
 Website/templates/themeChoice.twig     |  1 +
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Website/controllers/ControllerUser.php b/Website/controllers/ControllerUser.php
index 61f16a0..46cf806 100644
--- a/Website/controllers/ControllerUser.php
+++ b/Website/controllers/ControllerUser.php
@@ -89,7 +89,7 @@ class ControllerUser
             $_SESSION["idAdminConnected"] = $AdministratorIsOk;
             header("Location:/admin/administrators");
         } else {
-            $_SESSION["error"] = "utilisateur introuvable.";
+            $_SESSION["error"] = "Utilisateur introuvable.";
             header("Location:/login");
         }
     }
@@ -103,12 +103,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;
         }
 
@@ -126,8 +124,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"] = "";
         }
     }
 
@@ -137,14 +140,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()) {
@@ -222,6 +228,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/index.php b/Website/index.php
index 76806ae..54200b5 100755
--- a/Website/index.php
+++ b/Website/index.php
@@ -2,6 +2,7 @@
 
 //chargement config
 require_once(__DIR__ . '/usages/Config.php');
+require_once(__DIR__ . '/usages/Config_DB.php');
 
 //chargement for twig
 require __DIR__ . '/vendor/autoload.php';
diff --git a/Website/templates/singleplayer.twig b/Website/templates/singleplayer.twig
index 7c3e727..50fe026 100644
--- a/Website/templates/singleplayer.twig
+++ b/Website/templates/singleplayer.twig
@@ -34,13 +34,13 @@
         {# End of Awfull Code #}
             <div class="row g-5">
                 <div class="col pt-5">
-                    <input type="radio" class="btn-check" name="answer" value="0" id="answer1" autocomplete="off" required>
+                    <input type="radio" class="btn-check" name="answer" value="1" id="answer1" autocomplete="off" required>
                     <label class="btn fs-2 container text-white" for="answer1" style="background-color:blue;">
                         {{ answerss[numQuestion][0].content }}
                     </label>
                 </div>
                 <div class="col pt-5">
-                    <input type="radio" class="btn-check" name="answer" value="1" id="answer2" autocomplete="off">
+                    <input type="radio" class="btn-check" name="answer" value="2" id="answer2" autocomplete="off">
                     <label class="btn fs-2 container text-white" for="answer2" style="background-color:green;">
                         {{ answerss[numQuestion][1].content }}
                     </label>
@@ -48,13 +48,13 @@
             </div>
             <div class="row g-5">
                 <div class="col pt-5">
-                    <input type="radio" class="btn-check" name="answer" value="2" id="answer3" autocomplete="off">
+                    <input type="radio" class="btn-check" name="answer" value="3" id="answer3" autocomplete="off">
                     <label class="btn fs-2 container text-white" for="answer3" style="background-color:red;">
                         {{ answerss[numQuestion][2].content }}
                     </label>
                 </div>
                 <div class="col pt-5">
-                    <input type="radio" class="btn-check" name="answer" value="3" id="answer4" autocomplete="off">
+                    <input type="radio" class="btn-check" name="answer" value="4" id="answer4" autocomplete="off">
                     <label class="btn fs-2 container text-white" for="answer4" style="background-color:orange;">
                         {{ answerss[numQuestion][3].content }}
                     </label>
@@ -73,6 +73,7 @@
                     </button>
                 </div>
             </div>
+            <p class="mt-2 fs-5 text-danger">{{ error }}</p>
         </form>
     </div>
     <script type="module" src="js/scriptChrono.js"></script>
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 @@
 
             <div class="d-flex flex-column align-items-center">
                 <button type="submit" class="btn btn-success btn-lg fs-1" >Jouer</button>
+                <p class="mt-2 fs-5 text-danger">{{ error }}</p>
             </div>
         </form>
     </body>