git-svn-id: https://svn.coded.pt/svn/SIPRP@1698 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData

@@ -15,8 +15,8 @@
         <Node id="NovoUtilizador.jsp" x="150" y="450" zoom="true"/>
         <Node id="FormDirSiprp.jsp" x="650" y="150" zoom="true"/>
         <Node id="FichaUtilizador.jsp" x="1400" y="150" zoom="true"/>
-        <Node id="FormMedico.jsp" x="650" y="600" zoom="true"/>
         <Node id="FormHS.jsp" x="900" y="450" zoom="true"/>
+        <Node id="FormMedico.jsp" x="650" y="600" zoom="true"/>
         <Node id="EnviarCorrecao.jsp" x="400" y="450" zoom="true"/>
         <Node id="UtilizadorFields.jsp" x="150" y="600" zoom="true"/>
         <Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/>

trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData

@@ -2,8 +2,8 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="GestaoUtilizadores.jsp" x="400" y="450" zoom="true"/>
         <Node id="RecuperarPassword.jsp" x="400" y="150" zoom="true"/>
+        <Node id="GestaoUtilizadores.jsp" x="400" y="450" zoom="true"/>
         <Node id="FormDirGerRh.jsp" x="150" y="750" zoom="true"/>
         <Node id="FormGestor.jsp" x="400" y="300" zoom="true"/>
         <Node id="Erro.jsp" x="650" y="450" zoom="true"/>
@@ -15,15 +15,15 @@
         <Node id="NovoUtilizador.jsp" x="900" y="150" zoom="true"/>
         <Node id="FormDirSiprp.jsp" x="1400" y="150" zoom="true"/>
         <Node id="FichaUtilizador.jsp" x="150" y="300" zoom="true"/>
-        <Node id="FormHS.jsp" x="900" y="300" zoom="true"/>
         <Node id="FormMedico.jsp" x="900" y="450" zoom="true"/>
+        <Node id="FormHS.jsp" x="900" y="300" zoom="true"/>
         <Node id="EnviarCorrecao.jsp" x="150" y="150" zoom="true"/>
         <Node id="UtilizadorFields.jsp" x="1150" y="300" zoom="true"/>
         <Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/>
         <Node id="Dummy.jsp" x="150" y="600" zoom="true"/>
         <Node id="LoadImage.jsp" x="650" y="600" zoom="true"/>
-        <Node id="Login.jsp" x="650" y="300" zoom="true"/>
         <Node id="ViewAnaliseAcidenteTrabalho.jsp" x="650" y="150" zoom="true"/>
+        <Node id="Login.jsp" x="650" y="300" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/AATContextListener.java

@@ -19,7 +19,7 @@ import utils.AnaliseAcidentesTrabalhoLogger;
  *
  * @author dneves
  */
-public class ContextListener implements ServletContextListener
+public class AATContextListener implements ServletContextListener
 {
 
 	private long startedTime = 0L;

trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/AATMainPhaseListener.java

@@ -10,6 +10,7 @@ import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
 import analiseacidentestrabalho.SessionBean1;
+import beans.Utilizador;
 import com.evolute.utils.error.ErrorLogger;
 import javax.faces.component.UIViewRoot;
 import javax.servlet.http.HttpServletRequest;
@@ -20,7 +21,7 @@ import utils.Logos;
  *
  * @author lluis
  */
-public class MainPhaseListener implements PhaseListener
+public class AATMainPhaseListener implements PhaseListener
 {
 
 	@Override
@@ -48,6 +49,9 @@ public class MainPhaseListener implements PhaseListener
             System.out.println( "\tSessionValid : " + sessionValid );
             System.out.println( "\tLogged In : " + loggedIn );
 
+			Utilizador currentUser = session.getCurrentUser();
+			System.out.println( "\tUtilizador: " + ( currentUser == null ? "null" : currentUser.getLogin() ) );
+
             if ( sessionValid && loggedIn )
             {
                 //insert logos

trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/AATSessionListener.java

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpSessionListener;
  *
  * @author dneves
  */
-public class SessionListener implements HttpSessionListener
+public class AATSessionListener implements HttpSessionListener
 {
 
 	@Override

trunk/AnaliseAcidentesTrabalho/web/WEB-INF/faces-config.xml

@@ -24,7 +24,7 @@
     -->
 	
     <lifecycle>
-        <phase-listener>phaselistener.MainPhaseListener</phase-listener>
+        <phase-listener>phaselistener.AATMainPhaseListener</phase-listener>
     </lifecycle>
 	
 </faces-config>

trunk/AnaliseAcidentesTrabalho/web/WEB-INF/web.xml

@@ -129,10 +129,10 @@
 	</jsp-config>
 
 	<listener>
-		<listener-class>phaselistener.ContextListener</listener-class>
+		<listener-class>phaselistener.AATContextListener</listener-class>
 	</listener>
 	<listener>
-		<listener-class>phaselistener.SessionListener</listener-class>
+		<listener-class>phaselistener.AATSessionListener</listener-class>
 	</listener>
 	
 <!--	<security-constraint>