Merge branch 'master' of https://softwarepublico.gov.br:443/gitlab/relatoriocirc…

…unstanciado/relatoriocircunstanciado.git

Merge branch 'master' of https://softwarepublico.gov.br:443/gitlab/relatoriocirc…
…unstanciado/relatoriocircunstanciado.git
fabricio
2 parents bb58452e 2b9c3acb
Showing 6 changed files with 53 additions and 15 deletions Show diff stats
WebContent/WEB-INF/intervaloRespostaFormulario.properties
WebContent/WEB-INF/jsp/questionario/questionario.jsp
WebContent/WEB-INF/mail.properties
src/br/com/controller/QuestionarioController.java
src/br/com/model/entity/EnvioEmailSemAutenticacao.java
src/br/com/model/utilities/Email.java
@@ -0,0 +1,2 @@
+dataInicio = 01/10/2016
+dataFim = 30/10/2016
 \ No newline at end of file
@@ -19,10 +19,6 @@
 <input type="text" id="noOrgao" name="noOrgao"><br><br>
 <label for="emailDestinoOrgao">Email: </label>
 <input type="text" id="emailDestinoOrgao" name="emailDestinoOrgao"><br><br>
-<label for="dtInicioQuestionario">Início: </label>
-<input type="date" id="dtInicioQuestionario" name="dtInicioQuestionario"><br><br>
-<label for="dtFimQuestionario">Fim: </label>
-<input type="date" id="dtFimQuestionario" name="dtFimQuestionario"><br><br>
 <label for="file">Arquivo: </label>
 <input type="file" id="file" name="file"><br><br>
 <input type="submit" value="Salvar">
@@ -6,4 +6,5 @@ prop.email.authuser = &quot;&quot;
 prop.email.authpass = ""
 prop.email.auth = false
 prop.email.to = ""
-prop.email.from = govbr@planejamento.gov.br
 \ No newline at end of file
+prop.email.from = govbr@planejamento.gov.br
+prop.email.copiaEmailTo = govbr@planejamento.gov.br
 \ No newline at end of file
 package br.com.controller;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.Properties;
+import javax.mail.Address;
 import javax.servlet.ServletContext;
 import br.com.model.utilities.Email;
+import br.com.model.utilities.ManagerProperties;
 import br.com.model.utilities.StringHelper;
 import br.com.caelum.vraptor.Path;
 import br.com.caelum.vraptor.Resource;
@@ -40,14 +44,29 @@ public class QuestionarioController {
   }
   @Path("/salvar-questionario")
