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

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 18 years ago
parent 1519b964d9
commit bdaeb6322e
21 changed files with 399 additions and 286 deletions
Show Stats Download Patch File Download Diff File

6
trunk/SIPRPSoft/src/SIPRPMap.map.xml
Unescape View File

@ -286,6 +286,7 @@
<db-attribute name="morada" type="VARCHAR" length="2048"/>
<db-attribute name="nome" type="VARCHAR" length="255"/>
<db-attribute name="nome_plain" type="VARCHAR" length="255"/>
<db-attribute name="observacoes" type="VARCHAR" length="65535"/>
<db-key-generator>
<db-generator-type>ORACLE</db-generator-type>
<db-generator-name>prestadores_id_seq</db-generator-name>
@ -335,6 +336,7 @@
</db-entity>
<db-entity name="trabalhadores" schema="public">
<db-attribute name="actualizacao" type="TIMESTAMP" length="29"/>
<db-attribute name="bi" type="VARCHAR" length="255"/>
<db-attribute name="categoria" type="VARCHAR" length="255"/>
<db-attribute name="data_admissao" type="DATE" length="13"/>
<db-attribute name="data_admissao_funcao" type="DATE" length="13"/>
@ -477,6 +479,7 @@
</db-key-generator>
</db-entity>
<db-entity name="trabalhadores_processo" schema="public">
<db-attribute name="activo" type="CHAR" length="1"/>
<db-attribute name="data_fim" type="DATE" length="13"/>
<db-attribute name="data_inicio" type="DATE" length="13"/>
<db-attribute name="estado" type="CHAR" isMandatory="true" length="1"/>
@ -705,6 +708,7 @@
<obj-attribute name="morada" type="java.lang.String" db-attribute-path="morada"/>
<obj-attribute name="nome" type="java.lang.String" db-attribute-path="nome"/>
<obj-attribute name="nomePlain" type="java.lang.String" db-attribute-path="nome_plain"/>
<obj-attribute name="observacoes" type="java.lang.String" db-attribute-path="observacoes"/>
</obj-entity>
<obj-entity name="PrestadoresGruposProtocolo" className="siprp.database.cayenne.objects.PrestadoresGruposProtocolo" lock-type="optimistic" dbEntityName="prestadores_grupos_protocolo" superClassName="siprp.database.cayenne.objects.BaseObject">
</obj-entity>
@ -732,6 +736,7 @@
</obj-entity>
<obj-entity name="Trabalhadores" className="siprp.database.cayenne.objects.Trabalhadores" lock-type="optimistic" dbEntityName="trabalhadores" superClassName="siprp.database.cayenne.objects.BaseObject">
<obj-attribute name="actualizacao" type="java.util.Date" db-attribute-path="actualizacao"/>
<obj-attribute name="bi" type="java.lang.String" db-attribute-path="bi"/>
<obj-attribute name="categoria" type="java.lang.String" db-attribute-path="categoria"/>
<obj-attribute name="dataAdmissao" type="java.util.Date" db-attribute-path="data_admissao"/>
<obj-attribute name="dataAdmissaoFuncao" type="java.util.Date" db-attribute-path="data_admissao_funcao"/>
@ -802,6 +807,7 @@
<obj-attribute name="id" type="java.lang.Integer" db-attribute-path="id"/>
</obj-entity>
<obj-entity name="TrabalhadoresProcesso" className="siprp.database.cayenne.objects.TrabalhadoresProcesso" lock-type="optimistic" dbEntityName="trabalhadores_processo" superClassName="siprp.database.cayenne.objects.BaseObject">
<obj-attribute name="activo" type="java.lang.String" db-attribute-path="activo"/>
<obj-attribute name="dataFim" type="java.util.Date" db-attribute-path="data_fim"/>
<obj-attribute name="dataInicio" type="java.util.Date" db-attribute-path="data_inicio"/>
<obj-attribute name="estado" type="java.lang.String" db-attribute-path="estado"/>

3
trunk/SIPRPSoft/src/leaf/LeafInputField.java
Unescape View File

