se agrego tarea.jsp para agregar una nueva tarea. se modifico la vista

vista_asignatura.jsp para listar las tareas

3 files changed, 27 insertions, 1 deletions

diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index 12c2083..6352df7 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -72,11 +73,13 @@ public class Concepto implements Serializable {
     @ManyToMany
     private List<Ejercicio> ejercicioList;
     @JoinColumn(name = "tema", referencedColumnName = "id_tema")
-    @ManyToOne
+    @ManyToOne 
     private Tema tema;
     @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
     @ManyToOne
     private Profesor profesor;
+    @ManyToOne
+    private Tarea tarea;
 
     public Concepto() {
     }
@@ -171,7 +174,13 @@ public class Concepto implements Serializable {
     public void setProfesor(Profesor profesor) {
         this.profesor = profesor;
     }
+    public Tarea getTarea() {
+        return tarea;
+    }
 
+    public void setTarea(Tarea tarea) {
+        this.tarea = tarea;
+    }
     @Override
     public int hashCode() {
         int hash = 0;
diff --git a/EjercitarJPA/src/model/Tarea.java b/EjercitarJPA/src/model/Tarea.java
index 6a1c72b..b16a520 100644
--- a/EjercitarJPA/src/model/Tarea.java
+++ b/EjercitarJPA/src/model/Tarea.java
@@ -5,19 +5,24 @@
 package model;
 
 import java.io.Serializable;
+import java.util.List;
+
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 /**
  *
@@ -49,6 +54,8 @@ public class Tarea implements Serializable {
     @JoinColumn(name = "curso", referencedColumnName = "id_curso")
     @ManyToOne
     private Curso curso;
+    @OneToMany(mappedBy = "tarea")
+    private List<Concepto> conceptoList;
 
     public Tarea() {
     }
@@ -97,6 +104,15 @@ public class Tarea implements Serializable {
         this.curso = curso;
     }
 
+    @XmlTransient
+    public List<Concepto> getConceptoList() {
+        return conceptoList;
+    }
+
+    public void setConceptoList(List<Concepto> conceptoList) {
+        this.conceptoList = conceptoList;
+    }
+    
     @Override
     public int hashCode() {
         int hash = 0;
diff --git a/EjercitarJPA/src/model/Tema.java b/EjercitarJPA/src/model/Tema.java
index 2ba32cd..ca4e087 100644
--- a/EjercitarJPA/src/model/Tema.java
+++ b/EjercitarJPA/src/model/Tema.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;