filtros nas listagens; envio de emails - nao testei, mas deve funcionar.

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

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

@@ -5,6 +5,7 @@
 
 package db.providers;
 
+import com.evolute.utils.strings.StringPlainer;
 import db.entidades.Area;
 import db.entidades.EstadoMedida;
 import db.entidades.Medida;
@@ -424,119 +425,285 @@ public class PlanosDataProvider extends GenericDataProvider{
 //        return list;
 //    }
 
-    public ArrayList getPlanosActivos(Utilizador u) throws Exception
+
+	public String getExpression( String nome, String estabelecimento, String dataVisita )
 	{
-        int userType = u.getTipo().intValue();
+		String tables = "planos_actuacao";
-        Statement st = createStatement();
+		String whereExpression = "planos_actuacao.deleted_date IS NULL ";
-        String sql = "select * from planos_actuacao ";
+
+		if ( nome != null )
+		{
+			nome = StringPlainer.convertString( nome.trim() );
+			nome = nome.replaceAll( " ", "%" );
+			whereExpression += "AND plain_utf8( planos_actuacao.tecnico_hs_nome ) LIKE '%" + nome + "%' ";
+		}
+		if ( estabelecimento != null )
+		{
+			estabelecimento = StringPlainer.convertString( estabelecimento.trim() );
+			estabelecimento = estabelecimento.replaceAll( " ", "%" );
+			whereExpression += "AND plain_utf8( planos_actuacao.nome_estabelecimento ) LIKE '%" + estabelecimento + "%' ";
+		}
+		if ( dataVisita != null )
+		{
+			whereExpression += "AND planos_actuacao.data_visita = '" + dataVisita + "' ";
+		}
+
+		return "SELECT * FROM " + tables + " WHERE " + whereExpression;
+	}
+
+
 
+	private String getFaseActivos( Utilizador u )
+	{
+		String sql = "";
+		int userType = u.getTipo().intValue();
 		switch ( userType )
         {
             case Global.TECNICO_HS:
-                sql += "WHERE fase = 1 OR fase = 5";
+                sql += "(fase = 1 OR fase = 5)";
                 break;
 
             case Global.RESPONSAVEL_SEGURANCA:
-                sql += "WHERE fase = 2";                
+                sql += "fase = 2";
                 break;
 
             case Global.DIRECTOR_LOJA:
-                sql += "WHERE fase = 3";                
+                sql += "fase = 3";
                 break;
 
             case Global.DIRECTOR_NACIONAL_SEGURANCA:
-                sql += "WHERE fase = 4";                
+                sql += "fase = 4";
                 break;
         }
         if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA )
         {
-            sql += " and estabelecimento_id = " + u.getEstabelecimento_id();            
+            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
         }
-        sql += " and deleted_date is null";
 
-        ResultSet rs = st.executeQuery(sql);
+		return sql;
-        ArrayList list = getFullPlanos(rs);
-
-        return list;
 	}
 
-    public ArrayList getPlanosSeguimento(Utilizador u) throws Exception
+
+	public List< PlanoActuacao > searchPlanosActivos( Utilizador u, String nome, String estabelecimento, String dataVisita )
+		throws Exception
 	{
         Statement st = createStatement();
-        int userType = u.getTipo().intValue();
+        String sql = getExpression( nome, estabelecimento, dataVisita );
+		sql += " AND " + getFaseActivos( u );
+
+		System.out.println( "SEARCH ACTIVOS" );
+		System.out.println( "SQL: " + sql );
+
+		ResultSet rs = st.executeQuery(sql);
+		List< PlanoActuacao > list = getFullPlanos( rs );
+		return list;
+	}
+
+//    public ArrayList getPlanosActivos(Utilizador u) throws Exception
+//    {
+//		Statement st = createStatement();
+//        int userType = u.getTipo().intValue();
+//        Statement st = createStatement();
+//        String sql = "select * from planos_actuacao WHERE ";
+//
+//        switch(userType)
+//        {
+//            case Global.TECNICO_HS:
+//                sql += "fase = 1 OR fase = 5";
+//                break;
+//
+//            case Global.RESPONSAVEL_SEGURANCA:
+//                sql += "fase = 2";
+//                break;
+//
+//            case Global.DIRECTOR_LOJA:
+//                sql += "fase = 3";
+//                break;
+//
+//            case Global.DIRECTOR_NACIONAL_SEGURANCA:
+//                sql += "fase = 4";
+//                break;
+//        }
+//        if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA )
+//        {
+//            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
+//        }
+//        sql += " AND deleted_date IS NULL";
+//      
+//        ResultSet rs = st.executeQuery(sql);
+//        ArrayList list = getFullPlanos(rs);
+//
+//        return list;
+//    }
+
 
-        String sql = "select * from planos_actuacao ";
 