-  public void questionarioSalvar(String emailDestinoOrgao, UploadedFile file,
-      String dtInicioQuestionario, String dtFimQuestionario, String noOrgao) {
+  public void questionarioSalvar(String emailDestinoOrgao, UploadedFile file, String noOrgao) {
     String codigoHash = noOrgao + DateUtil.dataHoraAtual().toString().replace("/", "").replace(" ", "").replace(":", "");
     Questionario questionario = new Questionario();
     // BufferedReader reader = new BufferedReader(new InputStreamReader(file.getFile()));
+    ManagerProperties managerProperties = new ManagerProperties(); 
+    
+    String dtInicioQuestionario = "";
+    String dtFimQuestionario = "";
+    
+    try {
+      Properties prop = managerProperties.getProp(this.application.getRealPath("") + "/WEB-INF/intervaloRespostaFormulario.properties");
+      
+      dtInicioQuestionario  = prop.getProperty("dataInicio"); 
+      dtFimQuestionario = prop.getProperty("dataFim");      
+      
+  } catch (IOException e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
+  }
+    
     questionario.setDtInicioQuestionario(dtInicioQuestionario);
     questionario.setDtFimQuestionario(dtFimQuestionario);
     questionario.setEmailDestinoOrgao(emailDestinoOrgao);
@@ -85,12 +104,13 @@ public class QuestionarioController {
     EnvioEmailSemAutenticacao envioEmailSemAutenticacao =
         new EnvioEmailSemAutenticacao(email.getHost(), Integer.toString(email.getPort()));
-
+       
+    
     respSendEmail =
         envioEmailSemAutenticacao.sendMail(email.getFrom(), contato.getEmail(),
             StringHelper.convertFromUTF8(contato.getAssunto()),
             StringHelper.convertFromUTF8(contato.getMensagem()), email.getAuth(),
-            email.getAuthUser(), email.getAuthPass());
+            email.getAuthUser(), email.getAuthPass(), email.getCopiaEmailTo());
     /*
@@ -31,7 +31,8 @@ public class EnvioEmailSemAutenticacao {
 	public String sendMail(String from, String to, String subject,
 			String message, String comAutenticacao, String authuser,
-			String authpass) {
+			String authpass, String copiaEmailTo) {
+	  
 		Properties props = new Properties();
 		String retorno = "";
@@ -45,6 +46,7 @@ public class EnvioEmailSemAutenticacao {
 											// GMAIL)
 		props.put("mail.debug", "false");
 		props.put("mail.smtp.port", mailSMTPServerPort); // porta
+		
 		// Cria um autenticador que sera usado a seguir
 		SimpleAuth auth = null;
@@ -61,14 +63,21 @@ public class EnvioEmailSemAutenticacao {
 		// Objeto que cont�m a mensagem
 		Message msg = new MimeMessage(session);
 		try {
+		  
+		  
 			// Setando o destinat�rio
 			msg.setRecipient(Message.RecipientType.TO, new InternetAddress(to));
+			msg.setReplyTo(new javax.mail.Address[]
+			    {
+			        new javax.mail.internet.InternetAddress(copiaEmailTo)
+			    });
+			
 			// Setando a origem do email
 			msg.setFrom(new InternetAddress(from));
 			// Setando o assunto
 			msg.setSubject(subject);
 			// Setando o conte�do/corpo do email
-			msg.setContent(message, "text/html; charset=utf-8");
+			msg.setContent(message, "text/html; charset=utf-8");						
 		} catch (Exception e) {
 			retorno = e.getMessage();
@@ -2,9 +2,13 @@ package br.com.model.utilities;
 import java.io.IOException;
 import java.net.MalformedURLException;  
+import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 import java.util.Properties;
+import javax.mail.Address;
+
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.htmlparser.jericho.Source;
@@ -17,8 +21,9 @@ import org.apache.commons.mail.MultiPartEmail;
 /**
  * @category utilities
- * @version 1.0*/
-public class Email {  
+ * @version 1.0
+ * @param <InternetAddress>*/
+public class Email<InternetAddress> {  
 	@Getter private String authUser;
 	@Getter private String authPass;
@@ -27,12 +32,14 @@ public class Email {
 	@Getter private int port;
 	@Getter private String to;
 	@Getter private String from;
+	@Getter private String copiaEmailTo;
 	private MultiPartEmail email;
 	private  EmailAttachment anexo;
-	private void initConf(String path){
+	@SuppressWarnings("unchecked")
+  private void initConf(String path){
 		ManagerProperties managerProperties = new ManagerProperties();  
 		try {
 			Properties prop = managerProperties.getProp(path);
@@ -44,6 +51,7 @@ public class Email {
 			this.auth = prop.getProperty("prop.email.auth");
 			this.to = prop.getProperty("prop.email.to");
 			this.from = prop.getProperty("prop.email.from");
+			this.copiaEmailTo = prop.getProperty("prop.email.copiaEmailTo");
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
@@ -77,12 +85,14 @@ public class Email {
      * @throws EmailException  
      * @throws MalformedURLException
      * @return String*/  
-	public String sendEmail2( String nomeDestinatario, String emailDestinatario, String nomeRemetente, String emailRemetente, String assunto, String mensagem, boolean isHtml) throws EmailException {  
+	@SuppressWarnings("unchecked")
+  public String sendEmail( String nomeDestinatario, String emailDestinatario, String nomeRemetente, String emailRemetente, String assunto, String mensagem, boolean isHtml, List<InternetAddress> copiaEmailTo) throws EmailException {  
     	this.email.setHostName(this.host); // o servidor SMTP para envio do e-mail  
     	this.email.addTo(emailDestinatario, nomeDestinatario); //destinat�rio  
     	this.email.setFrom(emailRemetente, emailRemetente+", "); // remetente
     	this.email.setSubject(assunto); // assunto do e-mail
+    	this.email.setCc((Collection<javax.mail.internet.InternetAddress>) copiaEmailTo);
     	if(isHtml)
     		this.email.setContent("<p>Ol�, <b>"+nomeRemetente+"</b> enviou a seguinte mensagem:</p> \n "+mensagem, "text/html");
	@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
		1	+dataInicio = 01/10/2016
		2	+dataFim = 30/10/2016
0	\ No newline at end of file	3	\ No newline at end of file