diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java index 80effd8..f3d00ad 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java @@ -22,15 +22,12 @@ public class GameStatisticsServlet extends HttpServlet { try { DAO gameDAO = new Game_JPA_DAO_Factory().getDAOGame(); game = gameDAO.findById(Integer.parseInt(request.getParameter("id"))); - for(Player p : game.getPlayers()) { - System.out.println(p.toString()); - } request.removeAttribute("id"); game.sortPlayersByScoreAndRapidity(); request.setAttribute("game", game); request.getRequestDispatcher("/WEB-INF/pages/game-statistics.jsp").forward(request, response); } catch (Exception e) { - request.getRequestDispatcher("/WEB-INF/pages/profile.jsp").forward(request, response); + response.sendRedirect(request.getContextPath() + "/profile"); } } } diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java index b7e2743..9387dfb 100644 --- a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java +++ b/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java @@ -15,6 +15,11 @@ import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import uppa.project.bean.ProfileBean; +import uppa.project.database.dao.DAO; +import uppa.project.database.dao.DAOException; +import uppa.project.database.dao.jpa.Game_JPA_DAO_Factory; +import uppa.project.database.pojo.Player; +import uppa.project.database.pojo.User; import uppa.project.json.HttpResponse; import uppa.project.json.HttpResponseCode; @@ -25,8 +30,22 @@ public class ProfileServlet extends HttpServlet { } public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + User user = (User) request.getSession().getAttribute("user"); + DAO userDAO = null; + try { + userDAO = new Game_JPA_DAO_Factory().getDAOUser(); + user = userDAO.findById(user.getId().intValue()); + for(Player p : user.getPlayedGames()){ + System.out.println("Partie jouée le " + p.getGame().getCreatedAt().toLocaleString()); + } + request.getSession().setAttribute("user", user); // request.setAttribute("current", "profile"); - request.getRequestDispatcher("/WEB-INF/pages/profile.jsp").forward(request, response); + request.getRequestDispatcher("/WEB-INF/pages/profile.jsp").forward(request, response); + } catch (DAOException e) { + System.out.println(e); + response.sendRedirect(request.getContextPath() + "/lobby"); + } + } public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag index e04657a..ebd162e 100644 --- a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag +++ b/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag @@ -42,7 +42,6 @@ <% for (int i = 0; i < user.getPlayedGames().size(); i++) { Player player = user.getPlayedGames().get(i); - System.out.println(player.toString()); %> <%= player.getGame().getCreatedAt().toLocaleString() %>