Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/3.01-QCM_MuscuMaths

Website/controllers/ControllerAdminAdministrators.php

@@ -19,19 +19,20 @@ class ControllerAdminAdministrators
         session_start();
         try {
 
-            if($_SESSION["idAdminConnected"] != null){
+            if ($_SESSION["idAdminConnected"] != null) {
-                $this->twig =$twig;
+                $this->twig = $twig;
                 $this->vues = $vues;
-    
+
                 $this->mdAdministrator = new ModelAdministrator();
-    
+
                 $administrators = $this->mdAdministrator->getAdministrators();
-    
+
                 echo $twig->render($vues["adminAdministrators"], [
                     'administrators' => $administrators,
+                    'error' => $_SESSION["error"],
                 ]);
-            }
+                $_SESSION["error"] = null;
-            else {
+            } else {
                 header("Location:/loginAdmin");
             }
         } catch (PDOException $e) {
@@ -41,27 +42,40 @@ class ControllerAdminAdministrators
         }
     }
 
-    function delete($param) {
+    function delete($param)
+    {
         $this->mdAdministrator->deleteAdministratorByID($param["id"]);
         header("Location:/admin/administrators");
     }
 
-    function add($param) {
+    function add($param)
-
+    {
-        $username = $_POST['username'];
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
-        $password = $_POST['password'];
+            $_SESSION["error"]="Méthode non autorisée.";
-
+        } else {
-        $Admin = [
+            $username = $_POST['username'];
-            'username' => $username,
+            $password = $_POST['password'];
-            'password' => $password,
+            $username = trim($_POST['username']);
-        ];
+            $password = trim($_POST['password']);
-
+            if (!isset($username) || !isset($password) || empty($username) || empty($password)) {
-        $this->mdAdministrator->addAdministrator($Admin);
+                $_SESSION["error"]="Veuillez remplir tous les champs.";
-
+            } else {
-        header("Location:/admin/administrators");
+                $Admin = [
+                    'username' => $username,
+                    'password' => $password,
+                ];
+                if ($this->mdAdministrator->verifyAdministratorByName($Admin) != null) {
+                    $_SESSION["error"]="Cet admin existe déjà.";
+                } else {
+                    $this->mdAdministrator->addAdministrator($Admin);
+                    header("Location:/admin/administrators");
+                }
+            }
+        }
     }
 
-    function updatemodal($param) {
+    function updatemodal($param)
+    {
 
         $administrator = $this->mdAdministrator->getAdministratorByID($param["id"]);
 
@@ -70,7 +84,8 @@ class ControllerAdminAdministrators
         ]);
     }
 
-    function update($param) {
+    function update($param)
+    {
 
         $id = $_POST['id'];
         $username = $_POST['username'];
@@ -81,8 +96,8 @@ class ControllerAdminAdministrators
             'password' => $password,
         ];
 
-        $this->mdAdministrator->updateAdministrator($id,$Admin);
+        $this->mdAdministrator->updateAdministrator($id, $Admin);
 
         header("Location:/admin/administrators");
     }
-}
+}

Website/controllers/ControllerUser.php

@@ -49,7 +49,9 @@ class ControllerUser
 
     function home()
     {
-        echo $this->twig->render($this->vues["home"]);
+        echo $this->twig->render($this->vues["home"], [
+            'idPlayerConnected' => $_SESSION["idPlayerConnected"]
+        ]);
     }
 
     function error()
