From 2bed39f3d50d11d84db42263007bf6325142d594 Mon Sep 17 00:00:00 2001 From: 96409975520 <96409975520@STI-171301.mp.intra> Date: Fri, 19 May 2017 11:12:36 -0300 Subject: [PATCH] Correções para o suporte ao Azure. --- src/main/java/br/com/ases/controller/AvaliacaoController.java | 14 ++++++++++---- src/main/java/br/com/ases/model/utilities/ManagerReport.java | 11 +++++++---- src/main/webapp/WEB-INF/eselo.properties | 11 +++++++---- src/main/webapp/WEB-INF/jsp/avaliacao/avaliar.jsp | 12 +----------- src/main/webapp/WEB-INF/mail.properties | 3 ++- src/main/webapp/WEB-INF/tags/baseLayout.tag | 6 +++--- src/main/webapp/inicial_arquivos/css/default.css | 14 +++++++------- 7 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/main/java/br/com/ases/controller/AvaliacaoController.java b/src/main/java/br/com/ases/controller/AvaliacaoController.java index 79c005d..981157e 100644 --- a/src/main/java/br/com/ases/controller/AvaliacaoController.java +++ b/src/main/java/br/com/ases/controller/AvaliacaoController.java @@ -331,6 +331,8 @@ public class AvaliacaoController { url = "http://" + url; WebChecker pagina = WebChecker.from(url).withGetRequest().execute(); + + int[] errorsWarningsCss = avaliacaoBusiness.getErrorCount(true, url); int[] errorsWarningsHtml = avaliacaoBusiness.getErrorCount(false, url); @@ -509,6 +511,7 @@ public class AvaliacaoController { novaChave = "contentLenght" + chaveAvaliacao; String contentLenght = (String) VRaptorRequestHolder.currentRequest().getServletContext().getAttribute(novaChave); + this.sumarizarResultasNoResponse(checkerList, result); // ================================================ GERAR RELAT�RIO @@ -575,6 +578,8 @@ public class AvaliacaoController { ManagerReport managerReport = new ManagerReport(this.application.getRealPath("") + "/WEB-INF/templates-relatorios/relatorio-avaliacao.jrxml"); + + String path = null; try { @@ -925,8 +930,10 @@ public class AvaliacaoController { ManagerReport managerReport = new ManagerReport(this.application.getRealPath("") - + "/WEB-INF/templates-relatorios/relatorio-detalhes-avaliacao.jrxml"); + + "/WEB-INF/templates-relatorios/relatorio-detalhes-avaliacao.jrxml"); + + String path = null; try { @@ -960,8 +967,7 @@ public class AvaliacaoController { @Get("/servico-avaliacao-acessibilidade-salvando") @Post("/servico-avaliacao-acessibilidade-salvando") - public void servicoAvaliacaoAcessibilidadeSalvando(@QueryParam("url") String url, - String codigoHash) { + public void servicoAvaliacaoAcessibilidadeSalvando(@QueryParam("url") String url) { Boolean retornoNota = false; ErroWs erroWs = new ErroWs(); @@ -974,7 +980,7 @@ public class AvaliacaoController { if (validate.url(url)) { - if (url.startsWith("www")) { + if (!url.startsWith("http")) { url = "http://" + url; } diff --git a/src/main/java/br/com/ases/model/utilities/ManagerReport.java b/src/main/java/br/com/ases/model/utilities/ManagerReport.java index 9403e9c..e350d1a 100644 --- a/src/main/java/br/com/ases/model/utilities/ManagerReport.java +++ b/src/main/java/br/com/ases/model/utilities/ManagerReport.java @@ -37,16 +37,19 @@ public class ManagerReport { } public String gerarRelatorio(List list, HashMap map, int tipoRelatorio, String fileName) throws JRException, IOException{ - + System.out.println("erro_01"); + JasperReport report = JasperCompileManager.compileReport(this.pathTemplate); - + System.out.println("erro_02"); + JasperPrint print = JasperFillManager.fillReport(report, map,new JRBeanCollectionDataSource( this.criterioOrdenacao(Ordenacao.ordenarLista(this.carregarBean(list),null, true))) ); - + System.out.println("erro_03"); + List listOrdenado = this.criterioOrdenacao(Ordenacao.ordenarLista(this.carregarBean(list),null, true)); //JasperPrint print = JasperFillManager.fillReport(report, map,new JRBeanCollectionDataSource(Ordenacao.ordenarLista(this.carregarBean(list),null))); - + System.out.println("erro_04"); return this.getRelatorio(print, tipoRelatorio, fileName); } diff --git a/src/main/webapp/WEB-INF/eselo.properties b/src/main/webapp/WEB-INF/eselo.properties index e8c6ed3..b137f65 100644 --- a/src/main/webapp/WEB-INF/eselo.properties +++ b/src/main/webapp/WEB-INF/eselo.properties @@ -1,9 +1,12 @@ #url=https://sistemas-treinamento.ifbaiano.edu.br/intg_ases_selo/calcular-nota +#url=http://localhost:18080/eselo/calcular-nota #url=http://189.9.137.162:8080/eselo/calcular-nota -url=http://localhost:18080/eselo/calcular-nota -urlServicoSalvandoAvaliacao=http://localhost:18080/eselo/calcular-nota-salvando-avaliacao -urlAutenticacaoServico=http://localhost:18080/eselo/existe_usuario_servico_web -#urlAutenticacaoServico=http://localhost:18080/eselo/existe_usuario_servico_web +url=http://eselo-prd.brazilsouth.cloudapp.azure.com/calcular-nota + + + +#urlAutenticacaoServico=http://189.9.137.162:8080/eselo/existe_usuario_servico_web +urlAutenticacaoServico=http://eselo-prd.brazilsouth.cloudapp.azure.com/existe_usuario_servico_web #Esconde a nota caso não esteja usando o ESELO #Se atribuir o valor "sem_nota" na chave 'sem_nota', não exibirá a nota diff --git a/src/main/webapp/WEB-INF/jsp/avaliacao/avaliar.jsp b/src/main/webapp/WEB-INF/jsp/avaliacao/avaliar.jsp index b0f6539..45e93b2 100644 --- a/src/main/webapp/WEB-INF/jsp/avaliacao/avaliar.jsp +++ b/src/main/webapp/WEB-INF/jsp/avaliacao/avaliar.jsp @@ -7,8 +7,7 @@
- - +
${error}
@@ -197,16 +196,7 @@
-

Exportar Resultado

diff --git a/src/main/webapp/WEB-INF/mail.properties b/src/main/webapp/WEB-INF/mail.properties index 8116db5..cf2daa4 100644 --- a/src/main/webapp/WEB-INF/mail.properties +++ b/src/main/webapp/WEB-INF/mail.properties @@ -1,6 +1,7 @@ #com autenticação alterar o valor da chave "prop.email.auth = false" para "prop.email.auth = true" e #atribuir login e senha nas chaves respectivas "prop.email.authuser = ", "prop.email.authpass =". -prop.email.host = 189.9.150.53 +#prop.email.host = 189.9.150.53 +prop.email.host =191.235.89.55 prop.email.port = 25 prop.email.authuser = "" prop.email.authpass = "" diff --git a/src/main/webapp/WEB-INF/tags/baseLayout.tag b/src/main/webapp/WEB-INF/tags/baseLayout.tag index 6d7d9ad..18c94de 100644 --- a/src/main/webapp/WEB-INF/tags/baseLayout.tag +++ b/src/main/webapp/WEB-INF/tags/baseLayout.tag @@ -104,7 +104,7 @@

Avaliador e Simulador de Acessibilidade em Sítios - Governo Federal

@@ -129,9 +129,9 @@
Início do conteúdo - + - + Fim do conteúdo
diff --git a/src/main/webapp/inicial_arquivos/css/default.css b/src/main/webapp/inicial_arquivos/css/default.css index ff096b9..ace9b8f 100644 --- a/src/main/webapp/inicial_arquivos/css/default.css +++ b/src/main/webapp/inicial_arquivos/css/default.css @@ -17,7 +17,7 @@ padding-top:30px; height:105px; font-size:14px; - background-image: url("/ases/inicial_arquivos/imagens/loading.gif"); + background-image: url("/inicial_arquivos/imagens/loading.gif"); text-align: center; background-position: bottom; background-repeat: no-repeat; @@ -41,7 +41,7 @@ padding-top:30px; height:105px; font-size:14px; - background-image: url("/ases/inicial_arquivos/imagens/loading.gif"); + background-image: url("/inicial_arquivos/imagens/loading.gif"); text-align: center; background-position: bottom; background-repeat: no-repeat; @@ -238,7 +238,7 @@ .warning { color: #9F6000; background-color: #FEEFB3; - background-image: url('/ases/inicial_arquivos/imagens/warning.png'); + background-image: url('/inicial_arquivos/imagens/warning.png'); } .info, .success, .warning, .error, .validation { border: 1px solid; @@ -271,7 +271,7 @@ padding-top:30px; height:105px; font-size:14px; - background-image: url("/ases/inicial_arquivos/imagens/loading.gif"); + background-image: url("/inicial_arquivos/imagens/loading.gif"); text-align: center; background-position: bottom; background-repeat: no-repeat; @@ -300,7 +300,7 @@ padding-top:5px; height:105px; font-size:12px; - background-image: url("/ases/inicial_arquivos/imagens/loading.gif"); + background-image: url("/inicial_arquivos/imagens/loading.gif"); text-align: center; background-position: bottom; background-repeat: no-repeat; @@ -313,7 +313,7 @@ padding-top:5px; height:105px; font-size:12px; - background-image: url("/ases/inicial_arquivos/imagens/loading_altoContraste.gif"); + background-image: url("/inicial_arquivos/imagens/loading_altoContraste.gif"); text-align: center; background-position: bottom; background-repeat: no-repeat; @@ -516,7 +516,7 @@ .warning { color: #9F6000; background-color: #FEEFB3; - background-image: url('/ases/inicial_arquivos/imagens/warning.png'); + background-image: url('/inicial_arquivos/imagens/warning.png'); } .info, .success, .warning, .error, .validation { border: 1px solid; -- libgit2 0.21.2