se anhadio agregar tarea

3 files changed, 25 insertions, 1 deletions

diff --git a/EjercitarJPA/src/model/Asignatura.java b/EjercitarJPA/src/model/Asignatura.java
index a73af53..c757d6a 100644
--- a/EjercitarJPA/src/model/Asignatura.java
+++ b/EjercitarJPA/src/model/Asignatura.java
@@ -58,7 +58,10 @@ public class Asignatura implements Serializable {
     private Curso curso;
     @OneToMany(mappedBy = "asignatura")
     private List<Tema> temaList;
-
+    @OneToMany(mappedBy = "asignatura")
+    private List<Tarea> tareaList;
+    
+    
     public Asignatura() {
     }
 
@@ -120,6 +123,14 @@ public class Asignatura implements Serializable {
         this.temaList = temaList;
     }
 
+    @XmlTransient
+    public List<Tarea> getTareaList() {
+        return tareaList;
+    }
+
+    public void setTareaList(List<Tarea> tareaList) {
+        this.tareaList = tareaList;
+    }
     @Override
     public int hashCode() {
         int hash = 0;
diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index 6352df7..d31b1e9 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -78,6 +78,7 @@ public class Concepto implements Serializable {
     @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
     @ManyToOne
     private Profesor profesor;
+    @JoinColumn(name = "tarea", referencedColumnName = "id_tarea")
     @ManyToOne
     private Tarea tarea;
 
diff --git a/EjercitarJPA/src/model/Tarea.java b/EjercitarJPA/src/model/Tarea.java
index b16a520..7b0fb37 100644
--- a/EjercitarJPA/src/model/Tarea.java
+++ b/EjercitarJPA/src/model/Tarea.java
@@ -57,6 +57,10 @@ public class Tarea implements Serializable {
     @OneToMany(mappedBy = "tarea")
     private List<Concepto> conceptoList;
 
+    @JoinColumn(name = "asignatura", referencedColumnName = "id_asignatura")
+    @ManyToOne
+    private Asignatura asignatura;
+    
     public Tarea() {
     }
 
@@ -103,6 +107,14 @@ public class Tarea implements Serializable {
     public void setCurso(Curso curso) {
         this.curso = curso;
     }
+    
+    public Asignatura getAsignatura() {
+        return asignatura;
+    }
+
+    public void setAsignatura(Asignatura asignatura) {
+        this.asignatura = asignatura;
+    }
 
     @XmlTransient
     public List<Concepto> getConceptoList() {