diff --git a/trunk/SIPRPSoft/lib/evolute.jar b/trunk/SIPRPSoft/lib/evolute.jar index 7da39a60..dad15706 100644 Binary files a/trunk/SIPRPSoft/lib/evolute.jar and b/trunk/SIPRPSoft/lib/evolute.jar differ diff --git a/trunk/SIPRPSoft/properties/version.properties b/trunk/SIPRPSoft/properties/version.properties index 74d091cc..5b633109 100644 --- a/trunk/SIPRPSoft/properties/version.properties +++ b/trunk/SIPRPSoft/properties/version.properties @@ -1,6 +1,6 @@ #siprpsoft versioning file -#Wed Jul 14 15:49:54 WEST 2010 +#Wed Jul 14 17:09:45 WEST 2010 major=12 name=siprpsoft minor=0 -build=9 +build=10 diff --git a/trunk/SIPRPSoft/src/siprp/data/outer/EstabelecimentosData.java b/trunk/SIPRPSoft/src/siprp/data/outer/EstabelecimentosData.java index c1e6a620..670cf0f2 100644 --- a/trunk/SIPRPSoft/src/siprp/data/outer/EstabelecimentosData.java +++ b/trunk/SIPRPSoft/src/siprp/data/outer/EstabelecimentosData.java @@ -11,9 +11,6 @@ import java.sql.Timestamp; import java.util.Collections; import java.util.List; -import siprp.database.cayenne.objects.MarcacoesEstabelecimento; -import siprp.database.cayenne.objects.Trabalhadores; - import com.evolute.entity.evo.EvoDataException; diff --git a/trunk/SIPRPSoft/src/siprp/data/outer/TrabalhadoresData.java b/trunk/SIPRPSoft/src/siprp/data/outer/TrabalhadoresData.java index f72ad4df..9087adce 100644 --- a/trunk/SIPRPSoft/src/siprp/data/outer/TrabalhadoresData.java +++ b/trunk/SIPRPSoft/src/siprp/data/outer/TrabalhadoresData.java @@ -8,11 +8,7 @@ package siprp.data.outer; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; - -import siprp.database.cayenne.objects.TrabalhadoresProcesso; import com.evolute.entity.evo.EvoDataException; diff --git a/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java b/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java index 0b2bfe59..a367047b 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/ExamePanel.java @@ -13,7 +13,6 @@ import java.awt.GridLayout; import java.awt.Insets; import java.util.Calendar; import java.util.Date; -import java.util.Hashtable; import java.util.Vector; import javax.swing.BorderFactory; diff --git a/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java b/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java index 2abc40d9..ed7f8e28 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/TrabalhadorPanel.java @@ -10,7 +10,6 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; import java.util.Hashtable; -import java.util.Map; import javax.swing.BorderFactory; import javax.swing.JLabel; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java index b654785c..5a81e190 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/GestaoRelatorioWindow.java @@ -1,7 +1,6 @@ package siprp.higiene.gestao; import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; -import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; import static com.evolute.utils.strings.UnicodeLatin1Map.oacute; import java.awt.Dimension; diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java index 99a3c8c1..f25a11bb 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacaoVisitaHSTPanel.java @@ -4,8 +4,6 @@ import info.clearthought.layout.TableLayout; import info.clearthought.layout.TableLayoutConstraints; import java.awt.BorderLayout; -import java.util.Hashtable; -import java.util.Map; import javax.swing.BorderFactory; import javax.swing.JButton; @@ -19,10 +17,8 @@ import siprp.data.outer.MarcacoesEstabelecimentoData; import com.evolute.utils.Singleton; import com.evolute.utils.data.IDObject; import com.evolute.utils.data.MappableObject; -import com.evolute.utils.data.PropertyObject; import com.evolute.utils.dataui.ComponentController; import com.evolute.utils.dataui.ComponentsHashtable; -import com.evolute.utils.dataui.ControllableComponent; import com.evolute.utils.dataui.DataClassAware; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.SQLExecuter; @@ -30,9 +26,7 @@ import com.evolute.utils.ui.calendar.JCalendarPanel; import com.evolute.utils.ui.panel.RadioButtonFixedPanel; import com.evolute.utils.ui.text.StateTextArea; -public class MarcacaoVisitaHSTPanel - extends JPanel - implements ControllableComponent, DataClassAware +public class MarcacaoVisitaHSTPanel extends JPanel implements DataClassAware { private static final long serialVersionUID = 1L; @@ -234,56 +228,58 @@ public class MarcacaoVisitaHSTPanel components.putComponent( MarcacoesEstabelecimentoData.ESTADO, estadoList ); components.putComponent( MarcacoesEstabelecimentoData.OBSERVACOES, observacoesText ); } - - public void fill( Object toFill ) + + @Override + public void fill( MarcacoesEstabelecimentoData toFill ) { - clear(); - if( toFill == null || !( toFill instanceof PropertyObject ) ) - { - return; - } - Map data = null; - if( toFill instanceof PropertyObject ) - { - data = ( (PropertyObject) toFill ).getHashData(); - if( toFill instanceof MarcacoesEstabelecimentoData ) - { - marcacaoEstabelecimentosData = (MarcacoesEstabelecimentoData) toFill; - } - } - else if( toFill instanceof Hashtable ) - { - data = (Hashtable) toFill; - } - else - { - return; - } - if( marcacaoEstabelecimentosData == null ) - { - marcacaoEstabelecimentosData = new MarcacoesEstabelecimentoData(); - marcacaoEstabelecimentosData.setHashData( data ); - } - PropertyObject po = (PropertyObject) toFill; - String properties[] = (String[]) components.keySet().toArray( new String[ 0 ] ); - ComponentController.fill( properties, po.getHashData(), components ); + marcacaoEstabelecimentosData = toFill; +// if( toFill == null || !( toFill instanceof PropertyObject ) ) +// { +// return; +// } +// Map data = null; +// if( toFill instanceof PropertyObject ) +// { +// data = ( (PropertyObject) toFill ).getHashData(); +// if( toFill instanceof MarcacoesEstabelecimentoData ) +// { +// marcacaoEstabelecimentosData = (MarcacoesEstabelecimentoData) toFill; +// } +// } +// else if( toFill instanceof Hashtable ) +// { +// data = (Hashtable) toFill; +// } +// else +// { +// return; +// } +// if( marcacaoEstabelecimentosData == null ) +// { +// clear(); +// marcacaoEstabelecimentosData = new MarcacoesEstabelecimentoData(); +// marcacaoEstabelecimentosData.setHashData( data ); +// } +// PropertyObject po = (PropertyObject) toFill; +// String properties[] = (String[]) components.keySet().toArray( new String[ 0 ] ); + ComponentController.fillFrom( marcacaoEstabelecimentosData, components ); } - public Object save() + @Override + public MarcacoesEstabelecimentoData save() { if( marcacaoEstabelecimentosData == null ) { marcacaoEstabelecimentosData = new MarcacoesEstabelecimentoData(); } - Map data = marcacaoEstabelecimentosData.getHashData(); - String properties[] = (String[]) components.keySet().toArray( new String[ 0 ] ); - ComponentController.save( properties, data, components ); - if( !( marcacaoEstabelecimentosData instanceof PropertyObject ) ) - { - return data; - } - marcacaoEstabelecimentosData.setHashData( data ); - return marcacaoEstabelecimentosData; +// marcacaoEstabelecimentosData.setHashData( ComponentController.save( components ) ); +// if( !( marcacaoEstabelecimentosData instanceof PropertyObject ) ) +// { +// return marcacaoEstabelecimentosData; +// } + return ComponentController.saveTo( marcacaoEstabelecimentosData, components ); +// marcacaoEstabelecimentosData.setHashData( data ); +// return marcacaoEstabelecimentosData; } public void clear() diff --git a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java index b55d3e9c..8f233625 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java @@ -36,6 +36,7 @@ import siprp.clientes.AvisosPanel; import siprp.data.AvisoConstants; import siprp.data.Marcacao; import siprp.data.outer.ContactosData; +import siprp.data.outer.EmpresasData; import siprp.data.outer.EstabelecimentosData; import siprp.data.outer.MarcacoesEstabelecimentoData; import siprp.higiene.HigieneDataProvider; @@ -74,16 +75,16 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow protected MarcacaoVisitaHSTPanel marcacaoPanel; protected TableEditorPanel marcacaoEditorPanel; - protected HigieneDataProvider provider; - protected ProviderInterface JDO; + protected HigieneDataProvider higienteProvider; + protected ProviderInterface objectProvider; protected SHSTTrackerInterface tracker; private Hashtable tecnicosHash; - protected Integer empresaID; - protected String empresa; - protected Integer estabelecimentoID; - protected EstabelecimentosData estabelecimento; + private Integer empresaID; +// protected String empresa; + private Integer estabelecimentoID; + private EstabelecimentosData estabelecimento; protected boolean editing = false; @@ -92,8 +93,8 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow throws Exception { super( iPermissionArray ); - this.provider = ( HigieneDataProvider ) HigieneDataProvider.getProvider(); - this.JDO = ( ProviderInterface ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER ); + this.higienteProvider = ( HigieneDataProvider ) HigieneDataProvider.getProvider(); + this.objectProvider = ( ProviderInterface ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER ); this.tecnicosHash = new Hashtable(); this.setupComponents(); this.setSize( 800, 700 ); @@ -157,7 +158,9 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow marcacaoEditorPanel.addComponent( marcacaoPanel, new int[]{0,2}, new int[]{1,2}, 1.0, 1.0 ); - marcacaoEditorPanel.addListSelectionListener( new ListSelectionListener(){ + marcacaoEditorPanel.addListSelectionListener( new ListSelectionListener() + { + @Override public void valueChanged(javax.swing.event.ListSelectionEvent listSelectionEvent) { if( marcacaoEditorPanel.getID() != null ) @@ -170,8 +173,9 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow clear( INDEX_VISITA ); } } - }); - }catch( Exception ex ) + } ); + } + catch( Exception ex ) { DialogException.showException( ex ); return; @@ -201,7 +205,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow private void fillTecnicos( JComboBox tecnicosList, boolean superiores ) throws Exception { tecnicosList.removeAllItems(); - Object tecnicos[][] = provider.getTecnicosHST( superiores ); + Object tecnicos[][] = higienteProvider.getTecnicosHST( superiores ); tecnicosList.addItem( new MappableObject( new Integer( -2 ), " " ) ); for( int n = 0; n < tecnicos.length; n++ ) { @@ -218,6 +222,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow tecnicosList.addItem( new MappableObject( new Integer( -1 ), "Novo/Editar" ) ); } + @Override public void itemStateChanged( ItemEvent itemEvent ) { JComboBox tecnicos = null; @@ -265,6 +270,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow } } + @Override public boolean save(int index) { switch( index ) @@ -310,6 +316,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow return true; } + @Override public boolean delete(int index) { int option = JOptionPane.showConfirmDialog( this, "Tem a certeza que quer apagar a marca\u00e7\u00e3o?", @@ -337,13 +344,13 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow return false; } + @Override public void clear(int index) { switch( index ) { case INDEX_MAIN: empresaID = null; - empresa = null; estabelecimentoID = null; estabelecimento = null; upperPanel.clear(); @@ -378,6 +385,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow } } + @Override protected void enableSelect( int index, boolean select ) { switch( index ) @@ -388,6 +396,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow } } + @Override public void reload( int index ) { switch( index ) @@ -395,12 +404,12 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow case INDEX_MAIN: try { - empresa = provider.getEmpresa( empresaID ); - estabelecimento = ( EstabelecimentosData ) JDO.load( EstabelecimentosData.class, estabelecimentoID ); +// EmpresasData empresa = (EmpresasData) objectProvider.load( EmpresasData.class, empresaID ); + estabelecimento = estabelecimentoID == null ? null : ((EstabelecimentosData) objectProvider.load( EstabelecimentosData.class, estabelecimentoID )); // upperPanel.getEmpresaText().setText( empresa ); // upperPanel.getEstabelecimentoText().setText( estabelecimento ); // upperPanel.getTrabalhadorText().setText( ( String ) trabalhador.get( TrabalhadoresData.NOME ) ); - Object visitas[][] = provider.getVisitasEstabelecimento( estabelecimentoID ); + Object visitas[][] = higienteProvider.getVisitasEstabelecimento( estabelecimentoID ); if( visitas.length > 0 ) { marcacaoEditorPanel.setData( new Object2DArray( visitas ) ); @@ -424,8 +433,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow } try { - MarcacoesEstabelecimentoData visita = - ( MarcacoesEstabelecimentoData ) JDO.load( MarcacoesEstabelecimentoData.class, visitaID ); + MarcacoesEstabelecimentoData visita = (MarcacoesEstabelecimentoData) objectProvider.load( MarcacoesEstabelecimentoData.class, visitaID ); marcacaoPanel.fill( visita ); Date dataEmailVisita = ( Date ) visita.get( MarcacoesEstabelecimentoData.DATA_EMAIL ); if( dataEmailVisita != null ) @@ -445,6 +453,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow } } + @Override public void actionPerformed( ActionEvent e ) { Object source = e.getSource(); @@ -517,6 +526,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow } } + @Override public void valueChanged( ListSelectionEvent e ) { Object source = e.getSource(); @@ -538,6 +548,7 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow } } + @Override public void setEmpresaAndEstabelecimento( Integer empresaID, Integer estabelecimentoID ) { if( editing ) @@ -551,8 +562,10 @@ public class MarcacoesHigieneWindow extends SIPRPEditorWindow } } + @Override public void setTracker( SHSTTrackerInterface tracker ) { this.tracker = tracker; } + }