+	private String getFaseSeguimento( Utilizador u )
+	{
+		int userType = u.getTipo();
+		String sql = "";
 		switch( userType )
         {
             case Global.TECNICO_HS:
-                sql += "WHERE fase <> 1 AND fase <> 5 AND fase <> 6";
+                sql = "(fase <> 1 AND fase <> 5 AND fase <> 6)";
 				break;
-            
             case Global.RESPONSAVEL_SEGURANCA:
-                sql += "WHERE fase <> 2 AND fase <> 6";                
+                sql = "(fase <> 2 AND fase <> 6)";
 				break;
-                
             case Global.DIRECTOR_LOJA:
-                sql += "WHERE fase <> 3 AND fase <> 6";                
+                sql = "(fase <> 3 AND fase <> 6)";
 				break;
-                
             case Global.DIRECTOR_NACIONAL_SEGURANCA:
-                sql += "WHERE fase <> 4 AND fase <> 6";                
+                sql = "(fase <> 4 AND fase <> 6)";
 				break;
-                
             case Global.DIRECTOR_SIPRP:
-                sql += "WHERE fase > 1 AND fase < 6";                
-                break;   
-            
             case Global.RH:
-                sql += "WHERE fase > 1 AND fase < 6";                
-                break;
-
             case Global.DIRECTOR_GERAL_RH:
-                sql += "WHERE fase > 1 AND fase < 6";
-                break;
-
             case Global.GESTOR:
-                sql += "WHERE fase > 1 AND fase < 6";
+                sql = "(fase > 1 AND fase < 6)";
+				break;
+			default:
 				break;
         }
-        if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH && userType != Global.GESTOR)
+
+		if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS
+			&& userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH
+			&& userType != Global.GESTOR )
         {
-            sql += " and estabelecimento_id = " + u.getEstabelecimento_id();            
+            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
         }
-
-        //System.out.println("USER ESTABELECIMENTO GESTOR : " + u.getEstabelecimento_gestor().intValue());
 		if ( userType == Global.GESTOR )
         {
             if ( u.getEstabelecimento_gestor().intValue() > 0 )
             {
-                sql += " and estabelecimento_id = " + u.getEstabelecimento_gestor();
+                sql += " AND estabelecimento_id = " + u.getEstabelecimento_gestor();
+            }
         }
+		return sql;
 	}
-         sql += " and deleted_date is null";
+	
-        System.out.println("PLANOS SEGUIMENTO SQL : " + sql);
+	public List< PlanoActuacao > searchPlanosSeguimento( Utilizador u, String nome, String estabelecimento, String dataVisita )
+		throws Exception
+	{
+		Statement st = createStatement();
+
+		String sql = getExpression( nome, estabelecimento, dataVisita );
+		sql += " AND " + getFaseSeguimento( u );
+
+		System.out.println( "SEARCH SEGUIMENTO" );
+		System.out.println( "SQL: " + sql );
+
 		ResultSet rs = st.executeQuery(sql);
         ArrayList list = getFullPlanos(rs);
         return list;
 	}
 
-    public ArrayList getPlanosConcluidos(Utilizador u) throws Exception
+//    public ArrayList getPlanosSeguimento(Utilizador u) throws Exception
+//    {
+//        Statement st = createStatement();
+//
+//        String sql = "select * from planos_actuacao ";
+//        switch(userType)
+//        {
+//            case Global.TECNICO_HS:
+//                sql += "WHERE fase <> 1 AND fase <> 5 AND fase <> 6";
+//                break;
+//
+//            case Global.RESPONSAVEL_SEGURANCA:
+//                sql += "WHERE fase <> 2 AND fase <> 6";
+//                break;
+//
+//            case Global.DIRECTOR_LOJA:
+//                sql += "WHERE fase <> 3 AND fase <> 6";
+//                break;
+//
+//            case Global.DIRECTOR_NACIONAL_SEGURANCA:
+//                sql += "WHERE fase <> 4 AND fase <> 6";
+//                break;
+//
+//            case Global.DIRECTOR_SIPRP:
+//                sql += "WHERE fase > 1 AND fase < 6";
+//                break;
+//
+//            case Global.RH:
+//                sql += "WHERE fase > 1 AND fase < 6";
+//                break;
+//
+//            case Global.DIRECTOR_GERAL_RH:
+//                sql += "WHERE fase > 1 AND fase < 6";
+//                break;
+//
+//            case Global.GESTOR:
+//                sql += "WHERE fase > 1 AND fase < 6";
+//                break;
+//        }
+//        if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH && userType != Global.GESTOR)
+//        {
+//            sql += " and estabelecimento_id = " + u.getEstabelecimento_id();
+//        }
+//
+//        //System.out.println("USER ESTABELECIMENTO GESTOR : " + u.getEstabelecimento_gestor().intValue());
+//        if(userType == Global.GESTOR)
+//        {
+//            if(u.getEstabelecimento_gestor().intValue() > 0)
+//            {
+//                sql += " and estabelecimento_id = " + u.getEstabelecimento_gestor();
+//            }
+//        }
+//        sql += " and deleted_date is null";
+//
+//        System.out.println("PLANOS SEGUIMENTO SQL : " + sql);
+//        ResultSet rs = st.executeQuery(sql);
+//        ArrayList list = getFullPlanos(rs);
+//        return list;
+//    }
+
+
+	private String getFaseConcluidos( Utilizador u )
 	{
 		int userType = u.getTipo().intValue();
-        Statement st = createStatement();
+		String sql = "fase = 6";
-        String sql = "select * from planos_actuacao where fase = 6";
+
-        if(userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS && userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH)
+		if ( userType != Global.DIRECTOR_SIPRP && userType != Global.TECNICO_HS
+			&& userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH )
         {
-            sql += " and estabelecimento_id = " + u.getEstabelecimento_id();            
+            sql += " AND estabelecimento_id = " + u.getEstabelecimento_id();
         }
-         sql += " and deleted_date is null";
+
-        System.out.println("PLANOS CONCLUIDOS SQL : " + sql);
+		return sql;
+	}
+
+    public List< PlanoActuacao > searchPlanosConcluidos( Utilizador u, String nome, String estabelecimento, String dataVisita )
+		throws Exception
+	{
+		String sql = getExpression( nome, estabelecimento, dataVisita );
+		sql += " AND " + getFaseConcluidos( u );
+
+		System.out.println( "SEARCH CONCLUIDOS" );
+		System.out.println( "SQL: " + sql );
+
+		Statement st = createStatement();
 		ResultSet rs = st.executeQuery( sql );
-        ArrayList list = getFullPlanos(rs);
+		ArrayList< PlanoActuacao > list = getFullPlanos( rs );
 		return list;
 	}
 
