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

trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=dcb713c9
+build.xml.data.CRC32=d83fbdde
 build.xml.script.CRC32=97b5d0ef
 build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=dcb713c9
+nbproject/build-impl.xml.data.CRC32=d83fbdde
 nbproject/build-impl.xml.script.CRC32=6e839b17
 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1

trunk/AnaliseAcidentesTrabalho/nbproject/project.properties

@@ -71,16 +71,22 @@ includes=**
 j2ee.deploy.on.save=false
 j2ee.platform=1.4
 j2ee.platform.classpath=\
+    ${libs.Tomcat.classpath}:\
     ${libs.Tomcat.classpath}
 j2ee.platform.jwsdp.classpath=\
+    ${libs.Tomcat.wsjwsdp}:\
     ${libs.Tomcat.wsjwsdp}
 j2ee.platform.wscompile.classpath=\
+    ${libs.Tomcat.wscompile}:\
     ${libs.Tomcat.wscompile}
 j2ee.platform.wsgen.classpath=\
+    ${libs.Tomcat.wsgenerate}:\
     ${libs.Tomcat.wsgenerate}
 j2ee.platform.wsimport.classpath=\
+    ${libs.Tomcat.wsimport}:\
     ${libs.Tomcat.wsimport}
 j2ee.platform.wsit.classpath=\
+    ${libs.Tomcat.wsinterop}:\
     ${libs.Tomcat.wsinterop}
 j2ee.server.type=Tomcat60
 jar.compress=false
@@ -139,6 +145,7 @@ javac.classpath=\
     ${file.reference.commons-el-1.0.jar}:\
     ${file.reference.xmlParserAPIs-2.0.2.jar}:\
     ${file.reference.tomahawk-1.1.10.jar}:\
+    ${libs.Tomcat.classpath}:\
     ${libs.Tomcat.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=

trunk/AnaliseAcidentesTrabalho/nbproject/project.xml

@@ -226,6 +226,9 @@
                 <library>
                     <file>${libs.Tomcat.classpath}</file>
                 </library>
+                <library>
+                    <file>${libs.Tomcat.classpath}</file>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries>
                 <library>

trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java

@@ -14763,7 +14763,18 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
 		String errorMessage = "";
 
 		Integer tipo = null;
+		String estabelecimentoNome = null;
+		try
+		{
+			estabelecimentoNome = AnalisesDataProvider.getInstance().getEstabelecimentoNome( a.getEstabelecimento_id() );
+		}
+		catch( Exception ex )
+		{
+			ex.printStackTrace();
+		}
 		Acidentado ac = getSessionBean1().getAcidentado();
+		if( estabelecimentoNome == null )
+		{
 			if( ac == null )
 			{
 				Integer acidentadoId = a.getAcidentado_id();
@@ -14776,7 +14787,16 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
 					ex.printStackTrace();
 				}
 			}
-		String assunto = "Comunicacao de Analise de Acidentes de Trabalho" + " - " + ( ac != null ? ac.getEstabelecimento_origem() : "" );
+			if( ac != null )
+			{
+				estabelecimentoNome = ac.getEstabelecimento_origem();
+			}
+			else
+			{
+				estabelecimentoNome = "";
+			}
+		}
+		String assunto = "Comunicacao de Analise de Acidentes de Trabalho" + ( ac != null ? " de " + ac.getNome() : "" ) + " - " + estabelecimentoNome;
 
 		String texto_email = "<p>Esta &eacute; uma mensagem autom&aacute;tica da equipa da SIPRP:</p>";
 		texto_email += "<p>Recebeu um novo processo de an&aacute;lise de acidente de trabalho para tratar.</p>";