From 385fd292ce53cae5c0617335bb38aad2a5794421 Mon Sep 17 00:00:00 2001
From: Frederico Palma <deactivated@coded.pt>
Date: Fri, 28 Apr 2006 19:51:47 +0000
Subject: [PATCH] no message

git-svn-id: https://svn.coded.pt/svn/SIPRP@255 bb69d46d-e84e-40c8-a05a-06db0d633741
---
 trunk/siprp/ficha/ExamePanel.java  | 6 ++++++
 trunk/siprp/ficha/FichaWindow.java | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/siprp/ficha/ExamePanel.java
index 6ef937eb..01d3392c 100644
--- a/trunk/siprp/ficha/ExamePanel.java
+++ b/trunk/siprp/ficha/ExamePanel.java
@@ -483,6 +483,7 @@ public class ExamePanel extends JPanel
 		ComponentController.clear( names, components );
 		tipoGroup.setIntSelected( 0 );
 		dataExamePanel.setDate( new Date() );
+		tipoProximoPanel.setSelected( new Integer( 2 ) );
 		marcacao = null;
 	}
 
@@ -516,4 +517,9 @@ public class ExamePanel extends JPanel
 			especificarText.setEnabled( false );
 		}
 	}
+	
+	public Integer getMotivoProximoExame()
+	{
+		return tipoProximoPanel.getSelected();
+	}
 }
diff --git a/trunk/siprp/ficha/FichaWindow.java b/trunk/siprp/ficha/FichaWindow.java
index 3c643133..358914c3 100644
--- a/trunk/siprp/ficha/FichaWindow.java
+++ b/trunk/siprp/ficha/FichaWindow.java
@@ -9,6 +9,7 @@ package siprp.ficha;
 import siprp.*;
 import siprp.data.*;
 import siprp.importer.*;
+import siprp.medicina.*;
 
 import java.awt.*;
 import java.io.*;
@@ -43,6 +44,7 @@ public class FichaWindow extends TabbedWindow
 	private ExamePanel examePanel;
 
 	private FichaDataProvider fdpProvider;
+	private MarcacoesMedicinaHandler marcacoesHandler;
 	private Integer empresaID;
 	private Integer estabelecimentoID;
 	private Integer trabalhadorID;
@@ -61,6 +63,7 @@ public class FichaWindow extends TabbedWindow
 		upperPanel.owner = this;
 		fdpProvider = ( FichaDataProvider ) FichaDataProvider.getProvider();
 		JDO = ( JDOProvider ) Singleton.getInstance( Singleton.DEFAULT_JDO_PROVIDER );
+		marcacoesHandler = new MarcacoesMedicinaHandler();
 		setupComponents();
 	}
 	
@@ -281,7 +284,11 @@ public class FichaWindow extends TabbedWindow
 			trabalhadorID = ( Integer ) trabalhador.get( TrabalhadorData.ID );
 			try
 			{
-				Marcacao.saveMarcacaoConsultaForTrabalhadorID( trabalhadorID, (Date)exame.get( ExameData.PROXIMO_EXAME ) );
+				//Marcacao.saveMarcacaoConsultaForTrabalhadorID( trabalhadorID, (Date)exame.get( ExameData.PROXIMO_EXAME ) );
+				marcacoesHandler.ajustarMarcacoes( 
+						trabalhadorID, (Integer)exame.get( ExameData.TIPO ), 
+						(Date)exame.get( ExameData.DATA ), 
+						examePanel.getMotivoProximoExame(), (Date)exame.get( ExameData.PROXIMO_EXAME ) );
 			}
 			catch( Exception iex )
 			{