Commit d64fe9b30262f5d0b0d44dca17dbd6ba2d6f5e03
1 parent
9d094f75
Exists in
master
git-svn-id: https://svn.bento.ifrs.edu.br/default/ASES/e-selo@9950 c2178572-b5ca…
…-4887-91d2-9e3a90c7d55b
Showing
4 changed files
with
7 additions
and
3 deletions
Show diff stats
Desenvolvimento/Codificacao/e-Selo/WebContent/WEB-INF/jsp/parametroCalculo/relatorio.jsp
| @@ -89,6 +89,7 @@ | @@ -89,6 +89,7 @@ | ||
| 89 | <table class="table table-condensed table-hover"> | 89 | <table class="table table-condensed table-hover"> |
| 90 | <thead> | 90 | <thead> |
| 91 | <tr> | 91 | <tr> |
| 92 | + <th></th> | ||
| 92 | <th>Critério</th> | 93 | <th>Critério</th> |
| 93 | <th>Peso</th> | 94 | <th>Peso</th> |
| 94 | <th>Tipo</th> | 95 | <th>Tipo</th> |
| @@ -98,13 +99,14 @@ | @@ -98,13 +99,14 @@ | ||
| 98 | <c:forEach items="${recomendacao.criterios}" var="criterio"> | 99 | <c:forEach items="${recomendacao.criterios}" var="criterio"> |
| 99 | <tbody> | 100 | <tbody> |
| 100 | <tr> | 101 | <tr> |
| 102 | + <td>${criterio.numeroCriterio}</td> | ||
| 101 | <td>${criterio.descricao}</td> | 103 | <td>${criterio.descricao}</td> |
| 102 | <td>${criterio.peso}</td> | 104 | <td>${criterio.peso}</td> |
| 103 | <td>${criterio.tipoTeste.tipo}</td> | 105 | <td>${criterio.tipoTeste.tipo}</td> |
| 104 | </tr> | 106 | </tr> |
| 105 | <c:if test="${criterio.tipoTeste.id==3 and not empty criterio.faixas}"> | 107 | <c:if test="${criterio.tipoTeste.id==3 and not empty criterio.faixas}"> |
| 106 | <tr> | 108 | <tr> |
| 107 | - <td colspan="3"> | 109 | + <td colspan="4"> |
| 108 | <table id="criteriosTable" pagesize="10" class="table table-condensed table-hover"> | 110 | <table id="criteriosTable" pagesize="10" class="table table-condensed table-hover"> |
| 109 | <thead> | 111 | <thead> |
| 110 | <tr> | 112 | <tr> |
Desenvolvimento/Codificacao/e-Selo/src/main/java/br/com/eselo/model/Recomendacao.java
| @@ -13,6 +13,7 @@ import javax.persistence.Id; | @@ -13,6 +13,7 @@ import javax.persistence.Id; | ||
| 13 | import javax.persistence.JoinColumn; | 13 | import javax.persistence.JoinColumn; |
| 14 | import javax.persistence.ManyToOne; | 14 | import javax.persistence.ManyToOne; |
| 15 | import javax.persistence.OneToMany; | 15 | import javax.persistence.OneToMany; |
| 16 | +import javax.persistence.OrderBy; | ||
| 16 | import javax.persistence.SequenceGenerator; | 17 | import javax.persistence.SequenceGenerator; |
| 17 | import javax.persistence.Table; | 18 | import javax.persistence.Table; |
| 18 | 19 | ||
| @@ -47,6 +48,7 @@ public class Recomendacao { | @@ -47,6 +48,7 @@ public class Recomendacao { | ||
| 47 | private Integer peso; | 48 | private Integer peso; |
| 48 | 49 | ||
| 49 | @OneToMany(mappedBy = "recomendacao", targetEntity = br.com.eselo.model.Criterio.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) | 50 | @OneToMany(mappedBy = "recomendacao", targetEntity = br.com.eselo.model.Criterio.class, fetch = FetchType.LAZY, cascade = CascadeType.ALL) |
| 51 | + @OrderBy("numeroCriterio asc") | ||
| 50 | private List<Criterio> criterios; | 52 | private List<Criterio> criterios; |
| 51 | 53 | ||
| 52 | public List<Criterio> getCriterios() { | 54 | public List<Criterio> getCriterios() { |
Desenvolvimento/Codificacao/e-Selo/target/classes/br/com/eselo/model/Recomendacao.class
No preview for this file type
Desenvolvimento/Codificacao/e-Selo/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF