no message

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

trunk/siprp/companydataloaders/SIPRPDataLoader.java

@@ -28,7 +28,7 @@ public class SIPRPDataLoader implements CompanyDataLoader
 		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "SIPRP - Sociedade Ib\u00e9rica de Preven\u00e7\u00e3o de Riscos Profissionais" );
 		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_combo.jpg" );
 		Singleton.setInstance( SingletonConstants.COMPANY_ACRONYM, "SIPRP" );
-		Singleton.setInstance( SingletonConstants.SUBJECT_CONSULTA, "SIPRP - Marca\u00E7\u00E3o de consulta");
+		Singleton.setInstance( SingletonConstants.SUBJECT_CONSULTA, "SIPRP - Marca\u00E7\u00E3o de consulta de '" + NOME + "'");
 		Singleton.setInstance( SingletonConstants.LETTER_CONSULTA, "Vimos pelo presente informar que '" + NOME + "' dever\u00E1 comparecer "
 						+ "nas nossas instala\u00E7\u00F5es para a realiza\u00E7\u00E3o da consulta de Medicina "
 						+ "do Trabalho, no dia '" + DATA + "', pelas 08H30."
@@ -47,7 +47,7 @@ public class SIPRPDataLoader implements CompanyDataLoader
 						+ "%0A%0AATRIUM SALDANHA"
 						+ "%0A%0APra\u00e7a Duque de Saldanha, 1 - 9\u00BAC"
 						+ "%0A%0A1050-094 Lisboa" );
-		Singleton.setInstance( SingletonConstants.SUBJECT_EXAMES, "SIPRP - Marca\u00E7\u00E3o de exame");
+		Singleton.setInstance( SingletonConstants.SUBJECT_EXAMES, "SIPRP - Marca\u00E7\u00E3o de exame de '" + NOME + "'");
 		Singleton.setInstance( SingletonConstants.LETTER_EXAMES, "Vimos pelo presente informar que '" + NOME + "' dever\u00E1 comparecer "
 						+ "nas nossas instala\u00E7\u00F5es para a realiza\u00E7\u00E3o dos exames de Medicina "
 						+ "do Trabalho, no dia '" + DATA + "', pelas 08H30."

trunk/siprp/ficha/ExamePDF.java

@@ -125,11 +125,12 @@ public class ExamePDF {
 		}
 	}
 	
-	public void print( byte []pdf )
+	public void print( byte []pdf, String nome )
 		throws Exception
 	{
 		long time = System.currentTimeMillis();
-		FileOutputStream fos = new FileOutputStream( System.getProperty( "user.home" ) + System.getProperty( "file.separator" ) + "report_ficha" + time + ".pdf" );
+//		FileOutputStream fos = new FileOutputStream( System.getProperty( "user.home" ) + System.getProperty( "file.separator" ) + "report_ficha" + time + ".pdf" );
+		FileOutputStream fos = new FileOutputStream( System.getProperty( "user.home" ) + System.getProperty( "file.separator" ) + nome + "_" + time + ".pdf" );
 		fos.write( pdf );
 		fos.close();
 		System.out.println( "File saved." );

trunk/siprp/ficha/FichaWindow.java

@@ -20,6 +20,7 @@ import com.evolute.utils.*;
 import com.evolute.utils.data.*;
 import com.evolute.utils.jdo.*;
 import com.evolute.utils.metadb.*;
+import com.evolute.utils.strings.*;
 import com.evolute.utils.tracker.*;
 import com.evolute.utils.ui.*;
 import com.evolute.utils.ui.panel.*;
@@ -498,8 +499,11 @@ public class FichaWindow extends TabbedWindow
 		{
 			throw new Exception( "N\u00e3o existe exame" );
 		}
+		TrabalhadorData trabalhadorExame = ( TrabalhadorData ) exame.get( ExameData.TRABALHADOR );
+		String nomeFicheiro = StringPlainer.convertString( ( String ) trabalhadorExame.get( TrabalhadorData.NOME ) );
+		nomeFicheiro.replaceAll( " ", "_" );
 		ExamePDF ePDF = new ExamePDF();
-		ePDF.print( pdf );
+		ePDF.print( pdf, nomeFicheiro );
 	}
 		
 	public byte[] createPDF( ExameData exame )