no message

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

trunk/siprp/companydataloaders/IBookDataLoader.java

@@ -71,7 +71,7 @@ public class IBookDataLoader implements CompanyDataLoader
 					+ "Cumprimentos,%0A%0ASHST" );
 		Singleton.setInstance( SingletonConstants.USES_HOUR, Boolean.FALSE );
 		Singleton.setInstance( SingletonConstants.CODIGO_EMPRESA_FORMAT, "2 6 / 2" );
-		Singleton.setInstance( SingletonConstants.FICHA_MARCA_EXAMES, Boolean.FALSE );
+		Singleton.setInstance( SingletonConstants.FICHA_MARCA_EXAMES, Boolean.TRUE );
 		Singleton.setInstance( SingletonConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 } );
 		
 		Singleton.setInstance( SingletonConstants.MODULE_FICHA, Boolean.TRUE );

trunk/siprp/ficha/ExamePanel.java

@@ -47,6 +47,7 @@ public class ExamePanel extends JPanel
 //	private JRadioButton outroRadio;
 	private RadioButtonFixedPanel ocasionalPanel;
 	private JTextField especificarText;
+	private RadioButtonFixedPanel tipoProximoPanel;
 	private JCalendarPanel proximoExamePanel;
 	private RadioButtonFixedPanel resultadoPanel;
 	private JTextField outrasFuncoesTexts[];
@@ -107,8 +108,15 @@ public class ExamePanel extends JPanel
 		especificarText = new JTextField();
 		especificarText.setEnabled( false );
 		JPanel proximoExameOuterPanel = new JPanel();
-		JLabel proximoExameLabel = new JLabel( "Pr\u00f3ximo Exame" );
+		proximoExameOuterPanel.setBorder( BorderFactory.createTitledBorder( 
+					BorderFactory.createEtchedBorder(), "Pr\u00f3ximo Exame" ) );
 		proximoExamePanel = new JCalendarPanel( null );
+		tipoProximoPanel =  new RadioButtonFixedPanel(  
+			new IDObject[]{ new MappableObject( new Integer( 2 ), "Peri\u00f3dico" ),
+							new MappableObject( new Integer( 3 ), "Ocasional" ) },
+			RadioButtonFixedPanel.ORIENTATION_HORIZONTAL, 1, 2, false );
+//		JLabel proximoExameLabel = new JLabel( "Pr\u00f3ximo Exame" );
+		
 		JPanel resultadoOuterPanel = new JPanel();
 		resultadoOuterPanel.setBorder( BorderFactory.createTitledBorder( 
 				BorderFactory.createEtchedBorder(), "Resultado" ) );
@@ -151,8 +159,9 @@ public class ExamePanel extends JPanel
 		leftPanel.add( dataExameOuterPanel, BorderLayout.NORTH );
 		leftPanel.add( tipoPanel, BorderLayout.CENTER );
 		proximoExameOuterPanel.setLayout( new BorderLayout() );
-		proximoExameOuterPanel.add( proximoExameLabel, BorderLayout.WEST );
+//		proximoExameOuterPanel.add( proximoExameLabel, BorderLayout.WEST );
 		proximoExameOuterPanel.add( proximoExamePanel, BorderLayout.CENTER );
+		proximoExameOuterPanel.add( tipoProximoPanel, BorderLayout.SOUTH );
 		if( ( ( Boolean ) Singleton.getInstance( SingletonConstants.FICHA_MARCA_EXAMES ) ).booleanValue() )
 		{
 			leftPanel.add( proximoExameOuterPanel, BorderLayout.SOUTH );

trunk/siprp/ficha/FichaWindow.java

@@ -67,7 +67,7 @@ public class FichaWindow extends TabbedWindow
 	private void setupComponents()
 		throws Exception
 	{
-		setSize( 700, 570 );
+		setSize( 700, 640 );
 		setResizable( false );
 		setTitle( "Ficha de Aptid\u00e3o" );