From cf13d5756e38d1f1cec535824e4a359de22deec3 Mon Sep 17 00:00:00 2001
From: kmitresse <kmitresse@etud.univ-pau.fr>
Date: Sat, 23 Mar 2024 10:02:02 +0100
Subject: [PATCH] feat: dev-web - manage new game creation

---
 .../provider/EntityManagerProvider.java       |  3 +-
 .../uppa/project/servlet/NewGameServlet.java  | 10 ++++++-
 .../main/webapp/WEB-INF/views/new-game.jsp    | 29 ++++++++++++++-----
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java b/S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java
index c0c7bdf..a05d0db 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/provider/EntityManagerProvider.java
@@ -18,8 +18,7 @@ import jakarta.persistence.Persistence;
  * @see jakarta.persistence.EntityManager
  */
 public final class EntityManagerProvider {
-//  private static final String PERSISTENCE_UNIT_NAME = DotenvProvider.getInstance().get("PERSISTENCE_UNIT_NAME");
-  private static final String PERSISTENCE_UNIT_NAME = "prod";
+  private static final String PERSISTENCE_UNIT_NAME = DotenvProvider.getInstance().get("PERSISTENCE_UNIT_NAME");
 
   private static EntityManager instance;
   private static EntityManagerFactory factory;
diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java
index 7d95386..6cdc4cb 100644
--- a/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java
+++ b/S2/DevWeb/Projet/src/main/java/uppa/project/servlet/NewGameServlet.java
@@ -12,6 +12,7 @@ import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import uppa.project.pojo.User;
 
 @WebServlet(name = "newGameServlet", value = "/new-game")
 public class NewGameServlet extends HttpServlet {
@@ -24,10 +25,17 @@ public class NewGameServlet extends HttpServlet {
       response.sendRedirect(request.getContextPath() + "/login");
       return;
     }
+    User[] users = null;
+    /*TODO: récuperer la liste des joueurs connectés
+         penser à retirer l'utilisateur principal de la liste*/
 
+    request.setAttribute("connectedUsers", users);
     request.getRequestDispatcher("/WEB-INF/views/new-game.jsp").forward(request, response);
+
+
+
   }
 
   public void destroy() {
   }
-}
\ No newline at end of file
+}
diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/new-game.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/new-game.jsp
index afac64a..f2f5979 100644
--- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/new-game.jsp
+++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/views/new-game.jsp
@@ -1,4 +1,4 @@
-<%--
+<%@ page import="uppa.project.pojo.User" %><%--
   Created by IntelliJ IDEA.
   User: kmitr
   Date: 19/03/2024
@@ -16,26 +16,39 @@
             <h1> New Game</h1>
             <div id="settings">
                 <form>
-                    <label for="nbRounds">Nb Rounds</label>
+                    <label for="nbRounds">Nombre de tours</label>
                     <input type="number" id="nbRounds" name="nbRounds" min="1" max="50" value="10">
                     <label for="timer">Timer</label>
                     <input type="number" id="timer" name="timer" min="1" max="10" value="5">
-                    <label for="nbColors">Nb colors</label>
+                    <label for="nbColors">Nb coleurs</label>
                     <input type="range" id="nbColors" name="nbColors" min="1" max="4" value="4">
-                    <label for="nbValues">Nb values per colors</label>
+                    <label for="nbValues">Nb valeurs par coleurs</label>
                     <input type="range" id="nbValues" name="nbValues" min="5" max="13" value="13">
                 </form>
             </div>
             <div id="players-selection">
                 <table>
                     <tr>
-                        <th>User</th>
-                        <th>Game played</th>
-                        <th>Game won</th>
+                        <th>Nom d'utilisateur</th>
+                        <th>Nombre de partie jouées</th>
+                        <th>% Parties Gagnées</th>
+                        <th>% Clicks corrects</th>
+                        <th>% Clicks rapides</th>
                         <th>Invite</th>
                     </tr>
-                    <%-- Récuperer les joueurs connecter et les lister sous forme de tableau--%>
+                    <% User[] connectedUsers = (User[]) request.getAttribute("connectedUser"); %>
+                    <% for (User user : connectedUsers) { %>
+                        <tr>
+                            <td><%= user.getUsername() %></td>
+                            <td><%= user.getNbPlayedGame() %></td>
+                            <td><%= user.getWinRate() %></td>
+                            <td><%= user.getRightClickPercentRate()%></td>
+                            <td><%= user.getRapidClickPercentRate()%></td>
+                            <td><input type="checkbox" id="<%= user.getUsername()%>-invite" name="<%= user.getUsername()%>-invite"/></td>
+                        </tr>
+                    <% } %>
                 </table>
+                <button id="startGame">Commencer la partie</button>
             </div>
         </section>
     </main>