+//    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 && userType != Global.DIRECTOR_NACIONAL_SEGURANCA && userType != Global.DIRECTOR_GERAL_RH)
+//        {
+//            sql += " and estabelecimento_id = " + u.getEstabelecimento_id();
+//        }
+//         sql += " and deleted_date is null";
+//        System.out.println("PLANOS CONCLUIDOS SQL : " + sql);
+//        ResultSet rs = st.executeQuery(sql);
+//        ArrayList list = getFullPlanos(rs);
+//        return list;
+//    }
+    
     private ArrayList getFullPlanos(ResultSet rs) throws Exception
     {
         ArrayList list = new ArrayList();

trunk/PlanosActuacao/src/java/mail/Mail.java

@@ -25,8 +25,13 @@ import javax.mail.internet.MimeMultipart;
  */
 public class Mail {
 
-private final static String SERVIDOR_SMTP = "mail2.evolute.pt";
+
-private final static String SERVIDOR_SMTP_PASSWORD = "EVOLUTE";    
+	private final static String SMTP_HOST = "mail2.evolute.pt";
+	private final static int SMTP_PORT = 587;
+
+	private final String mail_username = "acidentes.auchan@siprp.pt";
+	private final String mail_password = "47Ju6Vb";
+
 	public final static String ENDERECO_ENVIO = "planos.auchan@siprp.pt";
 	//public final static String ENDERECO_ENVIO = "lluis@evolute.pt";    //testes
 
@@ -35,14 +40,18 @@ public final static String ENDERECO_ENVIO = "planos.auchan@siprp.pt";
     {
         Properties props = new Properties(); 
         //props.put("mail.transport.protocol", "smtp"); 
-        props.put("mail.smtp.host", SERVIDOR_SMTP); 
+        props.put("mail.smtp.host", SMTP_HOST );
         props.put("mail.from", emailFrom );
         props.put("mail.smtp.auth", "true" );
-        props.put("mail.smtp.user", "lluis");
+		props.put("mail.smtp.user", mail_username );
-        props.put("mail.smtp.password", "654321");        
+        props.put("mail.smtp.password", mail_password );
-    //        Session session1 = Session.getInstance(props); 
+//        props.put("mail.smtp.user", "lluis");
-        Authenticator auth = new SMTPAuthenticator();   
+//        props.put("mail.smtp.password", "654321");
-        Session session = Session.getDefaultInstance(props, auth);         
+
+
+		Session session = Session.getInstance( props );
+//        Authenticator auth = new SMTPAuthenticator();
+//        Session session = Session.getDefaultInstance(props, auth);
 
         Message msg = new MimeMessage( session );
         msg.setFrom( new InternetAddress( emailFrom ) );
@@ -60,18 +69,26 @@ public final static String ENDERECO_ENVIO = "planos.auchan@siprp.pt";
         msgBodyPart.setContent(html, "text/html");
         multipart.addBodyPart(msgBodyPart);
         msg.setContent(multipart);
-        Transport.send(msg); 
-        System.out.println("Email Enviado !!!! ");         
 		
-    }    
+//        Transport.send(msg);
+		Transport t;
+		t = session.getTransport( "smtp" );
 
-     private class SMTPAuthenticator extends Authenticator {   
+		t.connect( SMTP_HOST, SMTP_PORT, mail_username, mail_password );
-         public PasswordAuthentication getPasswordAuthentication() {   
+		t.sendMessage( msg, msg.getAllRecipients() );
-         String username = "lluis";   
+
-         String password = "654321";   
+		t.close();
-         return new PasswordAuthentication(username, password);   
+        System.out.println("Email Enviado !!!! ");         
-     }    
 
     }    
+
+//     private class SMTPAuthenticator extends Authenticator {
+//         public PasswordAuthentication getPasswordAuthentication() {
+//         String username = "lluis";
+//         String password = "654321";
+//         return new PasswordAuthentication(username, password);
+//     }
+//
+//     }
 }
 

trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java

@@ -11,15 +11,20 @@ import com.evolute.utils.timer.Timer;
 import com.sun.data.provider.RowKey;
 import com.sun.rave.web.ui.appbase.AbstractPageBean;
 import com.sun.webui.jsf.component.Button;
+import com.sun.webui.jsf.component.PanelGroup;
+import com.sun.webui.jsf.component.StaticText;
 import com.sun.webui.jsf.component.Table;
 import com.sun.webui.jsf.component.TableColumn;
 import com.sun.webui.jsf.component.TableRowGroup;
+import com.sun.webui.jsf.component.TextField;
 import db.Dblocal;
 import db.entidades.PlanoActuacao;
 import db.providers.UtilizadoresDataProvider;
 import db.entidades.Utilizador;
 import db.providers.PlanosDataProvider;
 import global.Global;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -91,8 +96,7 @@ public class ListaPlanos extends AbstractPageBean {
         this.tableRowGroup3 = trg;
     }
 
-    // </editor-fold>
+
-     PlanosDataProvider pdp = new PlanosDataProvider();
     private HtmlPanelGrid gridActual = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridActual() {
@@ -148,6 +152,184 @@ public class ListaPlanos extends AbstractPageBean {
 		this.buttonDesactivarSeguimento = b;
 	}
 
+	private HtmlPanelGrid gridPanelFilterActual = new HtmlPanelGrid();
+	public HtmlPanelGrid getGridPanelFilterActual()
+	{
+		return this.gridPanelFilterActual;
+	}
+	public void setGridPanelFilterActual( HtmlPanelGrid pg )
+	{
+		this.gridPanelFilterActual = pg;
+	}
+
+	private PanelGroup groupPanelFilterActual = new PanelGroup();
+	public PanelGroup getGroupPanelFilterActual()
+	{
+		return this.groupPanelFilterActual;
+	}
+	public void setGroupPanelFilterActual( PanelGroup pg )
+	{
+		this.groupPanelFilterActual = pg;
+	}
+
+	private TextField textFilterNameActual = new TextField();
+	public TextField getTextFilterNameActual()
+	{
+		return this.textFilterNameActual;
+	}
+	public void setTextFilterNameActual( TextField tf )
+	{
+		this.textFilterNameActual = tf;
+	}
+
+	private TextField textFilterEstabelecimentoActual = new TextField();
+
+	public TextField getTextFilterEstabelecimentoActual() {
+		return textFilterEstabelecimentoActual;
+	}
+	public void setTextFilterEstabelecimentoActual(TextField textFilterEstabelecimentoActual) {
+		this.textFilterEstabelecimentoActual = textFilterEstabelecimentoActual;
+	}
+
+	private com.sun.webui.jsf.component.Calendar calFilterDateActual = new com.sun.webui.jsf.component.Calendar();
+	public com.sun.webui.jsf.component.Calendar getCalFilterDateActual() {
+		return calFilterDateActual;
+	}
+	public void setCalFilterDateActual(com.sun.webui.jsf.component.Calendar calFilterDateActual) {
+		this.calFilterDateActual = calFilterDateActual;
+	}
+	
+	private Button buttonFilterActual = new Button();
+	public Button getButtonFilterActual()
+	{
+		return this.buttonFilterActual;
+	}
+	public void setButtonFilterActual( Button b )
+	{
+		this.buttonFilterActual = b;
+	}
+
+
+
+	private HtmlPanelGrid gridPanelFilterSeg = new HtmlPanelGrid();
+	public HtmlPanelGrid getGridPanelFilterSeg()
+	{
+		return this.gridPanelFilterSeg;
+	}
+	public void setGridPanelFilterSeg( HtmlPanelGrid pg )
+	{
+		this.gridPanelFilterSeg = pg;
+	}
+
+	private PanelGroup groupPanelFilterSeg = new PanelGroup();
+	public PanelGroup getGroupPanelFilterSeg()
+	{
+		return this.groupPanelFilterSeg;
+	}
+	public void setGroupPanelFilterSeg( PanelGroup pg )
+	{
+		this.groupPanelFilterSeg = pg;
+	}
+
+	private TextField textFilterNameSeg = new TextField();
+	public TextField getTextFilterNameSeg()
+	{
+		return this.textFilterNameSeg;
+	}
+	public void setTextFilterNameSeg( TextField tf )
+	{
+		this.textFilterNameSeg = tf;
+	}
+
+	private TextField textFilterEstabelecimentoSeg = new TextField();
+
+	public TextField getTextFilterEstabelecimentoSeg() {
+		return textFilterEstabelecimentoSeg;
+	}
+	public void setTextFilterEstabelecimentoSeg(TextField textFilterEstabelecimentoSeg) {
+		this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg;
+	}
+
+	private com.sun.webui.jsf.component.Calendar calFilterDateSeg = new com.sun.webui.jsf.component.Calendar();
+	public com.sun.webui.jsf.component.Calendar getCalFilterDateSeg() {
+		return calFilterDateSeg;
+	}
+	public void setCalFilterDateSeg(com.sun.webui.jsf.component.Calendar calFilterDateSeg) {
+		this.calFilterDateSeg = calFilterDateSeg;
+	}
+
+	private Button buttonFilterSeg = new Button();
+	public Button getButtonFilterSeg()
+	{
+		return this.buttonFilterSeg;
+	}
+	public void setButtonFilterSeg( Button b )
+	{
+		this.buttonFilterSeg = b;
+	}
+
+
+	private HtmlPanelGrid gridPanelFilterConc = new HtmlPanelGrid();
+	public HtmlPanelGrid getGridPanelFilterConc()
+	{
+		return this.gridPanelFilterConc;
+	}
+	public void setGridPanelFilterConc( HtmlPanelGrid pg )
+	{
+		this.gridPanelFilterConc = pg;
+	}
+
+	private PanelGroup groupPanelFilterConc = new PanelGroup();
+	public PanelGroup getGroupPanelFilterConc()
+	{
+		return this.groupPanelFilterConc;
+	}
+	public void setGroupPanelFilterConc( PanelGroup pg )
+	{
+		this.groupPanelFilterConc = pg;
+	}
+
+	private TextField textFilterNameConc = new TextField();
+	public TextField getTextFilterNameConc()
+	{
+		return this.textFilterNameConc;
+	}
+	public void setTextFilterNameConc( TextField tf )
+	{
+		this.textFilterNameConc = tf;
+	}
+
+	private TextField textFilterEstabelecimentoConc = new TextField();
+
+	public TextField getTextFilterEstabelecimentoConc() {
+		return textFilterEstabelecimentoConc;
+	}
+	public void setTextFilterEstabelecimentoConc(TextField textFilterEstabelecimentoConc) {
+		this.textFilterEstabelecimentoConc = textFilterEstabelecimentoConc;
+	}
+
+	private com.sun.webui.jsf.component.Calendar calFilterDateConc = new com.sun.webui.jsf.component.Calendar();
+	public com.sun.webui.jsf.component.Calendar getCalFilterDateConc() {
+		return calFilterDateConc;
+	}
+	public void setCalFilterDateConc(com.sun.webui.jsf.component.Calendar calFilterDateConc) {
+		this.calFilterDateConc = calFilterDateConc;
+	}
+
+	private Button buttonFilterConc = new Button();
+	public Button getButtonFilterConc()
+	{
+		return this.buttonFilterConc;
+	}
+	public void setButtonFilterConc( Button b )
+	{
+		this.buttonFilterConc = b;
+	}
+
+	private static final DateFormat D_F = new SimpleDateFormat( "yyyy-MM-dd" );
+    // </editor-fold>
+
+	PlanosDataProvider pdp = new PlanosDataProvider();
 
     /**
      * <p>Construct a new Page bean instance.</p>
@@ -569,6 +751,14 @@ FacesContext context = FacesContext.getCurrentInstance();
         
         ////PlanosActuacao planos = new PlanosActuacao(u);
 
+
+
+		System.out.println( "INITIALIZE:" );
+
+		if ( ! getSessionBean1().getIsSearchingPlanosActuacao() )
+		{
+			System.out.println( "\tGETTING INITIAL VALUES FOR EACH TABLE." );
+			
 			List listPlanosActivos = getPlanosActivos(u);
 			getSessionBean1().getPlanosActualDataProvider().setList(listPlanosActivos);
 
@@ -577,7 +767,7 @@ FacesContext context = FacesContext.getCurrentInstance();
 
 			List listPlanosConcluidos = getPlanosConcluidos(u);
 			getSessionBean1().getPlanosConcluidosDataProvider().setList(listPlanosConcluidos);
-        
+		}
         //checkPlanosDelayed();
     }
     
@@ -674,30 +864,52 @@ FacesContext context = FacesContext.getCurrentInstance();
 //        }                                
 //    }
 
-    public List<PlanoActuacao> getPlanosActivos(Utilizador u)
+	public List< PlanoActuacao > searchPlanosActivos( Utilizador u, String nome, String estabelecimento, String dataVisita )
 	{
-        ArrayList list = new ArrayList();
+		List< PlanoActuacao > list = new ArrayList< PlanoActuacao >();
 		try
 		{
-            if(u.getTipo().intValue() != Global.DIRECTOR_SIPRP && u.getTipo().intValue() != Global.GESTOR && u.getTipo().intValue() != Global.DIRECTOR_GERAL_RH)
+			if ( u.getTipo().intValue() != Global.DIRECTOR_SIPRP
+				&& u.getTipo().intValue() != Global.GESTOR
+				&& u.getTipo().intValue() != Global.DIRECTOR_GERAL_RH )
 			{
-                list = pdp.getPlanosActivos(u);
+				list = pdp.searchPlanosActivos( u, nome, estabelecimento, dataVisita );
 			}
 		}
-        catch(Exception ex)
+		catch ( Exception e )
 		{
-            ex.printStackTrace();
+			e.printStackTrace();
 		}
 		return list;
 	}
 
-    public List<PlanoActuacao> getPlanosSeguimento(Utilizador u)
+    public List<PlanoActuacao> getPlanosActivos(Utilizador u)
+    {
+		return searchPlanosActivos( u, null, null, null );
+//        List< PlanoActuacao > list = new ArrayList();
+//        try
+//        {
+//            if ( u.getTipo().intValue() != Global.DIRECTOR_SIPRP
+//				&& u.getTipo().intValue() != Global.GESTOR
+//				&& u.getTipo().intValue() != Global.DIRECTOR_GERAL_RH )
+//            {
+////                list = pdp.getPlanosActivos(u);
+//				list = pdp.searchPlanosActivos( u, null, null );
+//            }
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }
+//        return list;
+    }
+
+	public List< PlanoActuacao > searchPlanosSeguimento( Utilizador u, String nome, String estabelecimento, String dataVisita )
 	{
-        ArrayList list = new ArrayList();
+        List< PlanoActuacao > list = new ArrayList();
         try
         {
-                list = pdp.getPlanosSeguimento(u);
+				list = pdp.searchPlanosSeguimento( u, nome, estabelecimento, dataVisita );
-
         }
         catch(Exception ex)
         {
@@ -706,12 +918,28 @@ FacesContext context = FacesContext.getCurrentInstance();
         return list;
 	}
 
-    public List<PlanoActuacao> getPlanosConcluidos(Utilizador u)
+    public List<PlanoActuacao> getPlanosSeguimento(Utilizador u)
     {
-        ArrayList list = new ArrayList();
+		return searchPlanosSeguimento( u, null, null, null );
+//        List< PlanoActuacao > list = new ArrayList();
+//        try
+//        {
+////                list = pdp.getPlanosSeguimento(u);
+//				list = pdp.searchPlanosSeguimento( u, null, null );
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }
+//        return list;
+    }
+
+	public List< PlanoActuacao > searchPlanosConcluidos( Utilizador u, String nome, String estabelecimento, String dataVisita )
+	{
+        List< PlanoActuacao > list = new ArrayList();
         try
         {
-            list = pdp.getPlanosConcluidos(u);
+			list = pdp.searchPlanosConcluidos( u, nome, estabelecimento, dataVisita );
         }
         catch(Exception ex)
         {
@@ -720,5 +948,132 @@ FacesContext context = FacesContext.getCurrentInstance();
         return list;
 	}
 
+    public List<PlanoActuacao> getPlanosConcluidos(Utilizador u)
+    {
+		return searchPlanosConcluidos( u, null, null, null );
+//        List< PlanoActuacao > list = new ArrayList();
+//        try
+//        {
+////            list = pdp.getPlanosConcluidos(u);
+//			list = pdp.searchPlanosConcluidos( u, null, null );
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }
+//        return list;
+    }
+
+
+
+	public String buttonFilterActual_action()
+	{
+        String nome = null;
+        if ( textFilterNameActual.getText() != null )
+        {
+            nome = (( String ) textFilterNameActual.getText()).trim();
+            if( nome.length() == 0 )
+            {
+                nome = null;
+            }
+        }
+
+		String estabelecimento = null;
+        if ( textFilterEstabelecimentoActual.getText() != null )
+        {
+            estabelecimento = (( String ) textFilterEstabelecimentoActual.getText()).trim();
+            if( estabelecimento.length() == 0 )
+            {
+                estabelecimento = null;
+            }
+        }
+
+		Date visitaDate = ( Date ) calFilterDateActual.getValue();
+		String visitaDateStr = null;
+		if ( visitaDate != null )
+		{
+			visitaDateStr = D_F.format( visitaDate );
+		}
+
+		getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE );
+		getSessionBean1().getPlanosActualDataProvider().setList( 
+			searchPlanosActivos( getSessionBean1().getCurrentUser(), nome, estabelecimento, visitaDateStr ) );
+
+		return null;
+	}
+
+	public String buttonFilterSeg_action()
+	{
+        String nome = null;
+        if ( textFilterNameSeg.getText() != null )
+        {
+            nome = (( String ) textFilterNameSeg.getText()).trim();
+            if( nome.length() == 0 )
+            {
+                nome = null;
+            }
+        }
+
+		String estabelecimento = null;
+        if ( textFilterEstabelecimentoSeg.getText() != null )
+        {
+            estabelecimento = (( String ) textFilterEstabelecimentoSeg.getText()).trim();
+            if( estabelecimento.length() == 0 )
+            {
+                estabelecimento = null;
+            }
+        }
+
+		Date visitaDate = ( Date ) calFilterDateSeg.getValue();
+		String visitaDateStr = null;
+		if ( visitaDate != null )
+		{
+			visitaDateStr = D_F.format( visitaDate );
+		}
+
+		getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE );
+		getSessionBean1().getPlanosSeguimentoDataProvider().setList(
+			searchPlanosSeguimento( getSessionBean1().getCurrentUser(), nome, estabelecimento, visitaDateStr ) );
+
+		return null;
+	}
+
+
+	public String buttonFilterConc_action()
+	{
+        String nome = null;
+        if ( textFilterNameConc.getText() != null )
+        {
+            nome = (( String ) textFilterNameConc.getText()).trim();
+            if( nome.length() == 0 )
+            {
+                nome = null;
+            }
+        }
+
+		String estabelecimento = null;
+        if ( textFilterEstabelecimentoConc.getText() != null )
+        {
+            estabelecimento = (( String ) textFilterEstabelecimentoConc.getText()).trim();
+            if( estabelecimento.length() == 0 )
+            {
+                estabelecimento = null;
+            }
+        }
+
+		Date visitaDate = ( Date ) calFilterDateConc.getValue();
+		String visitaDateStr = null;
+		if ( visitaDate != null )
+		{
+			visitaDateStr = D_F.format( visitaDate );
+		}
+
+		getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE );
+		getSessionBean1().getPlanosConcluidosDataProvider().setList(
+			searchPlanosConcluidos( getSessionBean1().getCurrentUser(), nome, estabelecimento, visitaDateStr ) );
+
+		return null;
+	}
+
 }
 

trunk/PlanosActuacao/src/java/planosactuacao/SessionBean1.java

@@ -74,6 +74,9 @@ public class SessionBean1 extends AbstractSessionBean {
     
     private String logoEmpresaUrl = "";
 
+	private Boolean isSearchingPlanosActuacao = Boolean.FALSE;
+
+	
     /**
      * <p>Construct a new session data bean instance.</p>
      */
@@ -379,5 +382,13 @@ public class SessionBean1 extends AbstractSessionBean {
         this.logoEmpresaUrl = logoEmpresaUrl;
     }
 
+	public Boolean getIsSearchingPlanosActuacao() {
+		return isSearchingPlanosActuacao;
+	}
+
+	public void setIsSearchingPlanosActuacao(Boolean isSearchingPlanosActuacao) {
+		this.isSearchingPlanosActuacao = isSearchingPlanosActuacao;
+	}
+
 
 }

trunk/PlanosActuacao/web/ListaPlanos.jsp

@@ -35,7 +35,9 @@
                     </script>
                 </webuijsf:head>
                 <webuijsf:body id="body1" onLoad="checkEmptyTables();">
-                    <webuijsf:form id="form1">
+
+					<!-- form1 -->
+
                         <div style="height: 24px; left: 0px; top: 0px; width: 100%">
                             <jsp:directive.include file="Header.jspf"/>
                         </div>
@@ -50,7 +52,28 @@
                                     <webuijsf:staticText id="staticText1" style="font-size: 18px" text="Actual"/>
                                     <webuijsf:staticText escape="false" id="staticText2" style="font-size: 14px" text=" "/>
                                     <webuijsf:staticText id="staticText3" styleClass="label" text="Processos com dados pendentes"/>
+
+									<webuijsf:form id="form1">
+										<h:panelGrid binding="#{ListaPlanos.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" style="" styleClass="centerBlock">
+											<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterActual}" id="groupPanelFilterActual" style="">
+												<webuijsf:staticText id="labelFilterNameActual" style="" text="Nome:" />
+												<webuijsf:textField binding="#{ListaPlanos.textFilterNameActual}" id="textFilterNameActual" />
+											</webuijsf:panelGroup>
+											<webuijsf:panelGroup>
+												<webuijsf:staticText id="labelFilterEstabelecimentoActual" style="" text="Estabelecimento:" />
+												<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoActual}" id="textFilterEstabelecimentoActual" />
+											</webuijsf:panelGroup>
+											<webuijsf:panelGroup>
+												<webuijsf:staticText id="labelFilterDateActual" text="Data da Visita:" />
+												<webuijsf:calendar binding="#{ListaPlanos.calFilterDateActual}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateActual" />
+											</webuijsf:panelGroup>
+											<webuijsf:button binding="#{ListaPlanos.buttonFilterActual}" id="buttonFilterActual" actionExpression="#{ListaPlanos.buttonFilterActual_action}" text="Pesquisar" />
+										</h:panelGrid>
+									</webuijsf:form>
+
                                     <h:panelGrid columns="1" id="gridPanel1" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
