JPA - Se modifico entity sesion, tarea alumno. se agrego double a peso de las entidades tema concepto

Cliente - se modifico la interfaz
EJB se agrego metodo de sesion, falta terminar

8 files changed, 86 insertions, 75 deletions

diff --git a/EjercitarJPA/src/model/Alumno.java b/EjercitarJPA/src/model/Alumno.java
index c805c66..925dac3 100644
--- a/EjercitarJPA/src/model/Alumno.java
+++ b/EjercitarJPA/src/model/Alumno.java
@@ -14,8 +14,6 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
@@ -66,10 +64,7 @@ public class Alumno implements Serializable {
     @Size(max = 1)
     @Column(name = "genero")
     private String genero;
-    @JoinTable(name = "alumno_sesion", joinColumns = {
-        @JoinColumn(name = "id_alumno", referencedColumnName = "id_alumno")}, inverseJoinColumns = {
-        @JoinColumn(name = "id_sesion", referencedColumnName = "id_sesion")})
-    @ManyToMany
+    @OneToMany(mappedBy = "idAlumno")
     private List<Sesion> sesionList;
     @OneToMany(mappedBy = "alumno")
     private List<EjercicioResueltoAlumno> ejercicioResueltoAlumnoList;
diff --git a/EjercitarJPA/src/model/Asignatura.java b/EjercitarJPA/src/model/Asignatura.java
index c757d6a..b237f51 100644
--- a/EjercitarJPA/src/model/Asignatura.java
+++ b/EjercitarJPA/src/model/Asignatura.java
@@ -34,7 +34,8 @@ import javax.xml.bind.annotation.XmlTransient;
     @NamedQuery(name = "Asignatura.findAll", query = "SELECT a FROM Asignatura a"),
     @NamedQuery(name = "Asignatura.findByIdAsignatura", query = "SELECT a FROM Asignatura a WHERE a.idAsignatura = :idAsignatura"),
     @NamedQuery(name = "Asignatura.findByNombre", query = "SELECT a FROM Asignatura a WHERE a.nombre = :nombre"),
-    @NamedQuery(name = "Asignatura.findByDescripcion", query = "SELECT a FROM Asignatura a WHERE a.descripcion = :descripcion")})
+    @NamedQuery(name = "Asignatura.findByDescripcion", query = "SELECT a FROM Asignatura a WHERE a.descripcion = :descripcion"),
+    @NamedQuery(name = "Asignatura.findByIniciado", query = "SELECT a FROM Asignatura a WHERE a.iniciado = :iniciado")})
 public class Asignatura implements Serializable {
     private static final long serialVersionUID = 1L;
     @Id
@@ -50,6 +51,10 @@ public class Asignatura implements Serializable {
     @Size(max = 2147483647)
     @Column(name = "descripcion")
     private String descripcion;
+    @Column(name = "iniciado")
+    private Boolean iniciado;
+    @OneToMany(mappedBy = "asignatura")
+    private List<Tarea> tareaList;
     @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
     @ManyToOne
     private Profesor profesor;
@@ -58,10 +63,7 @@ public class Asignatura implements Serializable {
     private Curso curso;
     @OneToMany(mappedBy = "asignatura")
     private List<Tema> temaList;
-    @OneToMany(mappedBy = "asignatura")
-    private List<Tarea> tareaList;
-    
-    
+
     public Asignatura() {
     }
 
@@ -98,6 +100,23 @@ public class Asignatura implements Serializable {
         this.descripcion = descripcion;
     }
 
+    public Boolean getIniciado() {
+        return iniciado;
+    }
+
+    public void setIniciado(Boolean iniciado) {
+        this.iniciado = iniciado;
+    }
+
+    @XmlTransient
+    public List<Tarea> getTareaList() {
+        return tareaList;
+    }
+
+    public void setTareaList(List<Tarea> tareaList) {
+        this.tareaList = tareaList;
+    }
+
     public Profesor getProfesor() {
         return profesor;
     }
@@ -123,14 +142,6 @@ 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 85b1221..8d5b8bc 100644
--- a/EjercitarJPA/src/model/Concepto.java
+++ b/EjercitarJPA/src/model/Concepto.java
@@ -2,6 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
+
 package model;
 
 import java.io.Serializable;
@@ -57,9 +58,9 @@ public class Concepto implements Serializable {
     @Size(min = 1, max = 2147483647)
     @Column(name = "descripcion")
     private String descripcion;
-    @Column(name = "peso")
-    private Integer peso;
     // @Max(value=?)  @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation
+    @Column(name = "peso")
+    private Double peso;
     @Column(name = "adivinanza")
     private Double adivinanza;
     @Column(name = "descuido")
@@ -120,11 +121,11 @@ public class Concepto implements Serializable {
         this.descripcion = descripcion;
     }
 
-    public Integer getPeso() {
+    public Double getPeso() {
         return peso;
     }
 
-    public void setPeso(Integer peso) {
+    public void setPeso(Double peso) {
         this.peso = peso;
     }
 
@@ -210,5 +211,5 @@ public class Concepto implements Serializable {
     public String toString() {
         return "model.Concepto[ idConcepto=" + idConcepto + " ]";
     }
-    
+
 }
diff --git a/EjercitarJPA/src/model/Profesor.java b/EjercitarJPA/src/model/Profesor.java
index 282233a..1aca780 100644
--- a/EjercitarJPA/src/model/Profesor.java
+++ b/EjercitarJPA/src/model/Profesor.java
@@ -40,10 +40,10 @@ import javax.xml.bind.annotation.XmlTransient;
     @NamedQuery(name = "Profesor.findByApellido", query = "SELECT p FROM Profesor p WHERE p.apellido = :apellido"),
     @NamedQuery(name = "Profesor.findByCedula", query = "SELECT p FROM Profesor p WHERE p.cedula = :cedula"),
     @NamedQuery(name = "Profesor.findByFechaNac", query = "SELECT p FROM Profesor p WHERE p.fechaNac = :fechaNac"),
-	@NamedQuery(name = "Profesor.findByUsuario", query = "SELECT p FROM Profesor p WHERE p.usuario  = :usuario")})
+    @NamedQuery(name = "Profesor.findByUsuario", query = "SELECT p FROM Profesor p WHERE p.usuario = :usuario"),
+    @NamedQuery(name = "Profesor.findByPassword", query = "SELECT p FROM Profesor p WHERE p.password = :password")})
 public class Profesor implements Serializable {
-
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Basic(optional = false)
@@ -66,8 +66,10 @@ public class Profesor implements Serializable {
     @Column(name = "fecha_nac")
     @Temporal(TemporalType.DATE)
     private Date fechaNac;
+    @Size(max = 10)
     @Column(name = "usuario")
     private String usuario;
+    @Size(max = 10)
     @Column(name = "password")
     private String password;
     @ManyToMany(mappedBy = "profesorList", fetch=FetchType.EAGER)
@@ -80,6 +82,7 @@ public class Profesor implements Serializable {
     private List<Asignatura> asignaturaList;
     @OneToMany(mappedBy = "profesor")
     private List<Tema> temaList;
+
     public Profesor() {
     }
 
@@ -133,22 +136,22 @@ public class Profesor implements Serializable {
     public void setFechaNac(Date fechaNac) {
         this.fechaNac = fechaNac;
     }
-    public String getUsuario() {
-		return usuario;
-	}
 
-	public void setUsuario(String usuario) {
-		this.usuario = usuario;
-	}
+    public String getUsuario() {
+        return usuario;
+    }
 
-	public String getPassword() {
-		return password;
-	}
+    public void setUsuario(String usuario) {
+        this.usuario = usuario;
+    }
 
-	public void setPassword(String password) {
-		this.password = password;
-	}
+    public String getPassword() {
+        return password;
+    }
 
+    public void setPassword(String password) {
+        this.password = password;
+    }
 
     @XmlTransient
     public List<Curso> getCursoList() {
diff --git a/EjercitarJPA/src/model/Respuesta.java b/EjercitarJPA/src/model/Respuesta.java
index 47b7ef1..bcada7d 100644
--- a/EjercitarJPA/src/model/Respuesta.java
+++ b/EjercitarJPA/src/model/Respuesta.java
@@ -120,5 +120,5 @@ public class Respuesta implements Serializable {
     public String toString() {
         return "model.Respuesta[ idRespuesta=" + idRespuesta + " ]";
     }
-    
+
 }
diff --git a/EjercitarJPA/src/model/Sesion.java b/EjercitarJPA/src/model/Sesion.java
index f693e7a..77020f9 100644
--- a/EjercitarJPA/src/model/Sesion.java
+++ b/EjercitarJPA/src/model/Sesion.java
@@ -2,28 +2,27 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
+
 package model;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 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;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
 
 /**
  *
@@ -64,10 +63,12 @@ public class Sesion implements Serializable {
     @Size(max = 5)
     @Column(name = "estado_animo")
     private String estadoAnimo;
-    @ManyToMany(mappedBy = "sesionList")
-    private List<Alumno> alumnoList;
-    @OneToMany(mappedBy = "sesion")
-    private List<Tarea> tareaList;
+    @JoinColumn(name = "id_tarea", referencedColumnName = "id_tarea")
+    @ManyToOne
+    private Tarea idTarea;
+    @JoinColumn(name = "id_alumno", referencedColumnName = "id_alumno")
+    @ManyToOne
+    private Alumno idAlumno;
 
     public Sesion() {
     }
@@ -130,22 +131,20 @@ public class Sesion implements Serializable {
         this.estadoAnimo = estadoAnimo;
     }
 
-    @XmlTransient
-    public List<Alumno> getAlumnoList() {
-        return alumnoList;
+    public Tarea getIdTarea() {
+        return idTarea;
     }
 
-    public void setAlumnoList(List<Alumno> alumnoList) {
-        this.alumnoList = alumnoList;
+    public void setIdTarea(Tarea idTarea) {
+        this.idTarea = idTarea;
     }
 
-    @XmlTransient
-    public List<Tarea> getTareaList() {
-        return tareaList;
+    public Alumno getIdAlumno() {
+        return idAlumno;
     }
 
-    public void setTareaList(List<Tarea> tareaList) {
-        this.tareaList = tareaList;
+    public void setIdAlumno(Alumno idAlumno) {
+        this.idAlumno = idAlumno;
     }
 
     @Override
@@ -172,5 +171,5 @@ public class Sesion implements Serializable {
     public String toString() {
         return "model.Sesion[ idSesion=" + idSesion + " ]";
     }
-    
+
 }
diff --git a/EjercitarJPA/src/model/Tarea.java b/EjercitarJPA/src/model/Tarea.java
index 94f98c0..036e034 100644
--- a/EjercitarJPA/src/model/Tarea.java
+++ b/EjercitarJPA/src/model/Tarea.java
@@ -17,6 +17,7 @@ import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -48,15 +49,14 @@ public class Tarea implements Serializable {
     @JoinColumn(name = "tema", referencedColumnName = "id_tema")
     @ManyToOne
     private Tema tema;
-    @JoinColumn(name = "sesion", referencedColumnName = "id_sesion")
-    @ManyToOne
-    private Sesion sesion;
     @JoinColumn(name = "curso", referencedColumnName = "id_curso")
     @ManyToOne
     private Curso curso;
     @JoinColumn(name = "asignatura", referencedColumnName = "id_asignatura")
     @ManyToOne
     private Asignatura asignatura;
+    @OneToMany(mappedBy = "idTarea")
+    private List<Sesion> sesionList;
 
     public Tarea() {
     }
@@ -98,14 +98,6 @@ public class Tarea implements Serializable {
         this.tema = tema;
     }
 
-    public Sesion getSesion() {
-        return sesion;
-    }
-
-    public void setSesion(Sesion sesion) {
-        this.sesion = sesion;
-    }
-
     public Curso getCurso() {
         return curso;
     }
@@ -122,6 +114,15 @@ public class Tarea implements Serializable {
         this.asignatura = asignatura;
     }
 
+    @XmlTransient
+    public List<Sesion> getSesionList() {
+        return sesionList;
+    }
+
+    public void setSesionList(List<Sesion> sesionList) {
+        this.sesionList = sesionList;
+    }
+
     @Override
     public int hashCode() {
         int hash = 0;
diff --git a/EjercitarJPA/src/model/Tema.java b/EjercitarJPA/src/model/Tema.java
index ca4e087..b8d349b 100644
--- a/EjercitarJPA/src/model/Tema.java
+++ b/EjercitarJPA/src/model/Tema.java
@@ -2,6 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
+
 package model;
 
 import java.io.Serializable;
@@ -9,7 +10,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;
@@ -52,8 +52,9 @@ public class Tema implements Serializable {
     @Size(max = 2147483647)
     @Column(name = "descripcion")
     private String descripcion;
+    // @Max(value=?)  @Min(value=?)//if you know range of your decimal fields consider using these annotations to enforce field validation
     @Column(name = "peso")
-    private Integer peso;
+    private Double peso;
     @OneToMany(mappedBy = "tema")
     private List<Concepto> conceptoList;
     @OneToMany(mappedBy = "tema")
@@ -101,11 +102,11 @@ public class Tema implements Serializable {
         this.descripcion = descripcion;
     }
 
-    public Integer getPeso() {
+    public Double getPeso() {
         return peso;
     }
 
-    public void setPeso(Integer peso) {
+    public void setPeso(Double peso) {
         this.peso = peso;
     }
 
@@ -167,5 +168,5 @@ public class Tema implements Serializable {
     public String toString() {
         return "model.Tema[ idTema=" + idTema + " ]";
     }
-    
+
 }