diff --git a/trunk/WEB-INF/classes/siprp/pagina/doPostLogin.java b/trunk/WEB-INF/classes/siprp/pagina/doPostLogin.java index 25607d4c..2f1240c2 100644 --- a/trunk/WEB-INF/classes/siprp/pagina/doPostLogin.java +++ b/trunk/WEB-INF/classes/siprp/pagina/doPostLogin.java @@ -64,34 +64,32 @@ System.out.println( "doPostLogin()" ); session.setAttribute(sessionUserRole, userRole); session.setAttribute(sessionPassword, password); -HashMap hmValues = new HashMap(); -session.setAttribute( sessionEmpresaId, userRole ); -if( userRole.equals( "manager" ) ) -{ -// session.setAttribute( sessionCompanyName, nomeEmpresa( con, "" + session.getAttribute( sessionEmpresaId ) ) ); - session.setAttribute( sessionCompanyName, null ); - session.setAttribute( sessionEstabelecimentoId, null ); -//hmValues.put( templateQuery, super.queryStringEmpresas ); -new doGetListaEmpresas( req, res ); -} -else -{ - session.setAttribute( sessionCompanyName, nomeEmpresa( con, userRole ) ); - session.setAttribute( sessionEstabelecimentoId, "-1" ); -//hmValues.put( templateQuery, super.queryStringEstabelecimentos ); -new doGetListaEstabelecimentos( req, res ); -} - - - stmt.close(); - con.close(); + HashMap hmValues = new HashMap(); + session.setAttribute( sessionEmpresaId, userRole ); + if( userRole.equals( "manager" ) ) + { + // session.setAttribute( sessionCompanyName, nomeEmpresa( con, "" + session.getAttribute( sessionEmpresaId ) ) ); + session.setAttribute( sessionCompanyName, null ); + session.setAttribute( sessionEstabelecimentoId, null ); + //hmValues.put( templateQuery, super.queryStringEmpresas ); + new doGetListaEmpresas( req, res ); + } + else + { + session.setAttribute( sessionCompanyName, nomeEmpresa( con, userRole ) ); + session.setAttribute( sessionEstabelecimentoId, "-1" ); + //hmValues.put( templateQuery, super.queryStringEstabelecimentos ); + new doGetListaEstabelecimentos( req, res ); + } + stmt.close(); + con.close(); -hmValues.put( "empresa_nome", session.getAttribute( sessionCompanyName ) ); -hmValues.put( "empresa_id", session.getAttribute( sessionEmpresaId ) ); -hmValues.put( "estabelecimento_id", session.getAttribute( sessionEstabelecimentoId ) ); -hmValues.put( "userRole", userRole ); -hmValues.put( "userName", user ); -//out.println( mergeTemplate( hmValues, super.authenticatedUserTemplate)); + hmValues.put( "empresa_nome", session.getAttribute( sessionCompanyName ) ); + hmValues.put( "empresa_id", session.getAttribute( sessionEmpresaId ) ); + hmValues.put( "estabelecimento_id", session.getAttribute( sessionEstabelecimentoId ) ); + hmValues.put( "userRole", userRole ); + hmValues.put( "userName", user ); + //out.println( mergeTemplate( hmValues, super.authenticatedUserTemplate)); //out.println( mergeTemplate( user, userRole, super.authenticatedUserTemplate)); } diff --git a/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java b/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java index d444d25c..64d5b989 100644 --- a/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java +++ b/trunk/WEB-INF/classes/siprp/pagina/siprpServlet.java @@ -24,14 +24,15 @@ public class siprpServlet extends HttpServlet public static final String msgLogin = "Login"; public static final String msgNovaPasswordErrada="Erro ao criar a nova password, nova password inv\u00E1lida"; public static final String msgButtonNotSuported = "funcionalidade ainda n\u00E3o suportada" ; - public static final String msgSessionTimeout = "Sess\u00E3o expirou, por favor fa\u00E7a login de novo"; + public static final String msgSessionTimeout = "ERRO Por razões de segurança o tempo da sua sessão expirou
" + + "Por favor efectue novamente o seu login.
"; // Templates - Nomes e valores //public static final String loginTemplate = "login.html"; -public static final String indexTemplate = "index.html"; -public static final String authenticatedUserTemplate = "user.html"; -public static final String errorTemplate = "frame_erro.html"; + public static final String indexTemplate = "index.html"; + public static final String authenticatedUserTemplate = "user.html"; + public static final String errorTemplate = "frame_erro.html"; public static final String mainTemplate = "main.html"; //public static final String criticalErrorTemplate = "critical.html"; @@ -275,7 +276,6 @@ System.out.println( "DIR: " + TEMPLATE_DIR ); public String mergeTemplate (String msg, String template ) // #1 { - VelocityContext context = new VelocityContext(); StringWriter output = new StringWriter(); diff --git a/trunk/html/conteudos/links_text.html b/trunk/html/conteudos/links_text.html index 1e6a8f0d..6b7c268d 100644 --- a/trunk/html/conteudos/links_text.html +++ b/trunk/html/conteudos/links_text.html @@ -27,7 +27,7 @@ Cornell University Ergonomics Web – www.ergo.human.cornell.edu
Direcção -Geral de Eestudos Estatística e Planeamento – +Geral de Estudos Estatística e Planeamento – www.deep.msst.gov.pt
Direcção Geral de Saúde –
- Por razões de segurança o tempo da sua sessão expirou
- Por favor efectue novamente o seu login.
+ $msg
diff --git a/trunk/html/frame_erro.html b/trunk/html/frame_erro.html index 316fa1ad..3e17d77a 100644 --- a/trunk/html/frame_erro.html +++ b/trunk/html/frame_erro.html @@ -71,9 +71,43 @@ class="menu" href="html/links.html" target="_ifrm">links - - relatório + +   $userName   logout »