diff --git a/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java b/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
index ef35993c..d171fbab 100644
--- a/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
+++ b/trunk/WEB-INF/classes/siprp/pagina/ScheduleServlet.java
@@ -27,10 +27,11 @@ public class ScheduleServlet extends MailerServlet
private final static String MARCACAO_TIPO = "marcacao_tipo";
private final static String DATA = "data";
private final static String HORA = "hora";
+ private final static String EMAIL_EMPRESA = "email_empresa";
private final static String[] FORM_FIELDS = new String[]{
EMPRESA, ESTABELECIMENTO, FUNCIONARIO,
- MARCACAO_TIPO, DATA, HORA
+ MARCACAO_TIPO, DATA, HORA, EMAIL_EMPRESA
};
public void doGet( HttpServletRequest req, HttpServletResponse res )
@@ -80,8 +81,8 @@ public class ScheduleServlet extends MailerServlet
parameters.put( ESTABELECIMENTO, session.getAttribute( "session_estabelecimento_nome" ) );
parameters.put( FUNCIONARIO, session.getAttribute( "session_funcionario_nome" ) );
//parameters.put( session.getAttribute( "session_funcionario_numero" ) );
-
- // String from = MAIL DA EMPRESA
+
+ String from = ( String ) session.getAttribute( siprpServlet.sessionCompanyEmail );
String marcacao_tipo = ( String )parameters.get( MARCACAO_TIPO );
@@ -89,7 +90,7 @@ public class ScheduleServlet extends MailerServlet
String subject = "Pedido de marcação de " + marcacao_tipo + " via web";
String content = createContent( parameters, FORM_FIELDS, "marcacao/marcacao.html" );
// manda mail
- boolean success = sendMail( null, destination, subject, content, true );
+ boolean success = sendMail( from, destination, subject, content, true );
// mostra pagina correspondente
out.println( showResultPage( success, "marcacao/marcacao_enviada.html", "marcacao/marcacao_nao_enviada.html" ) );
diff --git a/trunk/WEB-INF/classes/siprp/pagina/doGetListaEstabelecimentos.java b/trunk/WEB-INF/classes/siprp/pagina/doGetListaEstabelecimentos.java
index 2b12dffc..d95395a7 100644
--- a/trunk/WEB-INF/classes/siprp/pagina/doGetListaEstabelecimentos.java
+++ b/trunk/WEB-INF/classes/siprp/pagina/doGetListaEstabelecimentos.java
@@ -63,6 +63,8 @@ else
session.setAttribute( sessionCompanyName, nomeEmpresa( con, userRole ) );
}
+session.setAttribute( sessionCompanyEmail, emailEmpresa( con, empresaId ) );
+
session.setAttribute( sessionEstabelecimentoId, null );
HashMap hmValues = new HashMap();
diff --git a/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java b/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java
index 652a84e1..d444d25c 100644
--- a/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java
+++ b/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java
@@ -60,7 +60,8 @@ public static final String errorTemplate = "frame_erro.html";
public static final String sessionEmpresaId="empresaId";
public static final String sessionEstabelecimentoId="estabelecimentoId";
public static final String sessionTrabalhadorId="trabalhadorId";
- public static final String sessionCompanyName = "sessionCompanyName";
+ public static final String sessionCompanyName = "sessionCompanyName";
+ public static final String sessionCompanyEmail = "sessionCompanyEmail";
public static final int sessionTimeout = 3600; // segundos
public static final String servletName="siprpWeb";
@@ -81,6 +82,7 @@ public static final String errorTemplate = "frame_erro.html";
public static final String bdTrabIdRef = "id"; // campo que contem id do trabalhador
public static final String bdTrabNomeRef = "nome"; // campo que contem nome do trabalhador
public static final String bdNullString = ""; // String a mostrar quando o campo lido da BD é null
+ public static final String bdEmailEmpresa = "email"; // campo que contem email da empresa
// Arrays
@@ -430,6 +432,37 @@ System.out.println( "DIR: " + TEMPLATE_DIR );
}
+ public String emailEmpresa(Connection con, String empresaId)
+ {
+ Statement stmt = null ;
+ ResultSet2DArray rs;
+ StringBuffer dbQuery;
+ String returnString;
+
+ try
+ {
+ dbQuery = new StringBuffer();
+ dbQuery.append( "SELECT "+bdEmailEmpresa+" FROM empresas WHERE "+bdEmpresaIdRef+" ='"+empresaId+"'");
+ stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
+ rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );
+ if( rs.columnLength() > 0 )
+ {
+ returnString = (String)rs.get(0,0);
+ stmt.close();
+ return returnString;
+ }
+ else
+ {
+ return null;
+ }
+ }
+ catch ( Exception e )
+ {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
public String nomeEmpresa(Connection con, String empresaId)
{
Statement stmt = null ;
diff --git a/trunk/html/marcacao/marcacao.html b/trunk/html/marcacao/marcacao.html
index b549c435..ead4a4e7 100644
--- a/trunk/html/marcacao/marcacao.html
+++ b/trunk/html/marcacao/marcacao.html
@@ -7,7 +7,5 @@ Estabelecimento: $estabelecimento
Funcionário: $funcionario
$marcacao_tipo no dia $data#if( $marcacao_tipo == 'Consulta' ) às $hora#end.
-
-Email de resposta