mirror of
https://github.com/kmitresse/Cards-Rush.git
synced 2026-07-09 21:37:46 +00:00
feat: dev-web - add modals in main-menu
This commit is contained in:
kmitresse
@@ -1,41 +1,44 @@
|
||||
<%@ page import="uppa.project.pojo.User" %>
|
||||
<%@ page import="java.util.List" %>
|
||||
<%@ page import="uppa.project.pojo.Game" %>
|
||||
<%@ page import="uppa.project.pojo.Deck" %><%--
|
||||
<%@ page import="uppa.project.pojo.Deck" %>
|
||||
<%--
|
||||
Created by IntelliJ IDEA.
|
||||
User: kmitr
|
||||
Date: 19/03/2024
|
||||
Time: 15:47
|
||||
To change this template use File | Settings | File Templates.
|
||||
--%>
|
||||
<div id="newGameModal" class="modal">
|
||||
<div class="modal-content">
|
||||
<span class="close">×</span>
|
||||
<h1> New Game</h1>
|
||||
<div id="settings">
|
||||
<form>
|
||||
<label for="timer">Timer</label>
|
||||
<input type="number" id="timer" name="timer" min="<%= Game.TIMER_MIN %>" max="<%= Game.TIMER_MAX %>" value="<%= Game.TIMER_MIN %>">
|
||||
<label for="nbColors">Nb couleurs</label>
|
||||
<input type="range" id="nbColors" name="nbColors" min="<%= Deck.NB_COLORS_MIN %>" max="<%= Deck.NB_COLORS_MAX %>" value="<%= Deck.NB_COLORS_MAX %>">
|
||||
<label for="nbValues">Nb valeurs par couleurs</label>
|
||||
<input type="range" id="nbValues" name="nbValues" min="<%= Deck.NB_VALUES_PER_COLOR_MIN %>" max="<%= Deck.NB_VALUES_PER_COLOR_MAX %>" value="<%= Deck.NB_VALUES_PER_COLOR_MAX %>">
|
||||
<label for="nbRounds">Nombre de tours</label>
|
||||
<input type="number" id="nbRounds" name="nbRounds" min="<%= Game.NB_ROUNDS_MIN %>" max="<%= Deck.NB_COLORS_MAX * Deck.NB_VALUES_PER_COLOR_MAX %>" value="Deck.NB_COLORS_MAX * Deck.NB_VALUES_PER_COLOR_MAX">
|
||||
</form>
|
||||
|
||||
<div id="newGameModal" class="modal-wrapper" style="display: none">
|
||||
<div class="modal">
|
||||
<a href="#close" title="Close" class="close">×</a>
|
||||
<div class="modal-header">
|
||||
<h2>Nouvelle Partie</h2>
|
||||
</div>
|
||||
<div id="players-selection">
|
||||
<table>
|
||||
<tr>
|
||||
<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>
|
||||
<% List<User> connectedUsers = (List<User>) request.getAttribute("connectedUsers"); %>
|
||||
<% for (User user : connectedUsers) { %>
|
||||
<div class="modal-content">
|
||||
<div id="settings">
|
||||
<form>
|
||||
<label for="timer">Timer</label>
|
||||
<input type="number" id="timer" name="timer" min="<%= Game.TIMER_MIN %>" max="<%= Game.TIMER_MAX %>" value="<%= Game.TIMER_MIN %>">
|
||||
<label for="nbColors">Nb couleurs</label>
|
||||
<input type="range" id="nbColors" name="nbColors" min="<%= Deck.NB_COLORS_MIN %>" max="<%= Deck.NB_COLORS_MAX %>" value="<%= Deck.NB_COLORS_MAX %>">
|
||||
<label for="nbValues">Nb valeurs par couleurs</label>
|
||||
<input type="range" id="nbValues" name="nbValues" min="<%= Deck.NB_VALUES_PER_COLOR_MIN %>" max="<%= Deck.NB_VALUES_PER_COLOR_MAX %>" value="<%= Deck.NB_VALUES_PER_COLOR_MAX %>">
|
||||
<label for="nbRounds">Nombre de tours</label>
|
||||
<input type="number" id="nbRounds" name="nbRounds" min="<%= Game.NB_ROUNDS_MIN %>" max="<%= Deck.NB_COLORS_MAX * Deck.NB_VALUES_PER_COLOR_MAX %>" value="Deck.NB_COLORS_MAX * Deck.NB_VALUES_PER_COLOR_MAX">
|
||||
</form>
|
||||
</div>
|
||||
<div id="players-selection">
|
||||
<table>
|
||||
<tr>
|
||||
<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>
|
||||
<% for (User user : connectedUsers) { %>
|
||||
<tr>
|
||||
<td><%= user.getUsername() %></td>
|
||||
<td><%= user.getNbPlayedGame() %></td>
|
||||
@@ -44,10 +47,10 @@
|
||||
<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>
|
||||
<% } %>
|
||||
</table>
|
||||
<button id="startGame">Commencer la partie</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
```
|
||||
|
||||
@@ -1,95 +1,98 @@
|
||||
<%@ page import="uppa.project.pojo.User" %>
|
||||
<%@ page import="uppa.project.pojo.Game" %>
|
||||
<%@ page import="java.util.Set" %>
|
||||
<%@ page import="java.util.ArrayList" %>
|
||||
<%@ page import="uppa.project.pojo.Player" %><%--
|
||||
<%@ page import="uppa.project.pojo.Player" %>
|
||||
<%@ page import="java.util.Date" %>
|
||||
<%--
|
||||
Created by IntelliJ IDEA.
|
||||
User: kmitr
|
||||
Date: 26/03/2024
|
||||
Time: 11:05
|
||||
To change this template use File | Settings | File Templates.
|
||||
--%>
|
||||
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
|
||||
//modale statistque
|
||||
<% User user = (User) request.getAttribute("user"); %>
|
||||
<% ArrayList<Game> games = (ArrayList<Game>) request.getAttribute("games"); %>
|
||||
<div id="statisticsModal" class="modal">
|
||||
<div class="modal-content">
|
||||
<span class="close">×</span>
|
||||
<h1> New Game</h1>
|
||||
<div id="selfSettings">
|
||||
<h2>Statistiques globales</h2>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Nombre de parties jouées:</th>
|
||||
<td><%= user.getNbPlayedGame() %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nombre de parties gagnées:</th>
|
||||
<td><%= user.getNbWin() %>, <%= user.getWinRate()%></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nombre de clicks total:</th>
|
||||
<td><%= user.getNbClicks() %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nombre de clicks corrects:</th>
|
||||
<td><%= user.getNbRightClicks() %>, <%= user.getRightClickPercentRate()%></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nombre de clicks rapides:</th>
|
||||
<td><%= user.getNbRapidClicks() %>, <%= user.getRapidClickPercentRate()%></td>
|
||||
</tr>
|
||||
</table>
|
||||
<%--TODO: adapter les deux lignes suivante pour ne pas vérifier la valeur nulle--%>
|
||||
<% User user = (User) session.getAttribute("user") != null ? (User) session.getAttribute("user") : new User("toto", "toto@gmail.com", "totopassword", new Date(), User.Gender.MALE); %>
|
||||
<% ArrayList<Game> games = (ArrayList<Game>) request.getAttribute("games") != null ? (ArrayList<Game>) request.getAttribute("games") : new ArrayList<Game>() ; %>
|
||||
<div id="statisticsModal" class="modal-wrapper" style="display: none">
|
||||
<div class="modal">
|
||||
<a href="#close" title="Close" class="close">×</a>
|
||||
<div class="modal-header">
|
||||
<h2>Statistiques</h2>
|
||||
</div>
|
||||
<div id="game-selection">
|
||||
//listes de game dont chacune est un onglet déroulante des joueurs
|
||||
<h2>Statistiques par jeu</h2>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Date de la partie</th>
|
||||
<th>Nombre de joueurs</th>
|
||||
<th>Nombre de manches</th>
|
||||
<th>Nombre de couleurs</th>
|
||||
<th>Nombre de valeurs par couleur</th>
|
||||
<th>Vainqueur</th>
|
||||
</tr>
|
||||
<%
|
||||
for (Game game : games) {
|
||||
%>
|
||||
<tr>
|
||||
<td><%= game.getCreatedAt() %></td>
|
||||
<td><%= game.getNbPlayers() %></td>
|
||||
<td><%= game.getNbRounds() %></td>
|
||||
<td><%= game.getNbColors() %></td>
|
||||
<td><%= game.getNbValuesPerColor() %></td>
|
||||
<td><%= game.getPlayers().get(0).getUser().getUsername() %></td>
|
||||
</tr>
|
||||
<tr class="dropdown" aria-disabled="false">
|
||||
<table>
|
||||
<tr>
|
||||
<th>Username</th>
|
||||
<th>Score</th>
|
||||
<th>Nombre de click</th>
|
||||
<th>Nombre de click corrects</th>
|
||||
<th>Nombre de click rapides</th>
|
||||
</tr>
|
||||
<%
|
||||
for (Player player : game.getPlayers()) {
|
||||
%>
|
||||
<tr>
|
||||
<td><%= player.getUser().getUsername() %></td>
|
||||
<td><%= player.getScore() %></td>
|
||||
<td><%= player.getClickCount() %></td>
|
||||
<td><%= player.getRightClickCount() %>, <%= player.getRatioRightClick() %></td>
|
||||
<td><%= player.getRapidClickCount() %>, <%= player.getRatioRapidClick() %></td>
|
||||
<%
|
||||
}
|
||||
%>
|
||||
</table>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div class="modal-content">
|
||||
<div id="self-stats">
|
||||
<h2>Statistiques globales</h2>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Nombre de parties jouées:</th>
|
||||
<td><%= user.getNbPlayedGame() %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nombre de parties gagnées:</th>
|
||||
<td><%= user.getNbWin() %>, <%= user.getWinRate()%></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nombre de clicks total:</th>
|
||||
<td><%= user.getNbClicks() %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nombre de clicks corrects:</th>
|
||||
<td><%= user.getNbRightClicks() %>, <%= user.getRightClickPercentRate()%></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Nombre de clicks rapides:</th>
|
||||
<td><%= user.getNbRapidClicks() %>, <%= user.getRapidClickPercentRate()%></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div id="game-selection">
|
||||
//listes de game dont chacune est un onglet déroulante des joueurs
|
||||
<h2>Statistiques par jeu</h2>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Date de la partie</th>
|
||||
<th>Nombre de joueurs</th>
|
||||
<th>Nombre de manches</th>
|
||||
<th>Nombre de couleurs</th>
|
||||
<th>Nombre de valeurs par couleur</th>
|
||||
<th>Vainqueur</th>
|
||||
</tr>
|
||||
<%
|
||||
for (Game game : games) {
|
||||
%>
|
||||
<tr>
|
||||
<td><%= game.getCreatedAt() %></td>
|
||||
<td><%= game.getNbPlayers() %></td>
|
||||
<td><%= game.getNbRounds() %></td>
|
||||
<td><%= game.getNbColors() %></td>
|
||||
<td><%= game.getNbValuesPerColor() %></td>
|
||||
<td><%= game.getPlayers().get(0).getUser().getUsername() %></td>
|
||||
</tr>
|
||||
<tr class="dropdown" aria-disabled="false">
|
||||
<table>
|
||||
<tr>
|
||||
<th>Username</th>
|
||||
<th>Score</th>
|
||||
<th>Nombre de click</th>
|
||||
<th>Nombre de click corrects</th>
|
||||
<th>Nombre de click rapides</th>
|
||||
</tr>
|
||||
<%
|
||||
for (Player player : game.getPlayers()) {
|
||||
%>
|
||||
<tr>
|
||||
<td><%= player.getUser().getUsername() %></td>
|
||||
<td><%= player.getScore() %></td>
|
||||
<td><%= player.getClickCount() %></td>
|
||||
<td><%= player.getRightClickCount() %>, <%= player.getRatioRightClick() %></td>
|
||||
<td><%= player.getRapidClickCount() %>, <%= player.getRatioRapidClick() %></td>
|
||||
</tr>
|
||||
<% } %>
|
||||
</table>
|
||||
</tr>
|
||||
<% } %>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user