@@ -78,6 +80,10 @@ class ControllerUser
 
     function loginAdmin()
     {
+        if ($_SESSION["idAdminConnected"] != null){
+            header("Location:/admin/administrators");
+        }
+
         echo $this->twig->render($this->vues["loginAdmin"], [
             'error' => $_SESSION["error"],
         ]);
@@ -87,6 +93,10 @@ class ControllerUser
 
     function loginPlayer()
     {
+        if ($_SESSION["idPlayerConnected"] != null){
+            header("Location:/userStatus");
+        }
+
         echo $this->twig->render($this->vues["loginPlayer"], [
             'error' => $_SESSION["error"],
         ]);
@@ -94,6 +104,25 @@ class ControllerUser
         $_SESSION["error"] = "";
     }
 
+    function userStatus(){
+        if($_SESSION["idPlayerConnected"] != null){
+            $this->mdPlayer = new ModelPlayer();
+            $player = $this->mdPlayer->getPlayerByID($_SESSION["idPlayerConnected"]);
+            $maxscores = $this->mdPlayer->getMaxScoresWithChapter($player);
+            foreach ($maxscores as $maxscore) {
+                $maxscore["chapter"]=$this->mdChapter->getChapterByID($maxscore["idchapter"])->getName();
+            }
+            echo $this->twig->render($this->vues["userStatus"],
+            [
+                'player' => $player,
+                'maxscores' => $maxscores,
+            ]);
+        }
+        else {
+            header("Location:/loginPlayer");
+        }
+    }
+
     function verifyAdmin()
     {
         $username = $_POST['username'];
@@ -258,21 +287,6 @@ class ControllerUser
         }
     }
 
-    function userStatus(){
-        if($_SESSION["idPlayerConnected"] != null){
-
-            //$this->mdAdministrator = new ModelAdministrator();
-
-            //$administrators = $this->mdAdministrator->getAdministrators();
-
-            echo $this->twig->render($this->vues["userStatus"]);
-
-        }
-        else {
-            header("Location:/loginPlayer");
-        }
-    }
-
     function passer()
     {
         $numQuestion = $_POST["numQuestion"];

Website/gateways/GatewayAdministrator.php

@@ -87,6 +87,19 @@ class GatewayAdministrator
         );
         $results = $this->con->getResults();
 
+        return $results[0];
+    }
+    public function verifyAdministratorByName($administrator)
+    {
+        $query = "SELECT administrators.id FROM administrators WHERE username = :username";
+        $this->con->executeQuery(
+            $query,
+            array(
+                ':username' => array($administrator['username'], PDO::PARAM_STR),
+            )
+        );
+        $results = $this->con->getResults();
+
         return $results[0];
     }
 }

Website/gateways/GatewayJouer.php

@@ -71,4 +71,16 @@ class GatewayJouer
         $results = $this->con->getResults();
         return $results[0];
     }
+    public function getMaxScoresWithChapter($player)
+    {
+        $query = "SELECT maxscore,idchapter FROM jouer WHERE idplayer = :idplayer;";
+        $this->con->executeQuery(
+            $query,
+            array(
+                ':idplayer' => array($player->getId(), PDO::PARAM_STR)
+            )
+        );
+        $results = $this->con->getResults();
+        return $results;
+    }
 }

Website/gateways/GatewayPlayer.php

@@ -93,7 +93,6 @@ class GatewayPlayer
             )
         );
         $results = $this->con->getResults();
-
+        return $results[0][0];
-        return $results[0];
     }
 }

Website/models/ModelAdministrator.php

@@ -52,4 +52,9 @@ class ModelAdministrator
         $administratorsId = $this->gwAdministrator->verifyAdministrator($Administrator);
         return $administratorsId;
     }
+    public function verifyAdministratorByName($Administrator)
+    {
+        $administratorsId = $this->gwAdministrator->verifyAdministratorByName($Administrator);
+        return $administratorsId;
+    }
 }

Website/models/ModelPlayer.php

@@ -32,6 +32,7 @@ class ModelPlayer
     {
         $playerDataArray = $this->gwPlayer->getPlayerByID($id);
         $player = new Player($playerDataArray["id"], $playerDataArray["nickname"], $playerDataArray["password"]);
+        return $player;
     }
 
     public function updatePlayer($id, $player)
@@ -60,6 +61,12 @@ class ModelPlayer
         $this->gwJouer->updateJouer($jouer);
     }
 
