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

1 files changed, 12 insertions, 1 deletions

diff --git a/EjercitarJPA/src/model/Alumno.java b/EjercitarJPA/src/model/Alumno.java
index d91bc89..45d1fbb 100644
--- a/EjercitarJPA/src/model/Alumno.java
+++ b/EjercitarJPA/src/model/Alumno.java
@@ -21,6 +21,7 @@ import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -71,8 +72,18 @@ public class Alumno implements Serializable {
     @JoinColumn(name = "curso", referencedColumnName = "id_curso")
     @ManyToOne
     private Curso curso;
+    @Transient
+    private String tipoAlumno;
 
-    public Alumno() {
+    public String getTipoAlumno() {
+		return tipoAlumno;
+	}
+
+	public void setTipoAlumno(String tipoAlumno) {
+		this.tipoAlumno = tipoAlumno;
+	}
+
+	public Alumno() {
     }
 
     public Alumno(Integer idAlumno) {