diff options
Diffstat (limited to 'EjercitarJPA/src/model/Concepto.java')
| -rw-r--r-- | EjercitarJPA/src/model/Concepto.java | 76 |
1 files changed, 65 insertions, 11 deletions
diff --git a/EjercitarJPA/src/model/Concepto.java b/EjercitarJPA/src/model/Concepto.java index a8cb860..d6d160a 100644 --- a/EjercitarJPA/src/model/Concepto.java +++ b/EjercitarJPA/src/model/Concepto.java @@ -15,6 +15,7 @@ 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;
import javax.persistence.Table;
@@ -34,7 +35,11 @@ import javax.xml.bind.annotation.XmlTransient; @NamedQuery(name = "Concepto.findAll", query = "SELECT c FROM Concepto c"),
@NamedQuery(name = "Concepto.findByIdConcepto", query = "SELECT c FROM Concepto c WHERE c.idConcepto = :idConcepto"),
@NamedQuery(name = "Concepto.findByNombre", query = "SELECT c FROM Concepto c WHERE c.nombre = :nombre"),
- @NamedQuery(name = "Concepto.findByDescripcion", query = "SELECT c FROM Concepto c WHERE c.descripcion = :descripcion")})
+ @NamedQuery(name = "Concepto.findByDescripcion", query = "SELECT c FROM Concepto c WHERE c.descripcion = :descripcion"),
+ @NamedQuery(name = "Concepto.findByPeso", query = "SELECT c FROM Concepto c WHERE c.peso = :peso"),
+ @NamedQuery(name = "Concepto.findByAdivinanza", query = "SELECT c FROM Concepto c WHERE c.adivinanza = :adivinanza"),
+ @NamedQuery(name = "Concepto.findByDescuido", query = "SELECT c FROM Concepto c WHERE c.descuido = :descuido"),
+ @NamedQuery(name = "Concepto.findByApriori", query = "SELECT c FROM Concepto c WHERE c.apriori = :apriori")})
public class Concepto implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@@ -52,16 +57,26 @@ 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 = "adivinanza")
+ private Double adivinanza;
+ @Column(name = "descuido")
+ private Double descuido;
+ @Column(name = "apriori")
+ private Double apriori;
@JoinTable(name = "ejercicio_concepto", joinColumns = {
@JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
@JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")})
@ManyToMany
private List<Ejercicio> ejercicioList;
- @JoinTable(name = "tema_concepto", joinColumns = {
- @JoinColumn(name = "id_concepto", referencedColumnName = "id_concepto")}, inverseJoinColumns = {
- @JoinColumn(name = "id_tema", referencedColumnName = "id_tema")})
- @ManyToMany
- private List<Tema> temaList;
+ @JoinColumn(name = "tema", referencedColumnName = "id_tema")
+ @ManyToOne
+ private Tema tema;
+ @JoinColumn(name = "profesor", referencedColumnName = "id_profesor")
+ @ManyToOne
+ private Profesor profesor;
public Concepto() {
}
@@ -100,6 +115,38 @@ public class Concepto implements Serializable { this.descripcion = descripcion;
}
+ public Integer getPeso() {
+ return peso;
+ }
+
+ public void setPeso(Integer peso) {
+ this.peso = peso;
+ }
+
+ public Double getAdivinanza() {
+ return adivinanza;
+ }
+
+ public void setAdivinanza(Double adivinanza) {
+ this.adivinanza = adivinanza;
+ }
+
+ public Double getDescuido() {
+ return descuido;
+ }
+
+ public void setDescuido(Double descuido) {
+ this.descuido = descuido;
+ }
+
+ public Double getApriori() {
+ return apriori;
+ }
+
+ public void setApriori(Double apriori) {
+ this.apriori = apriori;
+ }
+
@XmlTransient
public List<Ejercicio> getEjercicioList() {
return ejercicioList;
@@ -109,13 +156,20 @@ public class Concepto implements Serializable { this.ejercicioList = ejercicioList;
}
- @XmlTransient
- public List<Tema> getTemaList() {
- return temaList;
+ public Tema getTema() {
+ return tema;
+ }
+
+ public void setTema(Tema tema) {
+ this.tema = tema;
+ }
+
+ public Profesor getProfesor() {
+ return profesor;
}
- public void setTemaList(List<Tema> temaList) {
- this.temaList = temaList;
+ public void setProfesor(Profesor profesor) {
+ this.profesor = profesor;
}
@Override
|