11/12/2008

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

trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData

@@ -6,10 +6,11 @@
         <Node id="GestaoUtilizadores.jsp" x="900" y="150" zoom="true"/>
         <Node id="FormDirGerRh.jsp" x="150" y="150" zoom="true"/>
         <Node id="FormGestor.jsp" x="1150" y="150" zoom="true"/>
+        <Node id="Acesso.jsp" x="400" y="750" zoom="true"/>
         <Node id="Erro.jsp" x="650" y="450" zoom="true"/>
         <Node id="FormRH.jsp" x="400" y="150" zoom="true"/>
-        <Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="300" zoom="true"/>
         <Node id="FormSeguranca.jsp" x="1150" y="300" zoom="true"/>
+        <Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="300" zoom="true"/>
         <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"/>

trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData

@@ -2,10 +2,11 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="RecuperarPassword.jsp" x="400" y="150" zoom="true"/>
         <Node id="GestaoUtilizadores.jsp" x="400" y="450" zoom="true"/>
+        <Node id="RecuperarPassword.jsp" x="400" y="150" zoom="true"/>
         <Node id="FormDirGerRh.jsp" x="150" y="750" zoom="true"/>
         <Node id="FormGestor.jsp" x="400" y="300" zoom="true"/>
+        <Node id="Acesso.jsp" x="400" y="750" zoom="false"/>
         <Node id="Erro.jsp" x="650" y="450" zoom="true"/>
         <Node id="FormRH.jsp" x="400" y="600" zoom="true"/>
         <Node id="FormSeguranca.jsp" x="1150" y="150" zoom="true"/>
@@ -13,8 +14,8 @@
         <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="FormMedico.jsp" x="900" y="450" zoom="true"/>
         <Node id="FormHS.jsp" x="900" y="300" zoom="true"/>
+        <Node id="FormMedico.jsp" x="900" y="450" zoom="true"/>
         <Node id="EnviarCorrecao.jsp" x="150" y="150" zoom="true"/>
         <Node id="UtilizadorFields.jsp" x="1150" y="300" zoom="true"/>
         <Node id="Dummy.jsp" x="150" y="600" zoom="true"/>

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Acesso.java

@@ -0,0 +1,245 @@
+/*
+ * Acesso.java
+ *
+ * Created on Oct 15, 2008, 9:49:21 AM
+ */
+ 
+package analiseacidentestrabalho;
+
+import com.sun.rave.web.ui.appbase.AbstractPageBean;
+import com.sun.rave.web.ui.component.StaticText;
+import db.UtilizadoresDataProvider;
+import global.Global;
+import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
+import utils.JSFUtils;
+import utils.Utils;
+
+/**
+ * <p>Page bean that corresponds to a similarly named JSP page.  This
+ * class contains component definitions (and initialization code) for
+ * all components that you have defined on this page, as well as
+ * lifecycle methods and event handlers where you may add behavior
+ * to respond to incoming events.</p>
+ *
+ * @author lluis
+ */
+public class Acesso extends AbstractPageBean {
+    // <editor-fold defaultstate="collapsed" desc="Managed Component Definition">
+
+    /**
+     * <p>Automatically managed component initialization.  <strong>WARNING:</strong>
+     * This method is automatically generated, so any user-specified code inserted
+     * here is subject to being replaced.</p>
+     */
+    private void _init() throws Exception {
+    }
+    private StaticText stWelcome = new StaticText();
+
+    public StaticText getStWelcome() {
+        return stWelcome;
+    }
+
+    public void setStWelcome(StaticText st) {
+        this.stWelcome = st;
+    }
+
+    // </editor-fold>
+
+    /**
+     * <p>Construct a new Page bean instance.</p>
+     */
+    public Acesso() {
+    }
+
+    /**
+     * <p>Callback method that is called whenever a page is navigated to,
+     * either directly via a URL, or indirectly via page navigation.
+     * Customize this method to acquire resources that will be needed
+     * for event handlers and lifecycle methods, whether or not this
+     * page is performing post back processing.</p>
+     * 
+     * <p>Note that, if the current request is a postback, the property
+     * values of the components do <strong>not</strong> represent any
+     * values submitted with this request.  Instead, they represent the
+     * property values that were saved for this view when it was rendered.</p>
+     */
+    public void init() {
+        // Perform initializations inherited from our superclass
+        super.init();
+        // Perform application initialization that must complete
+        // *before* managed components are initialized
+        // TODO - add your own initialiation code here
+        
+        // <editor-fold defaultstate="collapsed" desc="Managed Component Initialization">
+        // Initialize automatically managed components
+        // *Note* - this logic should NOT be modified
+        try {
+            _init();
+        } catch (Exception e) {
+            log("Acesso Initialization Failure", e);
+            throw e instanceof FacesException ? (FacesException) e: new FacesException(e);
+        }
+        
+        // </editor-fold>
+        // Perform application initialization that must complete
+        // *after* managed components are initialized
+        // TODO - add your own initialization code here
+	if (!getSessionBean1().isLoggedIn()) {
+	    try {
+		getExternalContext().redirect("Login.jsp");
+	    } catch(Exception e) {  
+	    // . . .  handle exception . . .              
+	    }
+	}	        
+    }
+
+    /**
+     * <p>Callback method that is called after the component tree has been
+     * restored, but before any event processing takes place.  This method
+     * will <strong>only</strong> be called on a postback request that
+     * is processing a form submit.  Customize this method to allocate
+     * resources that will be required in your event handlers.</p>
+     */
+    public void preprocess() {
+    }
+
+    /**
+     * <p>Callback method that is called just before rendering takes place.
+     * This method will <strong>only</strong> be called for the page that
+     * will actually be rendered (and not, for example, on a page that
+     * handled a postback and then navigated to a different page).  Customize
+     * this method to allocate resources that will be required for rendering
+     * this page.</p>
+     */
+    public void prerender() {
+         Utilizador u = getSessionBean1().getCurrentUser();
+         //String nomeUnicode = Utils.textToUnicode(u.getNome());
+         //System.out.println("NOME UNICODE : " + nomeUnicode);
+         String nomeHtml = Utils.unicodeToHTML( u.getNome() );
+         stWelcome.setText("Bem vindo(a) " + nomeHtml);
+    }
+
+    /**
+     * <p>Callback method that is called after rendering is completed for
+     * this request, if <code>init()</code> was called (regardless of whether
+     * or not this was the page that was actually rendered).  Customize this
+     * method to release resources acquired in the <code>init()</code>,
+     * <code>preprocess()</code>, or <code>prerender()</code> methods (or
+     * acquired during execution of an event handler).</p>
+     * 
+     */
+     
+    public void destroy() {
+    }
+    
+    /**
+     * <p>Return a reference to the scoped data bean.</p>
+     */
+    protected SessionBean1 getSessionBean1() {
+        return (SessionBean1)getBean("SessionBean1");
+    }
+
+    /**
+     * <p>Return a reference to the scoped data bean.</p>
+     */
+    protected RequestBean1 getRequestBean1() {
+        return (RequestBean1)getBean("RequestBean1");
+    }
+
+    /**
+     * <p>Return a reference to the scoped data bean.</p>
+     */
+    protected ApplicationBean1 getApplicationBean1() {
+        return (ApplicationBean1)getBean("ApplicationBean1");
+    }         
+     
+
+
+    public String lnkAnalisesAcidente_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkNewUser_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkEditUser_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkLogout_action() {
+        // TODO: Replace with your code
+        FacesContext fc = getFacesContext();
+        try
+        {
+            JSFUtils.logout(fc);                    
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+        }
+        return "login";
+    }
+
+    public String lnkAnalises_action() {
+        // TODO: Replace with your code
+        Utilizador u = getSessionBean1().getCurrentUser();
+        UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
+        try
+        {
+            Integer permissao = udp.getPermissionCode(u.getId()); 
+            switch(permissao.intValue())
+            {
+                case 1: //seguranca
+                    return "form_seguranca";                      
+                case 3: //hs
+                    return "form_hs";                      
+                case 8: //dir_siprp
+                    return "form_dir_siprp";                                          
+                default:
+                    return "gestor";                
+            }            
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+            return "gestor";               
+        }
+
+
+    }
+
+    public String lnkPlanos_action() {
+        // TODO: Replace with your code
+        
+        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+        FacesContext fc = getFacesContext().getCurrentInstance();        
+        Global.redirectToPlanos(fc, u);                
+        
+//        FacesContext fc = getFacesContext().getCurrentInstance();
+//        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();
+//        try
+//        {
+//            JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser);            
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }
+
+        return null;
+    }
+    
+}
+

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java

@@ -4301,66 +4301,6 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         this.gridHeader1 = hpg;
     }
 
-    private PanelGroup groupPanel56 = new PanelGroup();
-
-    public PanelGroup getGroupPanel56() {
-        return groupPanel56;
-    }
-
-    public void setGroupPanel56(PanelGroup pg) {
-        this.groupPanel56 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText staticText165 = new StaticText();
-
-    public StaticText getStaticText165() {
-        return staticText165;
-    }
-
-    public void setStaticText165(StaticText st) {
-        this.staticText165 = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText166 = new StaticText();
-
-    public StaticText getStaticText166() {
-        return staticText166;
-    }
-
-    public void setStaticText166(StaticText st) {
-        this.staticText166 = st;
-    }
-
-    private Hyperlink lnkLogout = new Hyperlink();
-
-    public Hyperlink getLnkLogout() {
-        return lnkLogout;
-    }
-
-    public void setLnkLogout(Hyperlink h) {
-        this.lnkLogout = h;
-    }
-
     private HtmlPanelGrid gridPanel114 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridPanel114() {
@@ -6111,46 +6051,6 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         this.stEmailSuperior = st;
     }
 
-    private Hyperlink lnkNewUser1 = new Hyperlink();
-
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText staticText21 = new StaticText();
-
-    public StaticText getStaticText21() {
-        return staticText21;
-    }
-
-    public void setStaticText21(StaticText st) {
-        this.staticText21 = st;
-    }
-
-    private StaticText staticText161 = new StaticText();
-
-    public StaticText getStaticText161() {
-        return staticText161;
-    }
-
-    public void setStaticText161(StaticText st) {
-        this.staticText161 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
     private HiddenField hidDisableImprimir = new HiddenField();
 
     public HiddenField getHidDisableImprimir() {
@@ -6841,26 +6741,6 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         this.txtHorasTurno = tf;
     }
 
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText8 = new StaticText();
-
-    public StaticText getStaticText8() {
-        return staticText8;
-    }
-
-    public void setStaticText8(StaticText st) {
-        this.staticText8 = st;
-    }
-
     private HiddenField hidConfEnviar = new HiddenField();
 
     public HiddenField getHidConfEnviar() {
@@ -6870,6 +6750,15 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
     public void setHidConfEnviar(HiddenField hf) {
         this.hidConfEnviar = hf;
     }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
     /**
      * <p>Construct a new Page bean instance.</p>
      */
@@ -14954,7 +14843,12 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         }
 
         return true;        
-    }    
+    }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        return null;
+    }
 
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java

@@ -20,6 +20,7 @@ import com.sun.rave.web.ui.component.Link;
 import com.sun.rave.web.ui.component.Page;
 import com.sun.rave.web.ui.component.PanelGroup;
 import com.sun.rave.web.ui.component.StaticText;
+import com.sun.rave.web.ui.model.SingleSelectOptionsList;
 import global.Global;
 import java.io.File;
 import java.util.Calendar;
@@ -129,36 +130,6 @@ public class Dummy extends AbstractPageBean {
         this.hidConfEnviar = hf;
     }
 
