From 6c56a7e368c53eee16d7352d4613cbc401397208 Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Fri, 28 Jan 2005 14:10:11 +0000 Subject: [PATCH] no message git-svn-id: https://svn.coded.pt/svn/SIPRP@160 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/siprp/ficha/ExamePanel.java | 86 +++++++++++++++---------- trunk/siprp/ficha/FichaWindow.java | 24 ++++--- trunk/siprp/ficha/ObservacoesPanel.java | 5 +- 3 files changed, 69 insertions(+), 46 deletions(-) diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/siprp/ficha/ExamePanel.java index e8488f17..2bd40e3d 100644 --- a/trunk/siprp/ficha/ExamePanel.java +++ b/trunk/siprp/ficha/ExamePanel.java @@ -16,7 +16,7 @@ import java.util.*; import com.evolute.utils.documents.*; import com.evolute.utils.data.*; 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.button.*; import com.evolute.utils.ui.panel.*; @@ -30,6 +30,11 @@ import siprp.data.*; public class ExamePanel extends JPanel implements ChangeListener, ControllableComponent, ListSelectionListener { + static + { + ExameData.registerOperationHandlerForClass( DisableDeleteHandler.INSTANCE, ExameData.class ); + } + private JCalendarPanel dataExamePanel; private BetterButtonGroup tipoGroup; private JRadioButton admissaoRadio; @@ -245,20 +250,21 @@ public class ExamePanel extends JPanel private void setupComponentsHashtable() { components = new ComponentsHashtable(); - components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.TIPO ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.DATA, dataExamePanel ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OCASIONAL, ocasionalPanel ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRO_TIPO, especificarText ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.PROXIMO_EXAME, proximoExamePanel ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.RESULTADO, resultadoPanel ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_1, outrasFuncoesTexts[ 0 ] ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_2, outrasFuncoesTexts[ 1 ] ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_3, outrasFuncoesTexts[ 2 ] ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_4, outrasFuncoesTexts[ 3 ] ); - components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRAS_RECOMENDACOES, recomendacoesText ); - components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.INACTIVO ); - components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.TRABALHADOR_ID ); - components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.MEDICO_ID ); + components.putDummy( ExameData.TIPO ); + components.putComponent( ExameData.DATA, dataExamePanel ); + components.putComponent( ExameData.OCASIONAL, ocasionalPanel ); + components.putComponent( ExameData.OUTRO_TIPO, especificarText ); + components.putComponent( ExameData.PROXIMO_EXAME, proximoExamePanel ); + components.putComponent( ExameData.RESULTADO, resultadoPanel ); + components.putComponent( ExameData.OUTRA_FUNCAO_1, outrasFuncoesTexts[ 0 ] ); + components.putComponent( ExameData.OUTRA_FUNCAO_2, outrasFuncoesTexts[ 1 ] ); + components.putComponent( ExameData.OUTRA_FUNCAO_3, outrasFuncoesTexts[ 2 ] ); + components.putComponent( ExameData.OUTRA_FUNCAO_4, outrasFuncoesTexts[ 3 ] ); + components.putComponent( ExameData.OUTRAS_RECOMENDACOES, recomendacoesText ); + components.putDummy( ExameData.INACTIVO ); + components.putDummy( ExameData.TRABALHADOR ); + components.putDummy( ExameData.MEDICO ); + components.putDummy( ExameData.PDF ); } public void stateChanged( ChangeEvent e ) @@ -331,7 +337,7 @@ public class ExamePanel extends JPanel StringBuffer msg = new StringBuffer(); boolean hasMsg = false; boolean hasData = false; - MetaObject exame; + ExameData exame; if( dataExamePanel.getDate().after( new Date() ) ) { 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() ); - exame = provider.createObject( FichaDataProvider.EXAMES ); - DBField fields[] = FichaDataProvider.EXAMES.getInsertFields(); - String exameFields[] = new String[ fields.length ]; - for( int i = 0; i < exameFields.length; ++i ) - { - exameFields[ i ] = fields[ i ].FULL_NAME; - } +// exame = provider.createObject( FichaDataProvider.EXAMES ); + exame = new ExameData(); +// DBField fields[] = FichaDataProvider.EXAMES.getInsertFields(); +// String exameFields[] = new String[ fields.length ]; +// for( int i = 0; i < exameFields.length; ++i ) +// { +// 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(); - 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 ) ); - } + ComponentController.save( names, hash, components ); + exame.setHashData( hash ); + int tipo = 0; if( admissaoRadio.isSelected() ) { @@ -397,18 +409,22 @@ public class ExamePanel extends JPanel // { // 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 ) { - exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OCASIONAL ).FULL_NAME, null ); - exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OUTRO_TIPO ).FULL_NAME, "" ); +// exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OCASIONAL ).FULL_NAME, null ); + exame.set( ExameData.OCASIONAL, null ); +// exame.setProperty( FichaDataProvider.EXAMES.getFieldByName( FichaDataProvider.OUTRO_TIPO ).FULL_NAME, "" ); + exame.set( ExameData.OUTRO_TIPO, "" ); } else { Integer ocasionalID = ( Integer )ocasionalPanel.save(); 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, "" ); } } } diff --git a/trunk/siprp/ficha/FichaWindow.java b/trunk/siprp/ficha/FichaWindow.java index 1a840a75..618d8268 100644 --- a/trunk/siprp/ficha/FichaWindow.java +++ b/trunk/siprp/ficha/FichaWindow.java @@ -240,8 +240,13 @@ public class FichaWindow extends TabbedWindow exame.set( ExameData.TRABALHADOR, trabalhador ); try { + + exame.set( FichaDataProvider.PDF, createPDF( exame ) ); + +// empresa.save(); +// estabelecimento.save(); + exame.save(); -// exame.setProperty( FichaDataProvider.PDF, createPDF( exame ) ); // fdpProvider.savePDF( exame ); // DBKey key = trabalhador.getPrimaryKeyValue(); @@ -473,14 +478,15 @@ public class FichaWindow extends TabbedWindow private void print( Integer exameID ) throws Exception { -// MetaObject exame = fdpProvider.load( fdpProvider.EXAMES, new DBKey( exameID ) ); -// byte pdf[] = (byte []) exame.get( ExameData.PDF ); -// if( exame == null ) -// { -// throw new Exception( "N\u00e3o existe exame" ); -// } -// ExamePDF ePDF = new ExamePDF(); -// ePDF.print( pdf ); +// MetaObject exame = fdpProvider.load( fdpProvider.EXAMES, new DBKey( exameID ) ); + ExameData exame = (ExameData) ExameData.load( ExameData.class, exameID ); + byte pdf[] = (byte []) exame.get( ExameData.PDF ); + if( exame == null ) + { + throw new Exception( "N\u00e3o existe exame" ); + } + ExamePDF ePDF = new ExamePDF(); + ePDF.print( pdf ); } public byte[] createPDF( ExameData exame ) diff --git a/trunk/siprp/ficha/ObservacoesPanel.java b/trunk/siprp/ficha/ObservacoesPanel.java index 55c9a8c1..995df8f7 100644 --- a/trunk/siprp/ficha/ObservacoesPanel.java +++ b/trunk/siprp/ficha/ObservacoesPanel.java @@ -14,6 +14,7 @@ import com.evolute.utils.documents.*; import com.evolute.utils.metadb.*; import siprp.*; +import siprp.data.*; /** * * @author fpalma @@ -61,8 +62,8 @@ public class ObservacoesPanel extends JPanel try { - MetaObject trabalhador = provider.load( provider.TRABALHADORES, new DBKey( trabalhadorID ) ); - String observacoes = (String) trabalhador.getProperty( provider.OBSERVACOES ); + TrabalhadorData trabalhador = (TrabalhadorData)TrabalhadorData.load( TrabalhadorData.class, trabalhadorID ); + String observacoes = (String) trabalhador.get( TrabalhadorData.OBSERVACOES ); if( observacoes != null ) { observacoesText.setText( observacoes );