@ -31,7 +31,6 @@ import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import siprp.medicina.processo.ui.OrderedMap;
public class LeafInputField<ObjClass extends Object> extends JPanel implements FocusListener, MouseListener, PropertyChangeListener
{
@ -411,7 +410,7 @@ public class LeafInputField<ObjClass extends Object> extends JPanel implements F
{
if( object instanceof Date )
{
thiz = new JLabel( ((Date) object).getTime() <= 0 ? " " : sdf.format( object ) );
thiz = new JLabel( sdf.format( object ) );
}
else if( object instanceof Map )
{

1
trunk/SIPRPSoft/src/leaf/LeafOptionDialog.java
Unescape View File

@ -23,7 +23,6 @@ import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.ScrollPaneConstants;
import siprp.medicina.processo.ui.OrderedMap;
public class LeafOptionDialog<KeyClass extends Object> extends JDialog
{

1
trunk/SIPRPSoft/src/leaf/LeafTableModel.java
Unescape View File

@ -4,7 +4,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import siprp.medicina.processo.ui.OrderedMap;
import com.evolute.utils.tables.BaseTableModel;

2
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/OrderedMap.java → trunk/SIPRPSoft/src/leaf/OrderedMap.java
Unescape View File

@ -1,4 +1,4 @@
package siprp.medicina.processo.ui;
package leaf;
import java.util.ArrayList;
import java.util.Collection;

197
trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java
Unescape View File

@ -6,6 +6,9 @@
package siprp.clientes;
import info.clearthought.layout.TableLayout;
import info.clearthought.layout.TableLayoutConstraints;
import javax.swing.*;
import java.awt.*;
@ -48,6 +51,7 @@ public class TrabalhadorPanel extends JPanel
private JTextField nomeText;
private RadioButtonFixedPanel sexoPanel;
private JTextField biText;
private JCalendarPanel dataNascimentoPanel;
private JTextField nacionalidadeText;
private JTextField numeroMecanograficoText;
@ -99,6 +103,8 @@ public class TrabalhadorPanel extends JPanel
new IDObject[]{ new MappableObject( new Integer( 1 ), "M" ),
new MappableObject( new Integer( 2 ), "F" ) },
1, 2, RadioButtonPanel.ORIENTATION_HORIZONTAL, false );
JLabel biLabel = new JLabel("B.I.");
biText = new JTextField();
JLabel dataNascimentoLabel = new JLabel( "Data de Nascimento" );
dataNascimentoPanel = new JCalendarPanel( null );
JLabel nacionalidadeLabel = new JLabel( "Nacionalidade" );
@ -141,154 +147,56 @@ public class TrabalhadorPanel extends JPanel
JPanel pad;
GridBagLayout gridbag = new GridBagLayout();
dadosTrabalhadorPanel.setLayout( gridbag );
GridBagConstraints constraints = new GridBagConstraints();
constraints.insets = new Insets( 1, 1, 1, 1 );
constraints.fill = GridBagConstraints.HORIZONTAL;
constraints.weighty = 0;
constraints.gridheight = 1;
constraints.gridwidth = 1;
constraints.weightx = 0;
gridbag.setConstraints( nomeLabel, constraints );
dadosTrabalhadorPanel.add( nomeLabel );
constraints.weightx = 1;
constraints.gridwidth = 3;
gridbag.setConstraints( nomeText, constraints );
dadosTrabalhadorPanel.add( nomeText );
constraints.gridwidth = 1;
constraints.weightx = 0;
gridbag.setConstraints( sexoLabel, constraints );
dadosTrabalhadorPanel.add( sexoLabel );
constraints.weightx = 0;
//constraints.gridwidth = 1;
constraints.gridwidth = GridBagConstraints.REMAINDER;
double [] cols = new double[]{TableLayout.MINIMUM,TableLayout.FILL,TableLayout.MINIMUM,TableLayout.FILL};
double [] rows = new double[]{TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.FILL,
TableLayout.MINIMUM,};
TableLayout layout = new TableLayout(cols,rows);
layout.setHGap( 5 );
layout.setVGap( 5 );
dadosTrabalhadorPanel.setLayout( layout );
dadosTrabalhadorPanel.add( nomeLabel, new TableLayoutConstraints( 0,0 ) );
dadosTrabalhadorPanel.add( nomeText, new TableLayoutConstraints( 1,0,3,0 ) );
dadosTrabalhadorPanel.add( sexoLabel, new TableLayoutConstraints( 0,1 ) );
JPanel sexoOuterPanel = new JPanel();
sexoOuterPanel.setLayout( new GridLayout( 1, 2 ) );
sexoOuterPanel.add( sexoPanel );
sexoOuterPanel.add( new JPanel() );
gridbag.setConstraints( sexoOuterPanel, constraints );
dadosTrabalhadorPanel.add( sexoOuterPanel );
constraints.weightx = 0;
constraints.gridwidth = 2;
gridbag.setConstraints( nacionalidadeLabel, constraints );
dadosTrabalhadorPanel.add( nacionalidadeLabel );
constraints.weightx = 0.5;
constraints.gridwidth = 1;
gridbag.setConstraints( nacionalidadeText, constraints );
dadosTrabalhadorPanel.add( nacionalidadeText );
constraints.weightx = 0;
constraints.gridwidth = 1;
gridbag.setConstraints( dataNascimentoLabel, constraints );
dadosTrabalhadorPanel.add( dataNascimentoLabel );
constraints.weightx = 0.5;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( dataNascimentoPanel, constraints );
dadosTrabalhadorPanel.add( dataNascimentoPanel );
constraints.weightx = 0;
constraints.gridwidth = 2;
gridbag.setConstraints( numeroMecanograficoLabel, constraints );
dadosTrabalhadorPanel.add( numeroMecanograficoLabel );
constraints.weightx = 0.5;
constraints.gridwidth = 1;
gridbag.setConstraints( numeroMecanograficoText, constraints );
dadosTrabalhadorPanel.add( numeroMecanograficoText );
constraints.weightx = 0;
constraints.gridwidth = 1;
gridbag.setConstraints( dataAdmissaoLabel, constraints );
dadosTrabalhadorPanel.add( dataAdmissaoLabel );
constraints.weightx = 0.5;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( dataAdmissaoPanel, constraints );
dadosTrabalhadorPanel.add( dataAdmissaoPanel );
constraints.weightx = 0;
constraints.gridwidth = 2;
gridbag.setConstraints( categoriaLabel, constraints );
dadosTrabalhadorPanel.add( categoriaLabel );
constraints.weightx = 0.5;
constraints.gridwidth = 1;
gridbag.setConstraints( categoriaText, constraints );
dadosTrabalhadorPanel.add( categoriaText );
constraints.weightx = 0;
gridbag.setConstraints( localLabel, constraints );
dadosTrabalhadorPanel.add( localLabel );
constraints.weightx = 0.5;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( localText, constraints );
dadosTrabalhadorPanel.add( localText );
constraints.weightx = 0;
constraints.gridwidth = 2;
gridbag.setConstraints( funcaoLabel, constraints );
dadosTrabalhadorPanel.add( funcaoLabel );
constraints.weightx = 0.5;
constraints.gridwidth = 1;
gridbag.setConstraints( funcaoText, constraints );
dadosTrabalhadorPanel.add( funcaoText );
constraints.weightx = 0;
constraints.gridwidth = 1;
gridbag.setConstraints( dataAdmissaoFuncaoLabel, constraints );
dadosTrabalhadorPanel.add( dataAdmissaoFuncaoLabel );
constraints.weightx = 0.5;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( dataAdmissaoFuncaoPanel, constraints );
dadosTrabalhadorPanel.add( dataAdmissaoFuncaoPanel );
constraints.weightx = 0;
constraints.gridwidth = 2;
gridbag.setConstraints( perfilLabel, constraints );
dadosTrabalhadorPanel.add( perfilLabel );
constraints.weightx = 0.5;
constraints.gridwidth = 1;
// gridbag.setConstraints( perfilCombo, constraints );
// dadosTrabalhadorPanel.add( perfilCombo );
gridbag.setConstraints( perfilPanel, constraints );
dadosTrabalhadorPanel.add( perfilPanel );
constraints.weightx = 0;
constraints.gridwidth = 1;
gridbag.setConstraints( dataDemissaoLabel, constraints );
dadosTrabalhadorPanel.add( dataDemissaoLabel );
constraints.weightx = 0.5;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( dataDemissaoPanel, constraints );
dadosTrabalhadorPanel.add( dataDemissaoPanel );
constraints.weightx = 0;
constraints.gridwidth = 1;
gridbag.setConstraints( observacoesLabel, constraints );
dadosTrabalhadorPanel.add( observacoesLabel );
constraints.weightx = 1;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( observacoesText, constraints );
dadosTrabalhadorPanel.add( observacoesText );
constraints.weightx = 1;
constraints.gridwidth = GridBagConstraints.REMAINDER;
gridbag.setConstraints( marcacoesButton, constraints );
dadosTrabalhadorPanel.add( marcacoesButton );
dadosTrabalhadorPanel.add( sexoOuterPanel, new TableLayoutConstraints( 1,1 ) );
dadosTrabalhadorPanel.add( biLabel, new TableLayoutConstraints( 2,1 ) );
dadosTrabalhadorPanel.add( biText, new TableLayoutConstraints( 3,1 ) );
dadosTrabalhadorPanel.add( nacionalidadeLabel, new TableLayoutConstraints( 0,2 ) );
dadosTrabalhadorPanel.add( nacionalidadeText, new TableLayoutConstraints( 1,2 ) );
dadosTrabalhadorPanel.add( dataNascimentoLabel, new TableLayoutConstraints( 2,2 ) );
dadosTrabalhadorPanel.add( dataNascimentoPanel, new TableLayoutConstraints( 3,2 ) );
dadosTrabalhadorPanel.add( numeroMecanograficoLabel, new TableLayoutConstraints( 0,3 ) );
dadosTrabalhadorPanel.add( numeroMecanograficoText, new TableLayoutConstraints( 1,3 ) );
dadosTrabalhadorPanel.add( dataAdmissaoLabel, new TableLayoutConstraints( 2,3 ) );
dadosTrabalhadorPanel.add( dataAdmissaoPanel, new TableLayoutConstraints( 3,3 ));
dadosTrabalhadorPanel.add( categoriaLabel, new TableLayoutConstraints( 0,4 ) );
dadosTrabalhadorPanel.add( categoriaText, new TableLayoutConstraints( 1,4 ) );
dadosTrabalhadorPanel.add( localLabel, new TableLayoutConstraints( 2,4 ) );
dadosTrabalhadorPanel.add( localText, new TableLayoutConstraints( 3,4 ));
dadosTrabalhadorPanel.add( funcaoLabel, new TableLayoutConstraints( 0,5 ) );
dadosTrabalhadorPanel.add( funcaoText, new TableLayoutConstraints( 1,5 ) );
dadosTrabalhadorPanel.add( dataAdmissaoFuncaoLabel, new TableLayoutConstraints( 2,5 ) );
dadosTrabalhadorPanel.add( dataAdmissaoFuncaoPanel, new TableLayoutConstraints( 3,5 ) );
dadosTrabalhadorPanel.add( perfilLabel, new TableLayoutConstraints( 0,6 ) );
dadosTrabalhadorPanel.add( perfilPanel, new TableLayoutConstraints( 1,6 ) );
dadosTrabalhadorPanel.add( dataDemissaoLabel, new TableLayoutConstraints( 2,6 ) );
dadosTrabalhadorPanel.add( dataDemissaoPanel, new TableLayoutConstraints( 3,6 ) );
dadosTrabalhadorPanel.add( observacoesLabel, new TableLayoutConstraints( 0,7 ) );
dadosTrabalhadorPanel.add( observacoesText, new TableLayoutConstraints( 0,8, 3, 8 ) );
dadosTrabalhadorPanel.add( marcacoesButton, new TableLayoutConstraints( 0,9,3,9 ) );
// examesPanel = new MarcacaoPanel( false, "Realizados", "", Marcacao.TIPO_MARCACAO_TRABALHADOR_EXAMES );
// examesPanel.setCalendarDialogOrientation( JCalendarDialog.ABOVE, JCalendarDialog.RIGHT );
@ -364,6 +272,7 @@ public class TrabalhadorPanel extends JPanel
sexoPanel.setEnabled( enable );
}
} );
components.putComponent( TrabalhadorData.BI , biText );
components.putComponent( TrabalhadorData.DATA_NASCIMENTO, dataNascimentoPanel );
components.putComponent( TrabalhadorData.NACIONALIDADE, nacionalidadeText );
components.putComponent( TrabalhadorData.NUMERO_MECANOGRAFICO, numeroMecanograficoText );

