From 491697f47c9a3a73fa13e3ddee306754837f87af Mon Sep 17 00:00:00 2001
From: Diogo Neves <deactivated@coded.pt>
Date: Mon, 30 Aug 2010 08:49:46 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1442
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../java/db/providers/PlanosDataProvider.java | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
index e603e72f..42519ad3 100644
--- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
+++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
@@ -491,19 +491,19 @@ public class PlanosDataProvider extends GenericDataProvider{
 		switch ( userType )
         {
             case Global.TECNICO_HS:
-                sql += "(fase = 1 OR fase = 5)";
+                sql += " AND (fase = 1 OR fase = 5)";
                 break;
 
             case Global.RESPONSAVEL_SEGURANCA:
-                sql += "fase = 2";
+                sql += " AND fase = 2";
                 break;
 
             case Global.DIRECTOR_LOJA:
-                sql += "fase = 3";
+                sql += " AND fase = 3";
                 break;
 
             case Global.DIRECTOR_NACIONAL_SEGURANCA:
-                sql += "fase = 4";
+                sql += " AND fase = 4";
                 break;
         }
         if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA )
@@ -520,7 +520,8 @@ public class PlanosDataProvider extends GenericDataProvider{
 	{
         Statement st = createStatement();
         String sql = getExpression( nome, estabelecimento, dataVisita );
-		sql += " AND " + getFaseActivos( u );
+//		sql += " AND " + getFaseActivos( u );
+		sql += getFaseActivos( u );
 
 		System.out.println( "SEARCH ACTIVOS" );
 		System.out.println( "SQL: " + sql );
@@ -576,22 +577,22 @@ public class PlanosDataProvider extends GenericDataProvider{
 		switch( userType )
         {
             case Global.TECNICO_HS:
-                sql = "(fase <> 1 AND fase <> 5 AND fase <> 6)";
+                sql = " AND (fase <> 1 AND fase <> 5 AND fase <> 6) ";
 				break;
             case Global.RESPONSAVEL_SEGURANCA:
-                sql = "(fase <> 2 AND fase <> 6)";
+                sql = " AND (fase <> 2 AND fase <> 6) ";
 				break;
             case Global.DIRECTOR_LOJA:
-                sql = "(fase <> 3 AND fase <> 6)";
+                sql = " AND (fase <> 3 AND fase <> 6) ";
 				break;
             case Global.DIRECTOR_NACIONAL_SEGURANCA:
-                sql = "(fase <> 4 AND fase <> 6)";
+                sql = " AND (fase <> 4 AND fase <> 6) ";
 				break;
             case Global.DIRECTOR_SIPRP:
             case Global.RH:
             case Global.DIRECTOR_GERAL_RH:
             case Global.GESTOR:
-                sql = "(fase > 1 AND fase < 6)";
+                sql = " AND (fase > 1 AND fase < 6) ";
 				break;
 			default:
 				break;
@@ -619,7 +620,7 @@ public class PlanosDataProvider extends GenericDataProvider{
 		Statement st = createStatement();
 
 		String sql = getExpression( nome, estabelecimento, dataVisita );
-		sql += " AND " + getFaseSeguimento( u );
+		sql += getFaseSeguimento( u );
 
 		System.out.println( "SEARCH SEGUIMENTO" );
 		System.out.println( "SQL: " + sql );
@@ -693,7 +694,7 @@ public class PlanosDataProvider extends GenericDataProvider{
 	private String getFaseConcluidos( Utilizador u )
 	{
 		int userType = u.getTipo().intValue();
-		String sql = "fase = 6";
+		String sql = " AND fase = 6 ";
 
 		if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS
 			&& userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH )
@@ -708,7 +709,7 @@ public class PlanosDataProvider extends GenericDataProvider{
 		throws Exception
 	{
 		String sql = getExpression( nome, estabelecimento, dataVisita );
-		sql += " AND " + getFaseConcluidos( u );
+		sql += getFaseConcluidos( u );
 
 		System.out.println( "SEARCH CONCLUIDOS" );
 		System.out.println( "SQL: " + sql );