no message

git-svn-id: https://svn.coded.pt/svn/SIPRP@476 bb69d46d-e84e-40c8-a05a-06db0d633741
21 years ago · 42f86f567c
parent 9c8d6de66f
commit 42f86f567c
3 changed files with 88 additions and 5 deletions
--- a/trunk/WEB-INF/classes/siprp/pagina/RelatorioServlet.java
+++ b/trunk/WEB-INF/classes/siprp/pagina/RelatorioServlet.java
@ -20,19 +20,93 @@ import org.apache.velocity.app.*;
 */
 public class RelatorioServlet extends MailerServlet
 {
+	private final static String EMPRESA = "empresa";
+	private final static String EMAIL_EMPRESA = "email_empresa";
+	private final static String ANO = "ano";
 	
-	/** Creates a new instance of RelatorioServlet */
-	public RelatorioServlet()
-	{
-	}
+	private final static String[] FORM_FIELDS = new String[]{
+								EMPRESA, ANO, EMAIL_EMPRESA	};
 	
 	public void doGet( HttpServletRequest req, HttpServletResponse res )
 		throws IOException
 	{
+		ServletOutputStream out = res.getOutputStream();
+		String queryString = req.getQueryString();
+		res.setContentType( "text/html" );
+
+		Hashtable parameters = new Hashtable();
+
+		// Ir buscar os parametros à sessão
+		HttpSession session = req.getSession( false );
+		if( session == null )
+		{
+			// timeout
+			out.println( showPage( "relatorio/pedido_sessao_expirou.html", null ) );
+			return;
+		}
+
+		out.println( showPage( "relatorio/pedido_relatorio.html", parameters ) );
 	}

 	public void doPost( HttpServletRequest req, HttpServletResponse res )
 		throws IOException
 	{
+		ServletOutputStream out = res.getOutputStream();
+		String queryString = req.getQueryString();
+		res.setContentType( "text/html" );
+
+		// Info de marcacao
+		// Dados que vem no pedido: marcacao_tipo, data, hora
+		Hashtable parameters = parseParameters( new Hashtable( req.getParameterMap() ) );
+		
+		// Ir buscar o resto dos parametros à sessão
+		HttpSession session = req.getSession( false );
+		if( session == null )
+		{
+			// timeout
+			out.println( showPage( "relatorio/pedido_sessao_expirou.html", null ) );
+			return;
+		}
+
+		parameters.put( EMPRESA, session.getAttribute( siprpServlet.sessionCompanyName ) );
+		String from = ( String ) session.getAttribute( siprpServlet.sessionCompanyEmail );
+		
+		String destination = "fpalma@evolute.pt";
+		String subject = "Pedido de envio de relat&oacute;rio via web";
+		String content = createContent( parameters, FORM_FIELDS, "relatorio/pedido.html" );
+		// manda mail
+		boolean success = sendMail( from, destination, subject, content, true );
+
+		// mostra pagina correspondente
+		out.println( showResultPage( success, "relatorio/pedido_enviado.html", "relatorio/pedido_nao_enviado.html" ) );
+	}
+	
+	private String showPage( String page, Hashtable parameters )
+	{
+		VelocityContext context = new VelocityContext();
+		StringWriter output = new StringWriter();
+
+		try
+		{
+			if( parameters != null )
+			{
+				String key;
+				for( Enumeration e = parameters.keys(); e.hasMoreElements(); )
+				{
+					key = ( String ) e.nextElement();
+					context.put( key, parameters.get( key ) );
+				}
+			}
+
+			Velocity.mergeTemplate( page, Velocity.ENCODING_DEFAULT, context, output );
+
+			return output.toString();
+		}
+		catch( Exception e )
+		{
+			e.printStackTrace();
+		}
+
+		return null;
 	}
 }
--- a/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
+++ b/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
@ -96,7 +96,7 @@ public class ScheduleServlet extends MailerServlet

 		String marcacao_tipo = ( String )parameters.get( MARCACAO_TIPO );
 		
-		String destination = "psantos@evolute.pt";
+		String destination = "fpalma@evolute.pt";
 		String subject = "Pedido de marcação de " + marcacao_tipo + " via web";
 		String content = createContent( parameters, FORM_FIELDS, "marcacao/marcacao.html" );
 		// manda mail
--- a/trunk/html/relatorio/pedido.html
+++ b/trunk/html/relatorio/pedido.html
@ -0,0 +1,9 @@
+<html>
+<head>
+</head>
+<body>
+Empresa: $empresa<br>
+<br>
+Pedido de envio de relat&oacute;rio do ano: $ano<br>
+</body>
+</html>