2
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/BaseObject.java
Unescape View File

@ -21,7 +21,7 @@ public class BaseObject extends CayenneDataObject
protected static final DateFormat sdf = DateFormat.getDateInstance( DateFormat.SHORT, new Locale( "pt", "PT" ) );
protected static final String isNewMessage = "Em Edi"+ccedil+atilde+"o";
protected static final String isNewMessage = " ";
public boolean isNew()
{

1
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Empresas.java
Unescape View File

@ -62,6 +62,7 @@ public class Empresas extends _Empresas {
if( current == null || "y".equals(current.getInactivo()))
{
result.remove( i );
--i;
}
}
Collections.sort(result);

1
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Estabelecimentos.java
Unescape View File

@ -65,6 +65,7 @@ public class Estabelecimentos extends _Estabelecimentos implements Comparable<Es
if( current == null || "y".equals(current.getInactivo()))
{
result.remove( i );
--i;
}
}
Collections.sort( result );

17
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/Trabalhadores.java
Unescape View File

@ -1,6 +1,8 @@
package siprp.database.cayenne.objects;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import siprp.database.cayenne.objects.auto._Trabalhadores;
@ -19,6 +21,21 @@ public class Trabalhadores extends _Trabalhadores implements Comparable<Trabalha
return getDataNascimento() == null ? "" : sdf.format( getDataNascimento() );
}
@Override
public List<TrabalhadoresProcesso> getTrabalhadoresProcessoArray()
{
List<TrabalhadoresProcesso> allProcessos = super.getTrabalhadoresProcessoArray();
List<TrabalhadoresProcesso> result = new ArrayList<TrabalhadoresProcesso>();
for( TrabalhadoresProcesso current : allProcessos )
{
if("y".equals( current.getActivo() ))
{
result.add( current );
}
}
return result;
}
@Override
public String getNome()
{

42
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresConsultasDatasObservacoes.java
Unescape View File

@ -1,21 +1,55 @@
package siprp.database.cayenne.objects;
import com.evolute.utils.strings.UnicodeChecker;
import siprp.database.cayenne.objects.auto._TrabalhadoresConsultasDatasObservacoes;
public class TrabalhadoresConsultasDatasObservacoes extends _TrabalhadoresConsultasDatasObservacoes {
private static final long serialVersionUID = 1L;
private String name = null;
private String convertedName = null;
@Override
public String toString()
{
String result = getObservacao() == null ? "" : getObservacao();
if( result.indexOf( '\n' ) > 0 )
return getObservacao();
}
@Override
public String getObservacao()
{
String currentName = super.getObservacao();
if( name == null || !name.equals( currentName ))
{
result = result.substring( 0, result.indexOf( '\n', 1) );
name = currentName;
convertedName = null;
}
return result;
return convertName();
}
@Override
public void setObservacao( String nome )
{
super.setObservacao( UnicodeChecker.parseToUnicode( name ) );
getObservacao();
}
private String convertName()
{
if( name == null )
{
convertedName = null;
}
else
{
convertedName = UnicodeChecker.parseFromUnicode( name );
}
return convertedName;
}
}

3
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcds.java
Unescape View File

@ -4,9 +4,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import leaf.OrderedMap;
import siprp.database.cayenne.objects.auto._TrabalhadoresEcds;
import siprp.medicina.MedicinaConstants;
import siprp.medicina.processo.ui.OrderedMap;
public class TrabalhadoresEcds extends _TrabalhadoresEcds implements MedicinaConstants
{

3
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatas.java
Unescape View File

@ -5,9 +5,10 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import leaf.OrderedMap;
import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatas;
import siprp.medicina.MedicinaConstants;
import siprp.medicina.processo.ui.OrderedMap;
public class TrabalhadoresEcdsDatas extends _TrabalhadoresEcdsDatas implements MedicinaConstants
{

38
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresEcdsDatasObservacoes.java
Unescape View File

@ -1,17 +1,55 @@
package siprp.database.cayenne.objects;
import com.evolute.utils.strings.UnicodeChecker;
import siprp.database.cayenne.objects.auto._TrabalhadoresEcdsDatasObservacoes;
public class TrabalhadoresEcdsDatasObservacoes extends _TrabalhadoresEcdsDatasObservacoes {
private static final long serialVersionUID = 1L;
private String name = null;
private String convertedName = null;
@Override
public String toString()
{
return getObservacao();
}
@Override
public String getObservacao()
{
String currentName = super.getObservacao();
if( name == null || !name.equals( currentName ))
{
name = currentName;
convertedName = null;
}
return convertName();
}
@Override
public void setObservacao( String nome )
{
super.setObservacao( UnicodeChecker.parseToUnicode( name ) );
getObservacao();
}
private String convertName()
{
if( name == null )
{
convertedName = null;
}
else
{
convertedName = UnicodeChecker.parseFromUnicode( name );
}
return convertedName;
}
}

8
trunk/SIPRPSoft/src/siprp/database/cayenne/objects/TrabalhadoresProcesso.java
Unescape View File

@ -60,6 +60,14 @@ public class TrabalhadoresProcesso extends _TrabalhadoresProcesso implements Pro
result.put( MedicinaConstants.MOTIVO_PERIODICO_INTEGER, MedicinaConstants.MOTIVO_PERIODICO_STR);
return result;
}
public boolean isEmpty()
{
boolean noConsultas = (getTrabalhadoresConsultasArray() == null || getTrabalhadoresConsultasArray().size() == 0);
boolean noExames= ( getTrabalhadoresEcdsArray() == null || getTrabalhadoresEcdsArray().size() == 0);
boolean noFicha = ( getTrabalhadoresFichasAptidaoArray() == null || getTrabalhadoresFichasAptidaoArray().size() == 0);
return noConsultas && noExames && noFicha;
}
}

42
trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresWindow.java
Unescape View File

@ -10,6 +10,7 @@
package siprp.medicina.prestadores;
import com.evolute.utils.Singleton;
import static com.evolute.utils.strings.UnicodeLatin1Map.*;
import com.evolute.utils.data.IDObject;
import com.evolute.utils.dataui.ComponentController;
import com.evolute.utils.dataui.ComponentsHashtable;
@ -74,6 +75,9 @@ public class PrestadoresWindow extends EditorWindow
protected ContactoPanel contactoPanel;
protected JTextField contribuinteText;
private final JLabel labelObservacoes = new JLabel("Observa"+ccedil+otilde+"es");
private final JTextArea textObservacoes = new JTextArea();
protected PrestadoresDataProvider provider;
protected ClientesDataProvider clientesProvider;
@ -86,8 +90,8 @@ public class PrestadoresWindow extends EditorWindow
private final JPanel prestadoresPanel = new JPanel();
private final JPanel analisadoresPanel = new JPanel();
private final JLabel labelGrupos = new JLabel( "Grupos:" );
private final JLabel labelAnalisador = new JLabel( "Analisador:" );
private final JLabel labelGrupos = new JLabel( "Tipos de ECDs" );
private final JLabel labelAnalisador = new JLabel( "Analisadores" );
private final JLabel labelMessage = new JLabel( " " );
private final Map<PrtGruposProtocolo, JLabel> mapLabel = new HashMap<PrtGruposProtocolo, JLabel>();
@ -112,14 +116,22 @@ public class PrestadoresWindow extends EditorWindow
setupComponentsHashtable();
}
private void setupComponents() throws Exception
private void setupComponents()
{
setTitle( TITLE );
setSize( 800, 600);
tabbedPane.addTab( "Prestadores", prestadoresPanel );
tabbedPane.addTab( "Analisadores", analisadoresPanel );
setupAnalisadoresTab();
setupPrestadoresTab();
// pack();
}
private void setupPrestadoresTab()
{
try
{
JLabel nomeLabel = new JLabel( "Designa\u00e7\u00e3o" );
nomeText = new JTextField();
nomeText.setPreferredSize( new Dimension( 500, 20 ) );
@ -163,7 +175,17 @@ public class PrestadoresWindow extends EditorWindow
TableLayout.MINIMUM, TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.FILL
};
double rows[] = new double[] {
TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL, TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.FILL,
TableLayout.PREFERRED,
TableLayout.PREFERRED,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.MINIMUM,
TableLayout.FILL
};
TableLayout tableLayout = new TableLayout( cols, rows );
prestadoresPanel.setLayout( tableLayout );
@ -193,7 +215,12 @@ public class PrestadoresWindow extends EditorWindow
prestadoresPanel.add( localidadeText, new TableLayoutConstraints( 1, 7, 3, 7 ) );
prestadoresPanel.add( contribuinteLabel, new TableLayoutConstraints( 0, 8 ) );
prestadoresPanel.add( contribuinteText, new TableLayoutConstraints( 1, 8 ) );
pack();
prestadoresPanel.add( labelObservacoes, new TableLayoutConstraints( 0, 9 ) );
prestadoresPanel.add( textObservacoes, new TableLayoutConstraints( 0, 10,3,10 ) );
} catch( Exception e )
{
e.printStackTrace();
}
}
private void setupComponentsHashtable()
@ -206,6 +233,7 @@ public class PrestadoresWindow extends EditorWindow
components.putComponent( PrestadoresData.LOCALIDADE_CP, localidadeCodigoPostalText );
components.putComponent( PrestadoresData.LOCALIDADE, localidadeText );
components.putComponent( PrestadoresData.CONTRIBUINTE, contribuinteText );
components.putComponent( PrestadoresData.OBSERVACOES, textObservacoes );
components.putComponent( PrestadoresData.ACTIVO, activoCheck );
components.putComponent( PrestadoresData.FAZ_CONSULTAS, consultasCheck );
components.putComponent( PrestadoresData.FAZ_ECDS, ecdsCheck );
@ -323,7 +351,7 @@ public class PrestadoresWindow extends EditorWindow
private void setupAnalisadoresTabLayout()
{
double[] cols = new double[] {
TableLayout.FILL, TableLayout.FILL
TableLayout.MINIMUM, TableLayout.FILL
};
double[] rows = new double[1 + listGrupos.size() + 2];
for( int i = 0; i < rows.length; ++i )
@ -396,7 +424,7 @@ public class PrestadoresWindow extends EditorWindow
Prestadores analisador = (Prestadores) combo.getSelectedItem();
grupo.setToAnalisador( Prestadores.prestadorNulo.equals( analisador ) ? null : analisador );
medicinaCayenneDAO.saveObject( grupo );
shout( "Grupo: " + grupo.getDescricao() + " -> Analisador: " + analisador.getNome() + " (guardado)" );
shout( "Tipo de ECD: " + grupo.getDescricao() + " -> Analisador: " + analisador.getNome() + " [guardado]" );
}
}
}

