diff --git a/src/main/java/DAO/SessionDAO.java b/src/main/java/DAO/SessionDAO.java index 761d5fb..2db3ee6 100644 --- a/src/main/java/DAO/SessionDAO.java +++ b/src/main/java/DAO/SessionDAO.java @@ -15,12 +15,10 @@ public class SessionDAO extends AbstractJpaDao { } public List findByTheme(String theme){ - EntityTransaction t=em.getTransaction(); - t.begin(); Query query=em.createQuery("select s from Session s where s.theme=:theme"); query.setParameter("theme",theme); List sessions=query.getResultList(); - t.commit(); + if(sessions.size()>0){ return sessions; }else{ @@ -40,6 +38,5 @@ public class SessionDAO extends AbstractJpaDao { s.getQuizzs().add(q); em.merge(s); t.commit(); - em.refresh(s); } } diff --git a/src/main/java/DTO/UtilisateurDTO.java b/src/main/java/DTO/UtilisateurDTO.java index d4c8eeb..e5e998f 100644 --- a/src/main/java/DTO/UtilisateurDTO.java +++ b/src/main/java/DTO/UtilisateurDTO.java @@ -10,4 +10,5 @@ public class UtilisateurDTO { private int id; private String name; private String email; + private String password; } diff --git a/src/main/java/servlet/QuestionInfo.java b/src/main/java/servlet/QuestionInfo.java index 140a06f..5d87f5a 100644 --- a/src/main/java/servlet/QuestionInfo.java +++ b/src/main/java/servlet/QuestionInfo.java @@ -82,7 +82,7 @@ public class QuestionInfo extends HttpServlet { resp.getWriter().println( "\n\n" + - "

Success

" + + "

Question \"" + question.getQuestion() + "\" creee

" + "" ); return ; diff --git a/src/main/java/servlet/QuizzInfo.java b/src/main/java/servlet/QuizzInfo.java index 12820b3..ec03f07 100644 --- a/src/main/java/servlet/QuizzInfo.java +++ b/src/main/java/servlet/QuizzInfo.java @@ -29,7 +29,6 @@ public class QuizzInfo extends HttpServlet { UtilisateurDAO uDAO = new UtilisateurDAO(); String email_user = req.getParameter("email_User"); String id_User = req.getParameter("id_User"); -// String id_session = req.getParameter("code_pin"); Utilisateur u_cree_quizz = null; @@ -50,5 +49,10 @@ public class QuizzInfo extends HttpServlet { quizz.setUtilisateur(u_cree_quizz); //quizz.setSession(s_attached); quizzDAO.create(quizz); + + resp.getWriter().println("\n\n" + + "

Quizz cree par " + u_cree_quizz.getName() + "

" + + ""); + return ; } } diff --git a/src/main/java/servlet/SessionInfo.java b/src/main/java/servlet/SessionInfo.java index aa4832e..1c6c8ce 100644 --- a/src/main/java/servlet/SessionInfo.java +++ b/src/main/java/servlet/SessionInfo.java @@ -54,7 +54,7 @@ public class SessionInfo extends HttpServlet { sessionDAO.addQuizz(quizz,session); - resp.getWriter().println("

Quizz"+ idQuizz +" et ajouté à la session " + sessionID + " !

"); + resp.getWriter().println("

Quizz"+ idQuizz +" est ajouté à la session " + sessionID + " !

"); } } diff --git a/src/main/java/servlet/Show.java b/src/main/java/servlet/Show.java index 9a3fa69..1de981e 100644 --- a/src/main/java/servlet/Show.java +++ b/src/main/java/servlet/Show.java @@ -47,7 +47,7 @@ public class Show extends HttpServlet { "" + "" + "" + - "" + + "" + "" + "" + ""; @@ -55,8 +55,8 @@ public class Show extends HttpServlet { UtilisateurDTO dto = mapper_u.toDTO(u); result += "" + - "" + "" + - ""; + ""+ + ""; System.out.println(u.getName()+dto.getEmail()); } result += diff --git a/src/main/java/servlet/UserInfo.java b/src/main/java/servlet/UserInfo.java index be1d2b1..b737cfa 100644 --- a/src/main/java/servlet/UserInfo.java +++ b/src/main/java/servlet/UserInfo.java @@ -30,11 +30,13 @@ public class UserInfo extends HttpServlet { Utilisateur u = new Utilisateur(); u.setName(request.getParameter("name")); u.setEmail(request.getParameter("email")); + u.setPassword(request.getParameter("password")); + utilisateurDAO.create(u); PrintWriter out = response.getWriter(); out.println("\n\n" + - "

Recapitulatif des informations de Tibo

\n" + + "

Recapitulatif des informations de l'utilisateur

\n" + "
    \n" + "
  • Nom: " + request.getParameter("name") + "\n" + "
  • Email: " + request.getParameter("email") + "\n" + ""); @@ -43,7 +45,7 @@ public class UserInfo extends HttpServlet { int userId = Integer.parseInt(request.getParameter("userId")); utilisateurDAO.addToSession(sessionId, userId); response.getWriter().println("

    Reussi d'ajouter utilisateur " + - userId + " au session " + sessionId + "

    "); + userId + " à la session " + sessionId + ""); } } } diff --git a/src/main/webapp/Session.html b/src/main/webapp/Session.html index 2c1cc14..19b082f 100644 --- a/src/main/webapp/Session.html +++ b/src/main/webapp/Session.html @@ -3,20 +3,26 @@

    Creer une session

    + + + + +
    - Theme: - CodePin - - + Theme:
    + CodePin
    + + + +

    Ajouter un quizz à une session

    - session ID - ID Quizz - + session ID
    + ID Quizz
    + - \ No newline at end of file diff --git a/src/main/webapp/UserInfo.html b/src/main/webapp/UserInfo.html index 9be81af..0fd2c96 100644 --- a/src/main/webapp/UserInfo.html +++ b/src/main/webapp/UserInfo.html @@ -1,11 +1,16 @@ + + + User manager +

    Creer l'utilisateur

    Name :
    Email :
    + Passworld :
    diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index b42c7df..1f0809d 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -2,10 +2,10 @@ - Title + Kaflop! -

    Hello World!

    +

    Kaflop!

    myform session Quizz
NommailNomNommailPassword
" + dto.getName() + "" + dto.getEmail() + "
" + dto.getId() + "" + dto.getName() + "" + dto.getEmail() + "" + dto.getPassword() + "