diff --git a/WebContent/WEB-INF/jsp/questionario/questionario.jsp b/WebContent/WEB-INF/jsp/questionario/questionario.jsp index 0ac417f..a70355e 100644 --- a/WebContent/WEB-INF/jsp/questionario/questionario.jsp +++ b/WebContent/WEB-INF/jsp/questionario/questionario.jsp @@ -53,9 +53,10 @@ table, th, td {
- +
+ @@ -71,8 +72,9 @@ table, th, td { - + + @@ -98,7 +100,7 @@ table, th, td { - + diff --git a/WebContent/WEB-INF/jsp/relatorio/relatorioImprimir.jsp b/WebContent/WEB-INF/jsp/relatorio/relatorioImprimir.jsp index 9594971..ce93e29 100644 --- a/WebContent/WEB-INF/jsp/relatorio/relatorioImprimir.jsp +++ b/WebContent/WEB-INF/jsp/relatorio/relatorioImprimir.jsp @@ -29,8 +29,6 @@

- -
Responsável pelo Preenchimento
diff --git a/src/br/com/controller/QuestionarioController.java b/src/br/com/controller/QuestionarioController.java index 99877d7..e5140f4 100644 --- a/src/br/com/controller/QuestionarioController.java +++ b/src/br/com/controller/QuestionarioController.java @@ -52,6 +52,7 @@ public class QuestionarioController { List lsquestionario = new ArrayList(); lsquestionario = questionarioDao.retornarListaQuestionario(path); result.include("lsquestionario", lsquestionario); + result.include("totalSolicitacoes", lsquestionario.size()); } @Path("/confirmacaoHash") diff --git a/src/br/com/dao/HashDao.java b/src/br/com/dao/HashDao.java index d87a1d6..e5227c0 100644 --- a/src/br/com/dao/HashDao.java +++ b/src/br/com/dao/HashDao.java @@ -38,7 +38,7 @@ public class HashDao { questionario.setDtFimQuestionario(rset.getString("dt_fim_questionario")); questionario.setDtInicioQuestionario(rset.getString("dt_inicio_questionario")); questionario.setHashAutenticacao(rset.getString("hash_autenticacao")); - questionario.setNoOrgao(rset.getString("no_orgao")); + questionario.setNoOrgao(rset.getString("no_orgao").replace("
", "").replace("
", "")); questionario.setHashAutenticacao(rset.getString("hash_autenticacao")); questionario.setQuestionario_respondido(rset.getBoolean("questionario_respondido")); } -- libgit2 0.21.2
Nº Linha Orgão Responsável Cargo
${contador.count} ${questionario.noOrgao} ${questionario.responsavel} ${questionario.cargoResponsavel}