diff --git a/trunk/PlanosActuacao/nbproject/faces-config.NavData b/trunk/PlanosActuacao/nbproject/faces-config.NavData index 1468899f..365f6c28 100644 --- a/trunk/PlanosActuacao/nbproject/faces-config.NavData +++ b/trunk/PlanosActuacao/nbproject/faces-config.NavData @@ -3,8 +3,8 @@ - + diff --git a/trunk/PlanosActuacao/nbproject/genfiles.properties b/trunk/PlanosActuacao/nbproject/genfiles.properties index 58dcac6a..5ebd09d7 100644 --- a/trunk/PlanosActuacao/nbproject/genfiles.properties +++ b/trunk/PlanosActuacao/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=3084e562 +build.xml.data.CRC32=d2600779 build.xml.script.CRC32=fa3993b7 build.xml.stylesheet.CRC32=cfd7ba16 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=3084e562 +nbproject/build-impl.xml.data.CRC32=d2600779 nbproject/build-impl.xml.script.CRC32=db27eab1 nbproject/build-impl.xml.stylesheet.CRC32=8926891b diff --git a/trunk/PlanosActuacao/nbproject/project.xml b/trunk/PlanosActuacao/nbproject/project.xml index 448beb30..0f39e574 100644 --- a/trunk/PlanosActuacao/nbproject/project.xml +++ b/trunk/PlanosActuacao/nbproject/project.xml @@ -2,7 +2,7 @@ org.netbeans.modules.web.project - + PlanosActuacao 1.6 diff --git a/trunk/PlanosActuacao/src/java/db/Db.java b/trunk/PlanosActuacao/src/java/db/Db.java index 93ba3eb9..86267a6f 100644 --- a/trunk/PlanosActuacao/src/java/db/Db.java +++ b/trunk/PlanosActuacao/src/java/db/Db.java @@ -17,8 +17,9 @@ 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/PlanosActuacao/src/java/db/Dblocal.java b/trunk/PlanosActuacao/src/java/db/Dblocal.java index 64b8fd80..5516dc26 100644 --- a/trunk/PlanosActuacao/src/java/db/Dblocal.java +++ b/trunk/PlanosActuacao/src/java/db/Dblocal.java @@ -21,8 +21,9 @@ 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/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java index 424800b0..b68fb7cb 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java @@ -334,6 +334,11 @@ public class PlanosDataProvider extends GenericDataProvider{ sql += "WHERE fase = 4"; break; } + if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS) + { + sql += " and estabelecimento_id = " + u.getEstabelecimento_id(); + } + ResultSet rs = st.executeQuery(sql); ArrayList list = getFullPlanos(rs); @@ -370,16 +375,26 @@ public class PlanosDataProvider extends GenericDataProvider{ sql += "WHERE fase > 1 AND fase < 6"; break; } - + if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS) + { + sql += " and estabelecimento_id = " + u.getEstabelecimento_id(); + } + ResultSet rs = st.executeQuery(sql); ArrayList list = getFullPlanos(rs); return list; } - public ArrayList getPlanosConcluidos() throws Exception + public ArrayList getPlanosConcluidos(Utilizador u) throws Exception { + int userType = u.getTipo().intValue(); Statement st = createStatement(); String sql = "select * from planos_actuacao where fase = 6"; + if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS) + { + sql += " and estabelecimento_id = " + u.getEstabelecimento_id(); + } + ResultSet rs = st.executeQuery(sql); ArrayList list = getFullPlanos(rs); return list; diff --git a/trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java b/trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java index 500d5a84..04efe3ed 100644 --- a/trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java +++ b/trunk/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java @@ -26,11 +26,11 @@ public class MainPhaseListener implements PhaseListener{ private boolean firstEntry = true; public void afterPhase(PhaseEvent pe) { -// if(pe.getPhaseId() == PhaseId.RENDER_RESPONSE) -// { -// FacesContext fc = pe.getFacesContext(); + if(pe.getPhaseId() == PhaseId.RENDER_RESPONSE) + { + FacesContext fc = pe.getFacesContext(); // SessionBean1 session = JSFUtils.getSessionBean(fc); -// String view = fc.getViewRoot().getViewId(); + String view = fc.getViewRoot().getViewId(); // if(view.matches("/EditarPlano.jsp")) // { // session.setDisableMenu(true); @@ -39,8 +39,8 @@ public class MainPhaseListener implements PhaseListener{ // { // session.setDisableMenu(false); // } -// System.out.println("VIEW : " + view); -// } + System.out.println("RENDER RESPONSE VIEW : " + view); + } } public void beforePhase(PhaseEvent pe) { @@ -52,11 +52,15 @@ public class MainPhaseListener implements PhaseListener{ System.out.println("REFERER >>" + referer + "<<"); //check if comes from AnalisesAcidentes. If so, set loggedIn to true: - if(referer.indexOf("AnaliseAcidentes") != -1) + if(referer != null) { - session.setLoggedIn(true); - String user = JSFUtils.getRequestParameter(fc, "user"); - System.out.println("USER >" + user.toString() + "<"); + if(referer.indexOf("AnaliseAcidentes") != -1) + { + session.setLoggedIn(true); + String user = JSFUtils.getRequestParameter(fc, "user"); + System.out.println("USER >" + user.toString() + "<"); + } + } @@ -89,7 +93,7 @@ public class MainPhaseListener implements PhaseListener{ } catch(Exception ex) { - + ex.printStackTrace(); } } diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/Dummy.java b/trunk/PlanosActuacao/src/java/planosactuacao/Dummy.java index b0c76163..0b869dc7 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/Dummy.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/Dummy.java @@ -8,6 +8,7 @@ package planosactuacao; import com.sun.rave.web.ui.appbase.AbstractPageBean; +import com.sun.webui.jsf.model.DefaultTableDataProvider; import db.entidades.Utilizador; import db.providers.UtilizadoresDataProvider; import java.sql.Connection; @@ -35,6 +36,15 @@ public class Dummy extends AbstractPageBean { */ private void _init() throws Exception { } + private DefaultTableDataProvider defaultTableDataProvider = new DefaultTableDataProvider(); + + public DefaultTableDataProvider getDefaultTableDataProvider() { + return defaultTableDataProvider; + } + + public void setDefaultTableDataProvider(DefaultTableDataProvider dtdp) { + this.defaultTableDataProvider = dtdp; + } // diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java index f9c91b7e..6f43ebf4 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java @@ -332,7 +332,7 @@ public class ListaPlanos extends AbstractPageBean { List listPlanosSeguimento = planos.getPlanosSeguimento(u); getSessionBean1().getPlanosSeguimentoDataProvider().setList(listPlanosSeguimento); - List listPlanosConcluidos = planos.getPlanosConcluidos(); + List listPlanosConcluidos = planos.getPlanosConcluidos(u); getSessionBean1().getPlanosConcluidosDataProvider().setList(listPlanosConcluidos); //checkPlanosDelayed(); diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java index 5732e6d8..378bc3a5 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java @@ -233,12 +233,12 @@ public class PlanosActuacao { return list; } - public List getPlanosConcluidos() + public List getPlanosConcluidos(Utilizador u) { ArrayList list = new ArrayList(); try { - list = pdp.getPlanosConcluidos(); + list = pdp.getPlanosConcluidos(u); } catch(Exception ex) { diff --git a/trunk/PlanosActuacao/web/Dummy.jsp b/trunk/PlanosActuacao/web/Dummy.jsp index 9b12d694..ab6588f9 100644 --- a/trunk/PlanosActuacao/web/Dummy.jsp +++ b/trunk/PlanosActuacao/web/Dummy.jsp @@ -36,6 +36,19 @@ + + + + + + + + + + + + + diff --git a/trunk/PlanosActuacao/web/ListaPlanos.jsp b/trunk/PlanosActuacao/web/ListaPlanos.jsp index b0d0cd44..bf6937d4 100644 --- a/trunk/PlanosActuacao/web/ListaPlanos.jsp +++ b/trunk/PlanosActuacao/web/ListaPlanos.jsp @@ -6,7 +6,7 @@ --> - + diff --git a/trunk/PlanosActuacao/web/WEB-INF/web.xml b/trunk/PlanosActuacao/web/WEB-INF/web.xml index e90a22d0..b0cec922 100644 --- a/trunk/PlanosActuacao/web/WEB-INF/web.xml +++ b/trunk/PlanosActuacao/web/WEB-INF/web.xml @@ -71,7 +71,7 @@ 30 - faces/Dummy.jsp + faces/ListaPlanos.jsp javax.servlet.ServletException