Merge remote-tracking branch 'remotes/origin/Cecilia' into samu

Conflicts:
	EjercitarServer/ejbModule/beans/AdministracionBeanRemote.java
	EjercitarWeb/src/src/VerResultadosServlet.java

6 files changed, 30 insertions, 28 deletions

diff --git a/EjercitarJPA/build/classes/model/Asignatura.class b/EjercitarJPA/build/classes/model/Asignatura.class
index 64f7a87..7b4cdcb 100644
--- a/EjercitarJPA/build/classes/model/Asignatura.class
+++ b/EjercitarJPA/build/classes/model/Asignatura.class
diff --git a/EjercitarJPA/build/classes/model/Concepto.class b/EjercitarJPA/build/classes/model/Concepto.class
index cf486cd..dd33819 100644
--- a/EjercitarJPA/build/classes/model/Concepto.class
+++ b/EjercitarJPA/build/classes/model/Concepto.class
diff --git a/EjercitarJPA/build/classes/model/Tarea.class b/EjercitarJPA/build/classes/model/Tarea.class
index 22cc31e..2a651a8 100644
--- a/EjercitarJPA/build/classes/model/Tarea.class
+++ b/EjercitarJPA/build/classes/model/Tarea.class
diff --git a/EjercitarJPA/build/classes/model/Tema.class b/EjercitarJPA/build/classes/model/Tema.class
index a7efd11..98e2972 100644
--- a/EjercitarJPA/build/classes/model/Tema.class
+++ b/EjercitarJPA/build/classes/model/Tema.class
diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java
index d31b1e9..85b1221 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -9,7 +9,6 @@ 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;
@@ -67,20 +66,22 @@ public class Concepto implements Serializable {
     private Double descuido;
     @Column(name = "apriori")
     private Double apriori;
+    @JoinTable(name = "tarea_concepto", joinColumns = {
+        @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
+        @JoinColumn(name = "id_tarea", referencedColumnName = "id_tarea")})
+    @ManyToMany
+    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
     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;
-    @JoinColumn(name = "tarea", referencedColumnName = "id_tarea")
-    @ManyToOne
-    private Tarea tarea;
 
     public Concepto() {
     }
@@ -152,6 +153,15 @@ public class Concepto implements Serializable {
     }
 
     @XmlTransient
+    public List<Tarea> getTareaList() {
+        return tareaList;
+    }
+
+    public void setTareaList(List<Tarea> tareaList) {
+        this.tareaList = tareaList;
+    }
+
+    @XmlTransient
     public List<Ejercicio> getEjercicioList() {
         return ejercicioList;
     }
@@ -175,13 +185,7 @@ 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 7b0fb37..98f8262 100644
--- a/EjercitarJPA/src/model/Tarea.java
+++ b/EjercitarJPA/src/model/Tarea.java
@@ -6,17 +6,16 @@ package model;
 
 import java.io.Serializable;
 import java.util.List;
-
 import javax.persistence.Basic;
+import javax.persistence.CascadeType;
 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.ManyToMany;
 import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
@@ -45,6 +44,8 @@ public class Tarea implements Serializable {
     @Size(max = 2147483647)
     @Column(name = "descripcion")
     private String descripcion;
+    @ManyToMany(mappedBy = "tareaList", cascade = CascadeType.ALL)
+    private List<Concepto> conceptoList;
     @JoinColumn(name = "tema", referencedColumnName = "id_tema")
     @ManyToOne
     private Tema tema;
@@ -54,13 +55,10 @@ public class Tarea implements Serializable {
     @JoinColumn(name = "curso", referencedColumnName = "id_curso")
     @ManyToOne
     private Curso curso;
-    @OneToMany(mappedBy = "tarea")
-    private List<Concepto> conceptoList;
-
     @JoinColumn(name = "asignatura", referencedColumnName = "id_asignatura")
     @ManyToOne
     private Asignatura asignatura;
-    
+
     public Tarea() {
     }
 
@@ -84,6 +82,15 @@ public class Tarea implements Serializable {
         this.descripcion = descripcion;
     }
 
+    @XmlTransient
+    public List<Concepto> getConceptoList() {
+        return conceptoList;
+    }
+
+    public void setConceptoList(List<Concepto> conceptoList) {
+        this.conceptoList = conceptoList;
+    }
+
     public Tema getTema() {
         return tema;
     }
@@ -107,7 +114,7 @@ public class Tarea implements Serializable {
     public void setCurso(Curso curso) {
         this.curso = curso;
     }
-    
+
     public Asignatura getAsignatura() {
         return asignatura;
     }
@@ -116,15 +123,6 @@ public class Tarea implements Serializable {
         this.asignatura = asignatura;
     }
 
-    @XmlTransient
-    public List<Concepto> getConceptoList() {
-        return conceptoList;
-    }
-
-    public void setConceptoList(List<Concepto> conceptoList) {
-        this.conceptoList = conceptoList;
-    }
-    
     @Override
     public int hashCode() {
         int hash = 0;