From 8e8609aa4b19aada9ccb4b2ffe2c7ab8e2d396b7 Mon Sep 17 00:00:00 2001 From: trochas Date: Thu, 25 Sep 2025 15:45:24 +0200 Subject: [PATCH] avancement de Show, liaison entre Quizz et Question --- data/test.lck | Bin 16 -> 16 bytes src/main/java/metier/Choix.java | 9 ++++ src/main/java/metier/Question.java | 20 +++++++++ src/main/java/metier/Quizz.java | 15 ++++++- src/main/java/metier/Reponse.java | 13 ++++-- src/main/java/metier/ReponseCourte.java | 5 +++ src/main/java/servlet/Show.java | 54 ++++++++++++++++++++---- src/main/webapp/css/style.css | 20 +++++++++ src/main/webapp/index.html | 2 + 9 files changed, 124 insertions(+), 14 deletions(-) create mode 100644 src/main/webapp/css/style.css diff --git a/data/test.lck b/data/test.lck index 9b106bc0d95975483be41ea05fba08acf1f27e8d..674ad8fb708025e724545e5e0e495fa955b59f8c 100644 GIT binary patch literal 16 XcmeYW4)pQyclKsrV4T?~C$|s)Br613 literal 16 XcmeYW4)pQyclKsrV4T^ogjWavB?tsR diff --git a/src/main/java/metier/Choix.java b/src/main/java/metier/Choix.java index 87ea872..7b00d01 100644 --- a/src/main/java/metier/Choix.java +++ b/src/main/java/metier/Choix.java @@ -22,4 +22,13 @@ public class Choix extends Reponse{ this.choix = choix; } + @Override + public String valHTML(){ + String res = ""; + + for (String val : this.choix) { + res+=val+"
"; + } + return res; + } } diff --git a/src/main/java/metier/Question.java b/src/main/java/metier/Question.java index f095ab4..d3a085f 100644 --- a/src/main/java/metier/Question.java +++ b/src/main/java/metier/Question.java @@ -7,7 +7,9 @@ import java.io.Serializable; @Entity public class Question implements Serializable { private int id; + private String question; private Reponse reponse; + private Quizz quizz; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -28,4 +30,22 @@ public class Question implements Serializable { this.reponse = reponse; } + @ManyToOne + @JoinColumn(name="id_quizz") + public Quizz getQuizz(){ + return this.quizz; + } + + public void setQuizz(Quizz quizz){ + this.quizz = quizz; + } + + public String getQuestion(){ + return this.question; + } + + public void setQuestion(String question){ + this.question = question; + } + } diff --git a/src/main/java/metier/Quizz.java b/src/main/java/metier/Quizz.java index 4a014dc..f3cbc45 100644 --- a/src/main/java/metier/Quizz.java +++ b/src/main/java/metier/Quizz.java @@ -2,12 +2,14 @@ package metier; import jakarta.persistence.*; import java.io.Serializable; +import java.util.List; @Entity public class Quizz implements Serializable { private Session session; private int id; private Utilisateur utilisateur; + private List questions; public Quizz(){ super(); @@ -41,4 +43,15 @@ public class Quizz implements Serializable { public void setUtilisateur(Utilisateur u){ this.utilisateur=u; } -} + + @OneToMany(mappedBy = "quizz") + public List getQuestions(){ + return this.questions; + } + + + public void setQuestions(List questions){ + this.questions = questions; + } + +} \ No newline at end of file diff --git a/src/main/java/metier/Reponse.java b/src/main/java/metier/Reponse.java index c507aa4..b802b69 100644 --- a/src/main/java/metier/Reponse.java +++ b/src/main/java/metier/Reponse.java @@ -1,7 +1,7 @@ package metier; import java.io.Serializable; -import java.util.ArrayList; +import java.util.List; import jakarta.persistence.*; @@ -12,7 +12,7 @@ import jakarta.persistence.*; public abstract class Reponse implements Serializable { private int id; private Question question; - public ArrayList reponses; + public List reponses; public Reponse(){} @@ -35,11 +35,16 @@ public abstract class Reponse implements Serializable { this.question=question; } - public ArrayList getReponses(){ + public List getReponses(){ return this.reponses; } - public void setReponses(ArrayList reponses){ + public void setReponses(List reponses){ this.reponses=reponses; } + + public String valHTML(){ + return ""; + } + } \ No newline at end of file diff --git a/src/main/java/metier/ReponseCourte.java b/src/main/java/metier/ReponseCourte.java index 227c484..5f3fa95 100644 --- a/src/main/java/metier/ReponseCourte.java +++ b/src/main/java/metier/ReponseCourte.java @@ -18,4 +18,9 @@ public class ReponseCourte extends Reponse{ public String getValue(){ return this.value; } + + @Override + public String valHTML(){ + return "INPUT"; + } } diff --git a/src/main/java/servlet/Show.java b/src/main/java/servlet/Show.java index 7ac6acb..5ee60af 100644 --- a/src/main/java/servlet/Show.java +++ b/src/main/java/servlet/Show.java @@ -4,13 +4,13 @@ import java.io.IOException; import java.util.List; import DAO.*; +import metier.*; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import metier.Utilisateur; @WebServlet(name="Show", urlPatterns={"/Show"}) public class Show extends HttpServlet { @@ -22,20 +22,56 @@ public class Show extends HttpServlet { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { response.setContentType("text/html"); - List listUser = utilisateurDAO.findAll(); + String result = ""+ + ""+ + ""+ + ""+ + ""+ + ""; - String result = "\n\n"; + + + //UTILISATEUR + List listUser = utilisateurDAO.findAll(); result += "

Utilisateurs :

"; + result += + ""+ + ""+ + ""+ + ""+ + ""+ + ""+ + ""; for (Utilisateur u : listUser) { - - result += u.getName(); - result += u.getId(); - result += u.getEmail(); - result += u.getPassword(); + result+= + ""+ + ""+""+""+ + ""; } + result += + ""+ + "
IDNommail
"+u.getId()+""+u.getName()+""+u.getEmail()+"
"; + result += "\n"; - result += "\n"; + //QUIZZ + List listQuizz = quizzDAI.findAll(); + + result += "

Quizz :

"; + for (Quizz quizz : listQuizz) { + result += "quizz n°" + quizz.getId() + "
"; + for (Question question : quizz.getQuestions()) { + result += question.getQuestion() + "
"; + + result += "choix de réponse :
"; + result += question.getReponse().valHTML(); + + result+= "Reponses corrects :
"; + for (String reponse : question.getReponse().getReponses()) { + result += reponse; + } + } + } response.getWriter().write(result); diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css new file mode 100644 index 0000000..21114f6 --- /dev/null +++ b/src/main/webapp/css/style.css @@ -0,0 +1,20 @@ +body{ + +} + +table.show{ + border-collapse: collapse; + text-align: left; + border: 2px solid #C0C0C0; + +} + +thead.show{ + background-color: #F0F0F0; +} + +th.show{ + padding-left: 5px; + padding-right: 5px; + border: 1px solid #C0C0C0 +} diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index b311d47..5947d6e 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -7,6 +7,8 @@

Hello World!

myform +Quizz + show