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@160 bb69d46d-e84e-40c8-a05a-06db0d633741
lxbfYeaa
Frederico Palma 21 years ago
parent 440f6beb63
commit 6c56a7e368
3 changed files with 69 additions and 46 deletions
Show Stats Download Patch File Download Diff File

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

@ -16,7 +16,7 @@ import java.util.*;
import com.evolute.utils.documents.*; import com.evolute.utils.documents.*;
import com.evolute.utils.data.*; import com.evolute.utils.data.*;
import com.evolute.utils.dataui.*; import com.evolute.utils.dataui.*;
import com.evolute.utils.metadb.*; //import com.evolute.utils.metadb.*;
import com.evolute.utils.ui.*; import com.evolute.utils.ui.*;
import com.evolute.utils.ui.button.*; import com.evolute.utils.ui.button.*;
import com.evolute.utils.ui.panel.*; import com.evolute.utils.ui.panel.*;
@ -30,6 +30,11 @@ import siprp.data.*;
public class ExamePanel extends JPanel public class ExamePanel extends JPanel
implements ChangeListener, ControllableComponent, ListSelectionListener implements ChangeListener, ControllableComponent, ListSelectionListener
{ {
static
{
ExameData.registerOperationHandlerForClass( DisableDeleteHandler.INSTANCE, ExameData.class );
}
private JCalendarPanel dataExamePanel; private JCalendarPanel dataExamePanel;
private BetterButtonGroup tipoGroup; private BetterButtonGroup tipoGroup;
private JRadioButton admissaoRadio; private JRadioButton admissaoRadio;
@ -245,20 +250,21 @@ public class ExamePanel extends JPanel
private void setupComponentsHashtable() private void setupComponentsHashtable()
{ {
components = new ComponentsHashtable(); components = new ComponentsHashtable();
components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.TIPO ); components.putDummy( ExameData.TIPO );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.DATA, dataExamePanel ); components.putComponent( ExameData.DATA, dataExamePanel );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OCASIONAL, ocasionalPanel ); components.putComponent( ExameData.OCASIONAL, ocasionalPanel );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRO_TIPO, especificarText ); components.putComponent( ExameData.OUTRO_TIPO, especificarText );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.PROXIMO_EXAME, proximoExamePanel ); components.putComponent( ExameData.PROXIMO_EXAME, proximoExamePanel );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.RESULTADO, resultadoPanel ); components.putComponent( ExameData.RESULTADO, resultadoPanel );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_1, outrasFuncoesTexts[ 0 ] ); components.putComponent( ExameData.OUTRA_FUNCAO_1, outrasFuncoesTexts[ 0 ] );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_2, outrasFuncoesTexts[ 1 ] ); components.putComponent( ExameData.OUTRA_FUNCAO_2, outrasFuncoesTexts[ 1 ] );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_3, outrasFuncoesTexts[ 2 ] ); components.putComponent( ExameData.OUTRA_FUNCAO_3, outrasFuncoesTexts[ 2 ] );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_4, outrasFuncoesTexts[ 3 ] ); components.putComponent( ExameData.OUTRA_FUNCAO_4, outrasFuncoesTexts[ 3 ] );
components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRAS_RECOMENDACOES, recomendacoesText ); components.putComponent( ExameData.OUTRAS_RECOMENDACOES, recomendacoesText );
components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.INACTIVO ); components.putDummy( ExameData.INACTIVO );
components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.TRABALHADOR_ID ); components.putDummy( ExameData.TRABALHADOR );
components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.MEDICO_ID ); components.putDummy( ExameData.MEDICO );
components.putDummy( ExameData.PDF );
} }
public void stateChanged( ChangeEvent e ) public void stateChanged( ChangeEvent e )
@ -331,7 +337,7 @@ public class ExamePanel extends JPanel
StringBuffer msg = new StringBuffer(); StringBuffer msg = new StringBuffer();
boolean hasMsg = false; boolean hasMsg = false;
boolean hasData = false; boolean hasData = false;
MetaObject exame; ExameData exame;
if( dataExamePanel.getDate().after( new Date() ) ) if( dataExamePanel.getDate().after( new Date() ) )
{ {
throw new ValuesException( "N\u00E3o \u00E9 poss\u00EDvel gravar exames com datas futuras." ); throw new ValuesException( "N\u00E3o \u00E9 poss\u00EDvel gravar exames com datas futuras." );
@ -364,22 +370,28 @@ public class ExamePanel extends JPanel
} }
recomendacoesText.setText( recomendacoes.trim() ); recomendacoesText.setText( recomendacoes.trim() );
exame = provider.createObject( FichaDataProvider.EXAMES ); // exame = provider.createObject( FichaDataProvider.EXAMES );
DBField fields[] = FichaDataProvider.EXAMES.getInsertFields(); exame = new ExameData();
String exameFields[] = new String[ fields.length ]; // DBField fields[] = FichaDataProvider.EXAMES.getInsertFields();
for( int i = 0; i < exameFields.length; ++i ) // String exameFields[] = new String[ fields.length ];
{ // for( int i = 0; i < exameFields.length; ++i )
exameFields[ i ] = fields[ i ].FULL_NAME; // {
} // exameFields[ i ] = fields[ i ].FULL_NAME;
// }
// Hashtable hash = new Hashtable();
// ComponentController.save( exameFields, hash, components );
// hash.put( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.INACTIVO, "n" );
// Enumeration enum = hash.keys();
// while( enum.hasMoreElements() )
// {
// String name = ( String )enum.nextElement();
// exame.setProperty( name, hash.get( name ) );
// }
String names[] = exame.getFieldNames();
Hashtable hash = new Hashtable(); Hashtable hash = new Hashtable();
ComponentController.save( exameFields, hash, components ); ComponentController.save( names, hash, components );
hash.put( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.INACTIVO, "n" ); exame.setHashData( hash );
Enumeration enum = hash.keys();
while( enum.hasMoreElements() )
{
String name = ( String )enum.nextElement();
exame.setProperty( name, hash.get( name ) );
}
int tipo = 0; int tipo = 0;
if( admissaoRadio.isSelected() ) if( admissaoRadio.isSelected() )
{ {
@ -397,18 +409,22 @@ public class ExamePanel extends JPanel
// { // {
// tipo = 4; // tipo = 4;
// } // }
exame.setProperty( FichaDataProvider.TIPO, new Integer( tipo ) ); // exame.setProperty( FichaDataProvider.TIPO, new Integer( tipo ) );
exame.set( ExameData.TIPO, new Integer( tipo ) );
if( tipo != 3 ) if( tipo != 3 )
{ {
exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OCASIONAL ).FULL_NAME, null ); // exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OCASIONAL ).FULL_NAME, null );
exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OUTRO_TIPO ).FULL_NAME, "" ); exame.set( ExameData.OCASIONAL, null );
// exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OUTRO_TIPO ).FULL_NAME, "" );
exame.set( ExameData.OUTRO_TIPO, "" );
} }
else else
{ {
Integer ocasionalID = ( Integer )ocasionalPanel.save(); Integer ocasionalID = ( Integer )ocasionalPanel.save();
if( ocasionalID == null || ocasionalID.intValue() != 10 ) if( ocasionalID == null || ocasionalID.intValue() != 10 )
{ {
exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OUTRO_TIPO ).FULL_NAME, "" ); // exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OUTRO_TIPO ).FULL_NAME, "" );
exame.set( ExameData.OUTRO_TIPO, "" );
} }
} }
} }

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

