Download as
Browse Code »

Commit 3b8cfb751b0b60157e746fd966a0530187bc4dce

Authored by gibransodre
1 parent d8429b25
Exists in master

Adição da quantidade de solicitações.

Showing 4 changed files with 7 additions and 6 deletions   Show diff stats
WebContent/WEB-INF/jsp/questionario/questionario.jsp
  Diff comments   View file @3b8cfb7
... ... @@ -53,9 +53,10 @@ table, th, td {
53 53 </fieldset>
54 54 </form>
55 55 <br>
56   -
  56 +<label>Total de solicitações: <span>${totalSolicitacoes}</span></label><br>
57 57 <table>
58 58 <tr>
  59 + <th>Nº Linha</th>
59 60 <th>Orgão</th>
60 61 <th>Responsável</th>
61 62 <th>Cargo</th>
... ... @@ -71,8 +72,9 @@ table, th, td {
71 72  
72 73 <c:if test="${not empty lsquestionario}">
73 74  
74   - <c:forEach items="${lsquestionario}" var="questionario">
  75 + <c:forEach items="${lsquestionario}" var="questionario" varStatus="contador">
75 76 <tr>
  77 + <td>${contador.count}</td>
76 78 <td>${questionario.noOrgao}</td>
77 79 <td>${questionario.responsavel}</td>
78 80 <td>${questionario.cargoResponsavel}</td>
... ... @@ -98,7 +100,7 @@ table, th, td {
98 100 </c:if>
99 101  
100 102 </tr>
101   -
  103 +
102 104 </c:forEach>
103 105 </c:if>
104 106  
... ...
WebContent/WEB-INF/jsp/relatorio/relatorioImprimir.jsp
  Diff comments   View file @3b8cfb7
... ... @@ -29,8 +29,6 @@
29 29 </div>
30 30 <div>
31 31 <br>
32   -
33   - <label>Nome do Órgão: <strong>${questionario.noOrgao}</strong></label> <br>
34 32 <fieldset>
35 33 <legend>Responsável pelo Preenchimento</legend>
36 34 <label>Nome Completo: <strong> ${nomePessoa}</strong></label><br>
... ...
src/br/com/controller/QuestionarioController.java
  Diff comments   View file @3b8cfb7
... ... @@ -52,6 +52,7 @@ public class QuestionarioController {
52 52 List<Questionario> lsquestionario = new ArrayList<Questionario>();
53 53 lsquestionario = questionarioDao.retornarListaQuestionario(path);
54 54 result.include("lsquestionario", lsquestionario);
  55 + result.include("totalSolicitacoes", lsquestionario.size());
55 56 }
56 57  
57 58 @Path("/confirmacaoHash")
... ...
src/br/com/dao/HashDao.java
  Diff comments   View file @3b8cfb7
... ... @@ -38,7 +38,7 @@ public class HashDao {
38 38 questionario.setDtFimQuestionario(rset.getString("dt_fim_questionario"));
39 39 questionario.setDtInicioQuestionario(rset.getString("dt_inicio_questionario"));
40 40 questionario.setHashAutenticacao(rset.getString("hash_autenticacao"));
41   - questionario.setNoOrgao(rset.getString("no_orgao"));
  41 + questionario.setNoOrgao(rset.getString("no_orgao").replace("</br>", "").replace("<br>", ""));
42 42 questionario.setHashAutenticacao(rset.getString("hash_autenticacao"));
43 43 questionario.setQuestionario_respondido(rset.getBoolean("questionario_respondido"));
44 44 }
... ...