21
trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java
Unescape View File

@ -2,13 +2,11 @@ package siprp.medicina.processo.logic;
import java.util.Date;
import java.util.List;
import java.util.Vector;
import javax.swing.tree.DefaultMutableTreeNode;
import leaf.LeafLogic;
import leaf.LeafWindow.LeafObject;
import siprp.database.cayenne.objects.BaseObject;
import siprp.database.cayenne.objects.Empresas;
import siprp.database.cayenne.objects.Estabelecimentos;
@ -18,7 +16,6 @@ import siprp.database.cayenne.objects.TrabalhadoresConsultas;
import siprp.database.cayenne.objects.TrabalhadoresConsultasDatas;
import siprp.database.cayenne.objects.TrabalhadoresConsultasDatasEmails;
import siprp.database.cayenne.objects.TrabalhadoresConsultasDatasObservacoes;
import siprp.database.cayenne.objects.TrabalhadoresEcd;
import siprp.database.cayenne.objects.TrabalhadoresEcds;
import siprp.database.cayenne.objects.TrabalhadoresEcdsDatas;
import siprp.database.cayenne.objects.TrabalhadoresEcdsDatasEmails;
@ -27,11 +24,8 @@ import siprp.database.cayenne.objects.TrabalhadoresProcesso;
import siprp.database.cayenne.providers.MedicinaDAO;
import siprp.medicina.MedicinaConstants;
import siprp.medicina.processo.ProcessoConstants;
import siprp.medicina.processo.detalhes.EstadoChooser;
import siprp.medicina.processo.estrutura.FichaAptidaoMutableTreeNode;
import com.evolute.utils.tables.ColumnizedMappable;
public class MedicinaProcessoLogic extends LeafLogic
{
@Action(isSave = false)
@ -139,6 +133,9 @@ public class MedicinaProcessoLogic extends LeafLogic
@Action(isSave = true)
public static final String FECHAR_PROCESSO = "FECHAR_PROCESSO";
@Action(isSave = false)
public static final String APAGAR_PROCESSO = "APAGAR_PROCESSO";
@Action(isSave = false)
public static final String REFRESH = "REFRESH";
@ -184,7 +181,7 @@ public class MedicinaProcessoLogic extends LeafLogic
@LeafObject (useWith=LOAD_TRABALHADOR)
public Trabalhadores currentTrabalhador = null;
@LeafObject(useWith = SAVE_PROCESSO)
@LeafObject(useWith = { SAVE_PROCESSO, APAGAR_PROCESSO })
public TrabalhadoresProcesso currentProcesso = null;
@LeafObject(useWith = SAVE_CONSULTA)
@ -276,6 +273,16 @@ public class MedicinaProcessoLogic extends LeafLogic
}
}
@LeafLogicActionBinding(actions = APAGAR_PROCESSO)
public void apagarProcesso()
{
if( currentProcesso != null && currentProcesso.isEmpty() )
{
currentProcesso.setActivo( "n" );
runActionLater( SAVE_PROCESSO );
}
}
@LeafLogicActionBinding(actions = DESMARCAR_SIPRP_CONSULTA_MARCACAO)
public void desmarcarConsultaSiprp()
{

1
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/MedicinaProcessoWindow.java
Unescape View File

@ -12,6 +12,7 @@ import javax.swing.JSeparator;
import leaf.LeafOptionDialog;
import leaf.LeafWindow;
import leaf.OrderedMap;
import leaf.LeafLogic.LeafUIActionBinding;
import siprp.database.cayenne.objects.PrtGruposProtocolo;
import siprp.database.cayenne.objects.TrabalhadoresEcd;

31
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoAccoesPanel.java
Unescape View File

@ -101,6 +101,9 @@ public class ProcessoAccoesPanel extends JPanel
}, onChange = "")
public final LeafButton buttonNovoProcessoExame = new LeafButton( "Novo Exame" );
@ActionActivation(onSelect = APAGAR_PROCESSO, onChange = "")
public final LeafButton buttonApagarProcesso = new LeafButton( "Remover Processo" );
// consulta
@ActionActivation(onSelect = CREATE_CONSULTA_MARCACAO, onChange = "")
public final LeafButton buttonNovoConsultaMarcacao = new LeafButton( "Nova Marca" + ccedil + atilde + "o" );
@ -235,6 +238,7 @@ public class ProcessoAccoesPanel extends JPanel
if( processo != null )
{
buttonFecharProcesso.setEnabled( !ProcessoConstants.PROCESSO_FECHADO_CODE.equals( processo.getEstado() ) );
buttonApagarProcesso.setEnabled( processo.isEmpty() );
boolean consultaAberta = false;
for( TrabalhadoresConsultas consulta : (List<TrabalhadoresConsultas>) processo.getTrabalhadoresConsultasArray() )
{
@ -399,7 +403,11 @@ public class ProcessoAccoesPanel extends JPanel
private void setupProcessoPanel()
{
setupSimpleActionsPanel( panelProcesso, buttonFecharProcesso, buttonNovoProcessoConsulta, buttonNovoProcessoExame, new JPanel() );
JPanel panelTopProcesso = new JPanel();
JPanel panelBottomProcesso = new JPanel();
setupSimpleActionsPanel( panelTopProcesso, buttonNovoProcessoConsulta, buttonNovoProcessoExame );
setupSimpleActionsPanel( panelBottomProcesso, buttonFecharProcesso, buttonApagarProcesso );
setupTopBottomSimpleActionsPanel( panelProcesso, panelTopProcesso, panelBottomProcesso );
}
private void setupConsultaPanel()
@ -413,11 +421,7 @@ public class ProcessoAccoesPanel extends JPanel
JPanel consultaMarcacaoLowerPanel = new JPanel();
setupSimpleActionsPanel( consultaMarcacaoUpperPanel, buttonNovoConsultaMarcacaoEmail, buttonNovoConsultaMarcacaoObservacoes );
setupSimpleActionsPanel( consultaMarcacaoLowerPanel, buttonConsultaMarcacaoRealizar, buttonConsultaMarcacaoDesmarcarSiprp, buttonConsultaMarcacaoDesmarcarTrabalhador, buttonConsultaMarcacaoFaltou);
TableLayout consultaMarcacaoLayout = new TableLayout(new double[]{TableLayout.FILL}, new double[]{TableLayout.MINIMUM, TableLayout.FILL,TableLayout.MINIMUM});
panelConsultaMarcacao.setLayout( consultaMarcacaoLayout );
panelConsultaMarcacao.add( consultaMarcacaoUpperPanel, new TableLayoutConstraints(0,0) );
panelConsultaMarcacao.add( new JPanel(), new TableLayoutConstraints(0,1) );
panelConsultaMarcacao.add( consultaMarcacaoLowerPanel, new TableLayoutConstraints(0,2) );
setupTopBottomSimpleActionsPanel(panelConsultaMarcacao, consultaMarcacaoUpperPanel, consultaMarcacaoLowerPanel);
}
private void setupExameMarcacaoPanel()
@ -426,11 +430,7 @@ public class ProcessoAccoesPanel extends JPanel
JPanel exameMarcacaoLowerPanel = new JPanel();
setupSimpleActionsPanel( exameMarcacaoUpperPanel, buttonNovoExameMarcacaoEmail, buttonNovoExameMarcacaoObservacoes, new JPanel() );
setupSimpleActionsPanel( exameMarcacaoLowerPanel, buttonExameMarcacaoRealizar, buttonExameMarcacaoRealizarParcial, buttonExameMarcacaoFaltou, buttonExameMarcacaoAnular, buttonExameMarcacaoDesmarcarTrabalhador, buttonExameMarcacaoDesmarcarSiprp );
TableLayout exameMarcacaoLayout = new TableLayout(new double[]{TableLayout.FILL}, new double[]{TableLayout.MINIMUM, TableLayout.FILL,TableLayout.MINIMUM});
panelExameMarcacao.setLayout( exameMarcacaoLayout );
panelExameMarcacao.add( exameMarcacaoUpperPanel, new TableLayoutConstraints(0,0) );
panelExameMarcacao.add( new JPanel(), new TableLayoutConstraints(0,1) );
panelExameMarcacao.add( exameMarcacaoLowerPanel, new TableLayoutConstraints(0,2) );
setupTopBottomSimpleActionsPanel(panelExameMarcacao, exameMarcacaoUpperPanel, exameMarcacaoLowerPanel);
}
private void setupExamePanel()
@ -438,6 +438,15 @@ public class ProcessoAccoesPanel extends JPanel
setupSimpleActionsPanel( panelExame, buttonNovoExameMarcacao, new JPanel() );
}
private void setupTopBottomSimpleActionsPanel(JPanel panel, JPanel top, JPanel bottom)
{
TableLayout layout = new TableLayout(new double[]{TableLayout.FILL}, new double[]{TableLayout.MINIMUM, TableLayout.FILL,TableLayout.MINIMUM});
panel.setLayout( layout );
panel.add( top, new TableLayoutConstraints(0,0) );
panel.add( new JPanel(), new TableLayoutConstraints(0,1) );
panel.add( bottom, new TableLayoutConstraints(0,2) );
}
private void setupSimpleActionsPanel( JPanel panel, JComponent... field )
{
double[] cols = new double[] {

46
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoDadosPanel.java
Unescape View File

@ -5,7 +5,7 @@ import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
import static com.evolute.utils.strings.UnicodeLatin1Map.iacute;
import static com.evolute.utils.strings.UnicodeLatin1Map.otilde;
import static info.clearthought.layout.TableLayoutConstants.FILL;
import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_CONSULTA;
import static siprp.medicina.processo.logic.MedicinaProcessoLogic.*;
import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_CONSULTA_MARCACAO;
import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_CONSULTA_MARCACAO_EMAIL;
import static siprp.medicina.processo.logic.MedicinaProcessoLogic.CREATE_CONSULTA_MARCACAO_OBSERVACOES;
@ -37,6 +37,7 @@ import info.clearthought.layout.TableLayout;
import info.clearthought.layout.TableLayoutConstraints;
import java.awt.CardLayout;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -53,6 +54,7 @@ import leaf.LeafInputField;
import leaf.LeafOptionDialog;
import leaf.LeafTextDialog;
import leaf.LeafWindow;
import leaf.OrderedMap;
import leaf.LeafLogic.LeafUIActionBinding;
import leaf.LeafWindow.ActionActivation;
@ -117,13 +119,17 @@ public class ProcessoDadosPanel extends JPanel
private final JLabel labelTrabalhadorSexo = new JLabel( "Sexo" );
private final JLabel labelTrabalhadorDataNascimento = new JLabel( "Data de Nascimento" );
private final JLabel labelTrabalhadorNacionalidade = new JLabel( "Nacionalidade" );
private final JLabel labelTrabalhadorBI = new JLabel( "B.I." );
private final JLabel labelTrabalhadorObservacoes = new JLabel( "Observa" + ccedil + otilde + "es" );
private final JLabel labelTrabalhadorDataAdmissao = new JLabel( "Data de Admiss" + atilde + "o" );
public final LeafInputField<String> inputTrabalhadorNome = new LeafInputField<String>();
public final LeafInputField<HashMap<String, String>> inputTrabalhadorSexo = new LeafInputField<HashMap<String, String>>();
public final LeafInputField<Date> inputTrabalhadorDataNascimento = new LeafInputField<Date>();
public final LeafInputField<String> inputTrabalhadorNacionalidade = new LeafInputField<String>();
public final LeafInputField<String> inputTrabalhadorBI = new LeafInputField<String>();
public final LeafInputField<String> inputTrabalhadorObservacoes = new LeafInputField<String>();
public final LeafInputField<Date> inputTrabalhadorDataAdmissao = new LeafInputField<Date>();
// processo
@ -135,6 +141,7 @@ public class ProcessoDadosPanel extends JPanel
public final LeafInputField<HashMap<String, String>> inputProcessoEstado = new LeafInputField<HashMap<String, String>>();
public final LeafInputField<Date> inputProcessoDataInicio = new LeafInputField<Date>();
public final LeafInputField<Date> inputProcessoDataFim = new LeafInputField<Date>();
@ActionActivation(onSelect = "", onChange = SAVE_PROCESSO)
public final LeafInputField<HashMap<Integer, String>> inputProcessoMotivo = new LeafInputField<HashMap<Integer, String>>();
// consulta
@ -249,6 +256,29 @@ public class ProcessoDadosPanel extends JPanel
add( panelExameMarcacaoObservacao, PANEL_EXAME_MARCACAO_OBSERVACAO_NAME );
}
private int getIdade( Date nascimento )
{
int result = 0;
if(nascimento != null)
{
Calendar now = Calendar.getInstance();
Calendar birth = Calendar.getInstance();
birth.setTime( nascimento );
int birthYear = birth.get( Calendar.YEAR );
int currentYear = now.get( Calendar.YEAR );
if( birthYear < currentYear )
{
result = currentYear - birthYear;
birth.add( Calendar.YEAR, result );
if( birth.after( now ) )
{
--result;
}
}
}
return result;
}
@LeafUIActionBinding(action = {
LOAD_TRABALHADOR, SELECT_TRABALHADOR
})
@ -260,7 +290,10 @@ public class ProcessoDadosPanel extends JPanel
inputTrabalhadorSexo.setObject( trabalhador.getSexos(), trabalhador.getSexo() );
inputTrabalhadorNome.setObject( trabalhador.getNome() );
inputTrabalhadorNacionalidade.setObject( trabalhador.getNacionalidade() );
inputTrabalhadorObservacoes.setObject( trabalhador.getObservacoes() );
inputTrabalhadorBI.setObject( trabalhador.getBi() );
inputTrabalhadorObservacoes.setObject( trabalhador.getObservacoesGestao() );
inputTrabalhadorDataAdmissao.setObject(trabalhador.getDataAdmissao());
labelTrabalhadorDataNascimento.setText( "Data de Nascimento (" + getIdade( trabalhador.getDataNascimento() ) + " anos)" );
cardLayout.show( this, PANEL_TRABALHADOR_NAME );
}
@ -278,6 +311,7 @@ public class ProcessoDadosPanel extends JPanel
inputProcessoDataFim.setObject( processo.getDataFim() );
inputProcessoDataInicio.setObject( processo.getDataInicio() );
inputProcessoEstado.setObject( processo.getEstados(), processo.getEstado() );
inputProcessoMotivo.setEditable( true );
inputProcessoMotivo.setObject( processo.getMotivos(), processo.getMotivo() );
cardLayout.show( this, PANEL_PROCESSO_NAME );
@ -578,6 +612,12 @@ public class ProcessoDadosPanel extends JPanel
inputExameMarcacaoObsMensagem.setEditable( true );
}
@LeafUIActionBinding(action = SAVE_PROCESSO)
public void updateToSaveProcesso( TrabalhadoresProcesso processo)
{
processo.setMotivo( (Integer) inputProcessoMotivo.getSelectedObject() );
}
@LeafUIActionBinding(action = SAVE_CONSULTA_MARCACAO)
public void updateToSaveConsultaMarcacao( TrabalhadoresConsultasDatas marcacao )
{
@ -651,7 +691,7 @@ public class ProcessoDadosPanel extends JPanel
private void setupTrabalhadorPanel()
{
setupSimpleDataPanel( panelTrabalhador, "Trabalhador", labelTrabalhadorNome, inputTrabalhadorNome, labelTrabalhadorSexo, inputTrabalhadorSexo, labelTrabalhadorNacionalidade, inputTrabalhadorNacionalidade, labelTrabalhadorDataNascimento, inputTrabalhadorDataNascimento, labelTrabalhadorObservacoes, inputTrabalhadorObservacoes );
setupSimpleDataPanel( panelTrabalhador, "Trabalhador", labelTrabalhadorNome, inputTrabalhadorNome, labelTrabalhadorSexo, inputTrabalhadorSexo, labelTrabalhadorBI, inputTrabalhadorBI,labelTrabalhadorNacionalidade, inputTrabalhadorNacionalidade, labelTrabalhadorDataNascimento, inputTrabalhadorDataNascimento, labelTrabalhadorDataAdmissao, inputTrabalhadorDataAdmissao, labelTrabalhadorObservacoes, inputTrabalhadorObservacoes );
}
private void setupProcessoPanel()

39
trunk/SIPRPSoft/src/siprp/medicina/processo/ui/ProcessoTreePanel.java
Unescape View File

@ -136,7 +136,7 @@ public class ProcessoTreePanel extends JPanel
}
@LeafUIActionBinding(action = CREATE_PROCESSO)
public void createConsultaNode( TrabalhadoresProcesso processo)
public void createProcessoNode( TrabalhadoresProcesso processo )
{
if( processo != null )
{
@ -145,6 +145,16 @@ public class ProcessoTreePanel extends JPanel
}
}
@LeafUIActionBinding(action = APAGAR_PROCESSO)
public void removeProcessoNode( TrabalhadoresProcesso processo )
{
if( processo != null )
{
ProcessoMutableTreeNode node = new ProcessoMutableTreeNode( processo );
removeNode( node );
}
}
@LeafUIActionBinding(action = CREATE_CONSULTA)
public void createConsultaNode( TrabalhadoresConsultas consulta )
{
@ -245,7 +255,8 @@ public class ProcessoTreePanel extends JPanel
DefaultMutableTreeNode selected = getSelectedNode();
if( selected != null )
{
// ((DefaultTreeModel) mainTree.getModel()).nodeStructureChanged( rootNode );
// ((DefaultTreeModel) mainTree.getModel()).nodeStructureChanged(
// rootNode );
mainTree.setSelectionPath( new TreePath( rootNode.getPath() ) );
mainTree.setSelectionPath( new TreePath( selected.getPath() ) );
}
@ -253,7 +264,6 @@ public class ProcessoTreePanel extends JPanel
repaint();
}
protected List<DefaultMutableTreeNode> loadProcessos( Trabalhadores trabalhador )
{
List<DefaultMutableTreeNode> result = new ArrayList<DefaultMutableTreeNode>();
@ -350,15 +360,20 @@ public class ProcessoTreePanel extends JPanel
refresh( node, parentNode );
}
// private void removeNode( DefaultMutableTreeNode node )
// {
// if( node != null && !node.equals( rootNode ) && node.getParent() != null && node.getParent() instanceof DefaultMutableTreeNode)
// {
// DefaultMutableTreeNode parent = (DefaultMutableTreeNode) node.getParent();
// node.removeFromParent();
// refresh(parent, rootNode);
// }
// }
private void removeNode( DefaultMutableTreeNode node )
{
if( node != null )
{
DefaultMutableTreeNode parent = (DefaultMutableTreeNode) node.getParent();
if( parent == null )
{
parent = rootNode;
}
node.removeFromParent();
nodeByObject.remove( node.getUserObject() );
refresh( parent, rootNode );
}
}
private void refresh( DefaultMutableTreeNode newSelection, DefaultMutableTreeNode parentNode )
{

Write Preview
Loading…
Cancel
Save