diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleUser.java b/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleUser.java index 74b5686..0269958 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleUser.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleUser.java @@ -6,9 +6,18 @@ public class SimpleUser { private final int id; private final String username; + private final int nbPlayedGames; + private final int nbWin; + private final double rigthClickPercentRate; + private final double rapidClickPercentRate; + public SimpleUser(User user) { this.id = user.getId().intValue(); this.username = user.getUsername(); + this.nbPlayedGames = user.getNbPlayedGame(); + this.nbWin = user.getNbWin(); + this.rigthClickPercentRate = user.getRightClickPercentRate(); + this.rapidClickPercentRate = user.getRapidClickPercentRate(); } public int getId() { @@ -18,4 +27,20 @@ public class SimpleUser { public String getUsername() { return username; } -} \ No newline at end of file + + public int getNbPlayedGames() { + return nbPlayedGames; + } + + public int getNbWin() { + return nbWin; + } + + public double getRigthClickPercentRate() { + return rigthClickPercentRate; + } + + public double getRapidClickPercentRate() { + return rapidClickPercentRate; + } +} diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/lobby.jsp b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/lobby.jsp index 2519845..bfe3343 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/lobby.jsp +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/lobby.jsp @@ -10,15 +10,15 @@
- +
- \ No newline at end of file + diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connected-user-list.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connected-user-list.tag index 7d07c1d..ef8cb11 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connected-user-list.tag +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connected-user-list.tag @@ -8,7 +8,9 @@ - + + + @@ -26,14 +28,22 @@ // Add the users to the table users.forEach(user => { - const tr = document.createElement('tr'); - const td = document.createElement('td'); + const tr = document.createElement('tr'); + const tdUsername = document.createElement('td'); + tdUsername.dataset.id = user.id; + tdUsername.textContent = user.username; + const tdNbGames = document.createElement('td'); + tdNbGames.dataset.id = user.id; + tdNbGames.textContent = user.nbPlayedGames; + const tdNbWin = document.createElement('td'); + tdNbWin.dataset.id = user.id; + tdNbWin.textContent = user.nbWin; - td.dataset.id = user.id; - td.textContent = user.username; - tr.appendChild(td); - table.appendChild(tr); + tr.appendChild(tdUsername); + tr.appendChild(tdNbGames); + tr.appendChild(tdNbWin); + table.appendChild(tr); }); }
UtilisateurNom d'utilisateurNombre de parties jouéesNombre de victoires