+
+										<webuijsf:form id="form2">
                                         <webuijsf:table augmentTitle="false" binding="#{ListaPlanos.table1}" id="table1" style="width: 100%"
                                             styleClass="centerBlock" width="100%">
                                             <webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup1}" id="tableRowGroup1" rows="10"
@@ -79,12 +102,34 @@
 
                                             </webuijsf:tableRowGroup>
                                         </webuijsf:table>
+										</webuijsf:form>
+
                                     </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridSeguimento1" style="height: 24px; width: 100%" styleClass="gridPlanosList">
                                     <webuijsf:staticText id="staticText7" style="font-size: 18px" text="Em seguimento"/>
                                     <webuijsf:staticText escape="false" id="staticText8" style="font-size: 14px" text=" "/>
                                     <h:panelGrid columns="1" id="gridPanel2" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
+
+										<webuijsf:form id="form3">
+										<h:panelGrid binding="#{ListaPlanos.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" style="" styleClass="centerBlock">
+											<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterSeg}" id="groupPanelFilterSeg" style="">
+												<webuijsf:staticText id="labelFilterNameSeg" style="" text="Nome:" />
+												<webuijsf:textField binding="#{ListaPlanos.textFilterNameSeg}" id="textFilterNameSeg" />
+											</webuijsf:panelGroup>
+											<webuijsf:panelGroup>
+												<webuijsf:staticText id="labelFilterEstabelecimentoSeg" style="" text="Estabelecimento:" />
+												<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoSeg}" id="textFilterEstabelecimentoSeg" />
+											</webuijsf:panelGroup>
+											<webuijsf:panelGroup>
+												<webuijsf:staticText id="labelFilterDateSeg" text="Data da Visita:" />
+												<webuijsf:calendar binding="#{ListaPlanos.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg" />
+											</webuijsf:panelGroup>
+											<webuijsf:button binding="#{ListaPlanos.buttonFilterSeg}" id="buttonFilterSeg" actionExpression="#{ListaPlanos.buttonFilterSeg_action}" text="Pesquisar" />
+										</h:panelGrid>
+										</webuijsf:form>
+
+										<webuijsf:form id="form4">
                                         <webuijsf:table augmentTitle="false" id="table2" style="width: 100%" styleClass="centerBlock" width="100%">
                                             <webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup2}" id="tableRowGroup2" rows="10"
                                                 sourceData="#{SessionBean1.planosSeguimentoDataProvider}" sourceVar="currentRow">
