Download as
Browse Code »

Commit 61a0fe287e3f2db566bb81b988d12bc4af026be0

Authored by gibransodre
1 parent 4afe9aad
Exists in master

Criação do link para envio do relatório para o MPF.

Showing 2 changed files with 31 additions and 9 deletions   Show diff stats
WebContent/WEB-INF/tags/baseLayout.tag
  Diff comments   View file @61a0fe2
  1 +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
1 2  
2 3 <!DOCTYPE html>
3 4 <html lang="pt-br" id="principal">
... ... @@ -9,6 +10,7 @@
9 10 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/default.css" media="screen">
10 11 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/breadcrumb.css" media="screen">
11 12 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/formulario.css" media="screen">
  13 + <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/tabelas.css" media="screen">
12 14  
13 15 </head>
14 16  
... ... @@ -39,6 +41,7 @@
39 41  
40 42 <section>
41 43 <nav id="menu">
  44 +
42 45 <ul>
43 46 <li id="portalservicos-Instrucao" class="portalservicos-item">
44 47 <a href="${pageContext.request.contextPath}/instrucao-site" id="instrucaoLink">Instruções de Preenchimento |</a>
... ... @@ -49,13 +52,21 @@
49 52 </li>
50 53  
51 54 <li id="portalservicos-pTrabalho" class="portalservicos-item">
52   - <a href="${pageContext.request.contextPath}/planoTrabalho-site" id="pTrabalhoLink">Anexar Plano de Trabalho |</a>
  55 + <a href="${pageContext.request.contextPath}/planoTrabalho-site" id="pTrabalhoLink">Anexar Relatório |</a>
53 56 </li>
54   -
  57 + <li id="enviar-relatorio" class="portalservicos-item">
  58 + <a href="${pageContext.request.contextPath}/enviar-relatorio" id="pEnviarRelatorioLink">Enviar Relatório |</a>
  59 + </li>
55 60 <li id="portalservicos-contato" class="portalservicos-item">
56   - <a href="${pageContext.request.contextPath}/contato/contato-site" id="contatoLink">Contato</a>
57   - </li>
  61 + <a href="${pageContext.request.contextPath}/contato/contato-site" id="contatoLink">Contato </a>
  62 + </li>
  63 + <c:if test="${usuarioLogado == true}">
  64 + <li id="portalservicos-sair" class="portalservicos-item">
  65 + <a href="${pageContext.request.contextPath}/">| Sair</a>
  66 + </li>
  67 + </c:if>
58 68 </ul>
  69 +
59 70 </nav>
60 71  
61 72 <div id="main">
... ... @@ -108,8 +119,7 @@
108 119 <script type="text/javascript" src="${pageContext.request.contextPath}/js/html2canvas.js"></script>
109 120 <script type="text/javascript" src="${pageContext.request.contextPath}/js/html2pdf.js"></script>
110 121 <script type="text/javascript" src="${pageContext.request.contextPath}/js/formAddAncoras.js"></script>
111   - <script type="text/javascript" src="${pageContext.request.contextPath}/js/imprimir.js"></script>
112   -
113   -
  122 + <script type="text/javascript" src="${pageContext.request.contextPath}/js/imprimir.js"></script>
  123 +
114 124 </body>
115 125 </html>
116 126 \ No newline at end of file
... ...
src/br/com/controller/PlanoTrabalhoController.java
  Diff comments   View file @61a0fe2
... ... @@ -298,7 +298,7 @@ public class PlanoTrabalhoController extends DefaultMultipartConfig {
298 298 }
299 299 }
300 300  
301   - @Path("/enviar-relatorio-plano-trabalho")
  301 + @Path("/enviar-relatorio")
302 302 public void enviarRelatorioPlanoTrabalho() {
303 303  
304 304 }
... ... @@ -434,7 +434,19 @@ public class PlanoTrabalhoController extends DefaultMultipartConfig {
434 434  
435 435 if (questionario != null && questionario.getIdQuestionario() > 0) {
436 436  
437   - enviarEmail(questionario);
  437 + if(questionario.isFlagEnviado())
  438 + {
  439 + result.include("mensagemEnvio", "O Relatório já foi enviado para MPF!");
  440 + result.include("statusEnvio", false);
  441 +
  442 + this.validator.add(new ValidationMessage("", ""));
  443 + this.validator.onErrorUsePageOf(PlanoTrabalhoController.class).confirmacaoEnvioEmailMPF();
  444 + }
  445 + else
  446 + {
  447 + enviarEmail(questionario);
  448 + }
  449 +
438 450  
439 451 }
440 452  
... ...