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

no message

Browse Source 
git-svn-id: https://svn.coded.pt/svn/SIPRP@188 bb69d46d-e84e-40c8-a05a-06db0d633741
Frederico Palma 21 years ago
parent e2a53f8dd4
commit 0d71a7f6f7
9 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File

3
trunk/siprp/FichaDataProvider.java
Unescape View File

@ -400,8 +400,7 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter {
T_TRABALHADORES + "." + NOME },
new Field( T_ESTABELECIMENTOS + "." + EMPRESA_ID ).isEqual( empresaID ).and(
new Field( T_TRABALHADORES + "." + ESTABELECIMENTO_ID ).isEqual(
new Field( T_ESTABELECIMENTOS + "." + ID ) ) ).and(
new Field( T_TRABALHADORES + "." + INACTIVO ).isDifferent( "y" ) ),
new Field( T_ESTABELECIMENTOS + "." + ID ) ) ),
new String[]{ "lower(" + T_TRABALHADORES + "." + NOME + ")" }, null );
Virtual2DArray array = executer.executeQuery( select );
IDObject objects[] = new IDObject[ array.columnLength() ];

35
trunk/siprp/Main.java
Unescape View File

@ -176,13 +176,13 @@ public class Main implements Connector
return true;
}
public static void reconnectJDO()
{
PersistenceManagerFactory pmf = ( PersistenceManagerFactory ) Singleton.getInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY );
PersistenceManager pm = pmf.getPersistenceManager();
Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm );
com.evolute.utils.jdo.JDOObject.setPersistentManager( pm );
}
// public static void reconnectJDO()
// {
// PersistenceManagerFactory pmf = ( PersistenceManagerFactory ) Singleton.getInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY );
// PersistenceManager pm = pmf.getPersistenceManager();
// Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm );
// com.evolute.utils.jdo.JDOObject.setPersistentManager( pm );
// }
public boolean disconnect()
{
@ -273,16 +273,17 @@ System.out.println( "INIT: " + d );
System.setProperty( "org.jpox.catalogName", (String)Singleton.getInstance( SingletonConstants.LOCAL_DB_NAME ) );
System.setProperty( "org.jpox.schemaName", "" );
PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( jpoxProps );
// pmf.setOptimistic( true );
System.out.print( "Loading PM: " + new Date() );
// ( ( PersistenceManagerFactoryImpl )pmf ).setTransactionIsolation( Connection.TRANSACTION_READ_UNCOMMITTED );
// Retrieve a PersistenceManager from the PersistenceManagerFactory.
PersistenceManager pm = pmf.getPersistenceManager();
JDOObject.setPersistentManager( pm );
Singleton.setInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY, pmf );
Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm );
// PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( jpoxProps );
//// pmf.setOptimistic( true );
//System.out.print( "Loading PM: " + new Date() );
// // ( ( PersistenceManagerFactoryImpl )pmf ).setTransactionIsolation( Connection.TRANSACTION_READ_UNCOMMITTED );
// // Retrieve a PersistenceManager from the PersistenceManagerFactory.
// PersistenceManager pm = pmf.getPersistenceManager();
// JDOObject.setPersistentManager( pm );
// Singleton.setInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY, pmf );
// Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm );
JDOProvider jdoProvider = new JDOProvider( jpoxProps );
Singleton.setInstance( Singleton.DEFAULT_JDO_PROVIDER, jdoProvider );
System.out.println( "PM done " + new Date() );
}
}

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