@@ -113,12 +158,34 @@
 
                                             </webuijsf:tableRowGroup>
                                         </webuijsf:table>
+										</webuijsf:form>
+
                                     </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridConcluidos" style="height: 24px; width: 100%" styleClass="gridPlanosList">
                                     <webuijsf:staticText escape="false" id="staticText14" style="font-size: 18px" text="Conclu&amp;iacute;dos"/>
                                     <webuijsf:staticText escape="false" id="staticText15" style="font-size: 14px" text=" "/>
                                     <h:panelGrid columns="1" id="gridPanel4" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
+
+										<webuijsf:form id="form5">
+										<h:panelGrid binding="#{ListaPlanos.gridPanelFilterConc}" columns="4" id="gridPanelFilterConc" style="" styleClass="centerBlock">
+											<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterConc}" id="groupPanelFilterConc" style="">
+												<webuijsf:staticText id="labelFilterNameConc" style="" text="Nome:" />
+												<webuijsf:textField binding="#{ListaPlanos.textFilterNameConc}" id="textFilterNameConc" />
+											</webuijsf:panelGroup>
+											<webuijsf:panelGroup>
+												<webuijsf:staticText id="labelFilterEstabelecimentoConc" style="" text="Estabelecimento:" />
+												<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoConc}" id="textFilterEstabelecimentoConc" />
+											</webuijsf:panelGroup>
+											<webuijsf:panelGroup>
+												<webuijsf:staticText id="labelFilterDateConc" text="Data da Visita:" />
+												<webuijsf:calendar binding="#{ListaPlanos.calFilterDateConc}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateConc" />
+											</webuijsf:panelGroup>
+											<webuijsf:button binding="#{ListaPlanos.buttonFilterConc}" id="buttonFilterConc" actionExpression="#{ListaPlanos.buttonFilterConc_action}" text="Pesquisar" />
+										</h:panelGrid>
+										</webuijsf:form>
+
+										<webuijsf:form id="form6">
                                         <webuijsf:table augmentTitle="false" id="table3" style="width: 100%" styleClass="centerBlock" width="100%">
                                             <webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup3}" id="tableRowGroup3" rows="10"
                                                 sourceData="#{SessionBean1.planosConcluidosDataProvider}" sourceVar="currentRow">
@@ -140,6 +207,8 @@
                                                 </webuijsf:tableColumn>
                                             </webuijsf:tableRowGroup>
                                         </webuijsf:table>
+										</webuijsf:form>
+
                                     </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel3" style="height: 24px; width: 50%" styleClass="centerBlock">
@@ -151,7 +220,8 @@
                                 </h:panelGrid>
                             </h:panelGrid>
                         </h:panelGrid>
-                    </webuijsf:form>
+
+                    <!-- EOF form1 -->
                     <script type="text/javascript">
                     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
                     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));