git-svn-id: https://svn.bento.ifrs.edu.br/default/ASES/e-selo@9950 c2178572-b5ca…

…-4887-91d2-9e3a90c7d55b

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