Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/EjercitarJPA
diff options
context:
space:
mode:
authorSamu <samurey@gmail.com>2013-09-14 13:01:34 (GMT)
committer Samu <samurey@gmail.com>2013-09-14 13:01:34 (GMT)
commit4c6261d9bcc5368b867c935d52c9ee9d273c7c61 (patch)
tree952950408aa95f12494d2ff87eede5dbd19cc4f3 /EjercitarJPA
parent572aace484353292578bb3941feebf90f2c4bd0e (diff)
arreglado el login
Diffstat (limited to 'EjercitarJPA')
-rw-r--r--EjercitarJPA/src/model/Concepto.java6
-rw-r--r--EjercitarJPA/src/model/Ejercicio.java5
2 files changed, 5 insertions, 6 deletions
diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index 2202bcc..41b4d86 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -73,11 +73,7 @@ public class Concepto implements Serializable {
private List<Tarea> tareaList;
-
- @JoinTable(name = "ejercicio_concepto", joinColumns = {
- @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
- @JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")})
- @ManyToMany
+ @ManyToMany(mappedBy = "conceptoList")
private List<Ejercicio> ejercicioList;
@JoinColumn(name = "tema", referencedColumnName = "id_tema")
@ManyToOne
diff --git a/EjercitarJPA/src/model/Ejercicio.java b/EjercitarJPA/src/model/Ejercicio.java
index 026555c..693a34e 100644
--- a/EjercitarJPA/src/model/Ejercicio.java
+++ b/EjercitarJPA/src/model/Ejercicio.java
@@ -53,7 +53,10 @@ public class Ejercicio implements Serializable {
private String enunciado;
@Column(name = "nivel_dificultad")
private Integer nivelDificultad;
- @ManyToMany(mappedBy = "ejercicioList")
+ @JoinTable(name = "ejercicio_concepto", joinColumns = {
+ @JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")}, inverseJoinColumns = {
+ @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")})
+ @ManyToMany()
private List<Concepto> conceptoList;
@JoinTable(name = "respuesta_ejercicio", joinColumns = {
@JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")}, inverseJoinColumns = {