From 2677ecaa1ee2304a2e12bed2ec249b960971b3b7 Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Thu, 29 Apr 2004 17:43:30 +0000 Subject: [PATCH] no message git-svn-id: https://svn.coded.pt/svn/SIPRP@68 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/siprp/FichaDataProvider.java | 3 +- trunk/siprp/ficha/EmpresaPanel.java | 71 ++++++++++++++++++++++- trunk/siprp/ficha/ExamePanel.java | 28 +++++++++ trunk/siprp/ficha/ObservacoesPanel.java | 20 ++++--- trunk/siprp/ficha/RecomendacoesPanel.java | 2 + 5 files changed, 112 insertions(+), 12 deletions(-) diff --git a/trunk/siprp/FichaDataProvider.java b/trunk/siprp/FichaDataProvider.java index 081a8384..cd8e422f 100644 --- a/trunk/siprp/FichaDataProvider.java +++ b/trunk/siprp/FichaDataProvider.java @@ -24,6 +24,8 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter { private static FichaDataProvider instance = null; private final Executer executer; + public static final String SIPRP = "Sociedade Ib\u00e8rica de Preven\u00e7\u00e3o de Riscos Profissionais"; + // empresas public static final String T_EMPRESAS = "empresas"; public static final String ID = "id"; @@ -140,7 +142,6 @@ public class FichaDataProvider extends MetaProvider implements SearchExecuter { new DBField[]{ ESTABELECIMENTOS.getFieldByName( EMPRESA_ID ) }, "R_ESTABELECIMENTOS_EMPRESAS" ); EMPRESAS.disableSave( INACTIVO ); - EMPRESAS.disableSave( SERVICO_SAUDE_DESIGNACAO ); ESTABELECIMENTOS.disableSave( INACTIVO ); TRABALHADORES.disableSave( INACTIVO ); EXAMES.disableSave( PDF ); diff --git a/trunk/siprp/ficha/EmpresaPanel.java b/trunk/siprp/ficha/EmpresaPanel.java index bc1223c7..8ee6a08b 100644 --- a/trunk/siprp/ficha/EmpresaPanel.java +++ b/trunk/siprp/ficha/EmpresaPanel.java @@ -7,6 +7,7 @@ package siprp.ficha; import java.awt.*; +import java.awt.event.*; import javax.swing.*; import java.util.*; @@ -30,8 +31,11 @@ public class EmpresaPanel extends JPanel private JTextField estabelecimentoText; private JTextField localidadeText; private RadioButtonFixedPanel servicoSaudeTipoPanel; + private JTextField designacaoServicoSaudeText; + private JButton defaultServicoSaudeButton; private RadioButtonFixedPanel servicoHigieneTipoPanel; private JTextField designacaoText; + private JButton defaultServicoHigieneButton; private FichaDataProvider provider; private ComponentsHashtable components; @@ -68,6 +72,15 @@ public class EmpresaPanel extends JPanel new MappableObject( new Integer(3), "Externo" ), new MappableObject( new Integer(4), "Servi\u00e7o Nacional de Sa\u00fade" ) }, 1, 4, RadioButtonPanel.ORIENTATION_HORIZONTAL, false ); + JLabel designacaoServicoSaudeLabel = new JLabel( "Designa\u00e7\u00e3o" ); + designacaoServicoSaudeText = new JTextField(); + defaultServicoSaudeButton = new JButton("-"); + defaultServicoSaudeButton.addActionListener( new ActionListener(){ + public void actionPerformed( ActionEvent e ) + { + designacaoServicoSaudeText.setText( provider.SIPRP ); + } + } ); JLabel servicoHigieneLabel = new JLabel( "Servi\u00e7o de Higiene e Seguran\u00e7a: Tipo" ); servicoHigieneTipoPanel = @@ -78,6 +91,13 @@ public class EmpresaPanel extends JPanel 1, 4, RadioButtonPanel.ORIENTATION_HORIZONTAL, false ); JLabel designacaoLabel = new JLabel( "Designa\u00e7\u00e3o" ); designacaoText = new JTextField(); + defaultServicoHigieneButton = new JButton("-"); + defaultServicoHigieneButton.addActionListener( new ActionListener(){ + public void actionPerformed( ActionEvent e ) + { + designacaoText.setText( provider.SIPRP ); + } + } ); GridBagLayout gridbag = new GridBagLayout(); setLayout( gridbag ); @@ -127,6 +147,17 @@ public class EmpresaPanel extends JPanel gridbag.setConstraints( servicoSaudeTipoPanel, constraints ); add( servicoSaudeTipoPanel ); + constraints.weightx = 0; + constraints.gridwidth = 1; + gridbag.setConstraints( designacaoServicoSaudeLabel, constraints ); + add( designacaoServicoSaudeLabel ); + + JPanel designacaoServicoSaudePanel = new JPanel(); + constraints.weightx = 1; + constraints.gridwidth = GridBagConstraints.REMAINDER; + gridbag.setConstraints( designacaoServicoSaudePanel, constraints ); + add( designacaoServicoSaudePanel ); + constraints.weightx = 0; constraints.gridwidth = 3; gridbag.setConstraints( servicoHigieneLabel, constraints ); @@ -144,10 +175,46 @@ public class EmpresaPanel extends JPanel gridbag.setConstraints( designacaoLabel, constraints ); add( designacaoLabel ); + JPanel designacaoServicoHigienePanel = new JPanel(); constraints.weightx = 1; constraints.gridwidth = GridBagConstraints.REMAINDER; + gridbag.setConstraints( designacaoServicoHigienePanel, constraints ); + add( designacaoServicoHigienePanel ); + + gridbag = new GridBagLayout(); + designacaoServicoSaudePanel.setLayout( gridbag ); + constraints.insets = new Insets( 0, 0, 0, 0 ); + constraints.fill = GridBagConstraints.HORIZONTAL; + constraints.gridwidth = 1; + constraints.weightx = 1; + constraints.weighty = 1; + constraints.gridheight = GridBagConstraints.REMAINDER; + + gridbag.setConstraints( designacaoServicoSaudeText, constraints ); + designacaoServicoSaudePanel.add( designacaoServicoSaudeText ); + + constraints.weightx = 0; + constraints.gridwidth = GridBagConstraints.REMAINDER; + gridbag.setConstraints( defaultServicoSaudeButton, constraints ); + designacaoServicoSaudePanel.add( defaultServicoSaudeButton ); + + + gridbag = new GridBagLayout(); + designacaoServicoHigienePanel.setLayout( gridbag ); + constraints.insets = new Insets( 0, 0, 0, 0 ); + constraints.fill = GridBagConstraints.HORIZONTAL; + constraints.gridwidth = 1; + constraints.weightx = 1; + constraints.weighty = 1; + constraints.gridheight = GridBagConstraints.REMAINDER; + gridbag.setConstraints( designacaoText, constraints ); - add( designacaoText ); + designacaoServicoHigienePanel.add( designacaoText ); + + constraints.weightx = 0; + constraints.gridwidth = GridBagConstraints.REMAINDER; + gridbag.setConstraints( defaultServicoHigieneButton, constraints ); + designacaoServicoHigienePanel.add( defaultServicoHigieneButton ); } private void setupComponentsHashtable() @@ -155,7 +222,7 @@ public class EmpresaPanel extends JPanel components = new ComponentsHashtable(); components.putComponent( provider.T_EMPRESAS + "." + provider.DESIGNACAO_SOCIAL, designacaoSocialText ); components.put( provider.T_EMPRESAS + "." + provider.SERVICO_SAUDE_TIPO, servicoSaudeTipoPanel ); - components.putDummy( provider.T_EMPRESAS + "." + provider.SERVICO_SAUDE_DESIGNACAO ); + components.putComponent( provider.T_EMPRESAS + "." + provider.SERVICO_SAUDE_DESIGNACAO, designacaoServicoSaudeText ); components.put( provider.T_EMPRESAS + "." + provider.SERVICO_HIGIENE_TIPO, servicoHigieneTipoPanel ); components.putComponent( provider.T_EMPRESAS + "." + provider.SERVICO_HIGIENE_DESIGNACAO, designacaoText ); diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/siprp/ficha/ExamePanel.java index 7f07a295..4ad9d3c2 100644 --- a/trunk/siprp/ficha/ExamePanel.java +++ b/trunk/siprp/ficha/ExamePanel.java @@ -13,6 +13,7 @@ import javax.swing.*; import javax.swing.event.*; import java.util.*; +import com.evolute.utils.documents.*; import com.evolute.utils.data.*; import com.evolute.utils.dataui.*; import com.evolute.utils.metadb.*; @@ -116,6 +117,7 @@ public class ExamePanel extends JPanel recomendacoesText = new JTextArea(); recomendacoesText.setLineWrap( true ); recomendacoesText.setWrapStyleWord( true ); + recomendacoesText.setDocument( new MaximumLengthDocument( 300 ) ); recomendacoesScp.setViewportView( recomendacoesText ); recomendacoesScp.setBorder( BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), @@ -307,6 +309,32 @@ public class ExamePanel extends JPanel } try { + String recomendacoes = recomendacoesText.getText(); + String linhas[] = recomendacoes.split( "\\n" ); + Vector linhasV = new Vector(); + for( int n = 0; n < linhas.length; n++ ) + { + if( linhas[ n ].trim().length() > 0 ) + { + linhasV.add( linhas[ n ] ); + } + } + if( linhasV.size() > 0 ) + { + linhas = ( String[] ) linhasV.toArray( new String[0] ); + boolean compress = false; + if( linhas.length == 2 ) + { + linhas[ 0 ] += " "; + } + recomendacoes = ""; + for( int n = 0; n < linhas.length; n++ ) + { + recomendacoes += linhas[ n ]; + } + } + recomendacoesText.setText( recomendacoes.trim() ); + exame = provider.createObject( provider.EXAMES ); DBField fields[] = provider.EXAMES.getInsertFields(); String exameFields[] = new String[ fields.length ]; diff --git a/trunk/siprp/ficha/ObservacoesPanel.java b/trunk/siprp/ficha/ObservacoesPanel.java index b7d46a76..55c9a8c1 100644 --- a/trunk/siprp/ficha/ObservacoesPanel.java +++ b/trunk/siprp/ficha/ObservacoesPanel.java @@ -10,6 +10,7 @@ import java.awt.*; import javax.swing.*; import com.evolute.utils.dataui.*; +import com.evolute.utils.documents.*; import com.evolute.utils.metadb.*; import siprp.*; @@ -20,7 +21,7 @@ import siprp.*; public class ObservacoesPanel extends JPanel implements ControllableComponent { - private JTextArea observacoesText; + private JTextField observacoesText; private FichaDataProvider provider; @@ -38,16 +39,17 @@ public class ObservacoesPanel extends JPanel BorderFactory.createEtchedBorder(), "Observa\u00e7\u00f5es" ) ); - JScrollPane scp = new JScrollPane(); - scp.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); - scp.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS ); - observacoesText = new JTextArea(); - observacoesText.setLineWrap( true ); - observacoesText.setWrapStyleWord( true ); - scp.setViewportView( observacoesText ); +// JScrollPane scp = new JScrollPane(); +// scp.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER ); +// scp.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS ); + observacoesText = new JTextField(); + observacoesText.setDocument( new MaximumLengthDocument( 150 ) ); +// observacoesText.setLineWrap( true ); +// observacoesText.setWrapStyleWord( true ); +// scp.setViewportView( observacoesText ); setLayout( new GridLayout( 1, 1, 0, 0 ) ); - add( scp ); + add( observacoesText ); } public void fill(Object value) diff --git a/trunk/siprp/ficha/RecomendacoesPanel.java b/trunk/siprp/ficha/RecomendacoesPanel.java index 6ecc6429..f4b0654f 100644 --- a/trunk/siprp/ficha/RecomendacoesPanel.java +++ b/trunk/siprp/ficha/RecomendacoesPanel.java @@ -9,6 +9,7 @@ package siprp.ficha; import java.awt.*; import javax.swing.*; +import com.evolute.utils.documents.*; import com.evolute.utils.ui.*; /** @@ -37,6 +38,7 @@ public class RecomendacoesPanel extends JPanel recomendacoesText = new JTextArea(); recomendacoesText.setLineWrap( true ); recomendacoesText.setWrapStyleWord( true ); + recomendacoesText.setDocument( new MaximumLengthDocument( 150 ) ); scp.setViewportView( recomendacoesText ); JPanel rightPanel = new JPanel(); JLabel proximoExameLabel = new JLabel( "Pr\u00f3ximo Exame" );