diff --git a/data/test.lck b/data/test.lck deleted file mode 100644 index 3be2459..0000000 Binary files a/data/test.lck and /dev/null differ diff --git a/src/main/java/metier/Activity.java b/src/main/java/metier/Activity.java deleted file mode 100644 index 27ee515..0000000 --- a/src/main/java/metier/Activity.java +++ /dev/null @@ -1,21 +0,0 @@ -package metier; - -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; - -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; - -public abstract class Activity { - @Id - @GeneratedValue - public int id; - - @ManyToOne - @JoinColumn(name="id_utilisateur") - private Utilisateur utilisateur; - - public Activity(){ - - } -} diff --git a/src/main/java/metier/Classement.java b/src/main/java/metier/Classement.java deleted file mode 100644 index d45100f..0000000 --- a/src/main/java/metier/Classement.java +++ /dev/null @@ -1,6 +0,0 @@ -package metier; - -public class Classement { - private Question question; - -} diff --git a/src/main/java/metier/Quizz.java b/src/main/java/metier/Quizz.java index 600aa7d..d7a81b8 100644 --- a/src/main/java/metier/Quizz.java +++ b/src/main/java/metier/Quizz.java @@ -1,10 +1,37 @@ package metier; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import java.io.Serializable; public class Quizz extends Activity implements Serializable { + public int id; + private Utilisateur utilisateur; + public Quizz(){ super(); } + + @Id + @GeneratedValue + public int getId(){ + return id; + } + + public void setId(Integer id){ + this.id=id; + } + + @ManyToOne + @JoinColumn(name="id_utilisateur") + public Utilisateur getUtilisateur(){ + return utilisateur; + } + + public void setUtilisateur(Utilisateur u){ + this.utilisateur=u; + } } diff --git a/src/main/java/metier/Reponse.java b/src/main/java/metier/Reponse.java index eaf30d8..d31fbcd 100644 --- a/src/main/java/metier/Reponse.java +++ b/src/main/java/metier/Reponse.java @@ -9,9 +9,7 @@ import jakarta.persistence.Id; public abstract class Reponse implements Serializable { private int id; - - ArrayList reponses; - + private ArrayList reponses; public Reponse(){} diff --git a/src/main/java/metier/Utilisateur.java b/src/main/java/metier/Utilisateur.java index 81f7033..570f2e6 100644 --- a/src/main/java/metier/Utilisateur.java +++ b/src/main/java/metier/Utilisateur.java @@ -15,7 +15,7 @@ public class Utilisateur implements Serializable { private String password; @OneToMany(mappedBy = "utilisateur") - private List activities; + private List activities; public Utilisateur() {} diff --git a/target/classes/DAO/ChoixDAO.class b/target/classes/DAO/ChoixDAO.class new file mode 100644 index 0000000..c0ee5ba Binary files /dev/null and b/target/classes/DAO/ChoixDAO.class differ diff --git a/target/classes/DAO/QuestionDAO.class b/target/classes/DAO/QuestionDAO.class new file mode 100644 index 0000000..be87dc3 Binary files /dev/null and b/target/classes/DAO/QuestionDAO.class differ diff --git a/target/classes/DAO/QuizzDAO.class b/target/classes/DAO/QuizzDAO.class new file mode 100644 index 0000000..ceb0ad1 Binary files /dev/null and b/target/classes/DAO/QuizzDAO.class differ diff --git a/target/classes/DAO/ReponseCourteDAO.class b/target/classes/DAO/ReponseCourteDAO.class new file mode 100644 index 0000000..ed21a78 Binary files /dev/null and b/target/classes/DAO/ReponseCourteDAO.class differ diff --git a/target/classes/DAO/ReponseDAO.class b/target/classes/DAO/ReponseDAO.class new file mode 100644 index 0000000..f34701c Binary files /dev/null and b/target/classes/DAO/ReponseDAO.class differ diff --git a/target/classes/DAO/SessionDAO.class b/target/classes/DAO/SessionDAO.class new file mode 100644 index 0000000..366d621 Binary files /dev/null and b/target/classes/DAO/SessionDAO.class differ diff --git a/target/classes/DAO/Tous.class b/target/classes/DAO/Tous.class new file mode 100644 index 0000000..86a26ec Binary files /dev/null and b/target/classes/DAO/Tous.class differ diff --git a/target/classes/DAO/TousDAOImpl.class b/target/classes/DAO/TousDAOImpl.class new file mode 100644 index 0000000..602219a Binary files /dev/null and b/target/classes/DAO/TousDAOImpl.class differ diff --git a/target/classes/DAO/UtilisateurDAO.class b/target/classes/DAO/UtilisateurDAO.class new file mode 100644 index 0000000..5e45b34 Binary files /dev/null and b/target/classes/DAO/UtilisateurDAO.class differ diff --git a/target/classes/metier/Activity.class b/target/classes/metier/Activity.class deleted file mode 100644 index 806ff3b..0000000 Binary files a/target/classes/metier/Activity.class and /dev/null differ diff --git a/target/classes/metier/Classement.class b/target/classes/metier/Classement.class deleted file mode 100644 index 5d73d0b..0000000 Binary files a/target/classes/metier/Classement.class and /dev/null differ diff --git a/target/classes/metier/Question.class b/target/classes/metier/Question.class index 85398a2..141de72 100644 Binary files a/target/classes/metier/Question.class and b/target/classes/metier/Question.class differ diff --git a/target/classes/metier/Quizz.class b/target/classes/metier/Quizz.class index 708d3f6..5c9be08 100644 Binary files a/target/classes/metier/Quizz.class and b/target/classes/metier/Quizz.class differ diff --git a/target/classes/metier/Reponse.class b/target/classes/metier/Reponse.class index 9f8d583..924af11 100644 Binary files a/target/classes/metier/Reponse.class and b/target/classes/metier/Reponse.class differ diff --git a/target/classes/metier/Session.class b/target/classes/metier/Session.class index c08c08f..2344615 100644 Binary files a/target/classes/metier/Session.class and b/target/classes/metier/Session.class differ diff --git a/target/classes/metier/Utilisateur.class b/target/classes/metier/Utilisateur.class index 3d4751b..1e716ed 100644 Binary files a/target/classes/metier/Utilisateur.class and b/target/classes/metier/Utilisateur.class differ