07/01/2009

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

trunk/PlanosActuacao/src/java/SIPRPNode.driver.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <driver project-version="3.0" class="org.postgresql.Driver">
 	<!-- <url value="jdbc:postgresql://storage:5432/siprp_local"/> -->
-	<url value="jdbc:postgresql://localhost:5436/siprp_local_3"/>       
+	<url value="jdbc:postgresql://localhost:5436/siprp_local_3"/>
 	<connectionPool min="1" max="1"/>
 	<login userName="postgres" password=""/>
 </driver>

trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java

@@ -446,7 +446,7 @@ public class PlanosDataProvider extends GenericDataProvider{
                 sql += "WHERE fase > 1 AND fase < 6";                
                 break;                
         }        
-        if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS)
+        if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA)
         {
             sql += " and estabelecimento_id = " + u.getEstabelecimento_id();            
         }
@@ -461,7 +461,7 @@ public class PlanosDataProvider extends GenericDataProvider{
         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)
+        if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA)
         {
             sql += " and estabelecimento_id = " + u.getEstabelecimento_id();            
         }