se corrigieron los calculos de probabilidades de temas y asignaturas.

se arreglo el estilo de las vistas

2 files changed, 4 insertions, 0 deletions

diff --git a/EjercitarJPA/src/model/Asignatura.java b/EjercitarJPA/src/model/Asignatura.java
index b237f51..f9c4b17 100644
--- a/EjercitarJPA/src/model/Asignatura.java
+++ b/EjercitarJPA/src/model/Asignatura.java
@@ -17,6 +17,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -62,6 +63,7 @@ public class Asignatura implements Serializable {
     @ManyToOne
     private Curso curso;
     @OneToMany(mappedBy = "asignatura")
+    @OrderBy("idTema ASC")
     private List<Tema> temaList;
 
     public Asignatura() {
diff --git a/EjercitarJPA/src/model/Tema.java b/EjercitarJPA/src/model/Tema.java
index b8d349b..9da9eec 100644
--- a/EjercitarJPA/src/model/Tema.java
+++ b/EjercitarJPA/src/model/Tema.java
@@ -18,6 +18,7 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -56,6 +57,7 @@ public class Tema implements Serializable {
     @Column(name = "peso")
     private Double peso;
     @OneToMany(mappedBy = "tema")
+    @OrderBy("idConcepto ASC")
     private List<Concepto> conceptoList;
     @OneToMany(mappedBy = "tema")
     private List<Tarea> tareaList;