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

gibransodre
1 parent 4afe9aad
Showing 2 changed files with 31 additions and 9 deletions Show diff stats
WebContent/WEB-INF/tags/baseLayout.tag
src/br/com/controller/PlanoTrabalhoController.java
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <!DOCTYPE html>
 <html lang="pt-br" id="principal">
@@ -9,6 +10,7 @@
 	<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/default.css" media="screen">
 	<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/breadcrumb.css" media="screen">
 	<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/formulario.css" media="screen">
+	<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/css/tabelas.css" media="screen">
 </head>
@@ -39,6 +41,7 @@
 	<section>
 		<nav id="menu">
+		
 			<ul>	
 				<li id="portalservicos-Instrucao" class="portalservicos-item">
 					<a href="${pageContext.request.contextPath}/instrucao-site" id="instrucaoLink">Instruções de Preenchimento |</a>
@@ -49,13 +52,21 @@
 				</li>	
 				<li id="portalservicos-pTrabalho" class="portalservicos-item">
-					<a href="${pageContext.request.contextPath}/planoTrabalho-site" id="pTrabalhoLink">Anexar Plano de Trabalho |</a>
+					<a href="${pageContext.request.contextPath}/planoTrabalho-site" id="pTrabalhoLink">Anexar Relatório |</a>
 				</li>		
-								
+				<li id="enviar-relatorio" class="portalservicos-item">
+					<a href="${pageContext.request.contextPath}/enviar-relatorio" id="pEnviarRelatorioLink">Enviar Relatório |</a>
+				</li>			
 				<li id="portalservicos-contato" class="portalservicos-item">
-					<a href="${pageContext.request.contextPath}/contato/contato-site" id="contatoLink">Contato</a>
-				</li>				
+					<a href="${pageContext.request.contextPath}/contato/contato-site" id="contatoLink">Contato </a>
+				</li>	
+				<c:if test="${usuarioLogado == true}">  
+					<li id="portalservicos-sair" class="portalservicos-item">   		 
+      					<a href="${pageContext.request.contextPath}/">| Sair</a>
+      				</li>
+    			</c:if>			
 			</ul>
+			
 		</nav>
 		<div id="main">
@@ -108,8 +119,7 @@
     <script type="text/javascript" src="${pageContext.request.contextPath}/js/html2canvas.js"></script>
     <script type="text/javascript" src="${pageContext.request.contextPath}/js/html2pdf.js"></script>
     <script type="text/javascript" src="${pageContext.request.contextPath}/js/formAddAncoras.js"></script>
-     <script type="text/javascript" src="${pageContext.request.contextPath}/js/imprimir.js"></script>
-    
-    
+    <script type="text/javascript" src="${pageContext.request.contextPath}/js/imprimir.js"></script>
+     
     </body>
 </html>
 \ No newline at end of file
@@ -298,7 +298,7 @@ public class PlanoTrabalhoController extends DefaultMultipartConfig {
     }
   }
-  @Path("/enviar-relatorio-plano-trabalho")
+  @Path("/enviar-relatorio")
   public void enviarRelatorioPlanoTrabalho() {
   }
@@ -434,7 +434,19 @@ public class PlanoTrabalhoController extends DefaultMultipartConfig {
     if (questionario != null && questionario.getIdQuestionario() > 0) {
-      enviarEmail(questionario);
+      if(questionario.isFlagEnviado())
+      {
+        result.include("mensagemEnvio", "O Relatório já foi enviado para MPF!");
+        result.include("statusEnvio", false);
+        
+        this.validator.add(new ValidationMessage("", ""));
+        this.validator.onErrorUsePageOf(PlanoTrabalhoController.class).confirmacaoEnvioEmailMPF();
+      }
+      else
+      {
+        enviarEmail(questionario);
+      }
+      
     }