1 files changed, 13 insertions, 14 deletions
diff --git a/EjercitarJPA/src/model/Tema.java b/EjercitarJPA/src/model/Tema.java
index 1c6eb36..97b500b 100644
--- a/EjercitarJPA/src/model/Tema.java
+++ b/EjercitarJPA/src/model/Tema.java
@@ -12,8 +12,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import javax.persistence.ManyToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
@@ -28,7 +27,7 @@ import javax.xml.bind.annotation.XmlTransient;
  * @author Ceci
  */
 @Entity
-@Table(name = "TEMA")
+@Table(name = "tema")
 @XmlRootElement
 @NamedQueries({
     @NamedQuery(name = "Tema.findAll", query = "SELECT t FROM Tema t"),
@@ -50,11 +49,10 @@ public class Tema implements Serializable {
     @Size(max = 2147483647)
     @Column(name = "descripcion")
     private String descripcion;
+    @ManyToMany(mappedBy = "temaList")
+    private List<Concepto> conceptoList;
     @OneToMany(mappedBy = "tema")
     private List<Tarea> tareaList;
-    @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")
-    @ManyToOne
-    private Concepto idConcepto;
 
     public Tema() {
     }
@@ -93,20 +91,21 @@ public class Tema implements Serializable {
     }
 
     @XmlTransient
-    public List<Tarea> getTareaList() {
-        return tareaList;
+    public List<Concepto> getConceptoList() {
+        return conceptoList;
     }
 
-    public void setTareaList(List<Tarea> tareaList) {
-        this.tareaList = tareaList;
+    public void setConceptoList(List<Concepto> conceptoList) {
+        this.conceptoList = conceptoList;
     }
 
-    public Concepto getIdConcepto() {
-        return idConcepto;
+    @XmlTransient
+    public List<Tarea> getTareaList() {
+        return tareaList;
     }
 
-    public void setIdConcepto(Concepto idConcepto) {
-        this.idConcepto = idConcepto;
+    public void setTareaList(List<Tarea> tareaList) {
+        this.tareaList = tareaList;
     }
 
     @Override