From 8450555b398508814fd33e7e8cc9e05ad3657959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=20Lu=C3=ADs=20=3D?= Date: Thu, 11 Dec 2008 17:16:39 +0000 Subject: [PATCH] 11/12/2008 git-svn-id: https://svn.coded.pt/svn/SIPRP@819 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../nbproject/faces-config.NavData | 3 +- .../nbproject/navigation.NavData | 5 +- .../java/analiseacidentestrabalho/Acesso.java | 245 ++++++++++++++++ .../AnaliseAcidenteTrabalho.java | 136 +-------- .../java/analiseacidentestrabalho/Dummy.java | 107 +++---- .../EnviarCorrecao.java | 139 ++------- .../FichaUtilizador.java | 221 +++++++-------- .../FormDirGerRh.java | 162 +++-------- .../FormDirSiprp.java | 167 +++-------- .../analiseacidentestrabalho/FormGestor.java | 189 ++++--------- .../java/analiseacidentestrabalho/FormHS.java | 167 +++-------- .../java/analiseacidentestrabalho/FormRH.java | 171 ++++------- .../FormSeguranca.java | 171 ++++------- .../GestaoUtilizadores.java | 150 +++------- .../java/analiseacidentestrabalho/Header.java | 50 ++-- .../java/analiseacidentestrabalho/Login.java | 27 +- .../NovoUtilizador.java | 147 +++------- .../UtilizadorFields.java | 128 ++------- .../ViewAnaliseAcidenteTrabalho.java | 134 +-------- .../src/java/db/AnalisesDataProvider.java | 267 +++++++++++------- .../src/java/db/Db.java | 4 +- .../src/java/db/Dblocal.java | 4 +- .../src/java/global/Global.java | 31 +- .../src/java/utils/JSFUtils.java | 120 ++++++++ .../src/java/utils/Utils.java | 48 ++++ trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp | 61 ++++ .../web/AnaliseAcidenteTrabalho.jsp | 38 +-- trunk/AnaliseAcidentesTrabalho/web/Dummy.jsp | 48 +++- .../web/EnviarCorrecao.jsp | 36 +-- .../web/FichaUtilizador.jsp | 42 +-- .../web/FormDirGerRh.jsp | 35 +-- .../web/FormDirSiprp.jsp | 34 +-- .../web/FormGestor.jsp | 35 +-- trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp | 35 +-- trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp | 35 +-- .../web/FormSeguranca.jsp | 35 +-- .../web/GestaoUtilizadores.jsp | 39 +-- .../AnaliseAcidentesTrabalho/web/Header.jspf | 26 +- .../web/NovoUtilizador.jsp | 61 ++-- .../web/UtilizadorFields.jsp | 39 +-- .../web/ViewAnaliseAcidenteTrabalho.jsp | 40 +-- .../web/WEB-INF/faces-config.xml | 6 +- .../web/WEB-INF/navigation.xml | 27 ++ .../web/WEB-INF/web.xml | 3 +- .../web/resources/images/Logo_Auchan_novo.jpg | Bin 0 -> 3225 bytes 45 files changed, 1665 insertions(+), 2003 deletions(-) create mode 100644 trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Acesso.java create mode 100644 trunk/AnaliseAcidentesTrabalho/src/java/utils/JSFUtils.java create mode 100644 trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp create mode 100644 trunk/AnaliseAcidentesTrabalho/web/resources/images/Logo_Auchan_novo.jpg diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData index c1dae4ea..2d786f53 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData @@ -6,10 +6,11 @@ + - + diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData index 7543719b..66abc5cc 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData @@ -2,10 +2,11 @@ - + + @@ -13,8 +14,8 @@ - + diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Acesso.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Acesso.java new file mode 100644 index 00000000..0530fed1 --- /dev/null +++ b/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; + +/** + *

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.