@ -240,8 +240,13 @@ public class FichaWindow extends TabbedWindow
exame.set( ExameData.TRABALHADOR, trabalhador ); exame.set( ExameData.TRABALHADOR, trabalhador );
try try
{ {
exame.set( FichaDataProvider.PDF, createPDF( exame ) );
// empresa.save();
// estabelecimento.save();
exame.save(); exame.save();
// exame.setProperty( FichaDataProvider.PDF, createPDF( exame ) );
// fdpProvider.savePDF( exame ); // fdpProvider.savePDF( exame );
// DBKey key = trabalhador.getPrimaryKeyValue(); // DBKey key = trabalhador.getPrimaryKeyValue();
@ -473,14 +478,15 @@ public class FichaWindow extends TabbedWindow
private void print( Integer exameID ) private void print( Integer exameID )
throws Exception throws Exception
{ {
// MetaObject exame = fdpProvider.load( fdpProvider.EXAMES, new DBKey( exameID ) ); // MetaObject exame = fdpProvider.load( fdpProvider.EXAMES, new DBKey( exameID ) );
// byte pdf[] = (byte []) exame.get( ExameData.PDF ); ExameData exame = (ExameData) ExameData.load( ExameData.class, exameID );
// if( exame == null ) byte pdf[] = (byte []) exame.get( ExameData.PDF );
// { if( exame == null )
// throw new Exception( "N\u00e3o existe exame" ); {
// } throw new Exception( "N\u00e3o existe exame" );
// ExamePDF ePDF = new ExamePDF(); }
// ePDF.print( pdf ); ExamePDF ePDF = new ExamePDF();
ePDF.print( pdf );
} }
public byte[] createPDF( ExameData exame ) public byte[] createPDF( ExameData exame )

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

@ -14,6 +14,7 @@ import com.evolute.utils.documents.*;
import com.evolute.utils.metadb.*; import com.evolute.utils.metadb.*;
import siprp.*; import siprp.*;
import siprp.data.*;
/** /**
* *
* @author fpalma * @author fpalma
@ -61,8 +62,8 @@ public class ObservacoesPanel extends JPanel
try try
{ {
MetaObject trabalhador = provider.load( provider.TRABALHADORES, new DBKey( trabalhadorID ) ); TrabalhadorData trabalhador = (TrabalhadorData)TrabalhadorData.load( TrabalhadorData.class, trabalhadorID );
String observacoes = (String) trabalhador.getProperty( provider.OBSERVACOES ); String observacoes = (String) trabalhador.get( TrabalhadorData.OBSERVACOES );
if( observacoes != null ) if( observacoes != null )
{ {
observacoesText.setText( observacoes ); observacoesText.setText( observacoes );

Write Preview
Loading…
Cancel
Save