-    private HtmlPanelGrid gridPanel1 = new HtmlPanelGrid();
-
-    public HtmlPanelGrid getGridPanel1() {
-        return gridPanel1;
-    }
-
-    public void setGridPanel1(HtmlPanelGrid hpg) {
-        this.gridPanel1 = hpg;
-    }
-
-    private StaticText txtMsg1 = new StaticText();
-
-    public StaticText getTxtMsg1() {
-        return txtMsg1;
-    }
-
-    public void setTxtMsg1(StaticText st) {
-        this.txtMsg1 = st;
-    }
-
-    private Button butEliminar = new Button();
-
-    public Button getButEliminar() {
-        return butEliminar;
-    }
-
-    public void setButEliminar(Button b) {
-        this.butEliminar = b;
-    }
-
     private HiddenField hidConfDelete = new HiddenField();
 
     public HiddenField getHidConfDelete() {
@@ -168,45 +139,14 @@ public class Dummy extends AbstractPageBean {
     public void setHidConfDelete(HiddenField hf) {
         this.hidConfDelete = hf;
     }
+    private SingleSelectOptionsList dropDown1DefaultOptions = new SingleSelectOptionsList();
 
-    private PanelGroup groupPanel1 = new PanelGroup();
+    public SingleSelectOptionsList getDropDown1DefaultOptions() {
-
+        return dropDown1DefaultOptions;
-    public PanelGroup getGroupPanel1() {
-        return groupPanel1;
-    }
-
-    public void setGroupPanel1(PanelGroup pg) {
-        this.groupPanel1 = pg;
-    }
-
-    private Button butVoltar1 = new Button();
-
-    public Button getButVoltar1() {
-        return butVoltar1;
     }
 
-    public void setButVoltar1(Button b) {
+    public void setDropDown1DefaultOptions(SingleSelectOptionsList ssol) {
-        this.butVoltar1 = b;
+        this.dropDown1DefaultOptions = ssol;
-    }
-
-    private Button butEliminar1 = new Button();
-
-    public Button getButEliminar1() {
-        return butEliminar1;
-    }
-
-    public void setButEliminar1(Button b) {
-        this.butEliminar1 = b;
-    }
-
-    private Hyperlink lnkEstabelecimento = new Hyperlink();
-
-    public Hyperlink getLnkEstabelecimento() {
-        return lnkEstabelecimento;
-    }
-
-    public void setLnkEstabelecimento(Hyperlink h) {
-        this.lnkEstabelecimento = h;
     }
     
     // </editor-fold>
@@ -446,5 +386,40 @@ public class Dummy extends AbstractPageBean {
         
         return null;
     }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkAnalisesAcidente_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkNewUser_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkGerirUtilizadores_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkAnalises_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkPlanos_action() {
+        // TODO: Replace with your code
+        return null;
+    }
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java

@@ -171,66 +171,6 @@ public class EnviarCorrecao extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser1 = new StaticText();
-
-    public StaticText getLblUser1() {
-        return lblUser1;
-    }
-
-    public void setLblUser1(StaticText st) {
-        this.lblUser1 = st;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkEditUser1 = new Hyperlink();
-
-    public Hyperlink getLnkEditUser1() {
-        return lnkEditUser1;
-    }
-
-    public void setLnkEditUser1(Hyperlink h) {
-        this.lnkEditUser1 = h;
-    }
-
-    private StaticText staticText2 = new StaticText();
-
-    public StaticText getStaticText2() {
-        return staticText2;
-    }
-
-    public void setStaticText2(StaticText st) {
-        this.staticText2 = st;
-    }
-
-    private Hyperlink lnkLogout1 = new Hyperlink();
-
-    public Hyperlink getLnkLogout1() {
-        return lnkLogout1;
-    }
-
-    public void setLnkLogout1(Hyperlink h) {
-        this.lnkLogout1 = h;
-    }
-
     private HtmlPanelGrid gridLayoutTop1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridLayoutTop1() {
@@ -381,46 +321,6 @@ public class EnviarCorrecao extends AbstractPageBean {
         this.lnkEstadoCorr = h;
     }
 
-    private StaticText staticText3 = new StaticText();
-
-    public StaticText getStaticText3() {
-        return staticText3;
-    }
-
-    public void setStaticText3(StaticText st) {
-        this.staticText3 = st;
-    }
-
-    private Hyperlink lnkNewUser1 = new Hyperlink();
-
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText staticText4 = new StaticText();
-
-    public StaticText getStaticText4() {
-        return staticText4;
-    }
-
-    public void setStaticText4(StaticText st) {
-        this.staticText4 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
     private StaticText staticText5 = new StaticText();
 
     public StaticText getStaticText5() {
@@ -431,26 +331,6 @@ public class EnviarCorrecao extends AbstractPageBean {
         this.staticText5 = st;
     }
 
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText7 = new StaticText();
-
-    public StaticText getStaticText7() {
-        return staticText7;
-    }
-
-    public void setStaticText7(StaticText st) {
-        this.staticText7 = st;
-    }
-
     private Button butConfirmar = new Button();
 
     public Button getButConfirmar() {
@@ -480,6 +360,15 @@ public class EnviarCorrecao extends AbstractPageBean {
     public void setTxtMsg(StaticText st) {
         this.txtMsg = st;
     }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
     
     // </editor-fold>
     
@@ -858,5 +747,15 @@ public class EnviarCorrecao extends AbstractPageBean {
         }
 
     }
+
+    public String lnkAnalisesAcidente_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        return null;
+    }
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java

@@ -32,7 +32,8 @@ import javax.faces.event.ValueChangeEvent;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 import global.Global;
-import javax.servlet.ServletContext;
+import javax.faces.context.FacesContext;
+import utils.JSFUtils;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -173,66 +174,6 @@ public class FichaUtilizador extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText2 = new StaticText();
-
-    public StaticText getStaticText2() {
-        return staticText2;
-    }
-
-    public void setStaticText2(StaticText st) {
-        this.staticText2 = st;
-    }
-
-    private Hyperlink lnkLogout = new Hyperlink();
-
-    public Hyperlink getLnkLogout() {
-        return lnkLogout;
-    }
-
-    public void setLnkLogout(Hyperlink h) {
-        this.lnkLogout = h;
-    }
-
     private HtmlPanelGrid gridMsg1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridMsg1() {
@@ -573,6 +514,10 @@ public class FichaUtilizador extends AbstractPageBean {
     private final static int GESTOR = 6;        
     private final static int DIRECTOR_RH = 7;            
     private final static int DIRECTOR_SIPRP = 8;                
+    private final static int DIRECTOR_LOJA = 9;      
+    private final static int DIRECTOR_NACIONAL_SEGURANCA = 10;     
+    
+    private boolean isFromPlanos = false;
 
     private StaticText staticText12 = new StaticText();
 
@@ -693,17 +638,15 @@ public class FichaUtilizador extends AbstractPageBean {
     public void setStaticText11(StaticText st) {
         this.staticText11 = st;
     }
+    private StaticText lblUser = new StaticText();
 
-    private StaticText staticText14 = new StaticText();
+    public StaticText getLblUser() {
-
+        return lblUser;
-    public StaticText getStaticText14() {
-        return staticText14;
     }
 
-    public void setStaticText14(StaticText st) {
+    public void setLblUser(StaticText st) {
-        this.staticText14 = st;
+        this.lblUser = st;
     }
-
     private Hyperlink lnkGerirUtilizadores = new Hyperlink();
 
     public Hyperlink getLnkGerirUtilizadores() {
@@ -713,56 +656,6 @@ public class FichaUtilizador extends AbstractPageBean {
     public void setLnkGerirUtilizadores(Hyperlink h) {
         this.lnkGerirUtilizadores = h;
     }
-
-    private StaticText staticText15 = new StaticText();
-
-    public StaticText getStaticText15() {
-        return staticText15;
-    }
-
-    public void setStaticText15(StaticText st) {
-        this.staticText15 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText16 = new StaticText();
-
-    public StaticText getStaticText16() {
-        return staticText16;
-    }
-
-    public void setStaticText16(StaticText st) {
-        this.staticText16 = st;
-    }
-
-    private StaticText staticText17 = new StaticText();
-
-    public StaticText getStaticText17() {
-        return staticText17;
-    }
-
-    public void setStaticText17(StaticText st) {
-        this.staticText17 = st;
-    }
     
     /**
      * <p>Construct a new Page bean instance.</p>
@@ -812,6 +705,47 @@ public class FichaUtilizador extends AbstractPageBean {
 	}
         else
         {
+
+            FacesContext fc = getFacesContext();
+            System.out.println("REQUEST PARAMETERS : " + JSFUtils.requestHasParameters(fc));            
+            isFromPlanos = false;
+            if(JSFUtils.requestHasParameters(fc))
+            {
+                isFromPlanos = true;
+                String user_id = JSFUtils.getRequestParameter(fc, "user");
+                String mode = JSFUtils.getRequestParameter(fc, "mode");
+                if(mode != null)
+                {
+                    if(mode.matches("edit"))
+                    {
+                        System.out.println("MODE PARAMETER : " + mode);
+                        getSessionBean1().setModoEdicaoUtilizador("edit");                                    
+                    }
+                }
+
+                Utilizador u = null;
+                try
+                {
+                    Integer userId = new Integer(Integer.parseInt(user_id));
+                    System.out.println("USER ID FROM PLANOS : " + user_id);
+                    try
+                    {
+                        UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
+                        //udp.checkConnection();
+                        u = udp.getUtilizador(userId);
+                        getSessionBean1().setCurrentUser(u);
+                    }
+                    catch(Exception ex1)
+                    {
+                        ex1.printStackTrace();
+                    }
+                }
+                catch(Exception ex)
+                {
+                    ex.printStackTrace();
+                }                            
+            }
+
             
                 if(
                    getSessionBean1().getCurrentUser().getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_GERAL_RH
@@ -827,10 +761,19 @@ public class FichaUtilizador extends AbstractPageBean {
                HttpServletRequest request = (HttpServletRequest) getExternalContext().getRequest();
                String referer = request.getRequestURI();
                String pageFrom = Utils.getPageFrom(referer);
-               if(pageFrom.matches("FichaUtilizador.jsp"))
+               if(isFromPlanos)
+               {
+                   isPostData = false;
+               }
+               else
                {
-                   isPostData = true;
+                   if(pageFrom.matches("FichaUtilizador.jsp"))
+                   {
+                       isPostData = true;
+                        System.out.println("IS POSTDATA : " + isPostData);                   
+                   }                   
                }
+
                if(!isPostData)
                {       
 
@@ -853,6 +796,7 @@ public class FichaUtilizador extends AbstractPageBean {
                    try
                    {
                         getSessionBean1().setEstabelecimentosOptions(adp.getEstabelecimentosList( getSessionBean1().getCurrentUser().getEmpresa_id(), new Boolean(false) ));                           
+                        System.out.println("ESTABELECIMENTOS OPTIONS : " + getSessionBean1().getEstabelecimentosOptions().length);
                         drpEstabelecimentos.setSelected(new Integer(-1));
                    }
                    catch(Exception ex)
@@ -1027,6 +971,14 @@ public class FichaUtilizador extends AbstractPageBean {
         {
             return "form_gestor";                        
         }
+        else if(tipo == Global.TIPO_UTILIZADOR_DIRECTOR_LOJA)
+        {
+            return "form_gestor";                        
+        }        
+        else if(tipo == Global.TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA)
+        {
+            return "form_gestor";                        
+        }                
         
         return null;
     }    
@@ -1381,6 +1333,18 @@ public class FichaUtilizador extends AbstractPageBean {
             stCedula.setRendered(false);       
             txtCap.setText(u.getCap());
         }
+        else if(u.getTipo().intValue()  == DIRECTOR_LOJA || u.getTipo().intValue()  == DIRECTOR_NACIONAL_SEGURANCA)  
+        {
+            drpNome.setRendered(false);     
+            txtNome.setStyleClass("show");            
+            lblCap.setRendered(false);
+            txtCap.setRendered(false);       
+            lblCedula.setRendered(false);
+            stCedula.setRendered(false); 
+            lblResponsavelLoja.setRendered(false);
+            chkResponsavelLoja.setRendered(false);
+            txtNome.setText(utils.Utils.unicodeToHTML(u.getNome()));            
+        }
         else if(u.getTipo().intValue()  == MEDICO)  //medico
         {
             drpNome.setRendered(true);
@@ -1510,6 +1474,14 @@ public class FichaUtilizador extends AbstractPageBean {
     
     private String navigate()
     {
+        if(isFromPlanos)
+        {
+            Utilizador u = getSessionBean1().getCurrentUser();
+    //        String curUser = "?user=" + u.getId().toString();        
+            FacesContext fc = getFacesContext().getCurrentInstance();        
+            Global.redirectToPlanos(fc, u);                
+            return null;
+        }
         String nav_from = getSessionBean1().getNavFrom();
         if(nav_from.matches("FormSeguranca"))
         {
@@ -1574,6 +1546,10 @@ public class FichaUtilizador extends AbstractPageBean {
                     return "form_dir_ger_rh";                    
                 case Global.TIPO_UTILIZADOR_DIRECTOR_SIPRP:
                     return "form_dir_siprp";                                        
+                case Global.TIPO_UTILIZADOR_DIRECTOR_LOJA:
+                    return "form_gestor"; 
+                case Global.TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA:
+                    return "form_gestor";                                                                                
             }
         }                
         return null;
@@ -1614,5 +1590,10 @@ public class FichaUtilizador extends AbstractPageBean {
 //         }                
         return null;
     }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        return null;
+    }
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java

@@ -35,9 +35,10 @@ import java.util.GregorianCalendar;
 import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import utils.JSFUtils;
 import utils.Utils;
 
 /**
@@ -179,106 +180,6 @@ public class FormDirGerRh extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText stSep1 = new StaticText();
-
-    public StaticText getStSep1() {
-        return stSep1;
-    }
-
-    public void setStSep1(StaticText st) {
-        this.stSep1 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente1 = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente1() {
-        return lnkAnalisesAcidente1;
-    }
-
-    public void setLnkAnalisesAcidente1(Hyperlink h) {
-        this.lnkAnalisesAcidente1 = h;
-    }
-
-    private StaticText stSep2 = new StaticText();
-
-    public StaticText getStSep2() {
-        return stSep2;
-    }
-
-    public void setStSep2(StaticText st) {
-        this.stSep2 = st;
-    }
-
-    private Hyperlink lnkGerirUtilizadores = new Hyperlink();
-
-    public Hyperlink getLnkGerirUtilizadores() {
-        return lnkGerirUtilizadores;
-    }
-
-    public void setLnkGerirUtilizadores(Hyperlink h) {
-        this.lnkGerirUtilizadores = h;
-    }
-
-    private StaticText stSep3 = new StaticText();
-
-    public StaticText getStSep3() {
-        return stSep3;
-    }
-
-    public void setStSep3(StaticText st) {
-        this.stSep3 = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkLogout = new Hyperlink();
-
-    public Hyperlink getLnkLogout() {
-        return lnkLogout;
-    }
-
-    public void setLnkLogout(Hyperlink h) {
-        this.lnkLogout = h;
-    }
-
     private HtmlPanelGrid gridLayoutTop1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridLayoutTop1() {
@@ -839,26 +740,6 @@ public class FormDirGerRh extends AbstractPageBean {
         this.staticText8 = st;
     }
 
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText9 = new StaticText();
-
-    public StaticText getStaticText9() {
-        return staticText9;
-    }
-
-    public void setStaticText9(StaticText st) {
-        this.staticText9 = st;
-    }
-
     private TableColumn tableColumn11 = new TableColumn();
 
     public TableColumn getTableColumn11() {
@@ -898,6 +779,24 @@ public class FormDirGerRh extends AbstractPageBean {
     public void setLnkDataAberturaConcluida(Hyperlink h) {
         this.lnkDataAberturaConcluida = h;
     }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
+    private Hyperlink lnkPlanosActuacao = new Hyperlink();
+
+    public Hyperlink getLnkPlanosActuacao() {
+        return lnkPlanosActuacao;
+    }
+
+    public void setLnkPlanosActuacao(Hyperlink h) {
+        this.lnkPlanosActuacao = h;
+    }
     
     // </editor-fold>
     
@@ -970,6 +869,7 @@ public class FormDirGerRh extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
+        System.out.println("=== FORM_DIR_GER_RH ===");
         lblUser.setText( getSessionBean1().getCurrentUser().getLogin() );   
         
         AnalisesDataProvider adp = new AnalisesDataProvider();   
@@ -1432,5 +1332,25 @@ public class FormDirGerRh extends AbstractPageBean {
         return null;
     }
 
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+        FacesContext fc = getFacesContext().getCurrentInstance();        
+        Global.redirectToPlanos(fc, u);        
+//        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();
+//        FacesContext fc = getFacesContext().getCurrentInstance();
+//        try
+//        {
+//            JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser);            
+//        }
+//        catch(Exception ex)
+//        {
+//            
+//        }                
+        return null;
+    }
+
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java

@@ -35,9 +35,10 @@ import java.util.GregorianCalendar;
 import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import utils.JSFUtils;
 import utils.Utils;
 
 /**
@@ -179,86 +180,6 @@ public class FormDirSiprp extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText stSep1 = new StaticText();
-
-    public StaticText getStSep1() {
-        return stSep1;
-    }
-
-    public void setStSep1(StaticText st) {
-        this.stSep1 = st;
-    }
-
-    private Hyperlink lnkNewUser = new Hyperlink();
-
-    public Hyperlink getLnkNewUser() {
-        return lnkNewUser;
-    }
-
-    public void setLnkNewUser(Hyperlink h) {
-        this.lnkNewUser = h;
-    }
-
-    private StaticText stSep2 = new StaticText();
-
-    public StaticText getStSep2() {
-        return stSep2;
-    }
-
-    public void setStSep2(StaticText st) {
-        this.stSep2 = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkLogout = new Hyperlink();
-
-    public Hyperlink getLnkLogout() {
-        return lnkLogout;
-    }
-
-    public void setLnkLogout(Hyperlink h) {
-        this.lnkLogout = h;
-    }
-
     private HtmlPanelGrid gridLayoutTop1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridLayoutTop1() {
@@ -819,46 +740,6 @@ public class FormDirSiprp extends AbstractPageBean {
         this.staticText10 = st;
     }
 
-    private StaticText stSep3 = new StaticText();
-
-    public StaticText getStSep3() {
-        return stSep3;
-    }
-
-    public void setStSep3(StaticText st) {
-        this.stSep3 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText2 = new StaticText();
-
-    public StaticText getStaticText2() {
-        return staticText2;
-    }
-
-    public void setStaticText2(StaticText st) {
-        this.staticText2 = st;
-    }
-
     private HtmlPanelGrid gridPanel2 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridPanel2() {
@@ -938,6 +819,24 @@ public class FormDirSiprp extends AbstractPageBean {
     public void setLnkEstabelecimentoSeg1(Hyperlink h) {
         this.lnkEstabelecimentoSeg1 = h;
     }
+    private Hyperlink lnkPlanosActuacao = new Hyperlink();
+
+    public Hyperlink getLnkPlanosActuacao() {
+        return lnkPlanosActuacao;
+    }
+
+    public void setLnkPlanosActuacao(Hyperlink h) {
+        this.lnkPlanosActuacao = h;
+    }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
     
     // </editor-fold>
     
@@ -1010,6 +909,7 @@ public class FormDirSiprp extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
+        System.out.println("=== FORM_DIR_SIPRP ===");        
         lblUser.setText( getSessionBean1().getCurrentUser().getLogin() );   
         
        AnalisesDataProvider adp = new AnalisesDataProvider();
@@ -1490,6 +1390,31 @@ public class FormDirSiprp extends AbstractPageBean {
 //         }                
         return null;
     }
+
+    public String lnkAnalisesAcidente_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+        FacesContext fc = getFacesContext().getCurrentInstance();        
+        Global.redirectToPlanos(fc, u);        
+//        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();
+//        FacesContext fc = getFacesContext().getCurrentInstance();
+//        try
+//        {
+//            JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser);            
+//        }
+//        catch(Exception ex)
+//        {
+//            
+//        }                
+        return null;
+    }
        
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java

@@ -35,9 +35,10 @@ import java.util.GregorianCalendar;
 import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import utils.JSFUtils;
 import utils.Utils;
 
 /**
@@ -179,106 +180,6 @@ public class FormGestor extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText stSep1 = new StaticText();
-
-    public StaticText getStSep1() {
-        return stSep1;
-    }
-
-    public void setStSep1(StaticText st) {
-        this.stSep1 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente1 = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente1() {
-        return lnkAnalisesAcidente1;
-    }
-
-    public void setLnkAnalisesAcidente1(Hyperlink h) {
-        this.lnkAnalisesAcidente1 = h;
-    }
-
-    private StaticText stSep2 = new StaticText();
-
-    public StaticText getStSep2() {
-        return stSep2;
-    }
-
-    public void setStSep2(StaticText st) {
-        this.stSep2 = st;
-    }
-
-    private Hyperlink lnkGerirUtilizadores = new Hyperlink();
-
-    public Hyperlink getLnkGerirUtilizadores() {
-        return lnkGerirUtilizadores;
-    }
-
-    public void setLnkGerirUtilizadores(Hyperlink h) {
-        this.lnkGerirUtilizadores = h;
-    }
-
-    private StaticText stSep3 = new StaticText();
-
-    public StaticText getStSep3() {
-        return stSep3;
-    }
-
-    public void setStSep3(StaticText st) {
-        this.stSep3 = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkLogout = new Hyperlink();
-
-    public Hyperlink getLnkLogout() {
-        return lnkLogout;
-    }
-
-    public void setLnkLogout(Hyperlink h) {
-        this.lnkLogout = h;
-    }
-
     private HtmlPanelGrid gridLayoutTop1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridLayoutTop1() {
@@ -839,26 +740,6 @@ public class FormGestor extends AbstractPageBean {
         this.staticText8 = st;
     }
 
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText9 = new StaticText();
-
-    public StaticText getStaticText9() {
-        return staticText9;
-    }
-
-    public void setStaticText9(StaticText st) {
-        this.staticText9 = st;
-    }
-
     private TableColumn tableColumn11 = new TableColumn();
 
     public TableColumn getTableColumn11() {
@@ -918,6 +799,24 @@ public class FormGestor extends AbstractPageBean {
     public void setLnkEstabelecimentoSeg1(Hyperlink h) {
         this.lnkEstabelecimentoSeg1 = h;
     }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
+    private Hyperlink lnkPlanosActuacao = new Hyperlink();
+
+    public Hyperlink getLnkPlanosActuacao() {
+        return lnkPlanosActuacao;
+    }
+
+    public void setLnkPlanosActuacao(Hyperlink h) {
+        this.lnkPlanosActuacao = h;
+    }
     
     // </editor-fold>
     
@@ -990,7 +889,24 @@ public class FormGestor extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
-        lblUser.setText( getSessionBean1().getCurrentUser().getLogin() );   
+        System.out.println("=== FORM_GESTOR ===");        
+        Utilizador curUser = getSessionBean1().getCurrentUser();
+        lblUser.setText( curUser.getLogin() );        
+        if(curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_GESTOR)
+        {
+            if(curUser.getGestor_geral().matches("n"))
+            {
+                lnkPlanosActuacao.setDisabled(true);                
+            }
+        }
+        else if(curUser.getTipo().intValue() != Global.TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA)
+        {
+            if(curUser.getTipo().intValue() != Global.TIPO_UTILIZADOR_DIRECTOR_LOJA)
+            {
+                lnkPlanosActuacao.setDisabled(true);
+            }            
+        }
+
         
         AnalisesDataProvider adp = new AnalisesDataProvider();   
        try
@@ -998,13 +914,13 @@ public class FormGestor extends AbstractPageBean {
             //lblActivos.setRendered(true);
             table1.setRendered(true);                                      
             ArrayList seguimentoList = null;
-            if(getSessionBean1().getCurrentUser().getGestor_geral().matches("y"))
+            if(curUser.getGestor_geral().matches("y") || curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA || curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_LOJA)
             {
                 seguimentoList = adp.getAnalisesSeguimentoGestorList(null);                
             }
-            else
+            else if(curUser.getGestor_geral().matches("n") )
             {
-                seguimentoList = adp.getAnalisesSeguimentoGestorList(getSessionBean1().getCurrentUser().getEstabelecimento_id());                                
+                seguimentoList = adp.getAnalisesSeguimentoGestorList(curUser.getEstabelecimento_id());                                
             }
 
             getSessionBean1().getAnalisesSeguimentoDataProvider().setList(seguimentoList);
@@ -1027,7 +943,7 @@ public class FormGestor extends AbstractPageBean {
                 //lblActivos.setRendered(true);
                 table2.setRendered(true); 
                 ArrayList concluidasList = null;
-                if(getSessionBean1().getCurrentUser().getGestor_geral().matches("y"))
+                if(getSessionBean1().getCurrentUser().getGestor_geral().matches("y") || curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA || curUser.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_LOJA)
                 {
                     concluidasList = adp.getAnalisesConcluidasList(null);                                        
                 }
@@ -1080,11 +996,30 @@ public class FormGestor extends AbstractPageBean {
         return (ApplicationBean1)getBean("ApplicationBean1");
     }
 
-    public String lnkAnalisesAcidente_action() {
+    public String lnkPlanosActuacao_action() {
         // TODO: Replace with your code
+        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+        FacesContext fc = getFacesContext().getCurrentInstance();        
+        Global.redirectToPlanos(fc, u);
         
+//        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+//        FacesContext fc = getFacesContext().getCurrentInstance();
+//        try
+//        {
+//            JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser);            
+//        }
+//        catch(Exception ex)
+//        {
+//            
+//        }
         return null;
     }
+    
+    public String lnkAnalisesAcidente_action() { 
+        return null;
+    }       
 
     public String lnkGerirUtilizadores_action() {
         // TODO: Replace with your code

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java

@@ -36,9 +36,10 @@ import java.util.GregorianCalendar;
 import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import utils.JSFUtils;
 import utils.Utils;
 
 /**
@@ -180,66 +181,6 @@ public class FormHS extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText2 = new StaticText();
-
-    public StaticText getStaticText2() {
-        return staticText2;
-    }
-
-    public void setStaticText2(StaticText st) {
-        this.staticText2 = st;
-    }
-
-    private Hyperlink lnkLogout = new Hyperlink();
-
-    public Hyperlink getLnkLogout() {
-        return lnkLogout;
-    }
-
-    public void setLnkLogout(Hyperlink h) {
-        this.lnkLogout = h;
-    }
-
     private HtmlPanelGrid gridLayoutTop1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridLayoutTop1() {
@@ -970,66 +911,6 @@ public class FormHS extends AbstractPageBean {
         this.staticText11 = st;
     }
 
-    private Hyperlink lnkNewUser1 = new Hyperlink();
-
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText staticText12 = new StaticText();
-
-    public StaticText getStaticText12() {
-        return staticText12;
-    }
-
-    public void setStaticText12(StaticText st) {
-        this.staticText12 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
-    private StaticText staticText13 = new StaticText();
-
-    public StaticText getStaticText13() {
-        return staticText13;
-    }
-
-    public void setStaticText13(StaticText st) {
-        this.staticText13 = st;
-    }
-
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText14 = new StaticText();
-
-    public StaticText getStaticText14() {
-        return staticText14;
-    }
-
-    public void setStaticText14(StaticText st) {
-        this.staticText14 = st;
-    }
-
     private HtmlPanelGrid gridPanel10 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridPanel10() {
@@ -1149,6 +1030,24 @@ public class FormHS extends AbstractPageBean {
     public void setLnkEstabelecimentoSeg(Hyperlink h) {
         this.lnkEstabelecimentoSeg = h;
     }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
+    private Hyperlink lnkPlanosActuacao = new Hyperlink();
+
+    public Hyperlink getLnkPlanosActuacao() {
+        return lnkPlanosActuacao;
+    }
+
+    public void setLnkPlanosActuacao(Hyperlink h) {
+        this.lnkPlanosActuacao = h;
+    }
     
     // </editor-fold>
     
@@ -1220,6 +1119,7 @@ public class FormHS extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
+        System.out.println("=== FORM_HS ===");        
         lblUser.setText( getSessionBean1().getCurrentUser().getLogin() );
         
        AnalisesDataProvider adp = new AnalisesDataProvider();
@@ -1814,6 +1714,31 @@ public class FormHS extends AbstractPageBean {
         return null;
     }
 
+    public String lnkAnalisesAcidente_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+        FacesContext fc = getFacesContext().getCurrentInstance();        
+        Global.redirectToPlanos(fc, u);        
+//        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();
+//        FacesContext fc = getFacesContext().getCurrentInstance();
+//        try
+//        {
+//            JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser);            
+//        }
+//        catch(Exception ex)
+//        {
+//            
+//        }                
+        return null;
+    }
+
 
 
 }

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java

@@ -36,9 +36,10 @@ import java.util.GregorianCalendar;
 import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import utils.JSFUtils;
 import utils.Utils;
 
 /**
@@ -180,56 +181,6 @@ public class FormRH extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText2 = new StaticText();
-
-    public StaticText getStaticText2() {
-        return staticText2;
-    }
-
-    public void setStaticText2(StaticText st) {
-        this.staticText2 = st;
-    }
-
-    private Hyperlink lnkLogout = new Hyperlink();
-
-    public Hyperlink getLnkLogout() {
-        return lnkLogout;
-    }
-
-    public void setLnkLogout(Hyperlink h) {
-        this.lnkLogout = h;
-    }
-
     private HtmlPanelGrid gridLayoutTop1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridLayoutTop1() {
@@ -910,16 +861,6 @@ public class FormRH extends AbstractPageBean {
         this.txtPor = tf;
     }
 
-    private StaticText stSep1 = new StaticText();
-
-    public StaticText getStSep1() {
-        return stSep1;
-    }
-
-    public void setStSep1(StaticText st) {
-        this.stSep1 = st;
-    }
-
     private HtmlPanelGrid gridPanel9 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridPanel9() {
@@ -970,66 +911,6 @@ public class FormRH extends AbstractPageBean {
         this.staticText10 = st;
     }
 
-    private Hyperlink lnkNewUser1 = new Hyperlink();
-
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText staticText11 = new StaticText();
-
-    public StaticText getStaticText11() {
-        return staticText11;
-    }
-
-    public void setStaticText11(StaticText st) {
-        this.staticText11 = st;
-    }
-
-    private StaticText staticText12 = new StaticText();
-
-    public StaticText getStaticText12() {
-        return staticText12;
-    }
-
-    public void setStaticText12(StaticText st) {
-        this.staticText12 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText13 = new StaticText();
-
-    public StaticText getStaticText13() {
-        return staticText13;
-    }
-
-    public void setStaticText13(StaticText st) {
-        this.staticText13 = st;
-    }
-
     private HtmlPanelGrid gridPanel10 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridPanel10() {
@@ -1109,6 +990,24 @@ public class FormRH extends AbstractPageBean {
     public void setLnkDataAberturaConcluida(Hyperlink h) {
         this.lnkDataAberturaConcluida = h;
     }
+    private Hyperlink lnkPlanosActuacao = new Hyperlink();
+
+    public Hyperlink getLnkPlanosActuacao() {
+        return lnkPlanosActuacao;
+    }
+
+    public void setLnkPlanosActuacao(Hyperlink h) {
+        this.lnkPlanosActuacao = h;
+    }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
     
     // </editor-fold>
     
@@ -1181,9 +1080,14 @@ public class FormRH extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
+        System.out.println("=== FORM_RH ===");        
         lblUser.setText( getSessionBean1().getCurrentUser().getLogin() );
 
         String responsavel_loja = getSessionBean1().getCurrentUser().getResponsavel_loja();
+        if(responsavel_loja.matches("n"))
+        {
+            lnkPlanosActuacao.setDisabled(true);
+        }
 //        if(getSessionBean1().getCurrentUser().getTipo().intValue() == 7)  // director rh
 //        {
 //            //////stSep.setText("|");
@@ -1776,5 +1680,30 @@ public class FormRH extends AbstractPageBean {
         return null;
     }
 
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+        FacesContext fc = getFacesContext().getCurrentInstance();        
+        Global.redirectToPlanos(fc, u);        
+//        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();
+//        FacesContext fc = getFacesContext().getCurrentInstance();
+//        try
+//        {
+//            JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser);            
+//        }
+//        catch(Exception ex)
+//        {
+//            
+//        }                
+        return null;
+    }
+
+    public String lnkAnalisesAcidente_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java

@@ -40,10 +40,10 @@ import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
-import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import utils.JSFUtils;
 import utils.Utils;
 
 /**
@@ -635,66 +635,6 @@ public class FormSeguranca extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel6 = new PanelGroup();
-
-    public PanelGroup getGroupPanel6() {
-        return groupPanel6;
-    }
-
-    public void setGroupPanel6(PanelGroup pg) {
-        this.groupPanel6 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText staticText18 = new StaticText();
-
-    public StaticText getStaticText18() {
-        return staticText18;
-    }
-
-    public void setStaticText18(StaticText st) {
-        this.staticText18 = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText19 = new StaticText();
-
-    public StaticText getStaticText19() {
-        return staticText19;
-    }
-
-    public void setStaticText19(StaticText st) {
-        this.staticText19 = st;
-    }
-
-    private Hyperlink lnkLogout = new Hyperlink();
-
-    public Hyperlink getLnkLogout() {
-        return lnkLogout;
-    }
-
-    public void setLnkLogout(Hyperlink h) {
-        this.lnkLogout = h;
-    }
-
     private Hyperlink lnkDataAcidente = new Hyperlink();
 
     public Hyperlink getLnkDataAcidente() {
@@ -1005,66 +945,6 @@ public class FormSeguranca extends AbstractPageBean {
         this.staticText8 = st;
     }
 
-    private Hyperlink lnkNewUser1 = new Hyperlink();
-
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText staticText9 = new StaticText();
-
-    public StaticText getStaticText9() {
-        return staticText9;
-    }
-
-    public void setStaticText9(StaticText st) {
-        this.staticText9 = st;
-    }
-
-    private StaticText staticText10 = new StaticText();
-
-    public StaticText getStaticText10() {
-        return staticText10;
-    }
-
-    public void setStaticText10(StaticText st) {
-        this.staticText10 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
-    private Hyperlink lnkAjuda = new Hyperlink();
-
-    public Hyperlink getLnkAjuda() {
-        return lnkAjuda;
-    }
-
-    public void setLnkAjuda(Hyperlink h) {
-        this.lnkAjuda = h;
-    }
-
-    private StaticText staticText12 = new StaticText();
-
-    public StaticText getStaticText12() {
-        return staticText12;
-    }
-
-    public void setStaticText12(StaticText st) {
-        this.staticText12 = st;
-    }
-
     private HtmlPanelGrid gridPanel10 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridPanel10() {
@@ -1144,6 +1024,24 @@ public class FormSeguranca extends AbstractPageBean {
     public void setLnkDataAberturaConcluida(Hyperlink h) {
         this.lnkDataAberturaConcluida = h;
     }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
+    private Hyperlink lnkPlanosActuacao = new Hyperlink();
+
+    public Hyperlink getLnkPlanosActuacao() {
+        return lnkPlanosActuacao;
+    }
+
+    public void setLnkPlanosActuacao(Hyperlink h) {
+        this.lnkPlanosActuacao = h;
+    }
     
     // </editor-fold>
     
@@ -1216,8 +1114,13 @@ public class FormSeguranca extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
+        System.out.println("=== FORM_SEGURANCA ===");        
         lblUser.setText( getSessionBean1().getCurrentUser().getLogin());
         String responsavel_loja = getSessionBean1().getCurrentUser().getResponsavel_loja();
+        if(responsavel_loja.matches("n"))
+        {
+            lnkPlanosActuacao.setDisabled(true);
+        }
        AnalisesDataProvider adp = new AnalisesDataProvider();
        try
        {
@@ -1825,7 +1728,31 @@ public class FormSeguranca extends AbstractPageBean {
             ctx.responseComplete();  
             ctx.release();
         }
-    }        
+    }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+        FacesContext fc = getFacesContext().getCurrentInstance();        
+        Global.redirectToPlanos(fc, u);        
+//        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();
+//        FacesContext fc = getFacesContext().getCurrentInstance();
+//        try
+//        {
+//            JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser);            
+//        }
+//        catch(Exception ex)
+//        {
+//            
+//        }        
+        return null;
+    }
+    
+    public String lnkAnalisesAcidente_action() { 
+        return null;
+    }   
 
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java

@@ -31,11 +31,13 @@ import db.UtilizadoresDataProvider;
 import db.UtilizadoresInactivosListDataProvider;
 import global.Global;
 import java.util.ArrayList;
+import java.util.Map;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
+import utils.JSFUtils;
 import utils.Utils;
 
 /**
@@ -177,86 +179,6 @@ public class GestaoUtilizadores extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText stSep1 = new StaticText();
-
-    public StaticText getStSep1() {
-        return stSep1;
-    }
-
-    public void setStSep1(StaticText st) {
-        this.stSep1 = st;
-    }
-
-    private Hyperlink lnkNewUser1 = new Hyperlink();
-
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText stSep2 = new StaticText();
-
-    public StaticText getStSep2() {
-        return stSep2;
-    }
-
-    public void setStSep2(StaticText st) {
-        this.stSep2 = st;
-    }
-
-    private Hyperlink lnkEditUser1 = new Hyperlink();
-
-    public Hyperlink getLnkEditUser1() {
-        return lnkEditUser1;
-    }
-
-    public void setLnkEditUser1(Hyperlink h) {
-        this.lnkEditUser1 = h;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkLogout1 = new Hyperlink();
-
-    public Hyperlink getLnkLogout1() {
-        return lnkLogout1;
-    }
-
-    public void setLnkLogout1(Hyperlink h) {
-        this.lnkLogout1 = h;
-    }
-
     private HtmlPanelGrid gridConcluidos1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridConcluidos1() {
@@ -759,45 +681,23 @@ public class GestaoUtilizadores extends AbstractPageBean {
     public void setTxtMsg(StaticText st) {
         this.txtMsg = st;
     }
+    private StaticText lblUser = new StaticText();
 
-    private StaticText stSep3 = new StaticText();
+    public StaticText getLblUser() {
-
+        return lblUser;
-    public StaticText getStSep3() {
-        return stSep3;
-    }
-
-    public void setStSep3(StaticText st) {
-        this.stSep3 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
     }
 
-    public void setLnkAjuda1(Hyperlink h) {
+    public void setLblUser(StaticText st) {
-        this.lnkAjuda1 = h;
+        this.lblUser = st;
     }
+    private Hyperlink lnkPlanosActuacao = new Hyperlink();
 
-    private StaticText staticText4 = new StaticText();
+    public Hyperlink getLnkPlanosActuacao() {
-
+        return lnkPlanosActuacao;
-    public StaticText getStaticText4() {
-        return staticText4;
     }
 
-    public void setStaticText4(StaticText st) {
+    public void setLnkPlanosActuacao(Hyperlink h) {
-        this.staticText4 = st;
+        this.lnkPlanosActuacao = h;
     }
     /**
      * <p>Construct a new Page bean instance.</p>
@@ -860,14 +760,18 @@ public class GestaoUtilizadores extends AbstractPageBean {
                    getSessionBean1().setUserDeleted(false);
                }
 
-               if(!pageFrom.matches("GestaoUtilizadores.jsp") || userDeleted)        
+                FacesContext fc = getFacesContext();                  
+                Map parameters = fc.getCurrentInstance().getExternalContext().getRequestParameterMap();                                 
+               if(!pageFrom.matches("GestaoUtilizadores.jsp") || userDeleted || parameters.size() > 0)        
                {
                    isPostback = false;
                }
                else
                {
                    isPostback = true;
-               }            
+               }   
+
+
         }
 
     }
@@ -891,9 +795,14 @@ public class GestaoUtilizadores extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
+        Utilizador u = getSessionBean1().getCurrentUser();
+        if(u.getTipo().intValue() != Global.TIPO_UTILIZADOR_DIRECTOR_SIPRP)
+        {
+            lnkPlanosActuacao.setDisabled(true);
+        }
         AnalisesDataProvider adp = new AnalisesDataProvider();
         UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
-        
+        System.out.println("POSTBACK : " + isPostback);
         if(!isPostback)
         {
            try
@@ -1290,5 +1199,14 @@ public class GestaoUtilizadores extends AbstractPageBean {
 //         }                
         return null;
     }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        Utilizador u = getSessionBean1().getCurrentUser();
+//        String curUser = "?user=" + u.getId().toString();        
+        FacesContext fc = getFacesContext().getCurrentInstance();        
+        Global.redirectToPlanos(fc, u);                
+        return null;
+    }
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Header.java

@@ -29,26 +29,6 @@ public class Header extends AbstractFragmentBean {
      */
     private void _init() throws Exception {
     }
-
-    private HtmlPanelGrid gridPanel1 = new HtmlPanelGrid();
-
-    public HtmlPanelGrid getGridPanel1() {
-        return gridPanel1;
-    }
-
-    public void setGridPanel1(HtmlPanelGrid hpg) {
-        this.gridPanel1 = hpg;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
     // </editor-fold>
     
     public Header() {
@@ -117,4 +97,34 @@ public class Header extends AbstractFragmentBean {
     protected ApplicationBean1 getApplicationBean1() {
         return (ApplicationBean1)getBean("ApplicationBean1");
     }
+
+    public String lnkAnalisesAcidente_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkNewUser_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkEditUser_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
+    public String lnkLogout_action() {
+        // TODO: Replace with your code
+        return null;
+    }
 }

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java

@@ -21,12 +21,15 @@ import com.sun.rave.web.ui.component.TextField;
 import com.sun.rave.web.ui.model.Option;
 import db.AnalisesDataProvider;
 import db.UtilizadoresDataProvider;
+import global.Global;
 import java.sql.Connection;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
+import utils.JSFUtils;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -384,7 +387,14 @@ public class Login extends AbstractPageBean {
                                         Integer permissao = udp.getPermissionCode(u.getId());                                    
                                         if(permissao.intValue() == 1)   //seguranca
                                         {
-                                            sRet = "form_seguranca";
+                                            if(u.getResponsavel_loja().matches("y"))
+                                            {
+                                                sRet = "acesso";                                                                                                   
+                                            }
+                                            else
+                                            {
+                                                sRet = "form_seguranca";                                                
+                                            }
                                         }
                                         else if(permissao.intValue() == 2)  // rh
                                         {
@@ -392,7 +402,8 @@ public class Login extends AbstractPageBean {
                                         }
                                         else if(permissao.intValue() == 3)  // hs
                                         {
-                                            sRet = "form_hs";                                        
+                                            //sRet = "form_hs";  
+                                            sRet = "acesso";                                                   
                                         }                  
                                         else if(permissao.intValue() == 5)  // medico
                                         {
@@ -409,8 +420,18 @@ public class Login extends AbstractPageBean {
                                         }  
                                         else if(permissao.intValue() == 8)  // director siprp
                                         {
-                                            sRet = "form_dir_siprp";                                        
+                                            //sRet = "form_dir_siprp";                                        
+                                            sRet = "acesso";                                                                                    
                                         }                                                                               
+                                        else if(permissao.intValue() == 9)  // director loja
+                                        {
+                                            sRet = "acesso";                                        
+                                        }  
+                                        else if(permissao.intValue() == 10)  // director nacional de seguranca
+                                        {
+                                            sRet = "acesso";                                        
+                                        }  
+
                                         u.setCodigo_permissao(permissao);
                                         getSessionBean1().setCurrentUser( u ); 
                                         getSessionBean1().setLoggedIn(true);

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java

@@ -177,66 +177,6 @@ public class NovoUtilizador extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkEditUser1 = new Hyperlink();
-
-    public Hyperlink getLnkEditUser1() {
-        return lnkEditUser1;
-    }
-
-    public void setLnkEditUser1(Hyperlink h) {
-        this.lnkEditUser1 = h;
-    }
-
-    private StaticText staticText2 = new StaticText();
-
-    public StaticText getStaticText2() {
-        return staticText2;
-    }
-
-    public void setStaticText2(StaticText st) {
-        this.staticText2 = st;
-    }
-
-    private Hyperlink lnkLogout1 = new Hyperlink();
-
-    public Hyperlink getLnkLogout1() {
-        return lnkLogout1;
-    }
-
-    public void setLnkLogout1(Hyperlink h) {
-        this.lnkLogout1 = h;
-    }
-
     private HtmlPanelGrid gridMsg1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridMsg1() {
@@ -1079,65 +1019,32 @@ public class NovoUtilizador extends AbstractPageBean {
     public void setStaticText26(StaticText st) {
         this.staticText26 = st;
     }
+    private RadioButton rbCatDirNacSeg = new RadioButton();
 
-    private Hyperlink lnkNewUser1 = new Hyperlink();
+    public RadioButton getRbCatDirNacSeg() {
-
+        return rbCatDirNacSeg;
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText staticText27 = new StaticText();
-
-    public StaticText getStaticText27() {
-        return staticText27;
-    }
-
-    public void setStaticText27(StaticText st) {
-        this.staticText27 = st;
-    }
-
-    private StaticText staticText28 = new StaticText();
-
-    public StaticText getStaticText28() {
-        return staticText28;
     }
 
-    public void setStaticText28(StaticText st) {
+    public void setRbCatDirNacSeg(RadioButton rb) {
-        this.staticText28 = st;
+        this.rbCatDirNacSeg = rb;
     }
+    private RadioButton rbCatDirLoja = new RadioButton();
 
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
+    public RadioButton getRbCatDirLoja() {
-
+        return rbCatDirLoja;
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
     }
 
-    public void setLnkAnalisesAcidente(Hyperlink h) {
+    public void setRbCatDirLoja(RadioButton rb) {
-        this.lnkAnalisesAcidente = h;
+        this.rbCatDirLoja = rb;
     }
+    private StaticText lblUser = new StaticText();
 
-    private Hyperlink lnkAjuda1 = new Hyperlink();
+    public StaticText getLblUser() {
-
+        return lblUser;
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText29 = new StaticText();
-
-    public StaticText getStaticText29() {
-        return staticText29;
     }
 
-    public void setStaticText29(StaticText st) {
+    public void setLblUser(StaticText st) {
-        this.staticText29 = st;
+        this.lblUser = st;
     }
     /**
      * <p>Construct a new Page bean instance.</p>
@@ -1471,6 +1378,7 @@ public class NovoUtilizador extends AbstractPageBean {
                    return null;                   
                }
                Integer estabelecimento_outro = (Integer) drpEstabelecimentoOutro.getSelected();
+               System.out.println("ESTABELECIMENTO OUTRO : " + estabelecimento_outro.intValue());
                if(estabelecimento_outro.intValue() == -1)
                {
                    getSessionBean1().setMsg("Falta estabelecimento!");
@@ -1576,7 +1484,9 @@ public class NovoUtilizador extends AbstractPageBean {
         rbCatHs.setSelected(null);        
         rbCatMed.setSelected(null);        
         rbCatRh.setSelected(null);        
-        rbCatSeg.setSelected(null); 
+        rbCatSeg.setSelected(null);
+        rbCatDirNacSeg.setSelected(null);
+        rbCatDirLoja.setSelected(null);        
         
         AnalisesDataProvider adp = new AnalisesDataProvider();
         
@@ -1887,6 +1797,20 @@ public class NovoUtilizador extends AbstractPageBean {
     
     private NewUser setUserTipo(NewUser u)
     {
+        if(rbCatDirNacSeg.getSelected() != null)
+        {
+            if(rbCatDirNacSeg.getSelected().equals(new Boolean(true)))
+            {
+                u.setTipo(new Integer(10));
+            }
+        }
+        if(rbCatDirLoja.getSelected() != null)
+        {
+            if(rbCatDirLoja.getSelected().equals(new Boolean(true)))
+            {
+                u.setTipo(new Integer(9));
+            }
+        }        
         if(rbCatDirRh.getSelected() != null)
         {
             if(rbCatDirRh.getSelected().equals(new Boolean(true)))
@@ -2088,5 +2012,10 @@ public class NovoUtilizador extends AbstractPageBean {
 //         }                
         return null;
     }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        return null;
+    }
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java

@@ -172,66 +172,6 @@ public class UtilizadorFields extends AbstractPageBean {
         this.image2 = ic;
     }
 
-    private PanelGroup groupPanel2 = new PanelGroup();
-
-    public PanelGroup getGroupPanel2() {
-        return groupPanel2;
-    }
-
-    public void setGroupPanel2(PanelGroup pg) {
-        this.groupPanel2 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
-    private Hyperlink lnkEditUser1 = new Hyperlink();
-
-    public Hyperlink getLnkEditUser1() {
-        return lnkEditUser1;
-    }
-
-    public void setLnkEditUser1(Hyperlink h) {
-        this.lnkEditUser1 = h;
-    }
-
-    private StaticText staticText2 = new StaticText();
-
-    public StaticText getStaticText2() {
-        return staticText2;
-    }
-
-    public void setStaticText2(StaticText st) {
-        this.staticText2 = st;
-    }
-
-    private Hyperlink lnkLogout1 = new Hyperlink();
-
-    public Hyperlink getLnkLogout1() {
-        return lnkLogout1;
-    }
-
-    public void setLnkLogout1(Hyperlink h) {
-        this.lnkLogout1 = h;
-    }
-
     private HtmlPanelGrid gridMsg1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridMsg1() {
@@ -774,65 +714,23 @@ public class UtilizadorFields extends AbstractPageBean {
     public void setStaticText16(StaticText st) {
         this.staticText16 = st;
     }
+    private StaticText lblUser = new StaticText();
 
-    private StaticText staticText17 = new StaticText();
+    public StaticText getLblUser() {
-
+        return lblUser;
-    public StaticText getStaticText17() {
-        return staticText17;
-    }
-
-    public void setStaticText17(StaticText st) {
-        this.staticText17 = st;
-    }
-
-    private Hyperlink lnkNewUser1 = new Hyperlink();
-
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText staticText18 = new StaticText();
-
-    public StaticText getStaticText18() {
-        return staticText18;
-    }
-
-    public void setStaticText18(StaticText st) {
-        this.staticText18 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
-    private Hyperlink lnkAjuda = new Hyperlink();
-
-    public Hyperlink getLnkAjuda() {
-        return lnkAjuda;
     }
 
-    public void setLnkAjuda(Hyperlink h) {
+    public void setLblUser(StaticText st) {
-        this.lnkAjuda = h;
+        this.lblUser = st;
     }
+    private Hyperlink lnkPlanosActuacao = new Hyperlink();
 
-    private StaticText staticText19 = new StaticText();
+    public Hyperlink getLnkPlanosActuacao() {
-
+        return lnkPlanosActuacao;
-    public StaticText getStaticText19() {
-        return staticText19;
     }
 
-    public void setStaticText19(StaticText st) {
+    public void setLnkPlanosActuacao(Hyperlink h) {
-        this.staticText19 = st;
+        this.lnkPlanosActuacao = h;
     }
     /**
      * <p>Construct a new Page bean instance.</p>
@@ -1103,6 +1001,7 @@ public class UtilizadorFields extends AbstractPageBean {
         //drpTipo.setStyleClass("hidden");
         //drpEstabelecimentos.setStyleClass("hidden");
         NewUser u = getSessionBean1().getNewUser();
+        getSessionBean1().setEstabelecimentosOptions(getSessionBean1().getEstabelecimentosOutroOptions());
         if(u.getEstabelecimento() == null)
         {
             drpEstabelecimentos.setDisabled(true);
@@ -1742,5 +1641,10 @@ public class UtilizadorFields extends AbstractPageBean {
 //         }        
         return null;
     }
+
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        return null;
+    }
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java

@@ -1938,106 +1938,6 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
         this.gridHeader1 = hpg;
     }
 
-    private PanelGroup groupPanel25 = new PanelGroup();
-
-    public PanelGroup getGroupPanel25() {
-        return groupPanel25;
-    }
-
-    public void setGroupPanel25(PanelGroup pg) {
-        this.groupPanel25 = pg;
-    }
-
-    private StaticText lblUser = new StaticText();
-
-    public StaticText getLblUser() {
-        return lblUser;
-    }
-
-    public void setLblUser(StaticText st) {
-        this.lblUser = st;
-    }
-
-    private StaticText staticText21 = new StaticText();
-
-    public StaticText getStaticText21() {
-        return staticText21;
-    }
-
-    public void setStaticText21(StaticText st) {
-        this.staticText21 = st;
-    }
-
-    private Hyperlink lnkAnalisesAcidente = new Hyperlink();
-
-    public Hyperlink getLnkAnalisesAcidente() {
-        return lnkAnalisesAcidente;
-    }
-
-    public void setLnkAnalisesAcidente(Hyperlink h) {
-        this.lnkAnalisesAcidente = h;
-    }
-
-    private StaticText staticText38 = new StaticText();
-
-    public StaticText getStaticText38() {
-        return staticText38;
-    }
-
-    public void setStaticText38(StaticText st) {
-        this.staticText38 = st;
-    }
-
-    private Hyperlink lnkNewUser1 = new Hyperlink();
-
-    public Hyperlink getLnkNewUser1() {
-        return lnkNewUser1;
-    }
-
-    public void setLnkNewUser1(Hyperlink h) {
-        this.lnkNewUser1 = h;
-    }
-
-    private StaticText staticText39 = new StaticText();
-
-    public StaticText getStaticText39() {
-        return staticText39;
-    }
-
-    public void setStaticText39(StaticText st) {
-        this.staticText39 = st;
-    }
-
-    private Hyperlink lnkEditUser = new Hyperlink();
-
-    public Hyperlink getLnkEditUser() {
-        return lnkEditUser;
-    }
-
-    public void setLnkEditUser(Hyperlink h) {
-        this.lnkEditUser = h;
-    }
-
-    private StaticText staticText40 = new StaticText();
-
-    public StaticText getStaticText40() {
-        return staticText40;
-    }
-
-    public void setStaticText40(StaticText st) {
-        this.staticText40 = st;
-    }
-
-    private Hyperlink lnkLogout1 = new Hyperlink();
-
-    public Hyperlink getLnkLogout1() {
-        return lnkLogout1;
-    }
-
-    public void setLnkLogout1(Hyperlink h) {
-        this.lnkLogout1 = h;
-    }
-
     private HtmlPanelGrid gridPanel6 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridPanel6() {
@@ -2168,26 +2068,6 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
         this.image5 = ic;
     }
 
-    private Hyperlink lnkAjuda1 = new Hyperlink();
-
-    public Hyperlink getLnkAjuda1() {
-        return lnkAjuda1;
-    }
-
-    public void setLnkAjuda1(Hyperlink h) {
-        this.lnkAjuda1 = h;
-    }
-
-    private StaticText staticText1 = new StaticText();
-
-    public StaticText getStaticText1() {
-        return staticText1;
-    }
-
-    public void setStaticText1(StaticText st) {
-        this.staticText1 = st;
-    }
-
     private HiddenField hidConfDelete = new HiddenField();
 
     public HiddenField getHidConfDelete() {
@@ -2227,6 +2107,15 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
     public void setButEliminar(Button b) {
         this.butEliminar = b;
     }
+    private StaticText lblUser = new StaticText();
+
+    public StaticText getLblUser() {
+        return lblUser;
+    }
+
+    public void setLblUser(StaticText st) {
+        this.lblUser = st;
+    }
     /**
      * <p>Construct a new Page bean instance.</p>
      */
@@ -4656,5 +4545,10 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
 //        }
     }
 
+    public String lnkPlanosActuacao_action() {
+        // TODO: Replace with your code
+        return null;
+    }
+
 }
 

trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java

@@ -540,7 +540,11 @@ public class AnalisesDataProvider {
         Statement stlocal1 = dblocal.createStatement();
         
         ArrayList list = new ArrayList();
-        
+        if(!rs.isBeforeFirst()) //rs empty
+        {
+            dblocal.close();            
+            return list;
+        }
         rs.first();
         int nr = 0;
 	do
@@ -1619,15 +1623,19 @@ public class AnalisesDataProvider {
 	String sql = "SELECT * FROM recomendacoes WHERE analise_id = " + analiseId;
         //System.out.println("SQL : " + sql);
 	ResultSet rs = st.executeQuery(sql); 
-        rs.first();
+        if(rs.isBeforeFirst())
-	do
+        {
-	{
+            rs.first();
-            Recomendacao r = new Recomendacao();
+            do
-            r.setId(new Integer(rs.getInt("id")));
+            {
-            r.setAnalise_id(new Integer(rs.getInt("analise_id")));            
+                Recomendacao r = new Recomendacao();
-            r.setRecomendacao(rs.getString("recomendacao"));
+                r.setId(new Integer(rs.getInt("id")));
-	    list.add(r);
+                r.setAnalise_id(new Integer(rs.getInt("analise_id")));            
-	}while(rs.next());        
+                r.setRecomendacao(rs.getString("recomendacao"));
+                list.add(r);
+            }while(rs.next());                    
+        }
+
         return list;
     }
     
@@ -1688,16 +1696,20 @@ public class AnalisesDataProvider {
         Statement st = createStatement();    
 	String sql = "SELECT * FROM medidas WHERE analise_id = " + analiseId;
         //System.out.println("SQL : " + sql);
-	ResultSet rs = st.executeQuery(sql); 
+	ResultSet rs = st.executeQuery(sql);
-        rs.first();
+        if(rs.isBeforeFirst())
-	do
+        {
-	{
+            rs.first();
-            Medida m = new Medida();
+            do
-            m.setId(new Integer(rs.getInt("id")));
+            {
-            m.setAnalise_id(new Integer(rs.getInt("analise_id")));            
+                Medida m = new Medida();
-            m.setMedida(rs.getString("medida"));
+                m.setId(new Integer(rs.getInt("id")));
-	    list.add(m);
+                m.setAnalise_id(new Integer(rs.getInt("analise_id")));            
-	}while(rs.next());        
+                m.setMedida(rs.getString("medida"));
+                list.add(m);
+            }while(rs.next());                    
+        }
+
         return list;
     }    
             
@@ -1737,17 +1749,21 @@ public class AnalisesDataProvider {
         Statement st = createStatement();
         String sql ="SELECT * FROM tipos_utilizadores WHERE activo = 'y' ORDER BY ordem";
         ResultSet rs = st.executeQuery(sql);
-        rs.first(); 
+        if(rs.isBeforeFirst())
-	do
+        {
-	{
+            rs.first(); 
-            t = new TipoUtilizador();            
+            do
-            t.setId(new Integer(rs.getInt("id")));
+            {
-            t.setTipo(new Integer(rs.getInt("tipo")));            
+                t = new TipoUtilizador();            
-            t.setDescricao(rs.getString("descricao"));
+                t.setId(new Integer(rs.getInt("id")));
-                //t.setActivo(rs.getString("activo"));
+                t.setTipo(new Integer(rs.getInt("tipo")));            
-                //t.setOrdem(new Integer(rs.getInt("ordem")));
+                t.setDescricao(rs.getString("descricao"));
-            list.add(t);                
+                    //t.setActivo(rs.getString("activo"));
-	}while(rs.next());
+                    //t.setOrdem(new Integer(rs.getInt("ordem")));
+                list.add(t);                
+            }while(rs.next());            
+        }
+
         com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
         ListIterator iter = list.listIterator();
         int i = 0;
@@ -1772,33 +1788,37 @@ public class AnalisesDataProvider {
         Statement st = createStatement();
         String sql ="SELECT * FROM tipos_utilizadores WHERE activo = 'y' ORDER BY ordem";
         ResultSet rs = st.executeQuery(sql);
-        rs.first();
+        if(rs.isBeforeFirst())
-	do
+        {
-	{
+            rs.first();
-            t = new TipoUtilizador();            
+            do
-            if(permissao.intValue() == 7) //director rh
             {
-                t.setTipo(new Integer(rs.getInt("tipo")));            
+                t = new TipoUtilizador();            
-                if(t.getTipo().intValue() == 1 || t.getTipo().intValue() == 2 || t.getTipo().intValue() == 6) // seguranca || rh || gestor
+                if(permissao.intValue() == 7) //director rh
+                {
+                    t.setTipo(new Integer(rs.getInt("tipo")));            
+                    if(t.getTipo().intValue() == 1 || t.getTipo().intValue() == 2 || t.getTipo().intValue() == 6) // seguranca || rh || gestor
+                    {
+                        t.setId(new Integer(rs.getInt("id")));
+                        t.setDescricao(rs.getString("descricao"));
+                        //t.setActivo(rs.getString("activo"));
+                        //t.setOrdem(new Integer(rs.getInt("ordem")));
+                        list.add(t);                                    
+                    }
+                }
+                else
                 {
                     t.setId(new Integer(rs.getInt("id")));
+                    t.setTipo(new Integer(rs.getInt("tipo")));            
                     t.setDescricao(rs.getString("descricao"));
                     //t.setActivo(rs.getString("activo"));
                     //t.setOrdem(new Integer(rs.getInt("ordem")));
-                    list.add(t);                                    
+                    list.add(t);                
                 }
-            }
-            else
-            {
-                t.setId(new Integer(rs.getInt("id")));
-                t.setTipo(new Integer(rs.getInt("tipo")));            
-                t.setDescricao(rs.getString("descricao"));
-                //t.setActivo(rs.getString("activo"));
-                //t.setOrdem(new Integer(rs.getInt("ordem")));
-                list.add(t);                
-            }
 
-	}while(rs.next());
+            }while(rs.next());            
+        }
+
         com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
         ListIterator iter = list.listIterator();
         int i = 0;
@@ -1821,38 +1841,43 @@ public class AnalisesDataProvider {
         Estabelecimento e = new Estabelecimento();
         e.setId(new Integer(-1));
 
-        e.setNome_plain("-Seleccionar-");            
+        e.setNome("-Seleccionar-");            
 
         list.add(e);        
         if(booGestor.equals(new Boolean(true)))
         {
             e = new Estabelecimento();            
             e.setId(new Integer(0));
-            e.setNome_plain("-Todos os estabelecimentos-");
+            e.setNome("-Todos os estabelecimentos-");
+            
             list.add(e);            
         }
         String sql ="SELECT * FROM estabelecimentos WHERE empresa_id = " + empresa_id + " AND inactivo = 'n' ORDER BY nome_plain";            
 
-
         ResultSet rslocal = stlocal.executeQuery(sql);
-        rslocal.first();
+        if(rslocal.isBeforeFirst())
-	do
+        {
-	{
+            rslocal.first();
-	    e = new Estabelecimento();
+            do
-	    e.setId(new Integer(rslocal.getInt("id")));
+            {
-            //e.setNome_plain(rslocal.getString("nome_plain"));
+                e = new Estabelecimento();
-            e.setNome(rslocal.getString("nome"));
+                e.setId(new Integer(rslocal.getInt("id")));
-            //t.setActivo(rs.getString("activo"));
+                //e.setNome_plain(rslocal.getString("nome_plain"));
-            //t.setOrdem(new Integer(rs.getInt("ordem")));
+                e.setNome(rslocal.getString("nome"));
-	    list.add(e);
+        System.out.println("ESTABELECIMENTOAA : " + e.getId().toString() + " - " + e.getNome());                            
-	}while(rslocal.next());
+                //t.setActivo(rs.getString("activo"));
+                //t.setOrdem(new Integer(rs.getInt("ordem")));
+                list.add(e);
+            }while(rslocal.next());            
+        }
+
         com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
         ListIterator iter = list.listIterator();
         int i = 0;
         while(iter.hasNext())
         {
             e = (Estabelecimento) iter.next();
-            
+        System.out.println("ESTABELECIMENTOL : " + e.getId().toString() + " - " + e.getNome());            
             listOptions[i] = new Option(e.getId(), Utils.unicodeToHTML(e.getNome()));
             i++;
         }
@@ -1872,14 +1897,18 @@ public class AnalisesDataProvider {
         list.add(m);
         String sql ="SELECT * FROM medicos WHERE inactivo = 'n'";
         ResultSet rslocal = stlocal.executeQuery(sql);
-        rslocal.first();
+        if(rslocal.isBeforeFirst())
-	do
+        {
-	{
+            rslocal.first();
-	    m = new Medico();
+            do
-	    m.setId(new Integer(rslocal.getInt("id")));
+            {
-            m.setNome(rslocal.getString("nome"));
+                m = new Medico();
-	    list.add(m);
+                m.setId(new Integer(rslocal.getInt("id")));
-	}while(rslocal.next());
+                m.setNome(rslocal.getString("nome"));
+                list.add(m);
+            }while(rslocal.next());            
+        }
+
         com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
         ListIterator iter = list.listIterator();
         int i = 0;
@@ -1906,14 +1935,18 @@ public class AnalisesDataProvider {
         list.add(t);
         String sql ="SELECT * FROM marcacoes_tecnicos_hst WHERE inactivo = 'n'";
         ResultSet rslocal = stlocal.executeQuery(sql);
-        rslocal.first();
+        if(rslocal.isBeforeFirst())
-	do
+        {
-	{
+            rslocal.first();
-	    t = new TecnicoSaude();
+            do
-	    t.setId(new Integer(rslocal.getInt("id")));
+            {
-            t.setNome(rslocal.getString("nome"));
+                t = new TecnicoSaude();
-	    list.add(t);
+                t.setId(new Integer(rslocal.getInt("id")));
-	}while(rslocal.next());
+                t.setNome(rslocal.getString("nome"));
+                list.add(t);
+            }while(rslocal.next());            
+        }
+
         com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
         ListIterator iter = list.listIterator();
         int i = 0;
@@ -1938,14 +1971,18 @@ public class AnalisesDataProvider {
         Statement st = createStatement();
         String sql = "SELECT * FROM causas WHERE activa = 'y'"; 
         ResultSet rs = st.executeQuery(sql);
-        rs.first();
+        if(rs.isBeforeFirst())
-        do
         {
-            c = new Causa();
+            rs.first();
-            c.setId( new Integer(rs.getInt("id")) );
+            do
-            c.setCausa(rs.getString("causa"));
+            {
-            list.add(c);
+                c = new Causa();
-        }while(rs.next());
+                c.setId( new Integer(rs.getInt("id")) );
+                c.setCausa(rs.getString("causa"));
+                list.add(c);
+            }while(rs.next());            
+        }
+
         com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
         ListIterator iter = list.listIterator();
         int i = 0;
@@ -1970,14 +2007,18 @@ public class AnalisesDataProvider {
         Statement st = createStatement();
         String sql = "SELECT * FROM departamentos WHERE activo = 'y'"; 
         ResultSet rs = st.executeQuery(sql);
-        rs.first();
+        if(rs.isBeforeFirst())
-        do
         {
-            d = new Departamento();
+            rs.first();
-            d.setId( new Integer(rs.getInt("id")) );
+            do
-            d.setDescricao(rs.getString("descricao"));
+            {
-            list.add(d);
+                d = new Departamento();
-        }while(rs.next());
+                d.setId( new Integer(rs.getInt("id")) );
+                d.setDescricao(rs.getString("descricao"));
+                list.add(d);
+            }while(rs.next());            
+        }
+
         com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
         ListIterator iter = list.listIterator();
         int i = 0;
@@ -2011,15 +2052,19 @@ public class AnalisesDataProvider {
         }
 
         ResultSet rs = st.executeQuery(sql);
-        rs.first();
+        if(rs.isBeforeFirst())
-        do
         {
-            s = new Seccao();
+            rs.first();
-            s.setId( new Integer(rs.getInt("id")) );
+            do
-            s.setDescricao(rs.getString("descricao"));
+            {
-            s.setDepartamento_id( new Integer(rs.getInt("departamento_id")) );
+                s = new Seccao();
-            list.add(s);
+                s.setId( new Integer(rs.getInt("id")) );
-        }while(rs.next());
+                s.setDescricao(rs.getString("descricao"));
+                s.setDepartamento_id( new Integer(rs.getInt("departamento_id")) );
+                list.add(s);
+            }while(rs.next());            
+        }
+
         com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
         ListIterator iter = list.listIterator();
         int i = 0;
@@ -2074,13 +2119,17 @@ public class AnalisesDataProvider {
         sql ="select distinct extract(year from data_acidente) as ano from analises_acidentes where estado = 10 order by ano";            
         
         ResultSet rs = st.executeQuery(sql);
-        rs.first();
+        if(rs.isBeforeFirst())
-        do
         {
-            Double dAno = new Double(rs.getDouble("ano"));
+            rs.first();
-            Integer iAno = new Integer(dAno.intValue());
+            do
-            list.add(iAno);
+            {
-        }while(rs.next());
+                Double dAno = new Double(rs.getDouble("ano"));
+                Integer iAno = new Integer(dAno.intValue());
+                list.add(iAno);
+            }while(rs.next());            
+        }
+
         return list;        
     }
     

trunk/AnaliseAcidentesTrabalho/src/java/db/Db.java

@@ -21,8 +21,8 @@ import javax.servlet.http.HttpSession;
  * @author lluis
  */
 public class Db {
-    //String connectionURL = "jdbc:postgresql://storage:5432/siprp";    //testes
+    String connectionURL = "jdbc:postgresql://storage:5432/siprp";    //testes
-    String connectionURL = "jdbc:postgresql://localhost:5436/siprp";    //real
+    //String connectionURL = "jdbc:postgresql://localhost:5436/siprp";    //real
     String User = "postgres";
     String Pass = null;
     Connection connection = null;    

trunk/AnaliseAcidentesTrabalho/src/java/db/Dblocal.java

@@ -21,8 +21,8 @@ import javax.servlet.http.HttpSession;
  * @author lluis
  */
 public class Dblocal {
-    //String connectionURL = "jdbc:postgresql://storage/siprp_local"; //testes
+    String connectionURL = "jdbc:postgresql://storage/siprp_local"; //testes
-    String connectionURL = "jdbc:postgresql://localhost:5436/siprp_local_3";    
+    //String connectionURL = "jdbc:postgresql://localhost:5436/siprp_local_3";    
     String User = "postgres";
     String Pass = null;
     Connection connection = null;    

trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java

@@ -9,15 +9,17 @@
 
 package global;
 
+import analiseacidentestrabalho.Utilizador;
+//import com.sun.org.apache.bcel.internal.generic.GETFIELD;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import utils.JSFUtils;
 
 /**
  *
@@ -49,6 +51,8 @@ public class Global {
     public final static int TIPO_UTILIZADOR_GESTOR = 6;    
     public final static int TIPO_UTILIZADOR_DIRECTOR_GERAL_RH = 7;    
     public final static int TIPO_UTILIZADOR_DIRECTOR_SIPRP = 8; 
+    public final static int TIPO_UTILIZADOR_DIRECTOR_LOJA = 9; 
+    public final static int TIPO_UTILIZADOR_DIRECTOR_NACIONAL_SEGURANCA = 10;     
     
     public final static int AUCHAN = 32; 
     
@@ -62,7 +66,12 @@ public class Global {
     //public final static String IMAGE_FOLDER = "/home/lluis/imagens_acidentes";        
     public final static String RESOURCES_IMAGE_FOLDER = "/resources/images";  
     
-    public static final String PDF_FOLDER_URL = "/resources/pdf";     
+    public static final String PDF_FOLDER_URL = "/resources/pdf"; 
+    
+    
+    //public static final String PLANOS_ACTUACAO_URL = "http://localhost:8084/PlanosActuacao/faces/ListaPlanos.jsp";  //testes
+    public static final String PLANOS_ACTUACAO_URL = "http://192.168.111.24:8084/PlanosActuacao/faces/ListaPlanos.jsp";  //testes portatil    
+    //public static final String PLANOS_ACTUACAO_URL = "www.siprp.pt/PlanosActuacao/faces/ListaPlanos.jsp";  //real
     /** Creates a new instance of Global */
     public Global() {
     }
@@ -129,6 +138,22 @@ public class Global {
             ctx.responseComplete();  
             ctx.release();
         }
-    }    
+    }   
+    
+    public static void redirectToPlanos(FacesContext fc, Utilizador currentUser)
+    {
+        String curUser = "?user=" + currentUser.getId().toString();        
+        fc = fc.getCurrentInstance();
+        try
+        {
+            JSFUtils.redirect(fc, Global.PLANOS_ACTUACAO_URL + curUser);            
+            //JSFUtils.dispatch(fc, Global.PLANOS_ACTUACAO_URL + curUser);                        
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+        }
+        
+    }
     
 }

trunk/AnaliseAcidentesTrabalho/src/java/utils/JSFUtils.java

@@ -0,0 +1,120 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package utils;
+
+import java.util.Iterator;
+import java.util.Map;
+import javax.faces.application.Application;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+/**
+ *
+ * @author lluis
+ */
+public class JSFUtils {
+
+    
+//    public static SessionBean1 getSessionBean(FacesContext fc)
+//    {
+//        FacesContext context = fc.getCurrentInstance();
+//        SessionBean1 session = (SessionBean1) context.getApplication().getELResolver().getValue(context.getELContext(), null, "SessionBean1");
+//        return session;
+//    }
+    
+    //
+    // isPostBack - JSF 1.1 implementation
+    //
+//    public static boolean isPostBack(FacesContext fc)
+//    {
+//        Map parameterMap = fc.getExternalContext().getRequestParameterMap();
+//        if(parameterMap.size() > 0)
+//        {
+//            return true;
+//        }
+//        return false;
+//    }
+    
+    public static boolean isPostBack(FacesContext fc)
+    {
+        Map parameterMap = fc.getExternalContext().getRequestParameterMap();
+
+        if(parameterMap.size() > 0)
+        {
+            Iterator iter = parameterMap.keySet().iterator();
+            while(iter.hasNext())
+            {
+                String par = (String) iter.next();
+            }
+            return true;
+        }
+        return false;
+    }    
+    
+    //
+    // isPostBack - JSF 1.2 implementation
+    //
+//    public static boolean isPostBack12(FacesContext fc)
+//    {
+//        ResponseStateManager rsm = fc.getRenderKit().getResponseStateManager();
+//        if(rsm.isPostback(fc))
+//        {
+//            return true;
+//        }
+//        return false;
+//    }
+    
+    public static void logout(FacesContext fc) throws Exception
+    {
+        ExternalContext ectx = fc.getCurrentInstance().getExternalContext();
+        HttpSession session = (HttpSession) ectx.getSession(false);
+        session.invalidate();
+    }
+    
+    public static void navigateTo(FacesContext fc, String outcome)
+    {
+        FacesContext context = fc.getCurrentInstance();
+        Application app = context.getApplication();
+        app.getNavigationHandler().handleNavigation(context, null, outcome);
+    } 
+    
+    public static void redirect(FacesContext context, String url) throws Exception
+    {
+        HttpServletResponse response = (HttpServletResponse) context.getCurrentInstance().getExternalContext().getResponse();
+        response.sendRedirect(url);
+        context.responseComplete();
+    }    
+    
+    public static void dispatch(FacesContext context, String url) throws Exception
+    {
+        HttpServletResponse response = (HttpServletResponse) context.getCurrentInstance().getExternalContext().getResponse();        
+        HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest();
+        RequestDispatcher rd = request.getRequestDispatcher(url);
+        rd.forward(request, response);
+    }
+    
+    public static String getRequestParameter(FacesContext fc, String parameter)
+    {
+        Map parameters = fc.getCurrentInstance().getExternalContext().getRequestParameterMap();   
+        return (String) parameters.get(parameter);
+    }
+    
+    public static boolean requestHasParameters(FacesContext fc)
+    {
+        int size = fc.getCurrentInstance().getExternalContext().getRequestParameterMap().size();           
+        if(size > 0)
+        {
+            return true;
+        }
+        return false;
+    }
+    
+
+}

trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java

@@ -141,6 +141,54 @@ public class Utils {
 		return output;                
         }                
         
+	public static String textToHtml( String text )
+        {
+		String output = text;    
+                
+		output = output.replaceAll( "À", "À" );
+		output = output.replaceAll( "Á", "Á" );
+		output = output.replaceAll( "Â", "Â" );
+		output = output.replaceAll( "Ã", "Ã" );
+		output = output.replaceAll( "Ç", "Ç" );
+		output = output.replaceAll( "È", "È" );
+		output = output.replaceAll( "É", "É" );
+		output = output.replaceAll( "Ó", "Ó" );
+		output = output.replaceAll( "Ò", "Ò" );                
+                
+		output = output.replaceAll( "Ê", "Ê" );
+		output = output.replaceAll( "Ì", "Ì" );
+		output = output.replaceAll( "Í", "Í" );
+		output = output.replaceAll( "Î", "Î" );
+		output = output.replaceAll( "ò", "ò" );
+		output = output.replaceAll( "ó", "ó" );
+		output = output.replaceAll( "ô", "ô" );
+		output = output.replaceAll( "õ", "õ" );
+		output = output.replaceAll( "Ù", "Ù" );
+		output = output.replaceAll( "Ú", "Ú" );
+		output = output.replaceAll( "Û", "Û" );
+
+		output = output.replaceAll( "à", "à" );
+		output = output.replaceAll( "á", "á" );
+		output = output.replaceAll( "â", "â" );
+		output = output.replaceAll( "ã", "ã" );
+		output = output.replaceAll( "ç", "ç" );
+		output = output.replaceAll( "è", "è" );
+		output = output.replaceAll( "é", "é" );
+		output = output.replaceAll( "ê", "ê" );
+		output = output.replaceAll( "ì", "ì" );
+		output = output.replaceAll( "í", "í" );
+		output = output.replaceAll( "î", "î" );
+		output = output.replaceAll( "ò", "ò" );
+		output = output.replaceAll( "ó", "ó" );
+		output = output.replaceAll( "ô", "ô" );
+		output = output.replaceAll( "õ", "õ" );
+		output = output.replaceAll( "ù", "&ugrave" );
+		output = output.replaceAll( "ú", "ú" );
+		output = output.replaceAll( "û", "û" );    
+                
+		return output;                
+        }                        
+        
     public static String getPageFrom(String referer)
     {
         String pageFrom = referer.substring(referer.lastIndexOf("/")+1);

trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Document   : Acesso
+    Created on : Oct 15, 2008, 9:49:21 AM
+    Author     : lluis
+-->
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:ui="http://www.sun.com/web/ui">
+    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
+    <f:view>
+        <ui:page id="page1">
+            <ui:html id="html1">
+                <ui:head id="head1">
+                    <ui:link id="link1" url="/resources/stylesheet.css"/>
+                </ui:head>
+                <ui:body id="body1" style="-rave-layout: grid">
+                    <ui:form id="form1">
+                        <h:panelGrid columns="1" id="gridBaseLayout" style="left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock">
+                            <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridLayout" style="width: 80%" styleClass="centerBlock">
+                                <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel1" style="height: 24px; width: 100%">
+                                    <ui:panelGroup id="groupPanel1" style="height: 24px; width: 310px">
+                                        <ui:staticText escape="false" id="lblUser" styleClass="labelBold     " text="#{SessionBean1.currentUser.login}"/>
+                                        <ui:staticText escape="false" id="staticText1" text="   "/>
+                                        <ui:hyperlink action="#{Acesso.lnkLogout_action}" id="lnkLogout" text="sair&gt;&gt;"/>
+                                    </ui:panelGroup>
+                                </h:panelGrid>
+                                <ui:staticText escape="false" id="staticText2" style="font-size: XX-large" text="&amp;nbsp;"/>
+                                <ui:staticText escape="false" id="staticText3" style="font-size: xx-large" text="&amp;nbsp;"/>
+                                <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel2"
+                                    style="border: 1px solid black; background-color: #eeeeee; height: 24px; width: 100%" styleClass="centerBlock" width="360">
+                                    <h:panelGrid columnClasses="gridColCenter, gridColCenter" columns="2" id="gridLogos1" style="height: 48px; width: 96px" styleClass="centerBlock">
+                                        <ui:image id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                                        <ui:image height="40" id="image2" url="/resources/images/logo_auchan_small.jpg"/>
+                                    </h:panelGrid>
+                                    <ui:staticText binding="#{Acesso.stWelcome}" escape="false" id="stWelcome" style="font-size: 14px"/>
+                                    <ui:staticText escape="false" id="staticText4" style="font-size: xx-large" text="&amp;nbsp;"/>
+                                    <ui:staticText escape="false" id="stAccessTo" text="aceder a "/>
+                                    <ui:staticText escape="false" id="staticText5" style="font-size: xx-large" text="&amp;nbsp;"/>
+                                    <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel4" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{Acesso.lnkAnalises_action}" id="lnkAnalises" style="font-size: 16px" text="Análise de Acidentes de Trabalho"/>
+                                            <ui:staticText escape="false" id="staticText9" style="height: 24px; width: 22px" text="&amp;nbsp;|&amp;nbsp;"/>
+                                            <ui:hyperlink action="#{Acesso.lnkPlanos_action}" id="lnkPlanos" style="font-size: 16px" text="Planos de Actuação"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
+                                </h:panelGrid>
+                                <ui:staticText escape="false" id="staticText8" style="font-size: xx-large" text="&amp;nbsp;"/>
+                                <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel3" style="height: 24px; width: 100%">
+                                    <ui:panelGroup id="groupPanel3" style="border-bottom: solid rgb(255, 255, 255) 1px; height: 21px">
+                                        <ui:staticText id="staticText6" text="Software desenvolvido por "/>
+                                        <ui:image height="21" id="image3" url="/resources/images/logo_evolute_small.png" width="100"/>
+                                        <ui:staticText escape="false" id="staticText7" text="&amp;nbsp;&amp;copy; 2008 "/>
+                                    </ui:panelGroup>
+                                </h:panelGrid>
+                            </h:panelGrid>
+                        </h:panelGrid>
+                    </ui:form>
+                </ui:body>
+            </ui:html>
+        </ui:page>
+    </f:view>
+</jsp:root>

trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp

@@ -130,23 +130,25 @@
                                 styleClass="centerBlock" width="456">
                                 <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridHeader1}" columnClasses="gridColRightBottom" columns="1" id="gridHeader1"
                                     style="height: 24px; width: 100%" width="624">
-                                    <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel56}" id="groupPanel56" style="height: 24px">
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel10" style="height: 24px; width: 100%">
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
+                                        <ui:panelGroup id="groupPanel56">
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText165}" escape="false" id="staticText165" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;"/>
+                                            <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkPlanosActuacao_action}" disabled="true" id="lnkPlanosActuacao1" text="&lt;&lt;planos actuação"/>
-                                        <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkAnalisesAcidente_action}"
+                                            <ui:staticText escape="false" id="staticText133" text="|"/>
-                                            binding="#{AnaliseAcidenteTrabalho.lnkAnalisesAcidente}" id="lnkAnalisesAcidente" text="analisar acidentes"/>
+                                            <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkAnalisesAcidente_action}" id="lnkAnalisesAcidente1" text="análise de acidentes de trabalho&gt;&gt;"/>
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText161}" escape="false" id="staticText161" text="|"/>
+                                        </ui:panelGroup>
-                                        <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkNewUser_action}" binding="#{AnaliseAcidenteTrabalho.lnkNewUser1}"
+                                        <ui:panelGroup id="groupPanel73" style="height: 24px">
-                                            disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText binding="#{AnaliseAcidenteTrabalho.lblUser}" escape="false" id="lblUser" styleClass="labelBold  "/>
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText21}" escape="false" id="staticText21" text="|"/>
+                                            <ui:staticText escape="false" id="staticText8" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;"/>
-                                        <ui:hyperlink binding="#{AnaliseAcidenteTrabalho.lnkEditUser}" disabled="true" id="lnkEditUser" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText11" text="|"/>
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText166}" escape="false" id="staticText166" text="|"/>
+                                            <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
-                                        <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkAjuda_action}" binding="#{AnaliseAcidenteTrabalho.lnkAjuda1}"
+                                            <ui:staticText escape="false" id="staticText12" text="|"/>
-                                            id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda"/>
+                                            <ui:hyperlink disabled="true" id="lnkEditUser1" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText8}" id="staticText8" style="width: 0px" text="|"/>
+                                            <ui:staticText escape="false" id="staticText16" text="|"/>
-                                        <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkLogout_action}" binding="#{AnaliseAcidenteTrabalho.lnkLogout}"
+                                            <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda"/>
-                                            id="lnkLogout" text="sair&gt;&gt;"/>
+                                            <ui:staticText id="staticText21" style="width: 0px" text="|"/>
-                                    </ui:panelGroup>
+                                            <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                     <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel114}" columnClasses="gridColLeft, gridColRightBottom" columns="3"
                                         id="gridPanel114" style="border: 1px solid #000000; width: 100%" width="312">
                                         <ui:image binding="#{AnaliseAcidenteTrabalho.image27}" id="image27" url="/resources/images/SIPRP_logo_small.jpg"/>
@@ -167,7 +169,7 @@
                                                 </ui:panelGroup>
                                             </h:panelGrid>
                                         </h:panelGrid>
-                                        <ui:image binding="#{AnaliseAcidenteTrabalho.image28}" id="image28" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{AnaliseAcidenteTrabalho.image28}" id="image28" url="/resources/images/Logo_Auchan_novo.jpg"/>
                                     </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridMsg}" columnClasses="gridColCenter" columns="1" id="gridMsg"

trunk/AnaliseAcidentesTrabalho/web/Dummy.jsp

@@ -26,17 +26,45 @@
                     <ui:form binding="#{Dummy.form1}" id="form1">
                         <ui:hiddenField binding="#{Dummy.hiddenField1}" id="hiddenField1"/>
                         <ui:hiddenField binding="#{Dummy.hidConfEnviar}" id="hidConfEnviar"/>
-                        <h:panelGrid binding="#{Dummy.gridPanel1}" columnClasses="gridColCenter" columns="1" id="gridPanel1"
-                            style="position: absolute; left: 72px; top: 168px; height: 24px" width="504">
-                            <ui:staticText binding="#{Dummy.txtMsg1}" id="txtMsg1" style="color: #cc0000; font-weight: bold; height: 24px; width: 456px"/>
-                        </h:panelGrid>
-                        <ui:button binding="#{Dummy.butEliminar}" id="butEliminar" style="height: 24px; left: 96px; top: 96px; position: absolute; width: 119px" text="Eliminar"/>
                         <ui:hiddenField binding="#{Dummy.hidConfDelete}" id="hidConfDelete"/>
-                        <ui:panelGroup binding="#{Dummy.groupPanel1}" id="groupPanel1" style="height: 24px; left: 72px; top: 264px; position: absolute; width: 100%">
+                        <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel1" style="height: 24px; width: 100%">
-                            <ui:button action="#{Dummy.butVoltar_action}" binding="#{Dummy.butVoltar1}" id="butVoltar1" style="height: 24px; width: 96px" text="Voltar"/>
+                            <ui:panelGroup id="groupPanel2">
-                            <ui:button action="#{Dummy.butEliminar_action}" binding="#{Dummy.butEliminar1}" id="butEliminar1" style="height: 24px; width: 119px" text="Eliminar"/>
+                                <ui:hyperlink action="#{Dummy.lnkAnalisesAcidente_action}" id="lnkAnalisesAcidente1" text="análise de acidentes de trabalho&gt;&gt;"/>
-                        </ui:panelGroup>
+                            </ui:panelGroup>
-                        <ui:hyperlink binding="#{Dummy.lnkEstabelecimento}" id="lnkEstabelecimento" style=""/>
+                            <ui:panelGroup id="groupPanel1" style="height: 24px">
+                                <ui:staticText escape="false" id="lblUser1" styleClass="labelBold  "/>
+                                <ui:staticText escape="false" id="staticText1" text="   "/>
+                                <ui:hyperlink action="#{Dummy.lnkPlanosActuacao_action}" disabled="true" id="lnkPlanosActuacao" text="planos actuação"/>
+                                <ui:staticText escape="false" id="staticText2" text=" | "/>
+                                <ui:hyperlink action="#{Dummy.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                <ui:staticText escape="false" id="staticText3" text=" | "/>
+                                <ui:hyperlink action="#{Dummy.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                <ui:staticText escape="false" id="staticText4" text=" | "/>
+                                <ui:hyperlink action="#{Dummy.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                <ui:staticText id="staticText5" style="width: 0px" text="|"/>
+                                <ui:hyperlink action="#{Dummy.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                            </ui:panelGroup>
+                        </h:panelGrid>
+                        <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel2" style="height: 24px; left: 192px; top: 192px; position: absolute"
+                            styleClass="centerBlock" width="360">
+                            <h:panelGrid columnClasses="gridColCenter, gridColCenter" columns="2" id="gridLogos1" style="height: 48px; width: 96px" styleClass="centerBlock">
+                                <ui:image id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                                <ui:image height="40" id="image2" url="/resources/images/logo_auchan_small.jpg"/>
+                            </h:panelGrid>
+                            <ui:staticText escape="false" id="stWelcome1" style="font-size: 14px"/>
+                            <ui:staticText escape="false" id="staticText6" style="font-size: xx-large" text="&amp;nbsp;"/>
+                            <ui:staticText escape="false" id="stAccessTo1" text="aceder a "/>
+                            <ui:staticText escape="false" id="staticText7" style="font-size: xx-large" text="&amp;nbsp;"/>
+                            <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel3" style="height: 24px; width: 100%">
+                                <ui:panelGroup id="groupPanel3">
+                                    <ui:hyperlink action="#{Dummy.lnkAnalises_action}" id="lnkAnalises1" style="font-size: 16px" text="Análise de Acidentes de Trabalho"/>
+                                    <ui:staticText escape="false" id="staticText8" style="height: 24px; width: 22px" text="&amp;nbsp;|&amp;nbsp;"/>
+                                    <ui:hyperlink action="#{Dummy.lnkPlanos_action}" id="lnkPlanos1" style="font-size: 16px" text="Planos de Actuação"/>
+                                </ui:panelGroup>
+                            </h:panelGrid>
+                        </h:panelGrid>
+                        <ui:staticText id="staticText9" style="position: absolute; left: 72px; top: 120px" text="Enviar para: "/>
+                        <ui:dropDown id="dropDown1" items="#{Dummy.dropDown1DefaultOptions.options}" style="position: absolute; left: 168px; top: 120px"/>
                     </ui:form>
                 </ui:body>
             </ui:html>

trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp

@@ -28,24 +28,26 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{EnviarCorrecao.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{EnviarCorrecao.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{EnviarCorrecao.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{EnviarCorrecao.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{EnviarCorrecao.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%">
-                                        <ui:staticText binding="#{EnviarCorrecao.lblUser1}" escape="false" id="lblUser1" styleClass="labelBold "/>
-                                        <ui:staticText binding="#{EnviarCorrecao.staticText1}" escape="false" id="staticText1" text="   "/>
-                                        <ui:hyperlink action="#{EnviarCorrecao.lnkAnalisesAcidente_action}" binding="#{EnviarCorrecao.lnkAnalisesAcidente}"
-                                            id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{EnviarCorrecao.staticText4}" escape="false" id="staticText4" text=" | "/>
-                                        <ui:hyperlink action="#{EnviarCorrecao.lnkNewUser_action}" binding="#{EnviarCorrecao.lnkNewUser1}" disabled="true"
-                                            id="lnkNewUser1" style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{EnviarCorrecao.staticText3}" escape="false" id="staticText3" text=" | "/>
-                                        <ui:hyperlink action="#{EnviarCorrecao.lnkEditUser_action}" binding="#{EnviarCorrecao.lnkEditUser1}" id="lnkEditUser1" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{EnviarCorrecao.staticText2}" escape="false" id="staticText2" text=" | "/>
-                                        <ui:hyperlink action="#{EnviarCorrecao.lnkAjuda_action}" binding="#{EnviarCorrecao.lnkAjuda1}" id="lnkAjuda1"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{EnviarCorrecao.staticText7}" id="staticText7" style="height: 22px; width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{EnviarCorrecao.lnkLogout_action}" binding="#{EnviarCorrecao.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel4" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{EnviarCorrecao.lnkPlanosActuacao_action}" disabled="true" id="lnkPlanosActuacao1" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel3" style="height: 24px; top: 90%">
+                                            <ui:staticText binding="#{EnviarCorrecao.lblUser}" escape="false" id="lblUser" styleClass="labelBold     "/>
+                                            <ui:staticText escape="false" id="staticText1" text="   "/>
+                                            <ui:staticText escape="false" id="staticText2" text=" | "/>
+                                            <ui:hyperlink action="#{EnviarCorrecao.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="staticText3" text=" | "/>
+                                            <ui:hyperlink action="#{EnviarCorrecao.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText4" text=" | "/>
+                                            <ui:hyperlink action="#{EnviarCorrecao.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText7" style="height: 22px; width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{EnviarCorrecao.lnkAnalisesAcidente_action}" disabled="true" id="lnkAnalisesAcidente1" text="análise de acidentes de trabalho"/>
+                                            <ui:hyperlink action="#{EnviarCorrecao.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{EnviarCorrecao.gridLayoutTop1}" columns="1" id="gridLayoutTop1"
                                     style="height: 15px; position: relative; vertical-align: top; width: 100%" styleClass="centerBlock">

trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp

@@ -48,27 +48,29 @@
                                     style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FichaUtilizador.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FichaUtilizador.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FichaUtilizador.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{FichaUtilizador.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FichaUtilizador.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
-                                        <ui:staticText binding="#{FichaUtilizador.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
-                                        <ui:staticText binding="#{FichaUtilizador.staticText1}" escape="false" id="staticText1" text="   "/>
-                                        <ui:hyperlink action="#{FichaUtilizador.lnkAnalisesAcidente_action}" binding="#{FichaUtilizador.lnkAnalisesAcidente}"
-                                            id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{FichaUtilizador.staticText15}" escape="false" id="staticText15" text=" | "/>
-                                        <ui:hyperlink action="#{FichaUtilizador.lnkNewUser_action}" binding="#{FichaUtilizador.lnkGerirUtilizadores}"
-                                            id="lnkGerirUtilizadores" style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{FichaUtilizador.staticText14}" escape="false" id="staticText14" text=" | "/>
-                                        <ui:hyperlink action="#{FichaUtilizador.lnkEditUser_action}" binding="#{FichaUtilizador.lnkEditUser}" disabled="true"
-                                            id="lnkEditUser" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{FichaUtilizador.staticText2}" escape="false" id="staticText2" text=" | "/>
-                                        <ui:hyperlink action="#{FichaUtilizador.lnkAjuda_action}" binding="#{FichaUtilizador.lnkAjuda1}" id="lnkAjuda1"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{FichaUtilizador.staticText17}" id="staticText17" style="height: 22px; width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{FichaUtilizador.lnkLogout_action}" binding="#{FichaUtilizador.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;">
-                                            <ui:staticText binding="#{FichaUtilizador.staticText16}" id="staticText16" style="height: 22px; width: 0px" text="|"/>
-                                        </ui:hyperlink>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel9" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{FichaUtilizador.lnkPlanosActuacao_action}" disabled="true" id="lnkPlanosActuacao1" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel7" style="height: 24px; width: 310px; top: 90%">
+                                            <ui:staticText binding="#{FichaUtilizador.lblUser}" escape="false" id="lblUser" styleClass="labelBold     "/>
+                                            <ui:staticText escape="false" id="staticText1" text="   "/>
+                                            <ui:staticText escape="false" id="staticText2" text=" | "/>
+                                            <ui:hyperlink action="#{FichaUtilizador.lnkNewUser_action}" binding="#{FichaUtilizador.lnkGerirUtilizadores}"
+                                                id="lnkGerirUtilizadores" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="staticText14" text=" | "/>
+                                            <ui:hyperlink action="#{FichaUtilizador.lnkEditUser_action}" disabled="true" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText15" text=" | "/>
+                                            <ui:hyperlink action="#{FichaUtilizador.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText16" style="height: 22px; width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{FichaUtilizador.lnkAnalisesAcidente_action}" id="lnkAnalisesAcidente1" text="análise de acidentes de trabalho"/>
+                                            <ui:hyperlink action="#{FichaUtilizador.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;">
+                                                <ui:staticText id="staticText17" style="height: 22px; width: 0px" text="|"/>
+                                            </ui:hyperlink>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FichaUtilizador.gridMsg1}" columnClasses="gridColCenter" columns="1" id="gridMsg1"
                                     style="height: 24px; width: 100%" width="96">

trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp

@@ -28,24 +28,25 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormDirGerRh.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormDirGerRh.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormDirGerRh.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{FormDirGerRh.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormDirGerRh.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%; width: 100%">
-                                        <ui:staticText binding="#{FormDirGerRh.lblUser}" escape="false" id="lblUser" styleClass="labelBold  "/>
-                                        <ui:staticText binding="#{FormDirGerRh.stSep1}" escape="false" id="stSep1" text="   "/>
-                                        <ui:hyperlink action="#{FormDirGerRh.lnkAnalisesAcidente_action}" binding="#{FormDirGerRh.lnkAnalisesAcidente1}"
-                                            disabled="true" id="lnkAnalisesAcidente1" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{FormDirGerRh.stSep2}" escape="false" id="stSep2" text=" | "/>
-                                        <ui:hyperlink action="#{FormDirGerRh.lnkGerirUtilizadores_action}" binding="#{FormDirGerRh.lnkGerirUtilizadores}"
-                                            id="lnkGerirUtilizadores" style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{FormDirGerRh.stSep3}" escape="false" id="stSep3" text=" | "/>
-                                        <ui:hyperlink action="#{FormDirGerRh.lnkEditUser_action}" binding="#{FormDirGerRh.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{FormDirGerRh.staticText1}" escape="false" id="staticText1" text=" | "/>
-                                        <ui:hyperlink action="#{FormDirGerRh.lnkAjuda_action}" binding="#{FormDirGerRh.lnkAjuda1}" id="lnkAjuda1"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{FormDirGerRh.staticText9}" id="staticText9" style="width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{FormDirGerRh.lnkLogout_action}" binding="#{FormDirGerRh.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel8" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{FormDirGerRh.lnkPlanosActuacao_action}" binding="#{FormDirGerRh.lnkPlanosActuacao}"
+                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%; width: 100%">
+                                            <ui:staticText binding="#{FormDirGerRh.lblUser}" escape="false" id="lblUser" styleClass="labelBold    "/>
+                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                                            <ui:hyperlink action="#{FormDirGerRh.lnkGerirUtilizadores_action}" id="lnkGerirUtilizadores1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="stSep4" text=" | "/>
+                                            <ui:hyperlink action="#{FormDirGerRh.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText1" text=" | "/>
+                                            <ui:hyperlink action="#{FormDirGerRh.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText9" style="width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{FormDirGerRh.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormDirGerRh.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
                                     id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">

trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp

@@ -28,23 +28,25 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormDirSiprp.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormDirSiprp.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormDirSiprp.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{FormDirSiprp.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormDirSiprp.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%; width: 100%">
-                                        <ui:staticText binding="#{FormDirSiprp.lblUser}" escape="false" id="lblUser" styleClass="labelBold "/>
-                                        <ui:staticText binding="#{FormDirSiprp.stSep1}" escape="false" id="stSep1" text="   "/>
-                                        <ui:hyperlink action="#{FormDirSiprp.lnkAnalisesAcidente_action}" binding="#{FormDirSiprp.lnkAnalisesAcidente}"
-                                            disabled="true" id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{FormDirSiprp.stSep3}" escape="false" id="stSep3" text=" | "/>
-                                        <ui:hyperlink action="#{FormDirSiprp.lnkNewUser_action}" binding="#{FormDirSiprp.lnkNewUser}" id="lnkNewUser" style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{FormDirSiprp.stSep2}" escape="false" id="stSep2" text=" | "/>
-                                        <ui:hyperlink action="#{FormDirSiprp.lnkEditUser_action}" binding="#{FormDirSiprp.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{FormDirSiprp.staticText1}" escape="false" id="staticText1" text=" | "/>
-                                        <ui:hyperlink action="#{FormDirSiprp.lnkAjuda_action}" binding="#{FormDirSiprp.lnkAjuda1}" id="lnkAjuda1"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{FormDirSiprp.staticText2}" id="staticText2" style="width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{FormDirSiprp.lnkLogout_action}" binding="#{FormDirSiprp.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel3" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{FormDirSiprp.lnkPlanosActuacao_action}" binding="#{FormDirSiprp.lnkPlanosActuacao}"
+                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%; width: 100%">
+                                            <ui:staticText binding="#{FormDirSiprp.lblUser}" escape="false" id="lblUser" styleClass="labelBold   "/>
+                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                                            <ui:hyperlink action="#{FormDirSiprp.lnkNewUser_action}" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="stSep4" text=" | "/>
+                                            <ui:hyperlink action="#{FormDirSiprp.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText1" text=" | "/>
+                                            <ui:hyperlink action="#{FormDirSiprp.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText2" style="width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{FormDirSiprp.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormDirSiprp.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
                                     style="height: 24px; width: 100%" width="504">

trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp

@@ -28,24 +28,25 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormGestor.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormGestor.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormGestor.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{FormGestor.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormGestor.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%; width: 100%">
-                                        <ui:staticText binding="#{FormGestor.lblUser}" escape="false" id="lblUser" styleClass="labelBold   "/>
-                                        <ui:staticText binding="#{FormGestor.stSep1}" escape="false" id="stSep1" text="   "/>
-                                        <ui:hyperlink action="#{FormGestor.lnkAnalisesAcidente_action}" binding="#{FormGestor.lnkAnalisesAcidente1}"
-                                            disabled="true" id="lnkAnalisesAcidente1" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{FormGestor.stSep2}" escape="false" id="stSep2" text=" | "/>
-                                        <ui:hyperlink action="#{FormGestor.lnkGerirUtilizadores_action}" binding="#{FormGestor.lnkGerirUtilizadores}"
-                                            disabled="true" id="lnkGerirUtilizadores" style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{FormGestor.stSep3}" escape="false" id="stSep3" text=" | "/>
-                                        <ui:hyperlink action="#{FormGestor.lnkEditUser_action}" binding="#{FormGestor.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{FormGestor.staticText1}" escape="false" id="staticText1" text=" | "/>
-                                        <ui:hyperlink action="#{FormGestor.lnkAjuda_action}" binding="#{FormGestor.lnkAjuda1}" id="lnkAjuda1"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{FormGestor.staticText9}" id="staticText9" style="height: 22px; width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{FormGestor.lnkLogout_action}" binding="#{FormGestor.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel8" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{FormGestor.lnkPlanosActuacao_action}" binding="#{FormGestor.lnkPlanosActuacao}"
+                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%; width: 100%">
+                                            <ui:staticText binding="#{FormGestor.lblUser}" escape="false" id="lblUser" styleClass="labelBold             "/>
+                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                                            <ui:hyperlink action="#{FormGestor.lnkGerirUtilizadores_action}" disabled="true" id="lnkGerirUtilizadores1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="stSep4" text=" | "/>
+                                            <ui:hyperlink action="#{FormGestor.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText1" text=" | "/>
+                                            <ui:hyperlink action="#{FormGestor.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText9" style="height: 22px; width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{FormGestor.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormGestor.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
                                     id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">

trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp

@@ -28,24 +28,25 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormHS.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormHS.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormHS.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{FormHS.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormHS.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%">
-                                        <ui:staticText binding="#{FormHS.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
-                                        <ui:staticText binding="#{FormHS.staticText1}" escape="false" id="staticText1" text="   "/>
-                                        <ui:hyperlink action="#{FormHS.lnkAnalisesAcidente_action}" binding="#{FormHS.lnkAnalisesAcidente}" disabled="true"
-                                            id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{FormHS.staticText13}" escape="false" id="staticText13" text=" | "/>
-                                        <ui:hyperlink action="#{FormHS.lnkNewUser_action}" binding="#{FormHS.lnkNewUser1}" disabled="true" id="lnkNewUser1"
-                                            style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{FormHS.staticText12}" escape="false" id="staticText12" text=" | "/>
-                                        <ui:hyperlink action="#{FormHS.lnkEditUser_action}" binding="#{FormHS.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{FormHS.staticText2}" escape="false" id="staticText2" text=" | "/>
-                                        <ui:hyperlink action="#{FormHS.lnkAjuda_action}" binding="#{FormHS.lnkAjuda1}" id="lnkAjuda1" onClick="showPdf();"
-                                            style="" text="ajuda "/>
-                                        <ui:staticText binding="#{FormHS.staticText14}" id="staticText14" style="width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{FormHS.lnkLogout_action}" binding="#{FormHS.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{FormHS.lnkPlanosActuacao_action}" binding="#{FormHS.lnkPlanosActuacao}"
+                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%">
+                                            <ui:staticText binding="#{FormHS.lblUser}" escape="false" id="lblUser" styleClass="labelBold  "/>
+                                            <ui:staticText escape="false" id="staticText1" text="   "/>
+                                            <ui:hyperlink action="#{FormHS.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="staticText13" text=" | "/>
+                                            <ui:hyperlink action="#{FormHS.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText14" text=" | "/>
+                                            <ui:hyperlink action="#{FormHS.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText15" style="width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{FormHS.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormHS.gridPanel10}" columnClasses="gridColCenter" columns="1" id="gridPanel10"
                                     style="height: 24px; width: 100%" width="504">

trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp

@@ -28,24 +28,25 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormRH.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormRH.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormRH.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{FormRH.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormRH.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%">
-                                        <ui:staticText binding="#{FormRH.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
-                                        <ui:staticText binding="#{FormRH.stSep1}" escape="false" id="stSep1" text="   "/>
-                                        <ui:hyperlink action="#{FormRH.lnkAnalisesAcidente_action}" binding="#{FormRH.lnkAnalisesAcidente}" disabled="true"
-                                            id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{FormRH.staticText12}" escape="false" id="staticText12" text=" | "/>
-                                        <ui:hyperlink action="#{FormRH.lnkNewUser_action}" binding="#{FormRH.lnkNewUser1}" disabled="true" id="lnkNewUser1"
-                                            style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{FormRH.staticText11}" escape="false" id="staticText11" text=" | "/>
-                                        <ui:hyperlink action="#{FormRH.lnkEditUser_action}" binding="#{FormRH.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{FormRH.staticText2}" escape="false" id="staticText2" text=" | "/>
-                                        <ui:hyperlink action="#{FormRH.lnkAjuda_action}" binding="#{FormRH.lnkAjuda1}" id="lnkAjuda1" onClick="showPdf();"
-                                            style="" text="ajuda "/>
-                                        <ui:staticText binding="#{FormRH.staticText13}" id="staticText13" style="width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{FormRH.lnkLogout_action}" binding="#{FormRH.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{FormRH.lnkPlanosActuacao_action}" binding="#{FormRH.lnkPlanosActuacao}"
+                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel9" style="height: 24px; top: 90%">
+                                            <ui:staticText binding="#{FormRH.lblUser}" escape="false" id="lblUser" styleClass="labelBold  "/>
+                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                                            <ui:hyperlink action="#{FormRH.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="staticText11" text=" | "/>
+                                            <ui:hyperlink action="#{FormRH.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText12" text=" | "/>
+                                            <ui:hyperlink action="#{FormRH.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText13" style="width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{FormRH.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormRH.gridPanel10}" columnClasses="gridColCenter" columns="1" id="gridPanel10"
                                     style="height: 24px; width: 100%" width="504">

trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp

@@ -29,24 +29,25 @@
                                     style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{FormSeguranca.groupPanel5}" id="groupPanel5" style="height: 24px; width: 216px">
                                         <ui:image binding="#{FormSeguranca.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{FormSeguranca.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{FormSeguranca.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormSeguranca.groupPanel6}" id="groupPanel6" style="height: 24px; top: 90%">
-                                        <ui:staticText binding="#{FormSeguranca.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
-                                        <ui:staticText binding="#{FormSeguranca.staticText18}" escape="false" id="staticText18" text="   "/>
-                                        <ui:hyperlink action="#{FormSeguranca.lnkAnalisesAcidente_action}" binding="#{FormSeguranca.lnkAnalisesAcidente}"
-                                            disabled="true" id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{FormSeguranca.staticText10}" escape="false" id="staticText10" text=" | "/>
-                                        <ui:hyperlink action="#{FormSeguranca.lnkNewUser_action}" binding="#{FormSeguranca.lnkNewUser1}" disabled="true"
-                                            id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{FormSeguranca.staticText9}" escape="false" id="staticText9" text=" | "/>
-                                        <ui:hyperlink action="#{FormSeguranca.lnkEditUser_action}" binding="#{FormSeguranca.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{FormSeguranca.staticText19}" escape="false" id="staticText19" text=" | "/>
-                                        <ui:hyperlink action="#{FormSeguranca.lnkAjuda_action}" binding="#{FormSeguranca.lnkAjuda}" id="lnkAjuda"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{FormSeguranca.staticText12}" id="staticText12" style="width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{FormSeguranca.lnkLogout_action}" binding="#{FormSeguranca.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel11" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel6">
+                                            <ui:hyperlink action="#{FormSeguranca.lnkPlanosActuacao_action}" binding="#{FormSeguranca.lnkPlanosActuacao}"
+                                                id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel9" style="height: 24px">
+                                            <ui:staticText binding="#{FormSeguranca.lblUser}" escape="false" id="lblUser" styleClass="labelBold     "/>
+                                            <ui:staticText escape="false" id="staticText9" text="   "/>
+                                            <ui:hyperlink action="#{FormSeguranca.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="staticText12" text=" | "/>
+                                            <ui:hyperlink action="#{FormSeguranca.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText13" text=" | "/>
+                                            <ui:hyperlink action="#{FormSeguranca.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText15" style="width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{FormSeguranca.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormSeguranca.gridPanel10}" columnClasses="gridColCenter" columns="1" id="gridPanel10"
                                     style="height: 24px; width: 100%" width="504">

trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp

@@ -44,25 +44,28 @@
                                     id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{GestaoUtilizadores.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{GestaoUtilizadores.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{GestaoUtilizadores.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{GestaoUtilizadores.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{GestaoUtilizadores.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%; width: 100%">
-                                        <ui:staticText binding="#{GestaoUtilizadores.lblUser}" escape="false" id="lblUser" styleClass="labelBold  "/>
-                                        <ui:staticText binding="#{GestaoUtilizadores.stSep1}" escape="false" id="stSep1" text="   "/>
-                                        <ui:hyperlink action="#{GestaoUtilizadores.lnkAnalisesAcidente_action}"
-                                            binding="#{GestaoUtilizadores.lnkAnalisesAcidente}" id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{GestaoUtilizadores.stSep3}" escape="false" id="stSep3" text=" | "/>
-                                        <ui:hyperlink action="#{GestaoUtilizadores.lnkNewUser_action}" binding="#{GestaoUtilizadores.lnkNewUser1}"
-                                            disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{GestaoUtilizadores.stSep2}" escape="false" id="stSep2" text=" | "/>
-                                        <ui:hyperlink action="#{GestaoUtilizadores.lnkEditUser_action}" binding="#{GestaoUtilizadores.lnkEditUser1}"
-                                            id="lnkEditUser1" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{GestaoUtilizadores.staticText1}" escape="false" id="staticText1" text=" | "/>
-                                        <ui:hyperlink action="#{GestaoUtilizadores.lnkAjuda_action}" binding="#{GestaoUtilizadores.lnkAjuda1}" id="lnkAjuda1"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{GestaoUtilizadores.staticText4}" id="staticText4" style="width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{GestaoUtilizadores.lnkLogout_action}" binding="#{GestaoUtilizadores.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel4" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:staticText escape="false" id="stSep2" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;"/>
+                                            <ui:hyperlink action="#{GestaoUtilizadores.lnkPlanosActuacao_action}"
+                                                binding="#{GestaoUtilizadores.lnkPlanosActuacao}" id="lnkPlanosActuacao" text="&lt;&lt;planos actuação"/>
+                                            <ui:staticText escape="false" id="stSep4" text=" | "/>
+                                            <ui:hyperlink action="#{GestaoUtilizadores.lnkAnalisesAcidente_action}" id="lnkAnalisesAcidente1" text="análise de acidentes de trabalho&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel4" style="height: 24px; top: 90%; width: 100%">
+                                            <ui:staticText binding="#{GestaoUtilizadores.lblUser}" escape="false" id="lblUser" styleClass="labelBold      "/>
+                                            <ui:staticText escape="false" id="stSep1" text="   "/>
+                                            <ui:hyperlink action="#{GestaoUtilizadores.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="stSep3" text=" | "/>
+                                            <ui:hyperlink action="#{GestaoUtilizadores.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText1" text=" | "/>
+                                            <ui:hyperlink action="#{GestaoUtilizadores.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText4" style="width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{GestaoUtilizadores.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{GestaoUtilizadores.gridMsg1}" columnClasses="gridColCenter" columns="1" id="gridMsg1" style="height: 24px; width: 100%">
                                     <ui:staticText binding="#{GestaoUtilizadores.txtMsg}" escape="false" id="txtMsg" style="height: 24px; width: 384px" styleClass="labelMsg"/>

trunk/AnaliseAcidentesTrabalho/web/Header.jspf

@@ -1,8 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <div style="height: 200px; width: 100%; -rave-layout: grid" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://www.sun.com/web/ui">
     <f:subview id="Header">
-        <h:panelGrid binding="#{Header.gridPanel1}" columnClasses="gridColCenter" columns="1" id="gridPanel1" style="height: 24px; width: 100%" width="264">
+        <h:panelGrid columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
-            <ui:staticText binding="#{Header.staticText1}" escape="false" id="staticText1" style="height: 24px; width: 336px" styleClass="labelBold" text="SIPRP - Análise Acidente"/>
+            style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312">
+            <ui:panelGroup id="groupPanel1" style="height: 24px; width: 216px">
+                <ui:image id="imgLogoSiprp" url="/resources/images/SIPRP_logo_small.jpg"/>
+                <ui:image id="imgLogoAuchan" url="/resources/images/logo_auchan_small1.jpg"/>
+            </ui:panelGroup>
+            <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel2" style="height: 24px; width: 100%">
+                <ui:panelGroup id="groupPanel2">
+                    <ui:hyperlink action="#{Header.lnkAnalisesAcidente_action}" disabled="true" id="lnkAnalisesAcidente1" text="análise de acidentes de trabalho&gt;&gt;"/>
+                </ui:panelGroup>
+                <ui:panelGroup id="groupPanel3" style="height: 24px">
+                    <ui:staticText escape="false" id="lblUser1" styleClass="labelBold       "/>
+                    <ui:staticText escape="false" id="staticText1" text="   "/>
+                    <ui:hyperlink action="#{Header.lnkPlanosActuacao_action}" id="lnkPlanosActuacao1" text="planos actuação"/>
+                    <ui:staticText escape="false" id="staticText2" text=" | "/>
+                    <ui:hyperlink action="#{Header.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                    <ui:staticText escape="false" id="staticText3" text=" | "/>
+                    <ui:hyperlink action="#{Header.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                    <ui:staticText escape="false" id="staticText4" text=" | "/>
+                    <ui:hyperlink action="#{Header.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                    <ui:staticText id="staticText5" style="width: 0px" text="|"/>
+                    <ui:hyperlink action="#{Header.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                </ui:panelGroup>
+            </h:panelGrid>
         </h:panelGrid>
     </f:subview>
 </div>

trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp

@@ -52,6 +52,16 @@
                                {
                                   document.getElementById("form1:gridTrabalhadores").className = "";                               
                                }                               
+                               else if(rb.id == "form1:rbCatDirNacSeg")
+                               {
+                                  document.getElementById("form1:gridTrabalhadores").className = "";                               
+                                  //document.getElementById("form1:gridOutro").className = "hidden";                                   
+                               }                                                              
+                               else if(rb.id == "form1:rbCatDirLoja")
+                               {
+                                  document.getElementById("form1:gridTrabalhadores").className = "";                               
+                                  //document.getElementById("form1:gridOutro").className = "hidden";                                                                     
+                               }                                                                                             
                             } 
                         }
                         
@@ -79,24 +89,26 @@
                                     style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{NovoUtilizador.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{NovoUtilizador.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{NovoUtilizador.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{NovoUtilizador.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{NovoUtilizador.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
-                                        <ui:staticText binding="#{NovoUtilizador.lblUser}" escape="false" id="lblUser" styleClass="labelBold "/>
-                                        <ui:staticText binding="#{NovoUtilizador.staticText1}" escape="false" id="staticText1" text="   "/>
-                                        <ui:hyperlink action="#{NovoUtilizador.lnkAnalisesAcidente_action}" binding="#{NovoUtilizador.lnkAnalisesAcidente}"
-                                            id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{NovoUtilizador.staticText28}" escape="false" id="staticText28" text=" | "/>
-                                        <ui:hyperlink action="#{NovoUtilizador.lnkNewUser_action}" binding="#{NovoUtilizador.lnkNewUser1}" disabled="true"
-                                            id="lnkNewUser1" style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{NovoUtilizador.staticText27}" escape="false" id="staticText27" text=" | "/>
-                                        <ui:hyperlink action="#{NovoUtilizador.lnkEditUser_action}" binding="#{NovoUtilizador.lnkEditUser1}" id="lnkEditUser1" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{NovoUtilizador.staticText2}" escape="false" id="staticText2" text=" | "/>
-                                        <ui:hyperlink action="#{NovoUtilizador.lnkAjuda_action}" binding="#{NovoUtilizador.lnkAjuda1}" id="lnkAjuda1"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{NovoUtilizador.staticText29}" id="staticText29" style="height: 22px; width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{NovoUtilizador.lnkLogout_action}" binding="#{NovoUtilizador.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel5" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{NovoUtilizador.lnkPlanosActuacao_action}" disabled="true" id="lnkPlanosActuacao1" text="planos actuação&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel8" style="height: 24px; width: 310px; top: 90%">
+                                            <ui:staticText binding="#{NovoUtilizador.lblUser}" escape="false" id="lblUser" styleClass="labelBold      "/>
+                                            <ui:staticText escape="false" id="staticText1" text="   "/>
+                                            <ui:staticText escape="false" id="staticText2" text=" | "/>
+                                            <ui:hyperlink action="#{NovoUtilizador.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="staticText27" text=" | "/>
+                                            <ui:hyperlink action="#{NovoUtilizador.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText28" text=" | "/>
+                                            <ui:hyperlink action="#{NovoUtilizador.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText29" style="height: 22px; width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{NovoUtilizador.lnkAnalisesAcidente_action}" id="lnkAnalisesAcidente1" text="análise de acidentes de trabalho"/>
+                                            <ui:hyperlink action="#{NovoUtilizador.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{NovoUtilizador.gridMsg1}" columnClasses="gridColCenter" columns="1" id="gridMsg1"
                                     style="height: 24px; width: 100%" width="96">
@@ -164,6 +176,16 @@
                                                     style="height: 24px; width: 240px" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Respons&amp;aacute;vel de loja&amp;nbsp;"/>
                                                 <ui:checkbox binding="#{NovoUtilizador.chkSegResp}" id="chkSegResp" style="height: 24px; width: 24px"/>
                                             </ui:panelGroup>
+                                            <ui:panelGroup id="pgCatDirNacSeg" style="height: 24px; width: 312px">
+                                                <ui:radioButton binding="#{NovoUtilizador.rbCatDirNacSeg}" id="rbCatDirNacSeg" name="categorias"
+                                                    onClick="showPanel(this);" style="height: 24px; width: 24px"/>
+                                                <ui:staticText escape="false" id="staticText8" style="height: 24px; width: 240px" text="Director Nacional de Seguran&amp;ccedil;a&#xa; "/>
+                                            </ui:panelGroup>
+                                            <ui:panelGroup id="pgCatDirLoja" style="height: 24px; width: 312px">
+                                                <ui:radioButton binding="#{NovoUtilizador.rbCatDirLoja}" id="rbCatDirLoja" name="categorias"
+                                                    onClick="showPanel(this);" style="height: 24px; width: 24px"/>
+                                                <ui:staticText escape="false" id="staticText30" style="height: 24px; width: 240px" text="Director de Loja&#xa; "/>
+                                            </ui:panelGroup>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{NovoUtilizador.gridUtilizador}" columnClasses="gridColLeft" columns="1" id="gridUtilizador"
                                             style="height: 24px; width: 100%" width="456">
@@ -205,10 +227,11 @@
                                                 </ui:table>
                                                 <ui:staticText binding="#{NovoUtilizador.staticText7}" escape="false" id="staticText7"
                                                     style="height: 24px; width: 72px" text=" "/>
-                                                <ui:staticText binding="#{NovoUtilizador.stOutro}" escape="false" id="stOutro" style="height: 24px; width: 72px"
-                                                    styleClass="labelBold" text=" Outro"/>
                                                 <h:panelGrid binding="#{NovoUtilizador.gridOutro}" columnClasses="gridColLeft15, gridColLeft85" columns="2"
                                                     id="gridOutro" style="height: 24px" width="360">
+                                                    <ui:staticText binding="#{NovoUtilizador.stOutro}" escape="false" id="stOutro"
+                                                        style="height: 24px; width: 72px" styleClass="labelBold" text="Outro"/>
+                                                    <ui:staticText escape="false" id="staticText31" style="" text="&amp;nbsp;"/>
                                                     <ui:staticText binding="#{NovoUtilizador.staticText9}" escape="false" id="staticText9" style="width: 72px"
                                                         styleClass="labelBold" text="Designa&amp;ccedil;&amp;atilde;o:"/>
                                                     <ui:textField binding="#{NovoUtilizador.txtNomeOutro}" id="txtNomeOutro" style="height: 18px; width: 216px"/>

trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp

@@ -48,25 +48,28 @@
                                     id="gridPanel1" style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312">
                                     <ui:panelGroup binding="#{UtilizadorFields.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
                                         <ui:image binding="#{UtilizadorFields.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        <ui:image binding="#{UtilizadorFields.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{UtilizadorFields.image2}" id="image2" url="/resources/images/Logo_Auchan_novo.jpg"/>
-                                    </ui:panelGroup>
-                                    <ui:panelGroup binding="#{UtilizadorFields.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
-                                        <ui:staticText binding="#{UtilizadorFields.lblUser}" escape="false" id="lblUser" styleClass="labelBold "/>
-                                        <ui:staticText binding="#{UtilizadorFields.staticText1}" escape="false" id="staticText1" text="   "/>
-                                        <ui:hyperlink action="#{UtilizadorFields.lnkAnalisesAcidente_action}" binding="#{UtilizadorFields.lnkAnalisesAcidente}"
-                                            id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{UtilizadorFields.staticText18}" escape="false" id="staticText18" text=" | "/>
-                                        <ui:hyperlink action="#{UtilizadorFields.lnkNewUser_action}" binding="#{UtilizadorFields.lnkNewUser1}" disabled="true"
-                                            id="lnkNewUser1" style="" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{UtilizadorFields.staticText17}" escape="false" id="staticText17" text=" | "/>
-                                        <ui:hyperlink action="#{UtilizadorFields.lnkEditUser_action}" binding="#{UtilizadorFields.lnkEditUser1}" disabled="true"
-                                            id="lnkEditUser1" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{UtilizadorFields.staticText2}" escape="false" id="staticText2" text=" | "/>
-                                        <ui:hyperlink action="#{UtilizadorFields.lnkAjuda_action}" binding="#{UtilizadorFields.lnkAjuda}" id="lnkAjuda"
-                                            onClick="showPdf();" style="" text="ajuda "/>
-                                        <ui:staticText binding="#{UtilizadorFields.staticText19}" id="staticText19" style="height: 22px; width: 0px" text="|"/>
-                                        <ui:hyperlink action="#{UtilizadorFields.lnkLogout_action}" binding="#{UtilizadorFields.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel12" style="height: 24px; width: 100%">
+                                        <ui:panelGroup id="groupPanel2">
+                                            <ui:hyperlink action="#{UtilizadorFields.lnkPlanosActuacao_action}" binding="#{UtilizadorFields.lnkPlanosActuacao}"
+                                                disabled="true" id="lnkPlanosActuacao" text="planos actuação&gt;&gt;"/>
+                                            <ui:staticText escape="false" id="staticText20" text=" | "/>
+                                            <ui:hyperlink action="#{UtilizadorFields.lnkAnalisesAcidente_action}" id="lnkAnalisesAcidente" text="análise de acidentes de trabalho&#xa;"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup id="groupPanel10" style="height: 24px; width: 310px; top: 90%">
+                                            <ui:staticText binding="#{UtilizadorFields.lblUser}" escape="false" id="lblUser" styleClass="labelBold   "/>
+                                            <ui:staticText escape="false" id="staticText1" text="   "/>
+                                            <ui:staticText escape="false" id="staticText2" text=" | "/>
+                                            <ui:hyperlink action="#{UtilizadorFields.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                            <ui:staticText escape="false" id="staticText17" text=" | "/>
+                                            <ui:hyperlink action="#{UtilizadorFields.lnkEditUser_action}" disabled="true" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText18" text=" | "/>
+                                            <ui:hyperlink action="#{UtilizadorFields.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:staticText id="staticText19" style="height: 22px; width: 0px" text="|"/>
+                                            <ui:hyperlink action="#{UtilizadorFields.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{UtilizadorFields.gridMsg1}" columnClasses="gridColCenter" columns="1" id="gridMsg1"
                                     style="height: 24px; width: 100%" width="96">

trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp

@@ -45,24 +45,26 @@
                                 styleClass="centerBlock" width="456">
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridHeader1}" columnClasses="gridColRightBottom" columns="1"
                                     id="gridHeader1" style="height: 24px; width: 100%" width="624">
-                                    <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel25}" id="groupPanel25" style="height: 24px">
+                                    <h:panelGrid columnClasses="gridColRight" columns="1" id="gridPanel1" style="height: 24px; width: 100%">
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblUser}" escape="false" id="lblUser" styleClass="labelBold "/>
+                                        <ui:panelGroup id="groupPanel2">
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText21}" escape="false" id="staticText21" text="   "/>
+                                            <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkPlanosActuacao_action}" disabled="true"
-                                        <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkAnalisesAcidente_action}"
+                                                id="lnkPlanosActuacao1" text="&lt;&lt;planos actuação"/>
-                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkAnalisesAcidente}" id="lnkAnalisesAcidente" text="analisar acidentes"/>
+                                            <ui:staticText escape="false" id="staticText32" text=" | "/>
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText38}" escape="false" id="staticText38" text=" | "/>
+                                            <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkAnalisesAcidente_action}" id="lnkAnalisesAcidente1" text="análise de acidentes de trabalho&gt;&gt;"/>
-                                        <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkNewUser_action}"
+                                        </ui:panelGroup>
-                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkNewUser1}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                        <ui:panelGroup id="groupPanel25" style="height: 24px">
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText39}" escape="false" id="staticText39" text=" | "/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblUser}" escape="false" id="lblUser" styleClass="labelBold      "/>
-                                        <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkEditUser_action}"
+                                            <ui:staticText escape="false" id="staticText1" text="   "/>
-                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
+                                            <ui:staticText escape="false" id="staticText2" text=" | "/>
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText40}" escape="false" id="staticText40" text=" | "/>
+                                            <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkNewUser_action}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
-                                        <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkAjuda_action}" binding="#{ViewAnaliseAcidenteTrabalho.lnkAjuda1}"
+                                            <ui:staticText escape="false" id="staticText21" text=" | "/>
-                                            id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                            <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkEditUser_action}" id="lnkEditUser1" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText1}" id="staticText1" style="width: 0px" text="|"/>
+                                            <ui:staticText escape="false" id="staticText22" text=" | "/>
-                                        <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkLogout_action}"
+                                            <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkAjuda_action}" id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
-                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                            <ui:staticText id="staticText23" style="width: 0px" text="|"/>
-                                    </ui:panelGroup>
+                                            <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkLogout_action}" id="lnkLogout1" text="sair&gt;&gt;"/>
+                                        </ui:panelGroup>
+                                    </h:panelGrid>
                                     <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel6}" columnClasses="gridColLeft, gridColRightBottom" columns="3"
                                         id="gridPanel6" style="border: 1px solid #000000; height: 24px; width: 100%" width="312">
                                         <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel26}" id="groupPanel26" style="height: 24px; width: 216px">
@@ -85,7 +87,7 @@
                                                 </ui:panelGroup>
                                             </h:panelGrid>
                                         </h:panelGrid>
-                                        <ui:image binding="#{ViewAnaliseAcidenteTrabalho.image5}" id="image5" url="/resources/images/logo_auchan_small1.jpg"/>
+                                        <ui:image binding="#{ViewAnaliseAcidenteTrabalho.image5}" id="image5" url="/resources/images/Logo_Auchan_novo.jpg"/>
                                     </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridMsg1}" columnClasses="gridColCenter" columns="1" id="gridMsg1"

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

@@ -14,5 +14,9 @@
     </locale-config>
   </application>
   -->
-
+    <managed-bean>
+        <managed-bean-name>Acesso</managed-bean-name>
+        <managed-bean-class>analiseacidentestrabalho.Acesso</managed-bean-class>
+        <managed-bean-scope>request</managed-bean-scope>
+    </managed-bean>
 </faces-config>

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

@@ -12,6 +12,10 @@
             <from-outcome>erro</from-outcome>
             <to-view-id>/Erro.jsp</to-view-id>
         </navigation-case>
+        <navigation-case>
+            <from-outcome>acesso</from-outcome>
+            <to-view-id>/Acesso.jsp</to-view-id>
+        </navigation-case>        
         <navigation-case>
             <from-outcome>form_seguranca</from-outcome>
             <to-view-id>/FormSeguranca.jsp</to-view-id>
@@ -413,4 +417,27 @@
             <to-view-id>/Login.jsp</to-view-id>
         </navigation-case>
     </navigation-rule>
+    <navigation-rule>
+        <from-view-id>/Acesso.jsp</from-view-id>
+        <navigation-case>
+            <from-outcome>gestor</from-outcome>
+            <to-view-id>/FormGestor.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>form_hs</from-outcome>
+            <to-view-id>/FormHS.jsp</to-view-id>
+        </navigation-case>  
+        <navigation-case>
+            <from-outcome>form_seguranca</from-outcome>
+            <to-view-id>/FormSeguranca.jsp</to-view-id>
+        </navigation-case> 
+        <navigation-case>
+            <from-outcome>form_dir_siprp</from-outcome>
+            <to-view-id>/FormDirSiprp.jsp</to-view-id>
+        </navigation-case>        
+        <navigation-case>
+            <from-outcome>login</from-outcome>
+            <to-view-id>/Login.jsp</to-view-id>
+        </navigation-case>
+    </navigation-rule>
 </faces-config>

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

@@ -9,6 +9,7 @@
           disk instead of stored in memory.  Files smaller than or
           equal to this size will be stored in memory.  The default
           value is 4096.
-        </description><param-name>sizeThreshold</param-name><param-value>4096</param-value></init-param></filter><filter-mapping><filter-name>UploadFilter</filter-name><servlet-name>Faces Servlet</servlet-name></filter-mapping><servlet><servlet-name>Faces Servlet</servlet-name><servlet-class>javax.faces.webapp.FacesServlet</servlet-class><load-on-startup> 1 </load-on-startup></servlet><servlet><servlet-name>ExceptionHandlerServlet</servlet-name><servlet-class>com.sun.errorhandler.ExceptionHandler</servlet-class><init-param><param-name>errorHost</param-name><param-value>localhost</param-value></init-param><init-param><param-name>errorPort</param-name><param-value>24444</param-value></init-param></servlet><servlet><servlet-name>ThemeServlet</servlet-name><servlet-class>com.sun.rave.web.ui.theme.ThemeServlet</servlet-class></servlet><servlet-mapping><servlet-name>Faces Servlet</servlet-name><url-pattern>/faces/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>ExceptionHandlerServlet</servlet-name><url-pattern>/error/ExceptionHandler</url-pattern></servlet-mapping><servlet-mapping><servlet-name>ThemeServlet</servlet-name><url-pattern>/theme/*</url-pattern></servlet-mapping><welcome-file-list>
+        </description><param-name>sizeThreshold</param-name><param-value>4096</param-value></init-param></filter><filter-mapping><filter-name>UploadFilter</filter-name><servlet-name>Faces Servlet</servlet-name></filter-mapping><servlet><servlet-name>Faces Servlet</servlet-name><servlet-class>javax.faces.webapp.FacesServlet</servlet-class><load-on-startup> 1 </load-on-startup></servlet><servlet><servlet-name>ExceptionHandlerServlet</servlet-name><servlet-class>com.sun.errorhandler.ExceptionHandler</servlet-class><init-param><param-name>errorHost</param-name><param-value>localhost</param-value></init-param><init-param><param-name>errorPort</param-name><param-value>24444</param-value></init-param></servlet><servlet><servlet-name>ThemeServlet</servlet-name><servlet-class>com.sun.rave.web.ui.theme.ThemeServlet</servlet-class></servlet><servlet-mapping><servlet-name>Faces Servlet</servlet-name><url-pattern>/faces/*</url-pattern></servlet-mapping><servlet-mapping><servlet-name>ExceptionHandlerServlet</servlet-name><url-pattern>/error/ExceptionHandler</url-pattern></servlet-mapping><servlet-mapping><servlet-name>ThemeServlet</servlet-name><url-pattern>/theme/*</url-pattern></servlet-mapping>
+    <welcome-file-list>
         <welcome-file>faces/Login.jsp</welcome-file>
         </welcome-file-list><error-page><exception-type>javax.servlet.ServletException</exception-type><location>/error/ExceptionHandler</location></error-page><error-page><exception-type>java.io.IOException</exception-type><location>/error/ExceptionHandler</location></error-page><error-page><exception-type>javax.faces.FacesException</exception-type><location>/error/ExceptionHandler</location></error-page><error-page><exception-type>com.sun.rave.web.ui.appbase.ApplicationException</exception-type><location>/error/ExceptionHandler</location></error-page><jsp-config><jsp-property-group><url-pattern>*.jspf</url-pattern><is-xml>true</is-xml></jsp-property-group></jsp-config></web-app>