+ * + * @author lluis + */ +public class Acesso extends AbstractPageBean { + // + + /** + *

Automatically managed component initialization. WARNING: + * This method is automatically generated, so any user-specified code inserted + * here is subject to being replaced.

+ */ + private void _init() throws Exception { + } + private StaticText stWelcome = new StaticText(); + + public StaticText getStWelcome() { + return stWelcome; + } + + public void setStWelcome(StaticText st) { + this.stWelcome = st; + } + + // + + /** + *

Construct a new Page bean instance.

+ */ + public Acesso() { + } + + /** + *

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.

+ * + *

Note that, if the current request is a postback, the property + * values of the components do not represent any + * values submitted with this request. Instead, they represent the + * property values that were saved for this view when it was rendered.

+ */ + 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 + + // + // 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); + } + + // + // 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 . . . + } + } + } + + /** + *

Callback method that is called after the component tree has been + * restored, but before any event processing takes place. This method + * will only 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.

+ */ + public void preprocess() { + } + + /** + *

Callback method that is called just before rendering takes place. + * This method will only 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.

+ */ + 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); + } + + /** + *

Callback method that is called after rendering is completed for + * this request, if init() was called (regardless of whether + * or not this was the page that was actually rendered). Customize this + * method to release resources acquired in the init(), + * preprocess(), or prerender() methods (or + * acquired during execution of an event handler).

+ * + */ + + public void destroy() { + } + + /** + *

Return a reference to the scoped data bean.

+ */ + protected SessionBean1 getSessionBean1() { + return (SessionBean1)getBean("SessionBean1"); + } + + /** + *

Return a reference to the scoped data bean.

+ */ + protected RequestBean1 getRequestBean1() { + return (RequestBean1)getBean("RequestBean1"); + } + + /** + *

Return a reference to the scoped data bean.

+ */ + 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; + } + +} + diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java index e4c077c1..ed7142c5 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java +++ b/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; + } /** *

Construct a new Page bean instance.

*/ @@ -14954,7 +14843,12 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean { } return true; - } + } + + public String lnkPlanosActuacao_action() { + // TODO: Replace with your code + return null; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java index c0eab6e8..193fad43 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java +++ b/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 PanelGroup getGroupPanel1() { - return groupPanel1; - } - - public void setGroupPanel1(PanelGroup pg) { - this.groupPanel1 = pg; - } - - private Button butVoltar1 = new Button(); - - public Button getButVoltar1() { - return butVoltar1; + public SingleSelectOptionsList getDropDown1DefaultOptions() { + return dropDown1DefaultOptions; } - public void setButVoltar1(Button b) { - this.butVoltar1 = b; - } - - 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; + public void setDropDown1DefaultOptions(SingleSelectOptionsList ssol) { + this.dropDown1DefaultOptions = ssol; } // @@ -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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java index 62b3e39a..89ed0728 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java +++ b/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; + } // @@ -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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java index 6c97c727..f27840d4 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java +++ b/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; /** *

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 getStaticText14() { - return staticText14; + public StaticText getLblUser() { + return lblUser; } - public void setStaticText14(StaticText st) { - this.staticText14 = st; + public void setLblUser(StaticText 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; - } /** *

Construct a new Page bean instance.

@@ -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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java index 6fb8521f..d494b6e5 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java +++ b/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; + } // @@ -970,6 +869,7 @@ public class FormDirGerRh extends AbstractPageBean { * this page.

*/ 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; + } + } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java index b679a3c1..b881650d 100755 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java +++ b/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; + } // @@ -1010,6 +909,7 @@ public class FormDirSiprp extends AbstractPageBean { * this page.

*/ 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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java index 9330c08c..c550ab1e 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java +++ b/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; + } // @@ -990,7 +889,24 @@ public class FormGestor extends AbstractPageBean { * this page.

*/ 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 diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java index 3ebebe5f..f3df8d9d 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java +++ b/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; + } // @@ -1220,6 +1119,7 @@ public class FormHS extends AbstractPageBean { * this page.

*/ 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; + } + } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java index 06cc90ef..93d039d2 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java +++ b/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; + } // @@ -1181,9 +1080,14 @@ public class FormRH extends AbstractPageBean { * this page.

*/ 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; + } + } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java index de46c90b..3eae0063 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java +++ b/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; + } // @@ -1216,8 +1114,13 @@ public class FormSeguranca extends AbstractPageBean { * this page.

