diff options
author | cecigg <caggsld@gmail.com> | 2014-10-11 18:29:03 (GMT) |
---|---|---|
committer | cecigg <caggsld@gmail.com> | 2014-10-11 18:29:03 (GMT) |
commit | bda837bc523b5f65641454533c679e73e8446eca (patch) | |
tree | 53cd660a37e151bc63722547f1f422ba7c11f51f /EjercitarJPA | |
parent | 01978a03944af99ba09600c6ebbf5b8703069d35 (diff) | |
parent | de8434c76fcef2c174147d452ea03f7af2033b95 (diff) |
Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia
Conflicts:
EjercitarJPA/build/classes/model/Alumno.class
EjercitarJPA/build/classes/model/Profesor.class
Diffstat (limited to 'EjercitarJPA')
-rw-r--r-- | EjercitarJPA/src/model/Ejercicio.java | 5 | ||||
-rw-r--r-- | EjercitarJPA/src/model/Sesion.java | 17 |
2 files changed, 21 insertions, 1 deletions
diff --git a/EjercitarJPA/src/model/Ejercicio.java b/EjercitarJPA/src/model/Ejercicio.java index 28b98b2..bee8957 100644 --- a/EjercitarJPA/src/model/Ejercicio.java +++ b/EjercitarJPA/src/model/Ejercicio.java @@ -7,10 +7,12 @@ package model; import java.io.Serializable; import java.sql.Array; 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; @@ -74,6 +76,9 @@ public class Ejercicio implements Serializable { @OneToMany(mappedBy = "ejercicio") private List<EjercicioResueltoAlumno> ejercicioResueltoAlumnoList; + @ManyToMany(mappedBy = "ejercicioList", fetch=FetchType.EAGER) + private List<Sesion> sesionList; + private byte [] imagen; public void setImagen(byte[] imagen) { diff --git a/EjercitarJPA/src/model/Sesion.java b/EjercitarJPA/src/model/Sesion.java index 0719205..c5906cf 100644 --- a/EjercitarJPA/src/model/Sesion.java +++ b/EjercitarJPA/src/model/Sesion.java @@ -7,6 +7,8 @@ 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; @@ -14,6 +16,7 @@ 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.NamedQueries; import javax.persistence.NamedQuery; @@ -72,8 +75,12 @@ public class Sesion implements Serializable { private Alumno alumno; @Column(name = "cantidad_ejercicios_resueltos") private Integer cantidadEjerciciosResueltos; + + @ManyToMany + private List<Ejercicio> ejercicioList; + - public Sesion() { + public Sesion() { } public Sesion(Integer idSesion) { @@ -164,6 +171,14 @@ public class Sesion implements Serializable { public void setAlumno(Alumno alumno) { this.alumno = alumno; } + + public List<Ejercicio> getEjercicioList() { + return ejercicioList; + } + + public void setEjercicioList(List<Ejercicio> ejercicioList) { + this.ejercicioList = ejercicioList; + } @Override public int hashCode() { |