lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plain

Browse Source 
git-svn-id: https://svn.coded.pt/svn/SIPRP@198 bb69d46d-e84e-40c8-a05a-06db0d633741
Frederico Palma 20 years ago
parent bebe9a3f0f
commit c6570e6e21
5 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File

42
trunk/siprp/FichaDataProvider.java
Unescape View File

@ -17,6 +17,7 @@ import com.evolute.utils.db.keyretrievers.*;
import com.evolute.utils.metadb.*;
import com.evolute.utils.ui.search.*;
import com.evolute.utils.sql.*;
import com.evolute.utils.strings.*;
/**
*
@ -263,10 +264,10 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
public Virtual2DArray searchEmpresas( String pattern ) throws Exception {
Select select = new Select( new String[]{ T_EMPRESAS },
new String[]{ ID, DESIGNACAO_SOCIAL },
new Field( DESIGNACAO_SOCIAL ).isLike( "%" + pattern + "%" ).and(
new String[]{ ID, DESIGNACAO_SOCIAL, "designacao_social_plain" },
new Field( "designacao_social_plain" ).isLike( "%" + StringPlainer.convertString( pattern, false, false ) + "%" ).and(
new Field( INACTIVO ).isDifferent( "y" ) ),
new String[]{ "lower(" + DESIGNACAO_SOCIAL + ")" }, null );
new String[]{ "designacao_social_plain" }, null );
// Select select = new Select( "SELECT e.id, e.designacao_social FROM empresas e ORDER BY lower( e.designacao_social );" );
return executer.executeQuery( select );
}
@ -275,11 +276,11 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
// Select select = new Select( "SELECT e.id, e.nome FROM estabelecimentos e WHERE empresa_id = " + SEARCH_EMPRESAS_ID
// + " ORDER BY lower( e.nome )");
Select select = new Select( new String[]{ T_ESTABELECIMENTOS },
new String[]{ ID, NOME },
new Field( NOME ).isLike( "%" + pattern + "%" ).and(
new String[]{ ID, NOME, "nome_plain" },
new Field( "nome_plain" ).isLike( "%" + StringPlainer.convertString( pattern, false, false ) + "%" ).and(
new Field( EMPRESA_ID ).isEqual( new Integer( SEARCH_EMPRESAS_ID ) ) ).and(
new Field( INACTIVO ).isDifferent( "y" ) ),
new String[]{ "lower(" + NOME + ")" }, null );
new String[]{ "nome_plain" }, null );
return executer.executeQuery( select );
}
@ -290,12 +291,12 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
// + " AND es.empresa_id = " + SEARCH_EMPRESAS_ID + " ORDER BY lower(t.nome);" );
Select select = new Select( new String[]{ T_TRABALHADORES, T_ESTABELECIMENTOS },
new String[]{ T_TRABALHADORES + "." + ID, T_TRABALHADORES + "." + NOME },
new Field( T_TRABALHADORES + "." + NOME ).isLike( "%" + pattern + "%" ).and(
new Field( T_TRABALHADORES + ".nome_plain" ).isLike( "%" + StringPlainer.convertString( pattern, false, false ) + "%" ).and(
new Field( ESTABELECIMENTO_ID ).isEqual( new Field( T_ESTABELECIMENTOS + "." + ID ) ) ).and(
new Field( ESTABELECIMENTO_ID ).isEqual( new Integer( SEARCH_ESTABELECIMENTOS_ID ) ) ).and(
new Field( EMPRESA_ID ).isEqual( new Integer( SEARCH_EMPRESAS_ID ) ) ).and(
new Field( T_TRABALHADORES + "." + INACTIVO ).isDifferent( "y" ) ),
new String[]{ "lower(" + T_TRABALHADORES + "." + NOME + ")" }, null );
new String[]{ T_TRABALHADORES + ".nome_plain" }, null );
return executer.executeQuery( select );
}
@ -377,10 +378,10 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
throws Exception
{
Select select = new Select( new String[]{ T_ESTABELECIMENTOS },
new String[]{ ID, NOME },
new String[]{ ID, NOME, "nome_plain" },
new Field( EMPRESA_ID ).isEqual( empresaID ).and(
new Field( INACTIVO ).isDifferent( "y" ) ),
new String[]{ "lower(" + NOME + ")" }, null );
new String[]{ "nome_plain" }, null );
Virtual2DArray array = executer.executeQuery( select );
IDObject objects[] = new IDObject[ array.columnLength() ];
for( int n = 0; n < objects.length; n++ )
@ -397,11 +398,12 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
{
Select select = new Select( new String[]{ T_TRABALHADORES, T_ESTABELECIMENTOS },
new String[]{ T_TRABALHADORES + "." + ID,
T_TRABALHADORES + "." + NOME },
T_TRABALHADORES + "." + NOME,
T_TRABALHADORES + ".nome_plain" },
new Field( T_ESTABELECIMENTOS + "." + EMPRESA_ID ).isEqual( empresaID ).and(
new Field( T_TRABALHADORES + "." + ESTABELECIMENTO_ID ).isEqual(
new Field( T_ESTABELECIMENTOS + "." + ID ) ) ),
new String[]{ "lower(" + T_TRABALHADORES + "." + NOME + ")" }, null );
new String[]{ T_TRABALHADORES + ".nome_plain" }, null );
Virtual2DArray array = executer.executeQuery( select );
IDObject objects[] = new IDObject[ array.columnLength() ];
for( int n = 0; n < objects.length; n++ )
@ -417,10 +419,10 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
throws Exception
{
Select select = new Select( new String[]{ T_TRABALHADORES },
new String[]{ ID, NOME },
new String[]{ ID, NOME, "nome_plain" },
new Field( ESTABELECIMENTO_ID ).isEqual( estabelecimentoID ).and(
new Field( INACTIVO ).isDifferent( "y" ) ),
new String[]{ "lower(" + NOME + ")" }, null );
new String[]{ "nome_plain" }, null );
Virtual2DArray array = executer.executeQuery( select );
IDObject objects[] = new IDObject[ array.columnLength() ];
for( int n = 0; n < objects.length; n++ )
@ -469,9 +471,9 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
throws Exception
{
Select select = new Select( new String[]{ T_EMPRESAS },
new String[]{ ID, DESIGNACAO_SOCIAL },
new String[]{ ID, DESIGNACAO_SOCIAL, "designacao_social_plain" },
new Field( INACTIVO ).isEqual( "y" ),
new String[]{ "lower(" + DESIGNACAO_SOCIAL + ")" }, null );
new String[]{ "designacao_social_plain" }, null );
Virtual2DArray array = executer.executeQuery( select );
IDObject empresas[] = new IDObject[ array.columnLength() ];
for( int n = 0; n < array.columnLength(); n++ )
@ -487,10 +489,10 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
throws Exception
{
Select select = new Select( new String[]{ T_ESTABELECIMENTOS },
new String[]{ ID, NOME },
new String[]{ ID, NOME, "nome_plain" },
new Field( EMPRESA_ID ).isEqual( empresaID ).and(
new Field( INACTIVO ).isEqual( "y" ) ),
new String[]{ "lower(" + NOME + ")" }, null );
new String[]{ "nome_plain" }, null );
Virtual2DArray array = executer.executeQuery( select );
IDObject objects[] = new IDObject[ array.columnLength() ];
for( int n = 0; n < objects.length; n++ )
@ -506,10 +508,10 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
throws Exception
{
Select select = new Select( new String[]{ T_TRABALHADORES },
new String[]{ ID, NOME },
new String[]{ ID, NOME, "nome_plain" },
new Field( ESTABELECIMENTO_ID ).isEqual( estabelecimentoID ).and(
new Field( INACTIVO ).isEqual( "y" ) ),
new String[]{ "lower(" + NOME + ")" }, null );
new String[]{ "nome_plain" }, null );
Virtual2DArray array = executer.executeQuery( select );
IDObject objects[] = new IDObject[ array.columnLength() ];
for( int n = 0; n < objects.length; n++ )

13
trunk/siprp/companydataloaders/SIPRPDataLoader.java
Unescape View File

@ -97,10 +97,17 @@ public class SIPRPDataLoader implements CompanyDataLoader
// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "com.mysql.jdbc.Driver" );
Singleton.setInstance( SingletonConstants.LOCAL_USER, "slony" );
Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "-rg2hevosiprp" );
// Singleton.setInstance( SingletonConstants.LOCAL_USER, "slony" );
// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "-rg2hevosiprp" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL, "192.168.1.1:5432" );
// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
Singleton.setInstance( SingletonConstants.LOCAL_USER, "siprp" );
Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
Singleton.setInstance( SingletonConstants.LOCAL_URL, "192.168.1.188:5432" );
Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5433" );
Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
}

8
trunk/siprp/ficha/EmpresaPanel.java
Unescape View File

@ -259,6 +259,7 @@ public class EmpresaPanel extends JPanel
empresaComponents.putDummy( EmpresaData.PRECO_HIGIENE );
empresaComponents.putDummy( EmpresaData.PRECO_MEDICINA );
empresaComponents.putDummy( EmpresaData.PERIODICIDADE );
empresaComponents.putDummy( EmpresaData.DESIGNACAO_SOCIAL_PLAIN );
estabelecimentoComponents = new ComponentsHashtable();
estabelecimentoComponents.putComponent( EstabelecimentoData.NOME, estabelecimentoText );
@ -268,6 +269,7 @@ public class EmpresaPanel extends JPanel
estabelecimentoComponents.putDummy( EstabelecimentoData.CONTACTO );
estabelecimentoComponents.putDummy( EstabelecimentoData.HISTORICO );
estabelecimentoComponents.putDummy( EstabelecimentoData.EMPRESA );
estabelecimentoComponents.putDummy( EstabelecimentoData.NOME_PLAIN );
// components.putComponent( FichaDataProvider.T_EMPRESAS + "." + FichaDataProvider.DESIGNACAO_SOCIAL, designacaoSocialText );
// components.put( FichaDataProvider.T_EMPRESAS + "." + FichaDataProvider.SERVICO_SAUDE_TIPO, servicoSaudeTipoPanel );
@ -416,6 +418,12 @@ public class EmpresaPanel extends JPanel
msg.append( "A empresa tem de ter uma design\u00e7\u00e3o social\n" );
hasMsg = true;
}
else
{
empresa.set( EmpresaData.DESIGNACAO_SOCIAL_PLAIN,
com.evolute.utils.strings.StringPlainer.convertString( ( String )
empresa.get( EmpresaData.DESIGNACAO_SOCIAL ) ) );
}
// if( empresa.getProperty( provider.SERVICO_SAUDE_TIPO ) == null )
if( empresa.get( EmpresaData.SERVICO_SAUDE_TIPO ) == null )
{

8
trunk/siprp/ficha/FichaWindow.java
Unescape View File

@ -234,10 +234,18 @@ public class FichaWindow extends TabbedWindow
JOptionPane.showMessageDialog( this, msg.toString(), "Erro...", JOptionPane.ERROR_MESSAGE );
return false;
}
estabelecimento.set( EstabelecimentoData.NOME_PLAIN,
com.evolute.utils.strings.StringPlainer.convertString( ( String )
estabelecimento.get( EstabelecimentoData.NOME ) ) );
// trabalhador.setProperty( FichaDataProvider.R_TRABALHADOR_ESTABELECIMENTO, estabelecimento );
// trabalhador.setProperty( FichaDataProvider.OBSERVACOES, observacoesPanel.save() );
trabalhador.set( TrabalhadorData.ESTABELECIMENTO, estabelecimento );
trabalhador.set( TrabalhadorData.OBSERVACOES, observacoesPanel.save() );
trabalhador.set( TrabalhadorData.NOME_PLAIN,
com.evolute.utils.strings.StringPlainer.convertString( ( String )
trabalhador.get( TrabalhadorData.NOME ) ) );
// exame.setProperty( FichaDataProvider.R_EXAME_MEDICO, medico );
// exame.setProperty( FichaDataProvider.R_EXAME_TRABALHADOR, trabalhador );

1
trunk/siprp/ficha/TrabalhadorPanel.java
Unescape View File

@ -247,6 +247,7 @@ public class TrabalhadorPanel extends JPanel
components.putDummy( TrabalhadorData.OBSERVACOES_GESTAO );
components.putDummy( TrabalhadorData.PERFIL );
components.putDummy( TrabalhadorData.ESTABELECIMENTO );
components.putDummy( TrabalhadorData.NOME_PLAIN );
// components.putComponent( FichaDataProvider.T_TRABALHADORES + "." + FichaDataProvider.NOME, nomeText );
// components.putComponent( FichaDataProvider.T_TRABALHADORES + "." + FichaDataProvider.DATA_NASCIMENTO, dataNascimentoPanel );

Write Preview
Loading…
Cancel
Save