@ -14,6 +14,7 @@ import java.util.*;
import com.evolute.utils.*;
import com.evolute.utils.data.*;
import com.evolute.utils.dataui.*;
import com.evolute.utils.jdo.*;
import com.evolute.utils.metadb.*;
import com.evolute.utils.ui.*;
import com.evolute.utils.ui.button.*;
@ -29,6 +30,7 @@ import siprp.data.*;
public class EmpresaPanel extends JPanel
implements ControllableComponent
{
private JDOProvider JDO;
private JTextField designacaoSocialText;
private JTextField estabelecimentoText;
private JTextField localidadeText;
@ -52,6 +54,7 @@ public class EmpresaPanel extends JPanel
throws Exception
{
provider = (FichaDataProvider)FichaDataProvider.getProvider();
JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
setupComponents();
setupComponentsHashtable();
}
@ -293,13 +296,13 @@ public class EmpresaPanel extends JPanel
{
try
{
empresa = (EmpresaData)EmpresaData.load( EmpresaData.class, empresaID );
empresa = (EmpresaData)JDO.load( EmpresaData.class, empresaID );
String names[] = empresa.getFieldNames();
ComponentController.fill( names, empresa.getHashData(), empresaComponents );
if( estabelecimentoID != null )
{
estabelecimento = (EstabelecimentoData)EstabelecimentoData.load( EstabelecimentoData.class, estabelecimentoID );
estabelecimento = (EstabelecimentoData)JDO.load( EstabelecimentoData.class, estabelecimentoID );
names = estabelecimento.getFieldNames();
ComponentController.fill( names, estabelecimento.getHashData(), estabelecimentoComponents );
}

5
trunk/siprp/ficha/ExamePanel.java
Unescape View File

@ -17,6 +17,7 @@ import com.evolute.utils.*;
import com.evolute.utils.documents.*;
import com.evolute.utils.data.*;
import com.evolute.utils.dataui.*;
import com.evolute.utils.jdo.*;
//import com.evolute.utils.metadb.*;
import com.evolute.utils.ui.*;
import com.evolute.utils.ui.button.*;
@ -35,6 +36,7 @@ public class ExamePanel extends JPanel
{
ExameData.registerOperationHandlerForClass( DisableDeleteHandler.INSTANCE, ExameData.class );
}
private JDOProvider JDO;
private JCalendarPanel dataExamePanel;
private BetterButtonGroup tipoGroup;
@ -60,6 +62,7 @@ public class ExamePanel extends JPanel
throws Exception
{
provider = (FichaDataProvider)FichaDataProvider.getProvider();
JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
setupComponents();
setupComponentsHashtable();
}
@ -299,7 +302,7 @@ public class ExamePanel extends JPanel
{
return;
}
marcacao = ( MarcacaoTrabalhadorData ) MarcacaoTrabalhadorData.load( MarcacaoTrabalhadorData.class, marcacaoID );
marcacao = ( MarcacaoTrabalhadorData ) JDO.load( MarcacaoTrabalhadorData.class, marcacaoID );
proximoExamePanel.setDate( (Date) marcacao.get( Marcacao.DATA ) );
}
catch( Exception ex )

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

@ -16,7 +16,9 @@ import java.util.*;
import javax.swing.*;
import java.text.*;
import com.evolute.utils.*;
import com.evolute.utils.data.*;
import com.evolute.utils.jdo.*;
import com.evolute.utils.metadb.*;
import com.evolute.utils.tracker.*;
import com.evolute.utils.ui.*;
@ -31,6 +33,8 @@ import com.evolute.utils.ui.window.*;
public class FichaWindow extends TabbedWindow
implements ListAction
{
private JDOProvider JDO;
private UpperPanel upperPanel;
private EmpresaPanel empresaPanel;
private TrabalhadorPanel trabalhadorPanel;
@ -55,6 +59,7 @@ public class FichaWindow extends TabbedWindow
upperPanel = (UpperPanel) getUpperPanel();
upperPanel.owner = this;
fdpProvider = ( FichaDataProvider ) FichaDataProvider.getProvider();
JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
setupComponents();
}
@ -479,7 +484,7 @@ public class FichaWindow extends TabbedWindow
throws Exception
{
// MetaObject exame = fdpProvider.load( fdpProvider.EXAMES, new DBKey( exameID ) );
ExameData exame = (ExameData) ExameData.load( ExameData.class, exameID );
ExameData exame = (ExameData) JDO.load( ExameData.class, exameID );
byte pdf[] = (byte []) exame.get( ExameData.PDF );
if( exame == null )
{
@ -731,7 +736,7 @@ public class FichaWindow extends TabbedWindow
throws Exception
{
// MetaObject exame = fdpProvider.load( fdpProvider.EXAMES, new DBKey( exameID ) );
ExameData exame = (ExameData) ExameData.load( ExameData.class, exameID );
ExameData exame = (ExameData) JDO.load( ExameData.class, exameID );
if( exame == null )
{
throw new Exception( "N\u00e3o existe exame" );

7
trunk/siprp/ficha/MedicoEditor.java
Unescape View File

@ -12,6 +12,8 @@ import javax.swing.*;
import javax.swing.event.*;
import java.util.*;
import com.evolute.utils.*;
import com.evolute.utils.jdo.*;
import com.evolute.utils.metadb.*;
import com.evolute.utils.tables.*;
import com.evolute.utils.ui.*;
@ -30,7 +32,7 @@ public class MedicoEditor extends CustomJDialog
{
MedicoData.registerOperationHandlerForClass( DisableDeleteHandler.INSTANCE, MedicoData.class );
}
private JDOProvider JDO;
private FichaDataProvider provider;
private BaseTable table;
private VectorTableModel model;
@ -48,6 +50,7 @@ public class MedicoEditor extends CustomJDialog
{
super( owner, true );
provider = (FichaDataProvider)FichaDataProvider.getProvider();
JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
setupComponents();
}
@ -231,7 +234,7 @@ public class MedicoEditor extends CustomJDialog
MedicoData medico;
if( id != null )
{
medico = ( MedicoData ) MedicoData.load( MedicoData.class, id );
medico = ( MedicoData ) JDO.load( MedicoData.class, id );
// medico = provider.load( provider.MEDICOS, new DBKey( id ) );
}
else

7
trunk/siprp/ficha/ObservacoesPanel.java
Unescape View File

@ -9,8 +9,10 @@ package siprp.ficha;
import java.awt.*;
import javax.swing.*;
import com.evolute.utils.*;
import com.evolute.utils.dataui.*;
import com.evolute.utils.documents.*;
import com.evolute.utils.jdo.*;
import com.evolute.utils.metadb.*;
import siprp.*;
@ -22,6 +24,8 @@ import siprp.data.*;
public class ObservacoesPanel extends JPanel
implements ControllableComponent
{
private JDOProvider JDO;
private JTextField observacoesText;
private FichaDataProvider provider;
@ -31,6 +35,7 @@ public class ObservacoesPanel extends JPanel
throws Exception
{
provider = (FichaDataProvider)FichaDataProvider.getProvider();
JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
setupComponents();
}
@ -62,7 +67,7 @@ public class ObservacoesPanel extends JPanel
try
{
TrabalhadorData trabalhador = (TrabalhadorData)TrabalhadorData.load( TrabalhadorData.class, trabalhadorID );
TrabalhadorData trabalhador = (TrabalhadorData)JDO.load( TrabalhadorData.class, trabalhadorID );
String observacoes = (String) trabalhador.get( TrabalhadorData.OBSERVACOES );
if( observacoes != null )
{

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

@ -10,9 +10,11 @@ import java.awt.*;
import javax.swing.*;
import java.util.*;
import com.evolute.utils.*;
import com.evolute.utils.data.*;
import com.evolute.utils.dataui.*;
import com.evolute.utils.date.*;
import com.evolute.utils.jdo.*;
import com.evolute.utils.metadb.*;
import com.evolute.utils.ui.*;
import com.evolute.utils.ui.panel.*;
@ -27,6 +29,7 @@ import siprp.importer.*;
public class TrabalhadorPanel extends JPanel
implements ControllableComponent
{
private JDOProvider JDO;
private JTextField nomeText;
private RadioButtonFixedPanel sexoPanel;
private JCalendarPanel dataNascimentoPanel;
@ -48,6 +51,7 @@ public class TrabalhadorPanel extends JPanel
throws Exception
{
provider = (FichaDataProvider)FichaDataProvider.getProvider();
JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
setupComponents();
setupComponentsHashtable();
}
@ -303,7 +307,7 @@ public class TrabalhadorPanel extends JPanel
{
try
{
trabalhador = ( TrabalhadorData ) TrabalhadorData.load( TrabalhadorData.class, trabalhadorID );
trabalhador = ( TrabalhadorData ) JDO.load( TrabalhadorData.class, trabalhadorID );
String names[] = trabalhador.getFieldNames();
ComponentController.fill( names, trabalhador.getHashData(), components );
// trabalhador = provider.load( FichaDataProvider.TRABALHADORES, new DBKey( trabalhadorID ) );

13
trunk/siprp/ficha/UpperPanel.java
Unescape View File

@ -11,8 +11,10 @@ import java.awt.event.*;
import javax.swing.*;
import java.util.*;
import com.evolute.utils.*;
import com.evolute.utils.data.*;
import com.evolute.utils.dataui.*;
import com.evolute.utils.jdo.*;
import com.evolute.utils.metadb.*;
import com.evolute.utils.ui.*;
@ -26,6 +28,8 @@ import siprp.data.*;
public class UpperPanel extends JPanel
implements ControllableComponent, ItemListener
{
protected JDOProvider JDO;
protected JFrame owner;
private JTextField empresaText;
private JTextField nomeText;
@ -41,6 +45,7 @@ public class UpperPanel extends JPanel
{
provider = (FichaDataProvider)FichaDataProvider.getProvider();
medicosHash = new Hashtable();
JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
setupComponents();
}
@ -122,19 +127,19 @@ public class UpperPanel extends JPanel
EmpresaData empresa;
if( trabalhadorID != null )
{
trabalhador = ( TrabalhadorData ) TrabalhadorData.load( TrabalhadorData.class, trabalhadorID );
trabalhador = ( TrabalhadorData ) JDO.load( TrabalhadorData.class, trabalhadorID );
String nome = (String) trabalhador.get( TrabalhadorData.NOME );
nomeText.setText( nome );
}
String nomeEstabelecimento = "";
if( estabelecimentoID != null )
{
estabelecimento = ( EstabelecimentoData ) EstabelecimentoData.load( EstabelecimentoData.class, estabelecimentoID );
estabelecimento = ( EstabelecimentoData ) JDO.load( EstabelecimentoData.class, estabelecimentoID );
nomeEstabelecimento = (String) estabelecimento.get( EstabelecimentoData.NOME );
}
if( empresaID != null )
{
empresa = ( EmpresaData ) EmpresaData.load( EmpresaData.class, empresaID );
empresa = ( EmpresaData ) JDO.load( EmpresaData.class, empresaID );
String nomeEmpresa = (String) empresa.get( EmpresaData.DESIGNACAO_SOCIAL );
empresaText.setText( nomeEmpresa + ( nomeEstabelecimento.length() > 0?" / " + nomeEstabelecimento:"" ) );
}
@ -152,7 +157,7 @@ public class UpperPanel extends JPanel
{
try
{
MedicoData medico = ( MedicoData )MedicoData.load( MedicoData.class, id );
MedicoData medico = ( MedicoData )JDO.load( MedicoData.class, id );
return medico;
}
catch( Exception ex )

Write Preview
Loading…
Cancel
Save