1 files changed, 37 insertions, 4 deletions
diff --git a/EjercitarJPA/src/model/Tema.java b/EjercitarJPA/src/model/Tema.java
index 0aa655e..11f82dc 100644
--- a/EjercitarJPA/src/model/Tema.java
+++ b/EjercitarJPA/src/model/Tema.java
@@ -9,11 +9,11 @@ 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.ManyToMany;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
@@ -34,7 +34,8 @@ import javax.xml.bind.annotation.XmlTransient;
     @NamedQuery(name = "Tema.findAll", query = "SELECT t FROM Tema t"),
     @NamedQuery(name = "Tema.findByIdTema", query = "SELECT t FROM Tema t WHERE t.idTema = :idTema"),
     @NamedQuery(name = "Tema.findByNombre", query = "SELECT t FROM Tema t WHERE t.nombre = :nombre"),
-    @NamedQuery(name = "Tema.findByDescripcion", query = "SELECT t FROM Tema t WHERE t.descripcion = :descripcion")})
+    @NamedQuery(name = "Tema.findByDescripcion", query = "SELECT t FROM Tema t WHERE t.descripcion = :descripcion"),
+    @NamedQuery(name = "Tema.findByPeso", query = "SELECT t FROM Tema t WHERE t.peso = :peso")})
 public class Tema implements Serializable {
     private static final long serialVersionUID = 1L;
     @Id
@@ -50,10 +51,18 @@ public class Tema implements Serializable {
     @Size(max = 2147483647)
     @Column(name = "descripcion")
     private String descripcion;
-    @ManyToMany(mappedBy = "temaList")
+    @Column(name = "peso")
+    private Integer peso;
+    @OneToMany(mappedBy = "tema")
     private List<Concepto> conceptoList;
     @OneToMany(mappedBy = "tema")
     private List<Tarea> tareaList;
+    @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
+    @ManyToOne
+    private Profesor profesor;
+    @JoinColumn(name = "asignatura", referencedColumnName = "id_asignatura")
+    @ManyToOne
+    private Asignatura asignatura;
 
     public Tema() {
     }
@@ -91,6 +100,14 @@ public class Tema implements Serializable {
         this.descripcion = descripcion;
     }
 
+    public Integer getPeso() {
+        return peso;
+    }
+
+    public void setPeso(Integer peso) {
+        this.peso = peso;
+    }
+
     @XmlTransient
     public List<Concepto> getConceptoList() {
         return conceptoList;
@@ -109,6 +126,22 @@ public class Tema implements Serializable {
         this.tareaList = tareaList;
     }
 
+    public Profesor getProfesor() {
+        return profesor;
+    }
+
+    public void setProfesor(Profesor profesor) {
+        this.profesor = profesor;
+    }
+
+    public Asignatura getAsignatura() {
+        return asignatura;
+    }
+
+    public void setAsignatura(Asignatura asignatura) {
+        this.asignatura = asignatura;
+    }
+
     @Override
     public int hashCode() {
         int hash = 0;