diff --git a/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoPanel.java index 636c9cfe..230f4271 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/MarcacaoPanel.java @@ -6,21 +6,46 @@ package siprp.clientes; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; -import java.text.*; -import java.util.*; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.GridLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.text.DateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.Vector; -import com.evolute.utils.*; -import com.evolute.utils.dataui.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.calendar.*; -import com.evolute.utils.ui.panel.*; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; -import siprp.*; -import siprp.data.*; +import siprp.CompanyDataLoader; +import siprp.SingletonConstants; +import siprp.data.ContactoData; +import siprp.data.EstabelecimentoData; +import siprp.data.Marcacao; +import siprp.data.MarcacaoEstabelecimentoData; +import siprp.data.MarcacaoListLoader; +import siprp.data.MarcacaoTrabalhadorConstants; +import siprp.data.MarcacaoTrabalhadorData; +import siprp.data.TrabalhadorData; + +import com.evolute.utils.Singleton; +import com.evolute.utils.dataui.ComponentController; +import com.evolute.utils.dataui.ComponentsHashtable; +import com.evolute.utils.dataui.ControllableComponent; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.calendar.JCalendarPanel; +import com.evolute.utils.ui.dialog.ListActionDialog; /** * diff --git a/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java index d48913e5..bac0cd4b 100644 --- a/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java @@ -6,27 +6,42 @@ package siprp.ficha; -import siprp.*; -import siprp.data.*; -import siprp.importer.*; -import siprp.medicina.*; +import java.awt.FileDialog; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.io.File; +import java.io.FilenameFilter; +import java.text.DateFormat; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Vector; -import java.awt.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import java.text.*; +import javax.swing.JOptionPane; +import javax.swing.JPanel; -import com.evolute.utils.*; -import com.evolute.utils.data.*; -import com.evolute.utils.jdo.*; -import com.evolute.utils.metadb.*; -import com.evolute.utils.strings.*; -import com.evolute.utils.tracker.*; -import com.evolute.utils.ui.*; -import com.evolute.utils.ui.panel.*; -import com.evolute.utils.ui.search.*; -import com.evolute.utils.ui.window.*; +import siprp.FichaDataProvider; +import siprp.data.EmpresaData; +import siprp.data.EstabelecimentoData; +import siprp.data.ExameData; +import siprp.data.MedicoData; +import siprp.data.TrabalhadorData; +import siprp.importer.Importer; +import siprp.medicina.MarcacoesMedicinaHandler; + +import com.evolute.utils.Singleton; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.jdo.JDOProvider; +import com.evolute.utils.strings.StringPlainer; +import com.evolute.utils.ui.DialogException; +import com.evolute.utils.ui.dialog.ListAction; +import com.evolute.utils.ui.dialog.ListActionDialog; +import com.evolute.utils.ui.search.SearchDialog; +import com.evolute.utils.ui.window.ActionHandler; +import com.evolute.utils.ui.window.ProgressDialog; +import com.evolute.utils.ui.window.TabbedWindow; /** * diff --git a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java index f35e5ef8..15898510 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java @@ -150,6 +150,16 @@ public class EnviarAnalisesWindow extends JFrame { Object source = e.getSource(); if( source.equals( enviarButton ) ) + { + + } + } + + @Override + public void stateChanged( ChangeEvent e ) + { + Object source = e.getSource(); + if( source.equals( dataPanel ) ) { Date data = dataPanel.getDate(); try @@ -170,13 +180,6 @@ public class EnviarAnalisesWindow extends JFrame } } - @Override - public void stateChanged( ChangeEvent e ) - { - // TODO Auto-generated method stub - - } - @Override public void clear() { diff --git a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindowLogic.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindowLogic.java index 3e13a04c..cbe4d79b 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindowLogic.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindowLogic.java @@ -61,10 +61,12 @@ class EnviarAnalisesWindowLogic { Integer idsMarcacoes[] = locaisRealizacaoProvider.getMarcacoesEcdsIdsByDataAndPrestadorId( data, LocaisRealizacaoConstants.PRESTADOR_ID_SIPRP ); - logic.getGruposEcdsIdsByMarcacoes( idsMarcacoes ); + IDObject grupos[] = logic.getGruposEcdsIdsByMarcacoes( idsMarcacoes ); + window.setEcds( grupos ); } else { + window.setEcds( new IDObject[ 0 ] ); } } } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseDataProvider.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseDataProvider.java index 4a651c63..182adbb9 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseDataProvider.java @@ -2,6 +2,8 @@ package siprp.medicina.locais_analise; import com.evolute.utils.Singleton; import com.evolute.utils.arrays.Virtual2DArray; +import com.evolute.utils.data.IDObject; +import com.evolute.utils.data.MappableObject; import com.evolute.utils.db.DBManager; import com.evolute.utils.db.Executer; import com.evolute.utils.sql.Expression; @@ -37,28 +39,34 @@ public class LocaisAnaliseDataProvider return instance; } - protected Integer[] getGruposEcdsIdsByMarcacoes( Integer marcacoesIds[] ) + protected IDObject[] getGruposEcdsIdsByMarcacoes( Integer marcacoesIds[] ) throws Exception { Select select = new Select2( - new String[]{ "trabalhadores_ecd", "prt_tipos_elementos_protocolo" }, - new Integer[]{ Select2.JOIN_INNER }, + new String[]{ "trabalhadores_ecd", "prt_tipos_elementos_protocolo", + "prt_grupos_protocolo"}, + new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_INNER }, new Expression[]{ new Field( "trabalhadores_ecd.ecd_id" ).isEqual( - new Field( "prt_tipos_elementos_protocolo.id" ) ) + new Field( "prt_tipos_elementos_protocolo.id" ) ), + new Field( "prt_tipos_elementos_protocolo.grupo_protocolo_id" ).isEqual( + new Field( "prt_grupos_protocolo.id" ) ) }, - new String[]{ "DISTINCT prt_tipos_elementos_protocolo.grupo_protocolo_id" }, + new String[]{ "DISTINCT prt_grupos_protocolo.id", "prt_grupos_protocolo.descricao", + "prt_grupos_protocolo.ordem" }, new Field( "trabalhadores_ecd.trabalhadores_ecds_datas_id" ).in( marcacoesIds ), - null, + new String[]{ "prt_grupos_protocolo.ordem" }, null, null, null ); Virtual2DArray array = EXECUTER.executeQuery( select ); - Integer grupos[] = new Integer[ array.columnLength() ]; + IDObject grupos[] = new IDObject[ array.columnLength() ]; for( int n = 0; n < grupos.length; n++ ) { - grupos[ n ] = ( Integer ) array.get( n, 0 ); + Integer id = ( Integer ) array.get( n, 0 ); + String descricao = ( String ) array.get( n, 1 ); + grupos[ n ] = new MappableObject( id, descricao ); } return grupos; } diff --git a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseLogic.java b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseLogic.java index 4abdb3d4..ccb7f0f7 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseLogic.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseLogic.java @@ -1,5 +1,7 @@ package siprp.medicina.locais_analise; +import com.evolute.utils.data.IDObject; + public final class LocaisAnaliseLogic { private static final Object LOCK = new Object(); @@ -26,7 +28,7 @@ public final class LocaisAnaliseLogic return instance; } - protected Integer[] getGruposEcdsIdsByMarcacoes( Integer marcacoesIds[] ) + protected IDObject[] getGruposEcdsIdsByMarcacoes( Integer marcacoesIds[] ) throws Exception { return provider.getGruposEcdsIdsByMarcacoes( marcacoesIds ); diff --git a/trunk/build.xml b/trunk/build.xml index 81752aa8..47544b1f 100644 --- a/trunk/build.xml +++ b/trunk/build.xml @@ -144,7 +144,7 @@ - + diff --git a/trunk/lib.common/evolute.jar b/trunk/lib.common/evolute.jar index 7622224e..96599a51 100644 Binary files a/trunk/lib.common/evolute.jar and b/trunk/lib.common/evolute.jar differ