From 15ec368ecca1cab5d6dcbe6aab0197b5a4ea1c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Garnier?= <Noe.GARNIER@etu.uca.fr>
Date: Sun, 15 Jan 2023 12:13:57 +0100
Subject: [PATCH] test

---
 Controller/UserController.php              | 18 ++++++++++++++++++
 Model/UserModel.php                        |  8 ++++++++
 View/src/JS/dashboard.js                   |  2 +-
 View/src/pages/Multijoueur/FileAttente.php | 10 +++++-----
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/Controller/UserController.php b/Controller/UserController.php
index 67178928..4de13498 100644
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -76,6 +76,9 @@ class UserController
                 case "goToDashboard":
                     $this->goToDashboard();
                     break;
+                case "getPlayersPseudo":
+                    $this->getPlayersPseudo();
+                    break;
                 case "getPlayers":
                     $this->getPlayers();
                     break;
@@ -446,6 +449,21 @@ class UserController
             require($rep . $vues['erreur']);
         }
     }
+    public function getPlayersPseudo(){
+        try {
+            global $rep, $vues, $error;
+            $model = new UserModel();
+            $idPartie = $_SESSION['idPartie'];
+            $utilisateur = $_SESSION['utilisateur'];
+            $lesJoueurs = $model->getPlayersPseudo($idPartie);
+            $lesJoueurs = json_encode($lesJoueurs);
+            echo $lesJoueurs;
+        }
+        catch (Exception $e) {
+            $error = $e->getMessage();
+            require($rep . $vues['erreur']);
+        }
+    }
     public function getPlayers(){
         try {
             global $rep, $vues, $error;
diff --git a/Model/UserModel.php b/Model/UserModel.php
index 60784b14..f31ada4e 100644
--- a/Model/UserModel.php
+++ b/Model/UserModel.php
@@ -286,6 +286,14 @@ class UserModel
         }
         $this->partie_gateway->quitGame($mailUtilisateur, $idPartie);
     }
+    public function getPlayersPseudo(int $idPartie) : array{
+        $this->partie_gateway->getLesMailJoueurs($idPartie);
+        $lesPseudos = array();
+        foreach ($this->partie_gateway->getLesMailJoueurs($idPartie) as $mail){
+            $lesPseudos[] = $this->utilisateur_gateway->getPseudoByEmail($mail);
+        }
+        return $lesPseudos;
+    }
     public function getPlayers(int $idPartie) : array{
         $lesJoueurs = $this->getLesJoueurs($idPartie);
         $lesPseudo = array();
diff --git a/View/src/JS/dashboard.js b/View/src/JS/dashboard.js
index 9ce50b23..06ac27f5 100644
--- a/View/src/JS/dashboard.js
+++ b/View/src/JS/dashboard.js
@@ -88,7 +88,7 @@ function dashboard () {
     }
 
     console.log(data);
-
+    
     var chart = new CanvasJS.Chart("chartContainer", {
         animationEnabled: true,
         zoomEnabled: true,
diff --git a/View/src/pages/Multijoueur/FileAttente.php b/View/src/pages/Multijoueur/FileAttente.php
index 329f4036..3d938743 100644
--- a/View/src/pages/Multijoueur/FileAttente.php
+++ b/View/src/pages/Multijoueur/FileAttente.php
@@ -84,21 +84,21 @@
     function getPlayer() {
       console.log("getPlayer");
         var xhr = new XMLHttpRequest();
-        xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=getPlayers', true);
+        xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=getPlayersPseudo', true);
         xhr.responseType = 'text';
         xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
         xhr.onload = function () {
           var players = JSON.parse(xhr.responseText);
-          if (players[1][0] != null) {
+          if (players[0] != null) {
             document.getElementById("player1").innerHTML = players[0];
           }
-          if (players[1][1] != null) {
+          if (players[1] != null) {
             document.getElementById("player2").innerHTML = players[1];
           }
-          if (players[1][2] != null) {
+          if (players[2] != null) {
             document.getElementById("player3").innerHTML = players[2];
           }
-          if (players[1][3] != null) {
+          if (players[3] != null) {
             document.getElementById("player4").innerHTML = players[3];
           }
         };