Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/EjercitarJPA
diff options
context:
space:
mode:
authorceci <caggsld@gmail.com>2013-08-08 01:59:40 (GMT)
committer ceci <caggsld@gmail.com>2013-08-08 01:59:40 (GMT)
commit9445d7cebe5eef1aad40fb6bba019ee48be2beec (patch)
tree5282a7ad7a97353249e86a0afcea60b0c800f970 /EjercitarJPA
parentc19b8104b0c17ad747ad664f6f3827423621c25f (diff)
Se modificó la interfaz del cliente, donde se agrego registro de Sesion.class
Se agregar registarSesion y se modifico la entidad Sesion.
Diffstat (limited to 'EjercitarJPA')
-rw-r--r--EjercitarJPA/src/model/Alumno.java2
-rw-r--r--EjercitarJPA/src/model/Sesion.java23
-rw-r--r--EjercitarJPA/src/model/Tarea.java2
3 files changed, 13 insertions, 14 deletions
diff --git a/EjercitarJPA/src/model/Alumno.java b/EjercitarJPA/src/model/Alumno.java
index 925dac3..d91bc89 100644
--- a/EjercitarJPA/src/model/Alumno.java
+++ b/EjercitarJPA/src/model/Alumno.java
@@ -64,7 +64,7 @@ public class Alumno implements Serializable {
@Size(max = 1)
@Column(name = "genero")
private String genero;
- @OneToMany(mappedBy = "idAlumno")
+ @OneToMany(mappedBy = "alumno")
private List<Sesion> sesionList;
@OneToMany(mappedBy = "alumno")
private List<EjercicioResueltoAlumno> ejercicioResueltoAlumnoList;
diff --git a/EjercitarJPA/src/model/Sesion.java b/EjercitarJPA/src/model/Sesion.java
index 77020f9..110e35a 100644
--- a/EjercitarJPA/src/model/Sesion.java
+++ b/EjercitarJPA/src/model/Sesion.java
@@ -52,7 +52,6 @@ public class Sesion implements Serializable {
@Temporal(TemporalType.TIMESTAMP)
private Date entrada;
@Basic(optional = false)
- @NotNull
@Column(name = "salida")
@Temporal(TemporalType.TIMESTAMP)
private Date salida;
@@ -60,15 +59,15 @@ public class Sesion implements Serializable {
private Boolean ayudaPadres;
@Column(name = "desde_hogar")
private Boolean desdeHogar;
- @Size(max = 5)
+ @Size(max = 10)
@Column(name = "estado_animo")
private String estadoAnimo;
@JoinColumn(name = "id_tarea", referencedColumnName = "id_tarea")
@ManyToOne
- private Tarea idTarea;
+ private Tarea tarea;
@JoinColumn(name = "id_alumno", referencedColumnName = "id_alumno")
@ManyToOne
- private Alumno idAlumno;
+ private Alumno alumno;
public Sesion() {
}
@@ -131,20 +130,20 @@ public class Sesion implements Serializable {
this.estadoAnimo = estadoAnimo;
}
- public Tarea getIdTarea() {
- return idTarea;
+ public Tarea getTarea() {
+ return tarea;
}
- public void setIdTarea(Tarea idTarea) {
- this.idTarea = idTarea;
+ public void setTarea(Tarea tarea) {
+ this.tarea = tarea;
}
- public Alumno getIdAlumno() {
- return idAlumno;
+ public Alumno getAlumno() {
+ return alumno;
}
- public void setIdAlumno(Alumno idAlumno) {
- this.idAlumno = idAlumno;
+ public void setAlumno(Alumno alumno) {
+ this.alumno = alumno;
}
@Override
diff --git a/EjercitarJPA/src/model/Tarea.java b/EjercitarJPA/src/model/Tarea.java
index 036e034..b31021a 100644
--- a/EjercitarJPA/src/model/Tarea.java
+++ b/EjercitarJPA/src/model/Tarea.java
@@ -55,7 +55,7 @@ public class Tarea implements Serializable {
@JoinColumn(name = "asignatura", referencedColumnName = "id_asignatura")
@ManyToOne
private Asignatura asignatura;
- @OneToMany(mappedBy = "idTarea")
+ @OneToMany(mappedBy = "tarea")
private List<Sesion> sesionList;
public Tarea() {