no message

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

trunk/siprp/FichaDataProvider.java

@@ -235,22 +235,28 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
 	}
 	
 	public Virtual2DArray searchEmpresas( String pattern ) throws Exception {
-		Select select = new Select( "SELECT e.id, e.designacao_social FROM empresas e;" );
+		Select select = new Select( "SELECT e.id, e.designacao_social FROM empresas e ORDER BY lower( e.designacao_social );" );
 		return executer.executeQuery( select );
 	}
 
 	public Virtual2DArray searchEstabelecimentos( String pattern ) throws Exception {
-		Select select = new Select( "SELECT e.id, e.nome FROM estabelecimentos e;" );
+		Select select = new Select( "SELECT e.id, e.nome FROM estabelecimentos e WHERE empresa_id = " + SEARCH_EMPRESAS_ID
+									+ " ORDER BY lower( e.nome )");
 		return executer.executeQuery( select );
 	}
 
 	public Virtual2DArray searchTrabalhadores( String pattern ) throws Exception {
-		Select select = new Select( "SELECT t.id, t.nome FROM trabalhadores t;" );
+		Select select = 
+			new Select( "SELECT t.id, t.nome FROM trabalhadores t, estabelecimentos es "
+						+ " WHERE t.estabelecimento_id = es.id "
+						+ " AND es.empresa_id = " + SEARCH_EMPRESAS_ID + " ORDE BY lower(t.nome);" );
 		return executer.executeQuery( select );
 	}
 
 	public Virtual2DArray searchExames( String pattern ) throws Exception {
-		Select select = new Select( "SELECT e.id, e.data FROM exames e;" );
+		Select select = new Select( "SELECT e.id, e.data FROM exames e "
+									+ " WHERE e.trabalhador_id = " + SEARCH_TRABALHADORES_ID 
+									+ " ORDER BY e.data DESC;" );
 		return executer.executeQuery( select );
 	}
 

trunk/siprp/ficha/FichaWindow.java

@@ -112,31 +112,25 @@ public class FichaWindow extends TabbedWindow
 	
 	public boolean newItem( int index )
 	{
-		switch( index )
+			fdpProvider.setSearch( FichaDataProvider.SEARCH_EMPRESAS );
-		{
+			SearchDialog search = new SearchDialog( fdpProvider, null, true, null, false );
-			case 0:
+			Integer empresaID = (  Integer )search.getSelected();
-				fdpProvider.setSearch( FichaDataProvider.SEARCH_EMPRESAS );
-				SearchDialog search = new SearchDialog( fdpProvider, null, true, null, false );
-				Integer empresaID = ( Integer )search.getSelected();
 
-				if( empresaID == null )
+			if( empresaID == null )
-				{
+			{
-					return false;
+				return false;
-				}
+			}
 
-				fdpProvider.setSearch( FichaDataProvider.SEARCH_ESTABELECIMENTOS );
+			fdpProvider.setSearch( FichaDataProvider.SEARCH_ESTABELECIMENTOS );
-				fdpProvider.setSearchID( FichaDataProvider.SEARCH_EMPRESAS, empresaID.intValue() );
+			fdpProvider.setSearchID( FichaDataProvider.SEARCH_EMPRESAS, empresaID.intValue() );
-				search = new SearchDialog( fdpProvider, null, true, null, false );
+			search = new SearchDialog( fdpProvider, null, true, null, false );
-				Integer estabelecimentoID = ( Integer )search.getSelected();
+			Integer estabelecimentoID = ( Integer )search.getSelected();
 
-				if( estabelecimentoID == null )
+			if( estabelecimentoID == null )
-				{
+			{
-					return false;
+				return false;
-				}
+			}
-
+			return true;
-				break;				
-		}
-		return true;
 	}
 	
 	public boolean delete( int index )