diff --git a/README.md b/README.md index 84f5624..6202bb2 100644 --- a/README.md +++ b/README.md @@ -13,54 +13,61 @@ classDiagram class Utilisateur { -id : int - name : String - getId()int - setId(id:int)void - getName()String - setName(name:String)void - + -name : String + -session : List + -email : String + -password : String + -quizzs : String + +getId()int + +setId(id:int)void + +getName()String + +setName(name:String)void } class Session{ - -id : int - theme : int - getId()int - setId(id:int)void - getTheme()String - setTheme(theme:String)void + -codePin : int + -quizzs : List + -utilisateurs : List + -theme : int + +getCodePIN()int + +setCodePIN(id:int)void + +getTheme()String + +setTheme(theme:String)void } class Quizz{ + -session: Session -id : int - getId()int - setId(id:int)void + -utilisateur: Utilisateur + +getId()int + +setId(id:int)void } class Reponse{ - - id : int - reponses : ArrayList - getId()int - setId(id:int)void - getReponse()ArrayList - setReponse(reponse:ArrayList )void + -id : int + -question: Question + -reponses : ArrayList + +getId()int + +setId(id:int)void + +getReponse()ArrayList + +setReponse(reponse:ArrayList )void } class Choix{ - - id : int - choix : List - getId()int - setId(id:int)void - getChoix()List - setChoix(choix:List)void + -choix : ArrayList + +getId()int + +setId(id:int)void + +getChoix()List + +setChoix(choix:List)void } class ReponseCourte{ - - id : int - value : String - getId()int - setId(id:int)void - getVlaue()String - setId(id:String)void + -value : String + +getId()int + +setId(id:int)void + +getVlaue()String + +setId(id:String)void } class Question{ - - id : int - getId()int - setId(id:int)void + -id : int + -reponse: Reponse + +getId()int + +setId(id:int)void } ``` @@ -68,4 +75,4 @@ classDiagram Commande pour supprimer: ```rm -rd data/*``` run : -compile jetty:run \ No newline at end of file +compile jetty:run diff --git a/data/test.lck b/data/test.lck index 674ad8f..5b401ff 100644 Binary files a/data/test.lck and b/data/test.lck differ diff --git a/src/main/java/servlet/QuizzInfo.java b/src/main/java/servlet/QuizzInfo.java index 4f88c35..ca45606 100644 --- a/src/main/java/servlet/QuizzInfo.java +++ b/src/main/java/servlet/QuizzInfo.java @@ -17,25 +17,11 @@ public class QuizzInfo extends HttpServlet { QuizzDAO quizzDAO = new QuizzDAO(); @Override - public void init() throws ServletException { - super.init(); + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + req.getRequestDispatcher("/Quizz.html").forward(req, resp); } @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.setContentType("text/html;charset=UTF-8"); - resp.getWriter().println( - "" + - "

Créer un Quizz

" + - "
" + - "ID Utilisateur:
" + - "Email Utilisateur:
" + - "" + - "
" + - "" - ); - } - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { //Utilisateur UtilisateurDAO uDAO = new UtilisateurDAO(); diff --git a/src/main/java/servlet/SessionInfo.java b/src/main/java/servlet/SessionInfo.java new file mode 100644 index 0000000..5d5bfb9 --- /dev/null +++ b/src/main/java/servlet/SessionInfo.java @@ -0,0 +1,4 @@ +package servlet; + +public class SessionInfo { +} diff --git a/src/main/java/servlet/Show.java b/src/main/java/servlet/Show.java index 5ee60af..3ccb501 100644 --- a/src/main/java/servlet/Show.java +++ b/src/main/java/servlet/Show.java @@ -74,6 +74,5 @@ public class Show extends HttpServlet { } response.getWriter().write(result); - } } diff --git a/src/main/java/servlet/UserInfo.java b/src/main/java/servlet/UserInfo.java index a3e6078..a3d86a5 100644 --- a/src/main/java/servlet/UserInfo.java +++ b/src/main/java/servlet/UserInfo.java @@ -12,14 +12,12 @@ import metier.Utilisateur; @WebServlet(name="userinfo", urlPatterns={"/UserInfo"}) public class UserInfo extends HttpServlet { - - Utilisateur u; + UtilisateurDAO utilisateurDAO = new UtilisateurDAO(); @Override - public void init() throws ServletException { - super.init(); + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + req.getRequestDispatcher("/UserInfo.html").forward(req, resp); } - UtilisateurDAO utilisateurDAO = new UtilisateurDAO(); public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html"); diff --git a/src/main/webapp/Quizz.html b/src/main/webapp/Quizz.html index 76484c9..890855d 100644 --- a/src/main/webapp/Quizz.html +++ b/src/main/webapp/Quizz.html @@ -1,15 +1,12 @@ - - - Créer des quizz -
- Create from id : - Create from email : - Enter code pin : - Créer Quizz +

Creer des quizz

+ Create from id :
+ Create from email :
+ Enter code pin :
+
\ No newline at end of file diff --git a/src/main/webapp/Session.html b/src/main/webapp/Session.html new file mode 100644 index 0000000..fc8db62 --- /dev/null +++ b/src/main/webapp/Session.html @@ -0,0 +1,12 @@ + + + +
+

Creer des quizz

+ Create from id :
+ Create from email :
+ Enter code pin :
+ +
+ + \ No newline at end of file diff --git a/src/main/webapp/myform.html b/src/main/webapp/UserInfo.html similarity index 100% rename from src/main/webapp/myform.html rename to src/main/webapp/UserInfo.html