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

git-svn-id: https://svn.coded.pt/svn/SIPRP@632 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
lxbfYeaa
Frederico Palma 18 years ago
parent 07b9c89c19
commit d1487c6ecc
8 changed files with 105 additions and 50 deletions
Show Stats Download Patch File Download Diff File

55
trunk/SIPRPSoft/src/siprp/clientes/MarcacaoPanel.java
Unescape View File

@ -6,21 +6,46 @@
package siprp.clientes; package siprp.clientes;
import java.awt.*; import java.awt.Dimension;
import java.awt.event.*; import java.awt.GridBagConstraints;
import javax.swing.*; import java.awt.GridBagLayout;
import javax.swing.event.*; import java.awt.GridLayout;
import java.text.*; import java.awt.Insets;
import java.util.*; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import com.evolute.utils.*; import java.text.DateFormat;
import com.evolute.utils.dataui.*; import java.util.Arrays;
import com.evolute.utils.ui.*; import java.util.Date;
import com.evolute.utils.ui.calendar.*; import java.util.Vector;
import com.evolute.utils.ui.panel.*;
import javax.swing.BorderFactory;
import siprp.*; import javax.swing.Box;
import siprp.data.*; 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.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;
/** /**
* *

57
trunk/SIPRPSoft/src/siprp/ficha/FichaWindow.java
Unescape View File

@ -6,27 +6,42 @@
package siprp.ficha; package siprp.ficha;
import siprp.*; import java.awt.FileDialog;
import siprp.data.*; import java.awt.GridBagConstraints;
import siprp.importer.*; import java.awt.GridBagLayout;
import siprp.medicina.*; import java.awt.Insets;
import java.io.File;
import java.awt.*; import java.io.FilenameFilter;
import java.io.*; import java.text.DateFormat;
import java.util.*; import java.util.Arrays;
import javax.swing.*; import java.util.Date;
import java.text.*; import java.util.HashMap;
import java.util.Hashtable;
import com.evolute.utils.*; import java.util.Vector;
import com.evolute.utils.data.*;
import com.evolute.utils.jdo.*; import javax.swing.JOptionPane;
import com.evolute.utils.metadb.*; import javax.swing.JPanel;
import com.evolute.utils.strings.*;
import com.evolute.utils.tracker.*; import siprp.FichaDataProvider;
import com.evolute.utils.ui.*; import siprp.data.EmpresaData;
import com.evolute.utils.ui.panel.*; import siprp.data.EstabelecimentoData;
import com.evolute.utils.ui.search.*; import siprp.data.ExameData;
import com.evolute.utils.ui.window.*; 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;
/** /**
* *

17
trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindow.java
Unescape View File

@ -150,6 +150,16 @@ public class EnviarAnalisesWindow extends JFrame
{ {
Object source = e.getSource(); Object source = e.getSource();
if( source.equals( enviarButton ) ) if( source.equals( enviarButton ) )
{
}
}
@Override
public void stateChanged( ChangeEvent e )
{
Object source = e.getSource();
if( source.equals( dataPanel ) )
{ {
Date data = dataPanel.getDate(); Date data = dataPanel.getDate();
try try
@ -170,13 +180,6 @@ public class EnviarAnalisesWindow extends JFrame
} }
} }
@Override
public void stateChanged( ChangeEvent e )
{
// TODO Auto-generated method stub
}
@Override @Override
public void clear() public void clear()
{ {

4
trunk/SIPRPSoft/src/siprp/medicina/locais_analise/EnviarAnalisesWindowLogic.java
Unescape View File

@ -61,10 +61,12 @@ class EnviarAnalisesWindowLogic
{ {
Integer idsMarcacoes[] = Integer idsMarcacoes[] =
locaisRealizacaoProvider.getMarcacoesEcdsIdsByDataAndPrestadorId( data, LocaisRealizacaoConstants.PRESTADOR_ID_SIPRP ); locaisRealizacaoProvider.getMarcacoesEcdsIdsByDataAndPrestadorId( data, LocaisRealizacaoConstants.PRESTADOR_ID_SIPRP );
logic.getGruposEcdsIdsByMarcacoes( idsMarcacoes ); IDObject grupos[] = logic.getGruposEcdsIdsByMarcacoes( idsMarcacoes );
window.setEcds( grupos );
} }
else else
{ {
window.setEcds( new IDObject[ 0 ] );
} }
} }
} }

24
trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseDataProvider.java
Unescape View File

@ -2,6 +2,8 @@ package siprp.medicina.locais_analise;
import com.evolute.utils.Singleton; import com.evolute.utils.Singleton;
import com.evolute.utils.arrays.Virtual2DArray; 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.DBManager;
import com.evolute.utils.db.Executer; import com.evolute.utils.db.Executer;
import com.evolute.utils.sql.Expression; import com.evolute.utils.sql.Expression;
@ -37,28 +39,34 @@ public class LocaisAnaliseDataProvider
return instance; return instance;
} }
protected Integer[] getGruposEcdsIdsByMarcacoes( Integer marcacoesIds[] ) protected IDObject[] getGruposEcdsIdsByMarcacoes( Integer marcacoesIds[] )
throws Exception throws Exception
{ {
Select select = Select select =
new Select2( new Select2(
new String[]{ "trabalhadores_ecd", "prt_tipos_elementos_protocolo" }, new String[]{ "trabalhadores_ecd", "prt_tipos_elementos_protocolo",
new Integer[]{ Select2.JOIN_INNER }, "prt_grupos_protocolo"},
new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_INNER },
new Expression[]{ new Expression[]{
new Field( "trabalhadores_ecd.ecd_id" ).isEqual( 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 ), new Field( "trabalhadores_ecd.trabalhadores_ecds_datas_id" ).in( marcacoesIds ),
null, new String[]{ "prt_grupos_protocolo.ordem" },
null, null,
null, null,
null ); null );
Virtual2DArray array = EXECUTER.executeQuery( select ); 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++ ) 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; return grupos;
} }

4
trunk/SIPRPSoft/src/siprp/medicina/locais_analise/LocaisAnaliseLogic.java
Unescape View File

@ -1,5 +1,7 @@
package siprp.medicina.locais_analise; package siprp.medicina.locais_analise;
import com.evolute.utils.data.IDObject;
public final class LocaisAnaliseLogic public final class LocaisAnaliseLogic
{ {
private static final Object LOCK = new Object(); private static final Object LOCK = new Object();
@ -26,7 +28,7 @@ public final class LocaisAnaliseLogic
return instance; return instance;
} }
protected Integer[] getGruposEcdsIdsByMarcacoes( Integer marcacoesIds[] ) protected IDObject[] getGruposEcdsIdsByMarcacoes( Integer marcacoesIds[] )
throws Exception throws Exception
{ {
return provider.getGruposEcdsIdsByMarcacoes( marcacoesIds ); return provider.getGruposEcdsIdsByMarcacoes( marcacoesIds );

2
trunk/build.xml
Unescape View File

@ -144,7 +144,7 @@
<depend srcdir="${app.src.dir}" destdir="${app.build.classes.dir}" cache="${app.dependencies.chache.dir}"> <depend srcdir="${app.src.dir}" destdir="${app.build.classes.dir}" cache="${app.dependencies.chache.dir}">
<include name="**/*.java" /> <include name="**/*.java" />
</depend> </depend>
<javac srcdir="${app.src.dir}" destdir="${app.build.classes.dir}" classpathref="app.build.classpath" debug="on" deprecation="on" fork="true" memoryMaximumSize="512M" /> <javac srcdir="${app.src.dir}" destdir="${app.build.classes.dir}" classpathref="app.build.classpath" debug="on" deprecation="on" fork="true" memoryMaximumSize="512M" source="1.5" target="1.5" />
</target> </target>
<target name="app-clean" description="Removes all generated files"> <target name="app-clean" description="Removes all generated files">

BIN
trunk/lib.common/evolute.jar
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save