*/ 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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java index 0b25dd18..9e4027f0 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java +++ b/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 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 StaticText getLblUser() { + return lblUser; } - public void setLnkAjuda1(Hyperlink h) { - this.lnkAjuda1 = h; + public void setLblUser(StaticText st) { + this.lblUser = st; } + private Hyperlink lnkPlanosActuacao = new Hyperlink(); - private StaticText staticText4 = new StaticText(); - - public StaticText getStaticText4() { - return staticText4; + public Hyperlink getLnkPlanosActuacao() { + return lnkPlanosActuacao; } - public void setStaticText4(StaticText st) { - this.staticText4 = st; + public void setLnkPlanosActuacao(Hyperlink h) { + this.lnkPlanosActuacao = h; } /** *

Construct a new Page bean instance.

@@ -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.

*/ 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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Header.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Header.java index 7bcdb7dc..713acb0e 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Header.java +++ b/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; - } // 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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java index 8283ce80..adc3a3b3 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java +++ b/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; /** *

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); diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java index 68b45cd0..824d97cf 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java +++ b/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 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 RadioButton getRbCatDirNacSeg() { + return rbCatDirNacSeg; } - public void setStaticText28(StaticText st) { - this.staticText28 = st; + public void setRbCatDirNacSeg(RadioButton rb) { + this.rbCatDirNacSeg = rb; } + private RadioButton rbCatDirLoja = new RadioButton(); - private Hyperlink lnkAnalisesAcidente = new Hyperlink(); - - public Hyperlink getLnkAnalisesAcidente() { - return lnkAnalisesAcidente; + public RadioButton getRbCatDirLoja() { + return rbCatDirLoja; } - public void setLnkAnalisesAcidente(Hyperlink h) { - this.lnkAnalisesAcidente = h; + public void setRbCatDirLoja(RadioButton rb) { + this.rbCatDirLoja = rb; } + private StaticText lblUser = new StaticText(); - private Hyperlink lnkAjuda1 = new Hyperlink(); - - public Hyperlink getLnkAjuda1() { - return lnkAjuda1; - } - - public void setLnkAjuda1(Hyperlink h) { - this.lnkAjuda1 = h; - } - - private StaticText staticText29 = new StaticText(); - - public StaticText getStaticText29() { - return staticText29; + public StaticText getLblUser() { + return lblUser; } - public void setStaticText29(StaticText st) { - this.staticText29 = st; + public void setLblUser(StaticText st) { + this.lblUser = st; } /** *

Construct a new Page bean instance.

@@ -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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java index 8ace5eb5..78d1cea4 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java +++ b/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 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 StaticText getLblUser() { + return lblUser; } - public void setLnkAjuda(Hyperlink h) { - this.lnkAjuda = h; + public void setLblUser(StaticText st) { + this.lblUser = st; } + private Hyperlink lnkPlanosActuacao = new Hyperlink(); - private StaticText staticText19 = new StaticText(); - - public StaticText getStaticText19() { - return staticText19; + public Hyperlink getLnkPlanosActuacao() { + return lnkPlanosActuacao; } - public void setStaticText19(StaticText st) { - this.staticText19 = st; + public void setLnkPlanosActuacao(Hyperlink h) { + this.lnkPlanosActuacao = h; } /** *

Construct a new Page bean instance.

@@ -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; + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java index c410efad..c50f30eb 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java +++ b/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; + } /** *

Construct a new Page bean instance.

*/ @@ -4656,5 +4545,10 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean { // } } + public String lnkPlanosActuacao_action() { + // TODO: Replace with your code + return null; + } + } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java index c5979259..640190f7 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java +++ b/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(); - do - { - Recomendacao r = new Recomendacao(); - r.setId(new Integer(rs.getInt("id"))); - r.setAnalise_id(new Integer(rs.getInt("analise_id"))); - r.setRecomendacao(rs.getString("recomendacao")); - list.add(r); - }while(rs.next()); + if(rs.isBeforeFirst()) + { + rs.first(); + do + { + Recomendacao r = new Recomendacao(); + r.setId(new Integer(rs.getInt("id"))); + r.setAnalise_id(new Integer(rs.getInt("analise_id"))); + 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); - rs.first(); - do - { - Medida m = new Medida(); - m.setId(new Integer(rs.getInt("id"))); - m.setAnalise_id(new Integer(rs.getInt("analise_id"))); - m.setMedida(rs.getString("medida")); - list.add(m); - }while(rs.next()); + ResultSet rs = st.executeQuery(sql); + if(rs.isBeforeFirst()) + { + rs.first(); + do + { + Medida m = new Medida(); + m.setId(new Integer(rs.getInt("id"))); + m.setAnalise_id(new Integer(rs.getInt("analise_id"))); + 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(); - do - { - t = new TipoUtilizador(); - 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()); + if(rs.isBeforeFirst()) + { + rs.first(); + do + { + t = new TipoUtilizador(); + 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()); + } + 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(); - do - { - t = new TipoUtilizador(); - if(permissao.intValue() == 7) //director rh + if(rs.isBeforeFirst()) + { + rs.first(); + do { - t.setTipo(new Integer(rs.getInt("tipo"))); - if(t.getTipo().intValue() == 1 || t.getTipo().intValue() == 2 || t.getTipo().intValue() == 6) // seguranca || rh || gestor + t = new TipoUtilizador(); + 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(); - do - { - e = new Estabelecimento(); - e.setId(new Integer(rslocal.getInt("id"))); - //e.setNome_plain(rslocal.getString("nome_plain")); - e.setNome(rslocal.getString("nome")); - //t.setActivo(rs.getString("activo")); - //t.setOrdem(new Integer(rs.getInt("ordem"))); - list.add(e); - }while(rslocal.next()); + if(rslocal.isBeforeFirst()) + { + rslocal.first(); + do + { + e = new Estabelecimento(); + e.setId(new Integer(rslocal.getInt("id"))); + //e.setNome_plain(rslocal.getString("nome_plain")); + e.setNome(rslocal.getString("nome")); + System.out.println("ESTABELECIMENTOAA : " + e.getId().toString() + " - " + e.getNome()); + //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(); - do - { - m = new Medico(); - m.setId(new Integer(rslocal.getInt("id"))); - m.setNome(rslocal.getString("nome")); - list.add(m); - }while(rslocal.next()); + if(rslocal.isBeforeFirst()) + { + rslocal.first(); + do + { + m = new Medico(); + m.setId(new Integer(rslocal.getInt("id"))); + 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(); - do - { - t = new TecnicoSaude(); - t.setId(new Integer(rslocal.getInt("id"))); - t.setNome(rslocal.getString("nome")); - list.add(t); - }while(rslocal.next()); + if(rslocal.isBeforeFirst()) + { + rslocal.first(); + do + { + t = new TecnicoSaude(); + t.setId(new Integer(rslocal.getInt("id"))); + 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(); - do + if(rs.isBeforeFirst()) { - c = new Causa(); - c.setId( new Integer(rs.getInt("id")) ); - c.setCausa(rs.getString("causa")); - list.add(c); - }while(rs.next()); + rs.first(); + do + { + c = new Causa(); + 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(); - do + if(rs.isBeforeFirst()) { - d = new Departamento(); - d.setId( new Integer(rs.getInt("id")) ); - d.setDescricao(rs.getString("descricao")); - list.add(d); - }while(rs.next()); + rs.first(); + do + { + d = new Departamento(); + 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(); - do + if(rs.isBeforeFirst()) { - s = new Seccao(); - s.setId( new Integer(rs.getInt("id")) ); - s.setDescricao(rs.getString("descricao")); - s.setDepartamento_id( new Integer(rs.getInt("departamento_id")) ); - list.add(s); - }while(rs.next()); + rs.first(); + do + { + s = new Seccao(); + s.setId( new Integer(rs.getInt("id")) ); + 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(); - do + if(rs.isBeforeFirst()) { - Double dAno = new Double(rs.getDouble("ano")); - Integer iAno = new Integer(dAno.intValue()); - list.add(iAno); - }while(rs.next()); + rs.first(); + do + { + Double dAno = new Double(rs.getDouble("ano")); + Integer iAno = new Integer(dAno.intValue()); + list.add(iAno); + }while(rs.next()); + } + return list; } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/Db.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/Db.java index 9580e032..a0386180 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/db/Db.java +++ b/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://localhost:5436/siprp"; //real + String connectionURL = "jdbc:postgresql://storage:5432/siprp"; //testes + //String connectionURL = "jdbc:postgresql://localhost:5436/siprp"; //real String User = "postgres"; String Pass = null; Connection connection = null; diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/Dblocal.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/Dblocal.java index 01b72382..64b8fd80 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/db/Dblocal.java +++ b/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://localhost:5436/siprp_local_3"; + String connectionURL = "jdbc:postgresql://storage/siprp_local"; //testes + //String connectionURL = "jdbc:postgresql://localhost:5436/siprp_local_3"; String User = "postgres"; String Pass = null; Connection connection = null; diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java b/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java index 03b6915b..860bab09 100755 --- a/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java +++ b/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(); + } + + } } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/utils/JSFUtils.java b/trunk/AnaliseAcidentesTrabalho/src/java/utils/JSFUtils.java new file mode 100644 index 00000000..c3e4cb95 --- /dev/null +++ b/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; + } + + +} diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java b/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java index 41576f84..6ff0fdb7 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java +++ b/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( "ù", "ù" ); + output = output.replaceAll( "ú", "ú" ); + output = output.replaceAll( "û", "û" ); + + return output; + } + public static String getPageFrom(String referer) { String pageFrom = referer.substring(referer.lastIndexOf("/")+1); diff --git a/trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp b/trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp new file mode 100644 index 00000000..ba3a8e13 --- /dev/null +++ b/trunk/AnaliseAcidentesTrabalho/web/Acesso.jsp @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp index b195b1ab..41bb50a2 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp @@ -130,23 +130,25 @@ styleClass="centerBlock" width="456"> - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -167,7 +169,7 @@ - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp b/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp index 6c5e59b1..94f35e4c 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp @@ -28,24 +28,26 @@ style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp index 2e6b390c..e36c6518 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp @@ -48,27 +48,29 @@ style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp index 283899d3..593c0ded 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp @@ -28,24 +28,25 @@ style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp index 69adf5f4..d60ebe0e 100755 --- a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp @@ -28,23 +28,25 @@ style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp index b2f87812..da883181 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp @@ -28,24 +28,25 @@ style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp index 2350a895..14070e5c 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp @@ -28,24 +28,25 @@ style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp index d952f289..23e5bb05 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp @@ -28,24 +28,25 @@ style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp index 12d75930..68344c67 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp @@ -29,24 +29,25 @@ style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp b/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp index 87041ccd..9df9b2c6 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp @@ -44,25 +44,28 @@ id="gridPanel1" style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/Header.jspf b/trunk/AnaliseAcidentesTrabalho/web/Header.jspf index e3793e85..86d48d27 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/Header.jspf +++ b/trunk/AnaliseAcidentesTrabalho/web/Header.jspf @@ -1,8 +1,30 @@
- - + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp index 3395b0fa..5bb34507 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp +++ b/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"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -164,6 +176,16 @@ style="height: 24px; width: 240px" text="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Respons&aacute;vel de loja&nbsp;"/> + + + + + + + + @@ -205,10 +227,11 @@ - + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp b/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp index 9dd6586a..5d3e8633 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp +++ b/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"> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp index 568c661a..c6c28752 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp @@ -45,24 +45,26 @@ styleClass="centerBlock" width="456"> - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -85,7 +87,7 @@ - + --> - + + Acesso + analiseacidentestrabalho.Acesso + request + diff --git a/trunk/AnaliseAcidentesTrabalho/web/WEB-INF/navigation.xml b/trunk/AnaliseAcidentesTrabalho/web/WEB-INF/navigation.xml index b034d40b..5266d92b 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/WEB-INF/navigation.xml +++ b/trunk/AnaliseAcidentesTrabalho/web/WEB-INF/navigation.xml @@ -12,6 +12,10 @@ erro /Erro.jsp + + acesso + /Acesso.jsp + form_seguranca /FormSeguranca.jsp @@ -413,4 +417,27 @@ /Login.jsp + + /Acesso.jsp + + gestor + /FormGestor.jsp + + + form_hs + /FormHS.jsp + + + form_seguranca + /FormSeguranca.jsp + + + form_dir_siprp + /FormDirSiprp.jsp + + + login + /Login.jsp + + diff --git a/trunk/AnaliseAcidentesTrabalho/web/WEB-INF/web.xml b/trunk/AnaliseAcidentesTrabalho/web/WEB-INF/web.xml index b23abf6d..cd61087f 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/WEB-INF/web.xml +++ b/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. - sizeThreshold4096UploadFilterFaces ServletFaces Servletjavax.faces.webapp.FacesServlet 1 ExceptionHandlerServletcom.sun.errorhandler.ExceptionHandlererrorHostlocalhosterrorPort24444ThemeServletcom.sun.rave.web.ui.theme.ThemeServletFaces Servlet/faces/*ExceptionHandlerServlet/error/ExceptionHandlerThemeServlet/theme/* + sizeThreshold4096UploadFilterFaces ServletFaces Servletjavax.faces.webapp.FacesServlet 1 ExceptionHandlerServletcom.sun.errorhandler.ExceptionHandlererrorHostlocalhosterrorPort24444ThemeServletcom.sun.rave.web.ui.theme.ThemeServletFaces Servlet/faces/*ExceptionHandlerServlet/error/ExceptionHandlerThemeServlet/theme/* + faces/Login.jsp javax.servlet.ServletException/error/ExceptionHandlerjava.io.IOException/error/ExceptionHandlerjavax.faces.FacesException/error/ExceptionHandlercom.sun.rave.web.ui.appbase.ApplicationException/error/ExceptionHandler*.jspftrue diff --git a/trunk/AnaliseAcidentesTrabalho/web/resources/images/Logo_Auchan_novo.jpg b/trunk/AnaliseAcidentesTrabalho/web/resources/images/Logo_Auchan_novo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1b79d4cbe81d101944a4882290d38748292a709b GIT binary patch literal 3225 zcmb7`c{J2*8^?cRj3uE#WM3j?EKhh4Q%J;&$2QgsCA*XB_UB3ricWEuO6 zokGS^_BCZlmh7@*%{!g*p7Wmf{qOyrbKmzL-|PFi&i&7QU&mv|Q@|(C@a zGP=U(@{#)@&B(Pk%he$_U@~#hQery|J{YHnH0j^>{zbK^pq*PKFb0Fhw}l(eXqRhG zfjZ#?a^Na-9{dD-lE0j*U;nre-J$nP_<{_tHLKoxJoF@KlIw zw2``;5H@;67c0MA2WQr2yOqvbU#GkZxpc$&>&HSYo6$qiCQnCOrm}6(zjS zH~4p(B;SwW@O=>l+hLM04?;K0^lW+ZDH49!GD&hzBQ(=EV?<~4aA4_Z?igr`mgz({ zDL!-*gc0Yg>z>}NaxRWBsx(BZy5}8s&(AV0F8l3@47)mkglwBETR0$wjV8uP4yFs60?bAjdZYLI2n7S*M;f8 zBh0!m{SIlGYR(vr06&GjKKZ*}D+wx=Znfhw;hy%C9m-JN(sq{A^Wro`vA(GQ+wU7T zkGPE(r|f@DyA(J3bWT(~on=ds&MWY6Gu$DYu;y*dZ&7^n@5sG(wtOXlySdZxIz(=` z4PVV+;cIef8YNvI!?=POP(ami7ibG|lY~XlWA7#{^ zmzF*;uP@7Af!v_ae=R@z^@iYTfBEF?W*z@y0Q+{RO`EWdKhP-byjON%V$YhY2#Ipv zX=rNsxY)B7tez%fIgpS&3zulK3oc=W2Gk5(-OY5^a6NB;ZtyhmRPu7yU3B!xJ59mr zZ~}g*k8dne81N2{YL{B0GS{71*}v*d{9wN0eH`p=SY5Ve^{wI?QeKL7$WL_IdCtHZ zaNxU1@Ftn)MF)-vuV~cyT6+wkfe9Lh^=TT*mzv+WV zNVNIcJZ14C4r#0^O-12R=n8u>3?(zPPm!07deZ$WrlFfZ1;ntLoNUX!Sagq(gij-= z75{TCIpH!csJrCD)9caW6XD*9@hytg>go5iud1uHeWOoPl_k>RDofTg9_cg0mTVt> z_cEhg(u-1k9=6s+aBa!Bv!1yE$|7dZ^sYJD3aq`FX<4-#wjS(noXkyAehaGM@xR$l z=lVPMyr(HVSxS=;64-lzl8|_3vnzgfuI>eI4{o4t^iWy^bAnEUs9ZI01c=|I^_K(J zOq*L@YUs?sF(F|w?oEs7Cuz`6lRaA(Hm>&s@o@P@sf?4Hr<`2X7xJw=E_IoViH_8A z4utNoP;>HA<(+uwzJ20>7NvR6;RmA{CEk_z1f}JW4o4$;iLi5Kgk5)GtZaLV8)hJ1 z-}Jr?oj~oXA`LrR`MxpEQ}dd$_vUx|Ku|BAh>KND;;-Q31Y#u%3iw9*V(fG^@Kqm) zn&E%1%8hzn$Pz;hHVSNHf7_eUzHXw3X&s{$S=9hr>*Ni9d%Cg*Ci zBD5qze+_Re?klNPpaMi3=RU7=KcHcD&ECm(#UBH)I`NMu0>%gPC(P~8!H1(l;)#gwSB;Cuci*Mg6$V{a)xz^1RfL6IQlmu7e7xnR zzIa`Gr~x*rD@I;O2&=%( z?nW-g(`qnO=rI4?{fO}VjEcy8<=kp&&#?d87^9kc<>nh|XAk0_;LUK5+DdtwX2#Fm zKzggcFs4h7+im6kN0sJD|3j1F$1Y?Yjd+^>nrZ1z;xAcyWT;%iwHYUS<#BSig~Q#L zs?H$g^Ii*4lKUp3E9m5FKho#<>M*!qMOPI~{UlC`Tm|{3e=M=P4v61*bF1fEq zLrRZT>puzcF#>LV6P!eXS{5I|M87>?f89gPm+SR4m>TU~8Zzbr)o9c0W{rt*HM$by zGWS1>r3_5(O&aI%t~6nf0S&gVB`H@@XX4LqSLiqyyo_*hUeVilZ&A3=Y|cYp|MaK% z_D=HcgAhA{Cwp}F-Jz}LN**Nx2`R?J@1PE_aRLVeQTQIwQ4W8yunnodKK)jF3s;-N zh#7ZY%y)Am$lq@IBIsLwZOtwXt-qpsuSnRt|tIyLgiEHvh$R8XVJx_LvOpY$JrqJDIRvdD3zQEoteTY(=vs@2pjP+fzUR~Xs zMfS^neActZi0ZaKxYsn&Ymtw^oa{;#uFj)yA<(ULjBoeJerU?h(rBBe5#Ls1M;yOW zWL<6+x)XLpwN6)w-`Wvtmn)B}UMwr4busYzr-FH+tL_v%pEo`4J3GEa>1mm$ltkd$ z8onaps1A#a}j9fU=3uA($q67+R+WNp*L#@<&jKO$UQCQG|bf|#9_9sM+(j3Z5^Y_plR9=t{vJ$hedR zoMF=C?Z5i+9#Il`UNiyb&qhZokIY*zZ5t;E+p#mNm4TU)b47#J?P^_oK?xya!M44! z*jkkb#LU_oVgHOwMJ-PdRqJ`C`y{pERC}Y&9>UrqzC1-f+Jy569fgog1_bkBwMs9& zla@U~JZ)O^eq%qarnI}O@jm3t569a}iRlvyF!V3O<;~9d+kd{uu5?btd#5(3t_aK9 zWX{cpNE_T2yn~=M*qzfmJ@6Fw+$uC)H(H~7KaqXw3sz7&)cG;_54fra^MARBu|b5fEg0$qLMW%RkNrC@{SCy z(xJu(549GcIXT$pJrXqz@j06T>ik7DU28}**km^xW>_xP1&4BL(}!JgS_hiwwA-z! zweHm%Q}DkOuRtC3@f-}o&?)m5d6`Iw{jYWGEFCM?%+*EKJbBKE>_ld_1s6c%4WWD3 z9L2JQ@Hxt2f`{gt7%lFs-r^{jcs++*vk?31!$ODe%jx$HZ@t`jHv1gITGh8jip-EO zVGtWP*X#@W}EK8;&*^ zcSQ6p^r$dHdn2j6xr{6xK!A*}+O|cLa!CJ9mPV5mvI@C;HcNb`^reotVV7I3*^p#I zMG6}qkQK5W8a=5Ozu#W+GZurdDq6#2UyDvQ44>=vUbB83YzVg;h|kF&HZE*z&ymOv z?e