diff --git a/data/test.lck b/data/test.lck index 231bddf..3be2459 100644 Binary files a/data/test.lck and b/data/test.lck differ diff --git a/src/main/java/metier/Activity.java b/src/main/java/metier/Activity.java index c725218..b21c9ac 100644 --- a/src/main/java/metier/Activity.java +++ b/src/main/java/metier/Activity.java @@ -1,5 +1,17 @@ package metier; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; + public abstract class Activity { + private long id_utilisateur_created; + + @Id + @GeneratedValue + public int id; + + public Activity(){ + + } } diff --git a/src/main/java/metier/Choix.java b/src/main/java/metier/Choix.java index 60d91e7..826879a 100644 --- a/src/main/java/metier/Choix.java +++ b/src/main/java/metier/Choix.java @@ -1,7 +1,23 @@ package metier; +import java.util.ArrayList; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; + public class Choix extends Reponse{ - public Choix() {} + + @Id + @GeneratedValue + int id; + + ArrayList choix; + + public Choix() { + super(); + } + + } diff --git a/src/main/java/metier/Question.java b/src/main/java/metier/Question.java index dacaab8..86ae248 100644 --- a/src/main/java/metier/Question.java +++ b/src/main/java/metier/Question.java @@ -10,7 +10,7 @@ import java.util.List; public class Question { private int id; - private List reponseList; + private Reponse reponse; @Id @GeneratedValue @@ -22,11 +22,11 @@ public class Question { } @OneToMany(mappedBy ="reponse", cascade = CascadeType.DETACH) - public List getReponseList() { - return reponseList; + public Reponse getReponse() { + return reponse; } - public void setReponseList(List reponseList) { - this.reponseList = reponseList; + public void setReponse(Reponse reponse) { + this.reponse = reponse; } } diff --git a/src/main/java/metier/Quizz.java b/src/main/java/metier/Quizz.java index 099a34c..2d40c97 100644 --- a/src/main/java/metier/Quizz.java +++ b/src/main/java/metier/Quizz.java @@ -1,5 +1,8 @@ package metier; -public class Quizz { +public class Quizz extends Activity{ + public Quizz(){ + super(); + } } diff --git a/src/main/java/metier/Reponse.java b/src/main/java/metier/Reponse.java index 23865a9..7655c23 100644 --- a/src/main/java/metier/Reponse.java +++ b/src/main/java/metier/Reponse.java @@ -1,29 +1,17 @@ package metier; +import java.util.ArrayList; + import jakarta.persistence.Id; public abstract class Reponse { @Id private int id; - private String value; - private Boolean correct; + + ArrayList reponses; + public Reponse(){ } - public void setValue(String value){ - this.value = value; - } - - public String getValue(){ - return this.value; - } - - public boolean isCorrect(){ - return this.correct; - } - - public void setCorrect(Boolean correct){ - this.correct = correct; - } } \ No newline at end of file diff --git a/src/main/java/metier/ReponseCourte.java b/src/main/java/metier/ReponseCourte.java new file mode 100644 index 0000000..96a25d6 --- /dev/null +++ b/src/main/java/metier/ReponseCourte.java @@ -0,0 +1,20 @@ +package metier; + + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; + +public class ReponseCourte extends Reponse{ + + @Id + @GeneratedValue + int id; + + String value; + + + public ReponseCourte(){ + super(); + } + +} diff --git a/target/classes/metier/Activity.class b/target/classes/metier/Activity.class index 3f2c96f..806ff3b 100644 Binary files a/target/classes/metier/Activity.class and b/target/classes/metier/Activity.class differ diff --git a/target/classes/metier/Choix.class b/target/classes/metier/Choix.class index 640bf22..a454f3e 100644 Binary files a/target/classes/metier/Choix.class and b/target/classes/metier/Choix.class differ diff --git a/target/classes/metier/Question.class b/target/classes/metier/Question.class index 15efedd..85398a2 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 873b6e7..708d3f6 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 379f6a2..9f8d583 100644 Binary files a/target/classes/metier/Reponse.class and b/target/classes/metier/Reponse.class differ diff --git a/target/classes/metier/ReponseCourte.class b/target/classes/metier/ReponseCourte.class new file mode 100644 index 0000000..b49b6c0 Binary files /dev/null and b/target/classes/metier/ReponseCourte.class differ diff --git a/target/classes/metier/Session.class b/target/classes/metier/Session.class index d67b9f2..c08c08f 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 10a2c50..3d4751b 100644 Binary files a/target/classes/metier/Utilisateur.class and b/target/classes/metier/Utilisateur.class differ