+    public function getMaxScoresWithChapter($player)
+    {
+        $maxScores = $this->gwJouer->getMaxScoresWithChapter($player);
+        return $maxScores;
+    }
+
     public function verifyJouer($jouer)
     {
         $tabidjouer = $this->gwJouer->verifyJouer($jouer);

Website/templates/addquestions.twig

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="fr">
-<html>
 
 <head>
     <meta charset=utf-8>

Website/templates/adminAdministrators.twig

@@ -5,32 +5,33 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        </script>
+        <link rel="stylesheet" href="../css/global.css">
-        <link rel="stylesheet" href="css/global.css">
     </head>
 
-    <body>
+    <body id="bodyStyle">
-        <div class="container mt-5">
+        <div>
+            <a href="/" role="button" class="btn btn-secondary position-absolute top-0 mt-2 end-0 me-2">
+                Retour
+            </a>
+        </div>
+        <div class="container mt-5 text-light fs-4">
             <h1>Liste des administrators</h1>
             <ul class="list-group">
                 {% for admin in administrators %}
-                    <li class="list-group-item d-flex justify-content-between align-items-center">
+                    <li class="list-group-item d-flex justify-content-between align-items-center border-dark text-light bg-secondary">
                         {{ admin.username }}
                         <div class="btn-group" role="group">
-                            <a type="button" href="/admin/administrators/updatemodal/{{ admin.id }}"  class="btn btn-primary">Modifier</a>
+                            <a type="button" href="/admin/administrators/updatemodal/{{ admin.id }}"  class="btn btn-primary fs-5">Modifier</a>
-                            <a type="button" href="/admin/administrators/delete/{{ admin.id }}" class="btn btn-danger">Supprimer</a>
+                            <a type="button" href="/admin/administrators/delete/{{ admin.id }}" class="btn btn-danger fs-5">Supprimer</a>
                         </div>
                     </li>
                 {% endfor %}
             </ul>
         </div>
-        <div class="container mt-3">
+        <div class="container mt-3 d-flex justify-content-between">
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modalAdministrators">Ajouter un administrateur</button>
+            <a type="button" href="/admin/questions" class="btn btn-secondary fs-5"> ← Questions </a>
-            <div class="btn-group" role="group">
+            <button type="button" class="btn btn-primary fs-5" data-bs-toggle="modal" data-bs-target="#modalAdministrators">Ajouter un administrateur</button>
-                <a href="/admin/questions" class="btn btn-secondary"> ← Questions </a>
+            <a type="button" href="/admin/chapters" class="btn btn-secondary fs-5">Chapitres →</a>
-                <a href="/" class="btn btn-secondary">Retour</a>
-                <a href="/admin/chapters" class="btn btn-secondary">Chapitres →</a>
-            </div>
         </div>
 
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>

Website/templates/adminChapters.twig

@@ -6,31 +6,33 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
         </script>
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../css/global.css">
     </head>
 
-    <body>
+    <body id="bodyStyle">
-        <div class="container mt-5">
+        <div>
+            <a href="/" role="button" class="btn btn-secondary position-absolute top-0 mt-2 end-0 me-2">
+                Retour
+            </a>
+        </div>
+        <div class="container mt-5 text-light fs-4">
             <h1>Liste des chapitres</h1>
             <ul class="list-group">
                 {% for chapter in chapters %}
-                    <li class="list-group-item d-flex justify-content-between align-items-center">
+                    <li class="list-group-item d-flex justify-content-between align-items-center border-dark text-light bg-secondary">
                         {{ chapter.name }}
                         <div class="btn-group" role="group">
-                            <a type="button" href="/admin/chapters/updatemodal/{{ chapter.id }}"  class="btn btn-primary">Modifier</a>
+                            <a type="button" href="/admin/chapters/updatemodal/{{ chapter.id }}"  class="btn btn-primary fs-5">Modifier</a>
-                            <a type="button" href="/admin/chapters/delete/{{ chapter.id }}" class="btn btn-danger">Supprimer</a>
+                            <a type="button" href="/admin/chapters/delete/{{ chapter.id }}" class="btn btn-danger fs-5">Supprimer</a>
                         </div>
                     </li>
                 {% endfor %}
             </ul>
         </div>
-        <div class="container mt-3">
+        <div class="container mt-3 d-flex justify-content-between">
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modalchapters">Ajouter un chapitre</button>
+            <a type="button" href="/admin/administrators" class="btn btn-secondary fs-5"> ← Administrateur</a>
-            <div class="btn-group" role="group">
+            <button type="button" class="btn btn-primary fs-5" data-bs-toggle="modal" data-bs-target="#modalchapters">Ajouter un chapitre</button>
-                <a href="/admin/administrators" class="btn btn-secondary"> ← Administrateur</a>
+            <a type="button" href="/admin/questions" class="btn btn-secondary fs-5">Questions →</a>
-                <a href="/" class="btn btn-secondary">Retour</a>
-                <a href="/admin/questions" class="btn btn-secondary">Questions →</a>
-            </div>
         </div>
 
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>

Website/templates/adminQuestions.twig

@@ -6,31 +6,33 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
         </script>
-        <link rel="stylesheet" href="css/global.css">
+        <link rel="stylesheet" href="../css/global.css">
     </head>
 
-    <body>
+    <body id="bodyStyle">
-        <div class="container mt-5">
+        <div>
+            <a href="/" role="button" class="btn btn-secondary position-absolute top-0 mt-2 end-0 me-2">
+                Retour
+            </a>
+        </div>
+        <div class="container mt-5 text-light fs-4">
             <h1>Liste des questions</h1>
             <ul class="list-group">
                 {% for question in questions %}
-                    <li class="list-group-item d-flex justify-content-between align-items-center">
+                    <li class="list-group-item d-flex justify-content-between align-items-center border-dark text-light bg-secondary">
                         {{ question.content }}
                         <div class="btn-group" role="group">
-                            <a type="button" href="/admin/questions/updatemodal/{{ question.id }}"  class="btn btn-primary">Modifier</a>
+                            <a type="button" href="/admin/questions/updatemodal/{{ question.id }}"  class="btn btn-primary fs-5">Modifier</a>
-                            <a type="button" href="/admin/questions/delete/{{ question.id }}" class="btn btn-danger">Supprimer</a>
+                            <a type="button" href="/admin/questions/delete/{{ question.id }}" class="btn btn-danger fs-5">Supprimer</a>
                         </div>
                     </li>
                 {% endfor %}
             </ul>
         </div>
-        <div class="container mt-3">
+        <div class="container mt-3 d-flex justify-content-between">
-            <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#modalquestions">Ajouter un chapitre</button>
+            <a type="button" href="/admin/chapters" class="btn btn-secondary fs-5"> ← Chapitres</a>
-            <div class="btn-group" role="group">
+            <button type="button" class="btn btn-primary fs-5" data-bs-toggle="modal" data-bs-target="#modalquestions">Ajouter un chapitre</button>
-                <a href="/admin/chapters" class="btn btn-secondary"> ← Chapitres</a>
+            <a type="button" href="/admin/administrators" class="btn btn-secondary fs-5">Administrateurs →</a>
-                <a href="/" class="btn btn-secondary">Retour</a>
-                <a href="/admin/administrators" class="btn btn-secondary">Administrateurs →</a> 
-            </div>
         </div>
 
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>

Website/templates/home.twig

@@ -10,7 +10,15 @@
 
 <body id="bodyStyle">
     <div>
-        <a href="/loginPlayer">CONNEXION</a>
+        {% if idPlayerConnected == null %}
+            <a href="/loginPlayer" role="button" class="fs-4 btn btn-secondary btn-lg position-absolute top-0 mt-2 end-0 me-2">
+                CONNEXION
+            </a>
+        {% else %}
+            <a href="/loginPlayer" role="button" class="fs-4 btn btn-secondary btn-lg position-absolute top-0 mt-2 end-0 me-2">
+                PROFIL
+            </a>
+        {% endif %}
     </div>
     <div class="d-flex flex-column align-items-center justify-content-between" style="height:95vh">
         <img src="Media/Logo.png" style="margin-top:50px; object-fit:fill;" class="h-25">
@@ -21,7 +29,7 @@
                 </h1>
             </div>
         </a>
-        <a href="/multiplayer" class="text-white m-3 container text-center d-flex align-items-center w-75 rounded border border-white text-center" style="background-color:orange;text-decoration: none;color: black;height:20vh;">
+        <a href="/lobby" class="text-white m-3 container text-center d-flex align-items-center w-75 rounded border border-white text-center" style="background-color:orange;text-decoration: none;color: black;height:20vh;">
             <div class="container text-center d-flex align-items-center text-center">
                 <h1 class="mx-auto fs-1">
                     MULTIJOUEUR

Website/templates/loginAdmin.twig

@@ -6,7 +6,12 @@
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
         <link rel="stylesheet" href="css/global.css">
     </head>
-    <body>
+    <body id="bodyStyle">
+        <div>
+            <a href="/" role="button" class="fs-4 btn btn-secondary btn-lg position-absolute top-0 mt-2 end-0 me-2">
+                Retour
+            </a>
+        </div>
         <div class="container mt-5">
             <div class="row">
                 <div class="col-md-4 offset-md-4">

Website/templates/loginPlayer.twig

@@ -6,7 +6,12 @@
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
         <link rel="stylesheet" href="css/global.css">
     </head>
-    <body>
+    <body id="bodyStyle">
+        <div>
+            <a href="/" role="button" class="fs-4 btn btn-secondary btn-lg position-absolute top-0 mt-2 end-0 me-2">
+                Retour
+            </a>
+        </div>
         <div class="container mt-5">
             <div class="row">
                 <div class="col-md-4 offset-md-4">

Website/templates/themeChoice.twig

@@ -11,9 +11,11 @@
     </head>
 
     <body id="bodyStyle">
-        <a href="/" role="button" class="fs-4 btn btn-secondary btn-lg position-absolute end-0 me-2">
+        <div>
-            Retour
+            <a href="/" role="button" class="fs-4 btn btn-secondary btn-lg position-absolute top-0 mt-2 end-0 me-2">
-        </a>
+                Retour
+            </a>
+        </div>
         <form action="/verifySingleplayer" method="post">
             <div class="text-center" style="padding-top: 6vh">
                 <h1 style="color: white; font-size: 50px">Difficulte :</h1>

Website/templates/userPlayerModal.twig

@@ -5,7 +5,6 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        </script>
         <link rel="stylesheet" href="css/global.css">
     </head>
 

Website/templates/userStatus.twig

@@ -1,16 +1,29 @@
 <!DOCTYPE html>
 <html lang="fr">
     <head>
-        <meta charset=utf-8>
+        <title>Maths Educ</title>
-        <title>Math'Educ</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
-        <link rel="stylesheet" href="/css/global.css">
+        <link rel="stylesheet" href="css/global.css">
     </head>
 
     <body id="bodyStyle">
+        <div>
+            <a href="/" role="button" class="fs-4 btn btn-secondary btn-lg position-absolute top-0 mt-2 end-0 me-2">
+                Retour
+            </a>
+        </div>
         <div class="container mt-5">
-            <div>
+            <div class="col-5 bg-light border border-warning rounded">
-                <p>test</p>
+                <p> Player Nickname : </p>
+                <p>{{ player.nickname }} </p>
             </div>
+            {% for maxscore in maxscores %}
+                <div class="col-5 bg-light border border-warning rounded">
+                    <p> Maxscore pour le chapitre {{ maxscore["chapter"] }} : </p>
+                    <p>{{ maxscore["maxscore"] }} </p>
+                </div>
+            {% endfor %}
     </body>
 </html>