From 1e9e4642a028b2b3be7fb52e795a9654e58d89fb Mon Sep 17 00:00:00 2001 From: Frederico Palma Date: Tue, 30 Mar 2004 12:07:31 +0000 Subject: [PATCH] no message git-svn-id: https://svn.coded.pt/svn/SIPRP@9 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/siprp/ficha/EmpresaPanel.java | 89 +++++++++++++++++++---------- trunk/siprp/ficha/ExamePanel.java | 8 +-- 2 files changed, 63 insertions(+), 34 deletions(-) diff --git a/trunk/siprp/ficha/EmpresaPanel.java b/trunk/siprp/ficha/EmpresaPanel.java index 2c199a76..e559e43c 100644 --- a/trunk/siprp/ficha/EmpresaPanel.java +++ b/trunk/siprp/ficha/EmpresaPanel.java @@ -10,7 +10,9 @@ import java.awt.*; import javax.swing.*; import java.util.*; +import com.evolute.utils.data.*; import com.evolute.utils.ui.button.*; +import com.evolute.utils.ui.panel.*; /** * @@ -21,8 +23,10 @@ public class EmpresaPanel extends JPanel private JTextField designacaoSocialText; private JTextField estabelecimentoText; private JTextField localidadeText; - private RadioButtonGroup servicoSaudeTipoGroup; - private RadioButtonGroup servicoHigieneTipoGroup; +// private RadioButtonGroup servicoSaudeTipoGroup; +// private RadioButtonGroup servicoHigieneTipoGroup; + private RadioButtonFixedPanel servicoSaudeTipoPanel; + private RadioButtonFixedPanel servicoHigieneTipoPanel; private JTextField designacaoText; /** Creates a new instance of EmpresaPanel */ @@ -39,7 +43,7 @@ public class EmpresaPanel extends JPanel JLabel designacaoSocialLabel = new JLabel( "Designa\u00e7\u00e3o Social" ); designacaoSocialText = new JTextField(); - JPanel servicoSaudePanel = new JPanel(); +// JPanel servicoSaudePanel = new JPanel(); JLabel estabelecimentoLabel = new JLabel( "Estabelecimento" ); estabelecimentoText = new JTextField(); JLabel localidadeLabel = new JLabel( "Localidade" ); @@ -49,23 +53,25 @@ public class EmpresaPanel extends JPanel // JRadioButton saudeInterempresas = new JRadioButton( "Interempresas" ); // JRadioButton saudeExterno = new JRadioButton( "Externo" ); // JRadioButton saudeSNS = new JRadioButton( "Servi\u00e7o Nacional de Sa\u00fade" ); - servicoSaudeTipoGroup = - new RadioButtonGroup( servicoSaudePanel, - new Vector( Arrays.asList( new Object[]{ - "Interno", "Interempresas", - "Externo", "Servi\u00e7o Nacional de Sa\u00fade" } ) ), false ); +// servicoSaudeTipoGroup = +// new RadioButtonGroup( servicoSaudePanel, +// new Vector( Arrays.asList( new Object[]{ +// "Interno", "Interempresas", +// "Externo", "Servi\u00e7o Nacional de Sa\u00fade" } ) ), false ); + servicoSaudeTipoPanel = + new RadioButtonFixedPanel( new IDObject[]{ new MappableObject( new Integer(1), "Interno" ), + new MappableObject( new Integer(2), "Interempresas" ), + new MappableObject( new Integer(3), "Externo" ), + new MappableObject( new Integer(4), "Servi\u00e7o Nacional de Sa\u00fade" ) }, + 1, 4, RadioButtonPanel.ORIENTATION_HORIZONTAL, false ); - JPanel servicoHigienePanel = new JPanel(); JLabel servicoHigieneLabel = new JLabel( "Servi\u00e7o de Higiene e Seguran\u00e7a: Tipo" ); -// JRadioButton higieneInterno = new JRadioButton( "Interno" ); -// JRadioButton higieneInterempresas = new JRadioButton( "Interempresas" ); -// JRadioButton higieneExterno = new JRadioButton( "Externo" ); -// JRadioButton higieneOutro = new JRadioButton( "Outro" ); - servicoHigieneTipoGroup = - new RadioButtonGroup( servicoHigienePanel, - new Vector( Arrays.asList( new Object[]{ - "Interno", "Interempresas", - "Externo", "Outro" } ) ), false ); + servicoHigieneTipoPanel = + new RadioButtonFixedPanel( new IDObject[]{ new MappableObject( new Integer(1), "Interno" ), + new MappableObject( new Integer(2), "Interempresas" ), + new MappableObject( new Integer(3), "Externo" ), + new MappableObject( new Integer(4), "Outro" ) }, + 1, 4, RadioButtonPanel.ORIENTATION_HORIZONTAL, false ); JLabel designacaoLabel = new JLabel( "Designa\u00e7\u00e3o" ); designacaoText = new JTextField(); @@ -93,10 +99,12 @@ public class EmpresaPanel extends JPanel add( estabelecimentoLabel ); constraints.weightx = 0.6; + constraints.gridwidth = 3; gridbag.setConstraints( estabelecimentoText, constraints ); add( estabelecimentoText ); constraints.weightx = 0; + constraints.gridwidth = 1; gridbag.setConstraints( localidadeLabel, constraints ); add( localidadeLabel ); @@ -105,26 +113,47 @@ public class EmpresaPanel extends JPanel gridbag.setConstraints( localidadeText, constraints ); add( localidadeText ); +// constraints.weightx = 1; +// constraints.gridwidth = GridBagConstraints.REMAINDER; +// JPanel servicoSaudeOuterPanel = new JPanel(); +// servicoSaudeOuterPanel.setLayout( new BorderLayout( 0, 0 ) ); +// servicoSaudeOuterPanel.add( servicoSaudeLabel, BorderLayout.WEST ); +// servicoSaudeOuterPanel.add( servicoSaudeTipoPanel, BorderLayout.CENTER ); +// gridbag.setConstraints( servicoSaudeOuterPanel, constraints ); +// add( servicoSaudeOuterPanel ); + constraints.weightx = 0; + constraints.gridwidth = 2; + gridbag.setConstraints( servicoSaudeLabel, constraints ); + add( servicoSaudeLabel ); + constraints.weightx = 1; constraints.gridwidth = GridBagConstraints.REMAINDER; - JPanel servicoSaudeOuterPanel = new JPanel(); - servicoSaudeOuterPanel.setLayout( new BorderLayout( 0, 0 ) ); - servicoSaudeOuterPanel.add( servicoSaudeLabel, BorderLayout.WEST ); - servicoSaudeOuterPanel.add( servicoSaudePanel, BorderLayout.CENTER ); - gridbag.setConstraints( servicoSaudeOuterPanel, constraints ); - add( servicoSaudeOuterPanel ); + gridbag.setConstraints( servicoSaudeTipoPanel, constraints ); + add( servicoSaudeTipoPanel ); + +// constraints.weightx = 1; +// constraints.gridwidth = GridBagConstraints.REMAINDER; +// JPanel servicoHigieneOuterPanel = new JPanel(); +// servicoHigieneOuterPanel.setLayout( new BorderLayout( 0, 0 ) ); +// servicoHigieneOuterPanel.add( servicoHigieneLabel, BorderLayout.WEST ); +// servicoHigieneOuterPanel.add( servicoHigieneTipoPanel, BorderLayout.CENTER ); +// gridbag.setConstraints( servicoHigieneOuterPanel, constraints ); +// add( servicoHigieneOuterPanel ); + + constraints.weightx = 0; + constraints.gridwidth = 3; + gridbag.setConstraints( servicoHigieneLabel, constraints ); + add( servicoHigieneLabel ); constraints.weightx = 1; constraints.gridwidth = GridBagConstraints.REMAINDER; - JPanel servicoHigieneOuterPanel = new JPanel(); - servicoHigieneOuterPanel.setLayout( new BorderLayout( 0, 0 ) ); - servicoHigieneOuterPanel.add( servicoHigieneLabel, BorderLayout.WEST ); - servicoHigieneOuterPanel.add( servicoHigienePanel, BorderLayout.CENTER ); - gridbag.setConstraints( servicoHigieneOuterPanel, constraints ); - add( servicoHigieneOuterPanel ); + gridbag.setConstraints( servicoHigieneTipoPanel, constraints ); + add( servicoHigieneTipoPanel ); constraints.gridwidth = 1; constraints.weightx = 0; + constraints.weighty = 1; + constraints.gridheight = GridBagConstraints.REMAINDER; gridbag.setConstraints( designacaoLabel, constraints ); add( designacaoLabel ); diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/siprp/ficha/ExamePanel.java index fec6b441..7807a945 100644 --- a/trunk/siprp/ficha/ExamePanel.java +++ b/trunk/siprp/ficha/ExamePanel.java @@ -28,9 +28,9 @@ public class ExamePanel extends JPanel private BetterButtonGroup tipoGroup; private JRadioButton ocasionalRadio; private JRadioButton outroRadio; - private RadioButtonPanel ocasionalPanel; + private RadioButtonFixedPanel ocasionalPanel; private JTextField especificarText; - private RadioButtonPanel resultadoPanel; + private RadioButtonFixedPanel resultadoPanel; private JTextField outrasFuncoesTexts[]; /** Creates a new instance of ExamePanel */ @@ -66,7 +66,7 @@ public class ExamePanel extends JPanel outroRadio = new JRadioButton( "Outro" ); tipoGroup.add( outroRadio ); outroRadio.addChangeListener( this ); - ocasionalPanel = new RadioButtonPanel( + ocasionalPanel = new RadioButtonFixedPanel( new IDObject[]{ new MappableObject( new Integer( 1 ), "Ap\u00f3s doen\u00e7a" ), new MappableObject( new Integer( 2 ), "Ap\u00f3s acidente" ), new MappableObject( new Integer( 3 ), "A pedido do trabalhador" ), @@ -77,7 +77,7 @@ public class ExamePanel extends JPanel ocasionalPanel.setEnabled( false ); especificarText = new JTextField(); especificarText.setEnabled( false ); - resultadoPanel = new RadioButtonPanel( + resultadoPanel = new RadioButtonFixedPanel( new IDObject[]{ new MappableObject( new Integer( 1 ), "Apto" ), new MappableObject( new Integer( 2 ), "Apto condicionalmente" ), new MappableObject( new Integer( 3 ), "Inapto temporariamente" ),