diff --git a/trunk/AnaliseAcidentesTrabalho/build.xml b/trunk/AnaliseAcidentesTrabalho/build.xml
index 749e498d..eb87f66d 100644
--- a/trunk/AnaliseAcidentesTrabalho/build.xml
+++ b/trunk/AnaliseAcidentesTrabalho/build.xml
@@ -21,15 +21,15 @@
       -post-compile-test:        called after javac compilation of JUnit tests
       -pre-compile-test-single:  called before javac compilation of single JUnit test
       -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-dist:                 called before jar building 
-      -post-dist:                called after jar building 
+      -pre-dist:                 called before archive building 
+      -post-dist:                called after archive building 
       -post-clean:               called after cleaning build products 
       -pre-run-deploy:           called before deploying
       -post-run-deploy:          called after deploying
 
     Example of pluging an obfuscator after the compilation could look like 
 
-        <target name="post-compile">
+        <target name="-post-compile">
             <obfuscate>
                 <fileset dir="${build.classes.dir}"/>
             </obfuscate>
@@ -45,7 +45,7 @@
       init-macrodef-javac:    defines macro for javac compilation
       init-macrodef-junit:   defines macro for junit execution
       init-macrodef-debug:    defines macro for class debugging
-      do-dist:                jar archive building
+      do-dist:                archive building
       run:                    execution of project 
       javadoc-build:          javadoc generation 
 
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/ant-deploy.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/ant-deploy.xml
index bcfeee44..a6f1480c 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/ant-deploy.xml
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/ant-deploy.xml
@@ -12,7 +12,7 @@
     <target name="-deploy-ant" if="deploy.ant.enabled" depends="-init">
         <echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/>
         <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"
-                 classpath="${tomcat.home}/server/lib/catalina-ant.jar"/>
+                 classpath="${tomcat.home}/lib/catalina-ant.jar"/>
         <deploy url="${tomcat.url}/manager" username="${tomcat.username}"
                 password="${tomcat.password}" path="${Context(path)}"
                 war="${deploy.ant.archive}"/>
@@ -21,7 +21,7 @@
     <target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init">
         <echo message="Undeploying ${Context(path)}"/>
         <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask"
-                classpath="${tomcat.home}/server/lib/catalina-ant.jar"/>
+                classpath="${tomcat.home}/lib/catalina-ant.jar"/>
         <undeploy url="${tomcat.url}/manager" username="${tomcat.username}" 
                   password="${tomcat.password}" path="${Context(path)}"/>
     </target>
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
index c08bb76a..780cccbc 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
@@ -17,9 +17,9 @@
         - cleanup
 
         -->
-<project name="AnaliseAcidentesTrabalho-impl" default="build" basedir=".." xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1" xmlns:webproject1="http://www.netbeans.org/ns/web-project/1">
+<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="AnaliseAcidentesTrabalho-impl">
     <import file="ant-deploy.xml"/>
-    <target name="default" depends="dist,javadoc" description="Build whole project."/>
+    <target depends="dist,javadoc" description="Build whole project." name="default"/>
     <!--
                 INITIALIZATION SECTION
             -->
@@ -27,25 +27,21 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="-init-private" depends="-pre-init">
+    <target depends="-pre-init" name="-init-private">
         <property file="nbproject/private/private.properties"/>
     </target>
-    <target name="-init-user" depends="-pre-init,-init-private">
+    <target depends="-pre-init,-init-private" name="-init-user">
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
         <property name="default.javac.source" value="1.4"/>
         <property name="default.javac.target" value="1.4"/>
     </target>
-    <target name="-init-project" depends="-pre-init,-init-private,-init-user">
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/project.properties"/>
     </target>
-    <target name="-do-ear-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir">
-        <property value="${build.ear.web.dir}/META-INF" name="build.meta.inf.dir"/>
-        <property name="build.classes.dir.real" value="${build.ear.classes.dir}"/>
-        <property name="build.web.dir.real" value="${build.ear.web.dir}"/>
-    </target>
-    <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property, -do-ear-init">
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
         <condition property="have.tests">
             <or>
                 <available file="${test.src.dir}"/>
@@ -80,29 +76,74 @@
         <condition property="do.compile.jsps">
             <istrue value="${compile.jsps}"/>
         </condition>
+        <condition property="enable.jsdebugger">
+            <and>
+                <isset property="debug.client.available"/>
+                <istrue value="${debug.client.available}"/>
+            </and>
+        </condition>
+        <condition property="do.debug.server">
+            <or>
+                <not>
+                    <isset property="debug.server"/>
+                </not>
+                <istrue value="${debug.server}"/>
+                <not>
+                    <isset property="enable.jsdebugger"/>
+                </not>
+                <and>
+                    <not>
+                        <istrue value="${debug.server}"/>
+                    </not>
+                    <not>
+                        <istrue value="${debug.client}"/>
+                    </not>
+                </and>
+            </or>
+        </condition>
+        <condition property="do.debug.client">
+            <and>
+                <istrue value="${debug.client}"/>
+                <isset property="enable.jsdebugger"/>
+            </and>
+        </condition>
         <condition property="do.display.browser">
             <istrue value="${display.browser}"/>
         </condition>
+        <condition property="do.display.browser.debug">
+            <and>
+                <isset property="do.display.browser"/>
+                <not>
+                    <isset property="do.debug.client"/>
+                </not>
+            </and>
+        </condition>
         <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
         <available file="${conf.dir}/persistence.xml" property="has.persistence.xml"/>
         <condition property="do.war.package.with.custom.manifest">
+            <isset property="has.custom.manifest"/>
+        </condition>
+        <condition property="do.war.package.without.custom.manifest">
+            <not>
+                <isset property="has.custom.manifest"/>
+            </not>
+        </condition>
+        <condition property="do.tmp.war.package.with.custom.manifest">
             <and>
-                <istrue value="${war.package}"/>
                 <isset property="has.custom.manifest"/>
+                <isfalse value="${directory.deployment.supported}"/>
             </and>
         </condition>
-        <condition property="do.war.package.without.custom.manifest">
+        <condition property="do.tmp.war.package.without.custom.manifest">
             <and>
-                <istrue value="${war.package}"/>
                 <not>
                     <isset property="has.custom.manifest"/>
                 </not>
+                <isfalse value="${directory.deployment.supported}"/>
             </and>
         </condition>
-        <property value="${build.web.dir}/META-INF" name="build.meta.inf.dir"/>
-        <property name="build.classes.dir.real" value="${build.classes.dir}"/>
-        <property name="build.web.dir.real" value="${build.web.dir}"/>
-        <condition property="application.args.param" value="${application.args}" else="">
+        <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
+        <condition else="" property="application.args.param" value="${application.args}">
             <and>
                 <isset property="application.args"/>
                 <not>
@@ -110,12 +151,28 @@
                 </not>
             </and>
         </condition>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
+            <and>
+                <isset property="jaxws.endorsed.dir"/>
+                <available file="nbproject/jaxws-build.xml"/>
+            </and>
+        </condition>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -128,6 +185,13 @@
         <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
         <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
         <fail unless="dist.war">Must set dist.war</fail>
+        <fail unless="j2ee.platform.classpath">
+The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+   ant -Duser.properties.file=&lt;path_to_property_file&gt; (where you put the property "j2ee.platform.classpath" in a .properties file)
+or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties file is used)
+                </fail>
     </target>
     <target name="-init-macrodef-property">
         <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
@@ -140,17 +204,17 @@
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
-            <attribute name="srcdir" default="${src.dir}"/>
-            <attribute name="destdir" default="${build.classes.dir.real}"/>
-            <attribute name="classpath" default="${javac.classpath}:${j2ee.platform.classpath}"/>
-            <attribute name="debug" default="${javac.debug}"/>
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${javac.debug}" name="debug"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" includeantruntime="false" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
-                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
                     <customize/>
                 </javac>
             </sequential>
@@ -158,18 +222,18 @@
     </target>
     <target name="-init-macrodef-junit">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
-            <attribute name="includes" default="**/*Test.java"/>
+            <attribute default="**/*Test.java" name="includes"/>
             <sequential>
-                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
+                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${test.src.dir}" includes="@{includes}"/>
                     </batchtest>
                     <classpath>
-                        <path path="${run.test.classpath}"/>
+                        <path path="${run.test.classpath}:${j2ee.platform.classpath}"/>
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
-                        <mapper type="glob" from="test-sys-prop.*" to="*"/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
@@ -179,29 +243,37 @@
     </target>
     <target name="-init-macrodef-java">
         <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute name="classname" default="${main.class}"/>
+            <attribute default="${main.class}" name="classname"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java fork="true" classname="@{classname}">
+                <java classname="@{classname}" fork="true">
                     <jvmarg line="${runmain.jvmargs}"/>
                     <classpath>
-                        <path path="${build.classes.dir.real}:${javac.classpath}:${j2ee.platform.classpath}"/>
+                        <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="run-sys-prop."/>
-                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
                     <customize/>
                 </java>
             </sequential>
         </macrodef>
     </target>
+    <target if="enable.jsdebugger" name="-init-macrodef-nbjsdebug">
+        <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
+            <attribute default="${client.url}" name="webUrl"/>
+            <sequential>
+                <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
+            </sequential>
+        </macrodef>
+    </target>
     <target name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute name="name" default="${main.class}"/>
-            <attribute name="classpath" default="${debug.classpath}"/>
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
             <sequential>
-                <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}">
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="dt_socket">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -209,24 +281,44 @@
             </sequential>
         </macrodef>
         <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute name="dir" default="${build.classes.dir.real}"/>
+            <attribute default="${build.classes.dir}" name="dir"/>
             <sequential>
                 <nbjpdareload>
-                    <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
                 </nbjpdareload>
             </sequential>
         </macrodef>
+        <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
+            <sequential>
+                <nbjpdaappreloaded/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
     </target>
-    <target name="-init-macrodef-debug">
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
         <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
-            <attribute name="classname" default="${main.class}"/>
-            <attribute name="classpath" default="${debug.classpath}"/>
-            <attribute name="args" default="${application.args.param}"/>
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
+            <attribute default="${application.args.param}" name="args"/>
+            <element name="customize" optional="true"/>
             <sequential>
-                <java fork="true" classname="@{classname}">
-                    <jvmarg value="-Xdebug"/>
-                    <jvmarg value="-Xnoagent"/>
-                    <jvmarg value="-Djava.compiler=none"/>
+                <java classname="@{classname}" fork="true">
+                    <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
                     <jvmarg line="${runmain.jvmargs}"/>
                     <classpath>
@@ -234,9 +326,10 @@
                     </classpath>
                     <syspropertyset>
                         <propertyref prefix="run-sys-prop."/>
-                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
                     <arg line="@{args}"/>
+                    <customize/>
                 </java>
             </sequential>
         </macrodef>
@@ -246,66 +339,70 @@
             <attribute name="file"/>
             <attribute name="propname"/>
             <sequential>
-                <basename property="base_@{propname}" file="@{file}"/>
-                <zipfileset id="tld.files_@{propname}" src="@{file}" includes="META-INF/*.tld META-INF/tlds/*.tld"/>
+                <basename file="@{file}" property="base_@{propname}"/>
+                <zipfileset id="tld.files_@{propname}" includes="META-INF/*.tld META-INF/tlds/*.tld" src="@{file}"/>
                 <pathconvert property="tld.files.path_@{propname}" refid="tld.files_@{propname}"/>
-                <condition value="yes" property="hastlds_@{propname}">
-                    <contains string="${tld.files.path_@{propname}}" substring=".tld" casesensitive="false"/>
+                <condition property="hastlds_@{propname}" value="yes">
+                    <contains casesensitive="false" string="${tld.files.path_@{propname}}" substring=".tld"/>
                 </condition>
-                <condition value="${build.web.dir.real}/WEB-INF/lib" property="copy.to.dir_@{propname}">
+                <condition property="copy.to.dir_@{propname}" value="${build.web.dir}/WEB-INF/lib">
                     <isset property="hastlds_@{propname}"/>
                 </condition>
-                <condition value="${dist.ear.dir}" property="copy.to.dir_@{propname}">
+                <condition property="copy.to.dir_@{propname}" value="${dist.ear.dir}">
                     <not>
                         <isset property="hastlds_@{propname}"/>
                     </not>
                 </condition>
                 <copy file="@{file}" todir="${copy.to.dir_@{propname}}"/>
-                <condition value="${base_@{propname}}" property="@{propname}">
+                <condition property="@{propname}" value="${base_@{propname}}">
                     <not>
                         <isset property="hastlds_@{propname}"/>
                     </not>
                 </condition>
-                <condition value="" property="@{propname}">
+                <condition property="@{propname}" value="">
                     <isset property="hastlds_@{propname}"/>
                 </condition>
             </sequential>
         </macrodef>
     </target>
-    <target name="init" depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-copy-ear-war"/>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-macrodef-copy-ear-war" name="init"/>
     <!--
                 COMPILATION SECTION
             -->
-    <target name="deps-module-jar" depends="init" if="no.dist.ear.dir" unless="no.deps"/>
-    <target name="deps-ear-jar" depends="init" if="dist.ear.dir" unless="no.deps"/>
-    <target name="deps-jar" depends="init, deps-module-jar, deps-ear-jar" unless="no.deps"/>
-    <target name="-pre-pre-compile" depends="init,deps-jar">
-        <mkdir dir="${build.classes.dir.real}"/>
+    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
+    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
+    <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
     </target>
     <target name="-pre-compile">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target name="-copy-webdir">
-        <copy todir="${build.web.dir.real}">
-            <fileset excludes="${build.web.excludes}" dir="${web.docbase.dir}"/>
+        <copy todir="${build.web.dir}">
+            <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes}"/>
+        </copy>
+        <copy todir="${build.web.dir}/WEB-INF">
+            <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
         </copy>
     </target>
-    <target name="-do-compile" depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources">
-        <webproject2:javac destdir="${build.classes.dir.real}"/>
-        <copy todir="${build.classes.dir.real}">
+    <target name="-do-ws-compile"/>
+    <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest,-do-ws-compile" if="have.sources" name="-do-compile">
+        <webproject2:javac destdir="${build.classes.dir}"/>
+        <copy todir="${build.classes.dir}">
             <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
         </copy>
     </target>
-    <target name="-copy-manifest" if="has.custom.manifest">
+    <target if="has.custom.manifest" name="-copy-manifest">
         <mkdir dir="${build.meta.inf.dir}"/>
         <copy todir="${build.meta.inf.dir}">
             <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
         </copy>
     </target>
-    <target name="-copy-persistence-xml" if="has.persistence.xml">
-        <mkdir dir="${build.web.dir.real}/WEB-INF/classes/META-INF"/>
-        <copy todir="${build.web.dir.real}/WEB-INF/classes/META-INF">
+    <target if="has.persistence.xml" name="-copy-persistence-xml">
+        <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
+        <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
             <fileset dir="${conf.dir}" includes="persistence.xml"/>
         </copy>
     </target>
@@ -313,19 +410,19 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
     <target name="-pre-compile-single">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <webproject2:javac>
             <customize>
                 <patternset includes="${javac.includes}"/>
             </customize>
         </webproject2:javac>
-        <copy todir="${build.classes.dir.real}">
+        <copy todir="${build.classes.dir}">
             <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
         </copy>
     </target>
@@ -333,35 +430,39 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
-    <target name="compile-jsps" depends="compile" if="do.compile.jsps" description="Test compile JSP pages to expose compilation errors.">
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
         <mkdir dir="${build.generated.dir}/src"/>
-        <java classname="org.netbeans.modules.web.project.ant.JspC" fork="true" failonerror="true">
+        <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
             <arg value="-uriroot"/>
-            <arg file="${basedir}/${build.web.dir.real}"/>
+            <arg file="${basedir}/${build.web.dir}"/>
             <arg value="-d"/>
             <arg file="${basedir}/${build.generated.dir}/src"/>
             <arg value="-die1"/>
+            <arg value="-compilerSourceVM ${javac.source}"/>
+            <arg value="-compilerTargetVM ${javac.target}"/>
             <classpath path="${java.home}/../lib/tools.jar:${copyfiles.classpath}:${jspcompilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac srcdir="${build.generated.dir}/src" destdir="${build.generated.dir}/classes" classpath="${j2ee.platform.classpath}:${build.classes.dir.real}:${jspcompilation.classpath}"/>
+        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
     </target>
-    <target name="-do-compile-single-jsp" depends="compile" if="jsp.includes">
+    <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
         <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
         <mkdir dir="${build.generated.dir}/src"/>
-        <java classname="org.netbeans.modules.web.project.ant.JspCSingle" fork="true" failonerror="true">
+        <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
             <arg value="-uriroot"/>
-            <arg file="${basedir}/${build.web.dir.real}"/>
+            <arg file="${basedir}/${build.web.dir}"/>
             <arg value="-d"/>
             <arg file="${basedir}/${build.generated.dir}/src"/>
             <arg value="-die1"/>
             <arg value="-jspc.files"/>
             <arg path="${jsp.includes}"/>
+            <arg value="-compilerSourceVM ${javac.source}"/>
+            <arg value="-compilerTargetVM ${javac.target}"/>
             <classpath path="${java.home}/../lib/tools.jar:${copyfiles.classpath}:${jspcompilation.classpath}"/>
         </java>
         <mkdir dir="${build.generated.dir}/classes"/>
-        <webproject2:javac srcdir="${build.generated.dir}/src" destdir="${build.generated.dir}/classes" classpath="${j2ee.platform.classpath}:${build.classes.dir.real}:${jspcompilation.classpath}">
+        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
             <customize>
                 <patternset includes="${javac.jsp.includes}"/>
             </customize>
@@ -378,144 +479,161 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="-do-dist-without-manifest" if="do.war.package.without.custom.manifest" depends="init,compile,compile-jsps,-pre-dist">
-        <dirname property="dist.jar.dir" file="${dist.war}"/>
+    <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
+        <dirname file="${dist.war}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.war}">
+            <fileset dir="${build.web.dir}"/>
+        </jar>
+    </target>
+    <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
+        <dirname file="${dist.war}" property="dist.jar.dir"/>
         <mkdir dir="${dist.jar.dir}"/>
-        <jar jarfile="${dist.war}" compress="${jar.compress}">
-            <fileset dir="${build.web.dir.real}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
+            <fileset dir="${build.web.dir}"/>
         </jar>
     </target>
-    <target name="-do-dist-with-manifest" if="do.war.package.with.custom.manifest" depends="init,compile,compile-jsps,-pre-dist">
-        <dirname property="dist.jar.dir" file="${dist.war}"/>
+    <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
+        <dirname file="${dist.war}" property="dist.jar.dir"/>
         <mkdir dir="${dist.jar.dir}"/>
-        <jar manifest="${build.meta.inf.dir}/MANIFEST.MF" jarfile="${dist.war}" compress="${jar.compress}">
-            <fileset dir="${build.web.dir.real}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.war}">
+            <fileset dir="${build.web.dir}"/>
         </jar>
     </target>
-    <target name="do-dist" depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest"/>
-    <target name="library-inclusion-in-manifest" depends="init" if="dist.ear.dir">
-        <basename property="included.lib.libs.jsf-designtime.classpath.2" file="${libs.jsf-designtime.classpath.libfile.2}"/>
-        <basename property="included.lib.libs.jsf-designtime.classpath.1" file="${libs.jsf-designtime.classpath.libfile.1}"/>
+    <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
+        <dirname file="${dist.war}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
+            <fileset dir="${build.web.dir}"/>
+        </jar>
+    </target>
+    <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
+    <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+        <basename file="${libs.jsf-designtime.classpath.libfile.2}" property="included.lib.libs.jsf-designtime.classpath.2"/>
+        <basename file="${libs.jsf-designtime.classpath.libfile.1}" property="included.lib.libs.jsf-designtime.classpath.1"/>
         <copy-ear-war file="${libs.jsf-designtime.classpath.libfile.2}" propname="included.lib.libs.jsf-designtime.classpath.2.X"/>
         <copy-ear-war file="${libs.jsf-designtime.classpath.libfile.1}" propname="included.lib.libs.jsf-designtime.classpath.1.X"/>
-        <basename property="included.lib.libs.jsfsupport-designtime.classpath.3" file="${libs.jsfsupport-designtime.classpath.libfile.3}"/>
-        <basename property="included.lib.libs.jsfsupport-designtime.classpath.2" file="${libs.jsfsupport-designtime.classpath.libfile.2}"/>
-        <basename property="included.lib.libs.jsfsupport-designtime.classpath.1" file="${libs.jsfsupport-designtime.classpath.libfile.1}"/>
+        <basename file="${libs.jsfsupport-designtime.classpath.libfile.4}" property="included.lib.libs.jsfsupport-designtime.classpath.4"/>
+        <basename file="${libs.jsfsupport-designtime.classpath.libfile.3}" property="included.lib.libs.jsfsupport-designtime.classpath.3"/>
+        <basename file="${libs.jsfsupport-designtime.classpath.libfile.2}" property="included.lib.libs.jsfsupport-designtime.classpath.2"/>
+        <basename file="${libs.jsfsupport-designtime.classpath.libfile.1}" property="included.lib.libs.jsfsupport-designtime.classpath.1"/>
+        <copy-ear-war file="${libs.jsfsupport-designtime.classpath.libfile.4}" propname="included.lib.libs.jsfsupport-designtime.classpath.4.X"/>
         <copy-ear-war file="${libs.jsfsupport-designtime.classpath.libfile.3}" propname="included.lib.libs.jsfsupport-designtime.classpath.3.X"/>
         <copy-ear-war file="${libs.jsfsupport-designtime.classpath.libfile.2}" propname="included.lib.libs.jsfsupport-designtime.classpath.2.X"/>
         <copy-ear-war file="${libs.jsfsupport-designtime.classpath.libfile.1}" propname="included.lib.libs.jsfsupport-designtime.classpath.1.X"/>
-        <basename property="included.lib.libs.webui-designtime.classpath.2" file="${libs.webui-designtime.classpath.libfile.2}"/>
-        <basename property="included.lib.libs.webui-designtime.classpath.1" file="${libs.webui-designtime.classpath.libfile.1}"/>
+        <basename file="${libs.webui-designtime.classpath.libfile.2}" property="included.lib.libs.webui-designtime.classpath.2"/>
+        <basename file="${libs.webui-designtime.classpath.libfile.1}" property="included.lib.libs.webui-designtime.classpath.1"/>
         <copy-ear-war file="${libs.webui-designtime.classpath.libfile.2}" propname="included.lib.libs.webui-designtime.classpath.2.X"/>
         <copy-ear-war file="${libs.webui-designtime.classpath.libfile.1}" propname="included.lib.libs.webui-designtime.classpath.1.X"/>
-        <basename property="included.lib.libs.jdbcsupport-designtime.classpath.2" file="${libs.jdbcsupport-designtime.classpath.libfile.2}"/>
-        <basename property="included.lib.libs.jdbcsupport-designtime.classpath.1" file="${libs.jdbcsupport-designtime.classpath.libfile.1}"/>
-        <copy-ear-war file="${libs.jdbcsupport-designtime.classpath.libfile.2}" propname="included.lib.libs.jdbcsupport-designtime.classpath.2.X"/>
-        <copy-ear-war file="${libs.jdbcsupport-designtime.classpath.libfile.1}" propname="included.lib.libs.jdbcsupport-designtime.classpath.1.X"/>
-        <basename property="included.lib.libs.theme-default.classpath" file="${libs.theme-default.classpath}"/>
+        <basename file="${libs.jdbcsupport-designtime.classpath}" property="included.lib.libs.jdbcsupport-designtime.classpath"/>
+        <copy-ear-war file="${libs.jdbcsupport-designtime.classpath}" propname="included.lib.libs.jdbcsupport-designtime.classpath.X"/>
+        <basename file="${libs.theme-default.classpath}" property="included.lib.libs.theme-default.classpath"/>
         <copy-ear-war file="${libs.theme-default.classpath}" propname="included.lib.libs.theme-default.classpath.X"/>
-        <basename property="included.lib.libs.jstl11.classpath.2" file="${libs.jstl11.classpath.libfile.2}"/>
-        <basename property="included.lib.libs.jstl11.classpath.1" file="${libs.jstl11.classpath.libfile.1}"/>
+        <basename file="${libs.jstl11.classpath.libfile.2}" property="included.lib.libs.jstl11.classpath.2"/>
+        <basename file="${libs.jstl11.classpath.libfile.1}" property="included.lib.libs.jstl11.classpath.1"/>
         <copy-ear-war file="${libs.jstl11.classpath.libfile.2}" propname="included.lib.libs.jstl11.classpath.2.X"/>
         <copy-ear-war file="${libs.jstl11.classpath.libfile.1}" propname="included.lib.libs.jstl11.classpath.1.X"/>
-        <basename property="included.lib.file.reference.activation.jar" file="${file.reference.activation.jar}"/>
+        <basename file="${file.reference.activation.jar}" property="included.lib.file.reference.activation.jar"/>
         <copy-ear-war file="${file.reference.activation.jar}" propname="included.lib.file.reference.activation.jar.X"/>
-        <basename property="included.lib.file.reference.mail.jar" file="${file.reference.mail.jar}"/>
+        <basename file="${file.reference.mail.jar}" property="included.lib.file.reference.mail.jar"/>
         <copy-ear-war file="${file.reference.mail.jar}" propname="included.lib.file.reference.mail.jar.X"/>
-        <basename property="included.lib.file.reference.postgresql-8.2-506.jdbc4.jar" file="${file.reference.postgresql-8.2-506.jdbc4.jar}"/>
+        <basename file="${file.reference.postgresql-8.2-506.jdbc4.jar}" property="included.lib.file.reference.postgresql-8.2-506.jdbc4.jar"/>
         <copy-ear-war file="${file.reference.postgresql-8.2-506.jdbc4.jar}" propname="included.lib.file.reference.postgresql-8.2-506.jdbc4.jar.X"/>
-        <basename property="included.lib.file.reference.iText-2.0.8.jar" file="${file.reference.iText-2.0.8.jar}"/>
+        <basename file="${libs.rowset-ri.classpath}" property="included.lib.libs.rowset-ri.classpath"/>
+        <copy-ear-war file="${libs.rowset-ri.classpath}" propname="included.lib.libs.rowset-ri.classpath.X"/>
+        <basename file="${file.reference.iText-2.0.8.jar}" property="included.lib.file.reference.iText-2.0.8.jar"/>
         <copy-ear-war file="${file.reference.iText-2.0.8.jar}" propname="included.lib.file.reference.iText-2.0.8.jar.X"/>
-        <basename property="included.lib.file.reference.evolute.jar" file="${file.reference.evolute.jar}"/>
+        <basename file="${file.reference.evolute.jar}" property="included.lib.file.reference.evolute.jar"/>
         <copy-ear-war file="${file.reference.evolute.jar}" propname="included.lib.file.reference.evolute.jar.X"/>
-        <basename property="included.lib.file.reference.fop.jar" file="${file.reference.fop.jar}"/>
+        <basename file="${file.reference.fop.jar}" property="included.lib.file.reference.fop.jar"/>
         <copy-ear-war file="${file.reference.fop.jar}" propname="included.lib.file.reference.fop.jar.X"/>
-        <basename property="included.lib.file.reference.jdom.jar" file="${file.reference.jdom.jar}"/>
+        <basename file="${file.reference.jdom.jar}" property="included.lib.file.reference.jdom.jar"/>
         <copy-ear-war file="${file.reference.jdom.jar}" propname="included.lib.file.reference.jdom.jar.X"/>
-        <basename property="included.lib.file.reference.avalon-framework-4.2.0.jar" file="${file.reference.avalon-framework-4.2.0.jar}"/>
+        <basename file="${file.reference.avalon-framework-4.2.0.jar}" property="included.lib.file.reference.avalon-framework-4.2.0.jar"/>
         <copy-ear-war file="${file.reference.avalon-framework-4.2.0.jar}" propname="included.lib.file.reference.avalon-framework-4.2.0.jar.X"/>
-        <basename property="included.lib.file.reference.batik.jar" file="${file.reference.batik.jar}"/>
+        <basename file="${file.reference.batik.jar}" property="included.lib.file.reference.batik.jar"/>
         <copy-ear-war file="${file.reference.batik.jar}" propname="included.lib.file.reference.batik.jar.X"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.6}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.5}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.4}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.webui-runtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.webui-runtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-runtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-runtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <mkdir dir="${build.web.dir.real}/META-INF"/>
-        <manifest file="${build.web.dir.real}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${included.lib.libs.jsf-designtime.classpath.1.X} ${included.lib.libs.jsf-designtime.classpath.2.X} ${included.lib.libs.jsfsupport-designtime.classpath.1.X} ${included.lib.libs.jsfsupport-designtime.classpath.2.X} ${included.lib.libs.jsfsupport-designtime.classpath.3.X} ${included.lib.libs.webui-designtime.classpath.1.X} ${included.lib.libs.webui-designtime.classpath.2.X} ${included.lib.libs.jdbcsupport-designtime.classpath.1.X} ${included.lib.libs.jdbcsupport-designtime.classpath.2.X} ${included.lib.libs.theme-default.classpath} ${included.lib.libs.jstl11.classpath.1.X} ${included.lib.libs.jstl11.classpath.2.X} ${included.lib.file.reference.activation.jar} ${included.lib.file.reference.mail.jar} ${included.lib.file.reference.postgresql-8.2-506.jdbc4.jar} ${included.lib.file.reference.iText-2.0.8.jar} ${included.lib.file.reference.evolute.jar} ${included.lib.file.reference.fop.jar} ${included.lib.file.reference.jdom.jar} ${included.lib.file.reference.avalon-framework-4.2.0.jar} ${included.lib.file.reference.batik.jar} "/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.6}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.5}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-runtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-runtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.webui-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.webui-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jdbcsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <mkdir dir="${build.web.dir}/META-INF"/>
+        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
+            <attribute name="Class-Path" value="${included.lib.libs.jsf-designtime.classpath.1.X} ${included.lib.libs.jsf-designtime.classpath.2.X} ${included.lib.libs.jsfsupport-designtime.classpath.1.X} ${included.lib.libs.jsfsupport-designtime.classpath.2.X} ${included.lib.libs.jsfsupport-designtime.classpath.3.X} ${included.lib.libs.jsfsupport-designtime.classpath.4.X} ${included.lib.libs.webui-designtime.classpath.1.X} ${included.lib.libs.webui-designtime.classpath.2.X} ${included.lib.libs.jdbcsupport-designtime.classpath} ${included.lib.libs.theme-default.classpath} ${included.lib.libs.jstl11.classpath.1.X} ${included.lib.libs.jstl11.classpath.2.X} ${included.lib.file.reference.activation.jar} ${included.lib.file.reference.mail.jar} ${included.lib.file.reference.postgresql-8.2-506.jdbc4.jar} ${included.lib.libs.rowset-ri.classpath} ${included.lib.file.reference.iText-2.0.8.jar} ${included.lib.file.reference.evolute.jar} ${included.lib.file.reference.fop.jar} ${included.lib.file.reference.jdom.jar} ${included.lib.file.reference.avalon-framework-4.2.0.jar} ${included.lib.file.reference.batik.jar} "/>
         </manifest>
         <delete dir="${dist.ear.dir}/temp"/>
     </target>
-    <target name="library-inclusion-in-archive" depends="init" unless="dist.ear.dir">
-        <copy file="${libs.jsf-designtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-designtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-designtime.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-designtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-designtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.webui-designtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.webui-designtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-designtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-designtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.activation.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.mail.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.postgresql-8.2-506.jdbc4.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.iText-2.0.8.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.evolute.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.fop.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.jdom.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.avalon-framework-4.2.0.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${file.reference.batik.jar}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.6}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.5}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.4}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsf-runtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.3}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jsfsupport-runtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.webui-runtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.webui-runtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-runtime.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jdbcsupport-runtime.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir.real}/WEB-INF/lib"/>
-    </target>
-    <target name="do-ear-dist" depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest">
-        <dirname property="dist.jar.dir" file="${dist.ear.war}"/>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+        <copy file="${libs.jsf-designtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-designtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-designtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-designtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-designtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-designtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.webui-designtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.webui-designtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jdbcsupport-designtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.activation.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.mail.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.postgresql-8.2-506.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.rowset-ri.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.iText-2.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.evolute.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.fop.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.jdom.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.avalon-framework-4.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${file.reference.batik.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.6}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.5}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsf-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-runtime.classpath.libfile.4}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-runtime.classpath.libfile.3}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jsfsupport-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.webui-runtime.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.webui-runtime.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jdbcsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.theme-default.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jstl11.classpath.libfile.2}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copy file="${libs.jstl11.classpath.libfile.1}" todir="${build.web.dir}/WEB-INF/lib"/>
+    </target>
+    <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
+        <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
         <mkdir dir="${dist.jar.dir}"/>
-        <jar jarfile="${dist.ear.war}" compress="${jar.compress}" manifest="${build.web.dir.real}/META-INF/MANIFEST.MF">
-            <fileset dir="${build.web.dir.real}"/>
+        <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
+            <fileset dir="${build.web.dir}"/>
         </jar>
     </target>
     <target name="-post-dist">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="dist" depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)."/>
-    <target name="dist-ear" depends="init,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR."/>
+    <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
+    <target depends="init,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
     <!--
                 EXECUTION SECTION
             -->
-    <target name="run" depends="run-deploy,run-display-browser" description="Deploy to server and show in browser."/>
+    <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
     <target name="-pre-run-deploy">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
@@ -535,9 +653,11 @@
     <target name="-run-deploy-am">
         <!-- Task to deploy to the Access Manager runtime. -->
     </target>
-    <target name="run-deploy" depends="init,compile,compile-jsps,-do-compile-single-jsp,dist,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy"/>
-    <target name="-run-deploy-nb" if="netbeans.home">
-        <nbdeploy debugmode="false" clientUrlPart="${client.urlPart}" forceRedeploy="${forceRedeploy}"/>
+    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
+        <nbjpdaappreloaded/>
+    </target>
+    <target if="netbeans.home" name="-run-deploy-nb">
+        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
     </target>
     <target name="-init-deploy-ant" unless="netbeans.home">
         <property name="deploy.ant.archive" value="${dist.war}"/>
@@ -545,15 +665,15 @@
         <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
         <property name="deploy.ant.enabled" value="true"/>
     </target>
-    <target name="run-undeploy" depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant"/>
-    <target name="-run-undeploy-nb" if="netbeans.home">
+    <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
+    <target if="netbeans.home" name="-run-undeploy-nb">
         <fail message="Undeploy is not supported from within the IDE"/>
     </target>
-    <target name="verify" depends="init,dist">
+    <target depends="init,-pre-dist,dist,-post-dist" name="verify">
         <nbverify file="${dist.war}"/>
     </target>
-    <target name="run-display-browser" depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl"/>
-    <target name="-init-display-browser" if="do.display.browser">
+    <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
+    <target if="do.display.browser" name="-init-display-browser">
         <condition property="do.display.browser.nb">
             <isset property="netbeans.home"/>
         </condition>
@@ -561,14 +681,14 @@
             <isset property="deploy.ant.enabled"/>
         </condition>
     </target>
-    <target name="-display-browser-nb" if="do.display.browser.nb">
+    <target if="do.display.browser.nb" name="-display-browser-nb">
         <nbbrowse url="${client.url}"/>
     </target>
-    <target name="-get-browser" if="do.display.browser.cl" unless="browser">
+    <target if="do.display.browser.cl" name="-get-browser" unless="browser">
         <condition property="browser" value="rundll32">
             <os family="windows"/>
         </condition>
-        <condition property="browser.args" value="url.dll,FileProtocolHandler" else="">
+        <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
             <os family="windows"/>
         </condition>
         <condition property="browser" value="/usr/bin/open">
@@ -603,7 +723,7 @@
             <available file="/opt/csw/bin/mozilla"/>
         </condition>
     </target>
-    <target name="-display-browser-cl" depends="-get-browser" if="do.display.browser.cl">
+    <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
         <fail unless="browser">
                     Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
                 </fail>
@@ -613,54 +733,58 @@
             <arg line="${browser.args} ${browse.url}"/>
         </exec>
     </target>
-    <target name="run-main" depends="init,compile-single">
+    <target depends="init,compile-single" name="run-main">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <webproject1:java classname="${run.class}"/>
     </target>
     <!--
                 DEBUGGING SECTION
             -->
-    <target name="debug" description="Debug project in IDE." depends="init,compile,compile-jsps,-do-compile-single-jsp,dist" if="netbeans.home">
-        <nbdeploy debugmode="true" clientUrlPart="${client.urlPart}"/>
+    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
+        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true"/>
         <antcall target="connect-debugger"/>
         <antcall target="debug-display-browser"/>
+        <antcall target="connect-client-debugger"/>
     </target>
-    <target name="connect-debugger" unless="is.debugged">
-        <nbjpdaconnect name="${name}" host="${jpda.host}" address="${jpda.address}" transport="${jpda.transport}">
+    <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
+        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
             <classpath>
-                <path path="${debug.classpath}:${ws.debug.classpaths}"/>
+                <path path="${debug.classpath}:${j2ee.platform.classpath}:${ws.debug.classpaths}"/>
             </classpath>
             <sourcepath>
                 <path path="${web.docbase.dir}:${ws.web.docbase.dirs}"/>
             </sourcepath>
         </nbjpdaconnect>
     </target>
-    <target name="debug-display-browser" if="do.display.browser">
+    <target if="do.display.browser.debug" name="debug-display-browser">
         <nbbrowse url="${client.url}"/>
     </target>
-    <target name="debug-single" if="netbeans.home" depends="init,compile,compile-jsps,-do-compile-single-jsp,debug"/>
-    <target name="-debug-start-debugger" if="netbeans.home" depends="init">
+    <target if="do.debug.client" name="connect-client-debugger">
+        <webproject1:nbjsdebugstart webUrl="${client.url}"/>
+    </target>
+    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
         <webproject1:nbjpdastart name="${debug.class}"/>
     </target>
-    <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
         <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
         <webproject1:debug classname="${debug.class}"/>
     </target>
-    <target name="debug-single-main" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
-    <target name="-pre-debug-fix" depends="init">
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
+    <target depends="init" name="-pre-debug-fix">
         <fail unless="fix.includes">Must set fix.includes</fail>
         <property name="javac.includes" value="${fix.includes}.java"/>
     </target>
-    <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
         <webproject1:nbjpdareload/>
     </target>
-    <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
     <!--
                 JAVADOC SECTION
             -->
-    <target name="javadoc-build" depends="init">
+    <target depends="init" name="javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
             </classpath>
@@ -671,23 +795,23 @@
             <fileset dir="${src.dir}" includes="*.java"/>
         </javadoc>
     </target>
-    <target name="javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,javadoc-build">
+    <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
         <nbbrowse file="${dist.javadoc.dir}/index.html"/>
     </target>
-    <target name="javadoc" depends="init,javadoc-build,javadoc-browse" description="Build Javadoc."/>
+    <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
     <!--
                 
                 JUNIT COMPILATION SECTION
             -->
-    <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
         <mkdir dir="${build.test.classes.dir}"/>
     </target>
     <target name="-pre-compile-test">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
-        <webproject2:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}:${j2ee.platform.classpath}"/>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
+        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="**/*.java"/>
         </copy>
@@ -696,14 +820,14 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
     <target name="-pre-compile-test-single">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <webproject2:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}:${j2ee.platform.classpath}">
+        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}">
             <customize>
                 <patternset includes="${javac.includes}"/>
             </customize>
@@ -716,75 +840,85 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
     <!--
                 
                 JUNIT EXECUTION SECTION
             -->
-    <target name="-pre-test-run" if="have.tests" depends="init">
+    <target depends="init" if="have.tests" name="-pre-test-run">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
-    <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
         <webproject2:junit/>
     </target>
-    <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
         <fail if="tests.failed">Some tests failed; see details above.</fail>
     </target>
-    <target name="test-report" if="have.tests" depends="init"/>
-    <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
-    <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
-    <target name="-pre-test-run-single" if="have.tests" depends="init">
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
-    <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
         <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
         <webproject2:junit includes="${test.includes}"/>
     </target>
-    <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
         <fail if="tests.failed">Some tests failed; see details above.</fail>
     </target>
-    <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
     <!--
                 
                 JUNIT DEBUGGING SECTION
             -->
-    <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
         <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <webproject1:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}" args="${test.class}"/>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <!-- must exist, otherwise the XML formatter would fail -->
+        <mkdir dir="${build.test.results.dir}"/>
+        <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </webproject1:debug>
     </target>
-    <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
-        <webproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
     </target>
-    <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
-    <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
+    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
         <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     </target>
-    <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
     <!--
                 
                 CLEANUP SECTION
             -->
-    <target name="deps-clean" depends="init" if="no.dist.ear.dir" unless="no.deps"/>
-    <target name="do-clean" depends="init">
-        <condition value="${build.web.dir.real}" property="build.dir.to.clean">
+    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="do-clean">
+        <condition property="build.dir.to.clean" value="${build.web.dir}">
             <isset property="dist.ear.dir"/>
         </condition>
-        <property value="${build.web.dir.real}" name="build.dir.to.clean"/>
+        <property name="build.dir.to.clean" value="${build.web.dir}"/>
         <delete includeEmptyDirs="true" quiet="true">
             <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
         </delete>
         <delete dir="${build.dir}"/>
-        <available file="${build.dir.to.clean}/WEB-INF/lib" type="dir" property="status.clean-failed"/>
+        <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
         <delete dir="${dist.dir}"/>
     </target>
-    <target name="check-clean" depends="do-clean" if="status.clean-failed">
-        <echo message="Warning: unable to delete some files in ${build.web.dir.real}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
+    <target depends="do-clean" if="status.clean-failed" name="check-clean">
+        <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
         <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
     </target>
     <target name="-post-clean">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target name="clean" depends="init,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products."/>
-    <target name="clean-ear" depends="clean" description="Clean build products."/>
+    <target depends="init,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target depends="clean" description="Clean build products." name="clean-ear"/>
 </project>
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData
new file mode 100644
index 00000000..c1dae4ea
--- /dev/null
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scene Scope="Project" version="2">
+    <Scope Scope="Faces Configuration Only"/>
+    <Scope Scope="Project">
+        <Node id="RecuperarPassword.jsp" x="900" y="300" zoom="true"/>
+        <Node id="GestaoUtilizadores.jsp" x="900" y="150" zoom="true"/>
+        <Node id="FormDirGerRh.jsp" x="150" y="150" zoom="true"/>
+        <Node id="FormGestor.jsp" x="1150" y="150" zoom="true"/>
+        <Node id="Erro.jsp" x="650" y="450" zoom="true"/>
+        <Node id="FormRH.jsp" x="400" y="150" zoom="true"/>
+        <Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="300" zoom="true"/>
+        <Node id="FormSeguranca.jsp" x="1150" y="300" zoom="true"/>
+        <Node id="NovoUtilizador.jsp" x="150" y="450" zoom="true"/>
+        <Node id="FormDirSiprp.jsp" x="650" y="150" zoom="true"/>
+        <Node id="FichaUtilizador.jsp" x="1400" y="150" zoom="true"/>
+        <Node id="FormHS.jsp" x="900" y="450" zoom="true"/>
+        <Node id="FormMedico.jsp" x="650" y="600" zoom="true"/>
+        <Node id="EnviarCorrecao.jsp" x="400" y="450" zoom="true"/>
+        <Node id="UtilizadorFields.jsp" x="150" y="600" zoom="true"/>
+        <Node id="Dummy.jsp" x="150" y="750" zoom="true"/>
+        <Node id="LoadImage.jsp" x="400" y="600" zoom="true"/>
+        <Node id="ViewAnaliseAcidenteTrabalho.jsp" x="650" y="300" zoom="true"/>
+        <Node id="Login.jsp" x="400" y="300" zoom="true"/>
+    </Scope>
+    <Scope Scope="All Faces Configurations"/>
+</Scene>
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
index 6d4fc5d8..ab3002cc 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=9736285c
-build.xml.script.CRC32=ab1471e9
-build.xml.stylesheet.CRC32=95be3570
+build.xml.data.CRC32=306dea99
+build.xml.script.CRC32=82e52d07
+build.xml.stylesheet.CRC32=cfd7ba16
 # 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=9736285c
-nbproject/build-impl.xml.script.CRC32=8213162e
-nbproject/build-impl.xml.stylesheet.CRC32=ac43bae1
+nbproject/build-impl.xml.data.CRC32=306dea99
+nbproject/build-impl.xml.script.CRC32=8bf3a1ef
+nbproject/build-impl.xml.stylesheet.CRC32=8926891b
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData
new file mode 100644
index 00000000..7543719b
--- /dev/null
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scene Scope="Project" version="2">
+    <Scope Scope="Faces Configuration Only"/>
+    <Scope Scope="Project">
+        <Node id="RecuperarPassword.jsp" x="400" y="150" zoom="true"/>
+        <Node id="GestaoUtilizadores.jsp" x="400" y="450" zoom="true"/>
+        <Node id="FormDirGerRh.jsp" x="150" y="750" zoom="true"/>
+        <Node id="FormGestor.jsp" x="400" y="300" zoom="true"/>
+        <Node id="Erro.jsp" x="650" y="450" zoom="true"/>
+        <Node id="FormRH.jsp" x="400" y="600" zoom="true"/>
+        <Node id="FormSeguranca.jsp" x="1150" y="150" zoom="true"/>
+        <Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="450" zoom="true"/>
+        <Node id="NovoUtilizador.jsp" x="900" y="150" zoom="true"/>
+        <Node id="FormDirSiprp.jsp" x="1400" y="150" zoom="true"/>
+        <Node id="FichaUtilizador.jsp" x="150" y="300" zoom="true"/>
+        <Node id="FormMedico.jsp" x="900" y="450" zoom="true"/>
+        <Node id="FormHS.jsp" x="900" y="300" zoom="true"/>
+        <Node id="EnviarCorrecao.jsp" x="150" y="150" zoom="true"/>
+        <Node id="UtilizadorFields.jsp" x="1150" y="300" zoom="true"/>
+        <Node id="Dummy.jsp" x="150" y="600" zoom="true"/>
+        <Node id="LoadImage.jsp" x="650" y="600" zoom="true"/>
+        <Node id="Login.jsp" x="650" y="300" zoom="true"/>
+        <Node id="ViewAnaliseAcidenteTrabalho.jsp" x="650" y="150" zoom="true"/>
+    </Scope>
+    <Scope Scope="All Faces Configurations"/>
+</Scene>
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
index bb85d001..3eca7146 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
@@ -28,7 +28,7 @@ file.reference.jdom.jar=lib/jdom.jar
 file.reference.mail.jar=jars/mail.jar
 file.reference.postgresql-8.2-506.jdbc4.jar=jars/postgresql-8.2-506.jdbc4.jar
 j2ee.platform=1.4
-j2ee.server.type=Tomcat55
+j2ee.server.type=Tomcat60
 jar.compress=false
 javac.classpath=\
     ${libs.jsf-designtime.classpath}:\
@@ -71,9 +71,23 @@ javadoc.version=false
 javadoc.windowtitle=
 jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
 lib.dir=${web.docbase.dir}/WEB-INF/lib
+libs.jsfsupport-designtime.classpath.libfile.1=/usr/local/netbeans-6.1/visualweb2/modules/ext/jsfcl.jar
+libs.jsfsupport-designtime.classpath.libfile.2=/usr/local/netbeans-6.1/visualweb2/modules/ext/appbase.jar
+libs.jsfsupport-designtime.classpath.libfile.3=/usr/local/netbeans-6.1/visualweb2/modules/ext/dataprovider.jar
+libs.jsfsupport-designtime.classpath.libfile.4=/usr/local/netbeans-6.1/visualweb2/modules/ext/sqlx.jar
+libs.jsfsupport-runtime.classpath.libfile.1=/usr/local/netbeans-6.1/visualweb2/modules/ext/jsfcl.jar
+libs.jsfsupport-runtime.classpath.libfile.2=/usr/local/netbeans-6.1/visualweb2/modules/ext/appbase.jar
+libs.jsfsupport-runtime.classpath.libfile.3=/usr/local/netbeans-6.1/visualweb2/modules/ext/dataprovider.jar
+libs.jsfsupport-runtime.classpath.libfile.4=/usr/local/netbeans-6.1/visualweb2/modules/ext/sqlx.jar
+libs.jstl11.classpath.libfile.1=/usr/local/netbeans-6.1/enterprise5/modules/ext/standard.jar
+libs.jstl11.classpath.libfile.2=/usr/local/netbeans-6.1/enterprise5/modules/ext/jstl.jar
 # Property libs.rowset-ri.classpath is set here just to make sharing of project simpler.
 # The library definition has always preference over this property.
 libs.rowset-ri.classpath=../../../../.netbeans/6.0/modules/ext/rowset-1.0.1.jar
+libs.webui-designtime.classpath.libfile.1=/usr/local/netbeans-6.1/visualweb2/modules/ext/webui.jar
+libs.webui-designtime.classpath.libfile.2=/usr/local/netbeans-6.1/enterprise5/modules/ext/commons-fileupload-1.0.jar
+libs.webui-runtime.classpath.libfile.1=/usr/local/netbeans-6.1/visualweb2/modules/ext/webui.jar
+libs.webui-runtime.classpath.libfile.2=/usr/local/netbeans-6.1/enterprise5/modules/ext/commons-fileupload-1.0.jar
 platform.active=default_platform
 resource.dir=setup
 run.test.classpath=\
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml
index bad63696..e9370564 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml
@@ -11,7 +11,7 @@
                     <file>${libs.jsf-designtime.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library files="3">
+                <library files="4">
                     <file>${libs.jsfsupport-designtime.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -19,7 +19,7 @@
                     <file>${libs.webui-designtime.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library files="2">
+                <library files="1">
                     <file>${libs.jdbcsupport-designtime.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -43,7 +43,7 @@
                     <file>${file.reference.postgresql-8.2-506.jdbc4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library>
+                <library files="1">
                     <file>${libs.rowset-ri.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -77,7 +77,7 @@
                     <file>${libs.jsf-runtime.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library files="3">
+                <library files="4">
                     <file>${libs.jsfsupport-runtime.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -85,7 +85,7 @@
                     <file>${libs.webui-runtime.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library files="2">
+                <library files="1">
                     <file>${libs.jdbcsupport-runtime.classpath}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java
index 2abfcb01..e4c077c1 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java
@@ -43,6 +43,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.ListIterator;
 import java.util.Properties;
 import javax.activation.DataHandler;
@@ -6839,6 +6840,36 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
     public void setTxtHorasTurno(TextField tf) {
         this.txtHorasTurno = tf;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText8 = new StaticText();
+
+    public StaticText getStaticText8() {
+        return staticText8;
+    }
+
+    public void setStaticText8(StaticText st) {
+        this.staticText8 = st;
+    }
+
+    private HiddenField hidConfEnviar = new HiddenField();
+
+    public HiddenField getHidConfEnviar() {
+        return hidConfEnviar;
+    }
+
+    public void setHidConfEnviar(HiddenField hf) {
+        this.hidConfEnviar = hf;
+    }
     /**
      * <p>Construct a new Page bean instance.</p>
      */
@@ -6916,6 +6947,9 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                         }
 
                         lblUser.setText( getSessionBean1().getCurrentUser().getLogin() ); 
+                        getSessionBean1().setGravado(false);
+                        getSessionBean1().setSubmetido(false);   
+                        getSessionBean1().setIeBug(false);
                         //drpTecnicos.setSelected(new Integer(0));
                         //drpMedicos.setSelected(new Integer(0));                
                         if(getSessionBean1().getCurrentAnalise() == null) // new analise
@@ -6935,8 +6969,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                         }
 
                     }
-               }                         
-            
+               } 
             
         }
         
@@ -7002,7 +7035,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
 
     public String lnkLogout_action() {
         // TODO: Replace with your code
-        
+        getSessionBean1().setIeBug(true);                
         try
         {
             javax.servlet.http.HttpSession session =
@@ -7541,175 +7574,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                fillVerificacaoView(a);               
                fillVerificacao(a);               
                 break;
-////            case Global.ESTADO_ASSINATURAS:
-////               butImprimir.setDisabled(true);
-////               butCorrecao.setRendered(false);                
-////               butGravar.setText("Gravar");                   
-////               butEnviar.setText("Enviar a Impressão");                 
-////               if(a.getEstado_assinatura().intValue() == ESTADO_ASSINATURA_1) 
-////               {
-////                   butEnviar.setDisabled(true);
-////               }
-////               else
-////               {
-////                   butEnviar.setDisabled(false);                   
-////               }
-////                                 
-////              
-////               int tipo_utilizador = getSessionBean1().getCurrentUser().getTipo().intValue();
-////
-////               switch(tipo_utilizador)
-////               {
-////                   case 1:  //seguranca
-////                       if(a.getEstado_assinatura().intValue() == 1)
-////                       {
-////                        //txtAssRespSeg.setDisabled(false);                               
-////                       }
-////                       else
-////                       {
-////                        //txtAssSeg.setDisabled(false);                                                  
-////                       }
-////                       butGravar.setText("Enviar");
-////                       gridSiprp.setRendered(false);
-////                       gridAcidentado.setRendered(false);
-////                       gridDadosAcidenteSeg.setRendered(false);
-////                       gridDadosAcidenteRh.setRendered(false);
-////                       gridRecomendacoesHS.setRendered(false); 
-////                       gridRecomendacoesViewHS.setRendered(false);  
-////                       gridMedidasRH.setRendered(false);
-////                       //gridMedidasViewRH.setRendered(false);    
-////                       gridMedico.setRendered(false);
-////                       //gridMedicoView.setRendered(false);
-////                       gridVerificacaoView.setRendered(false); 
-////                       gridImpressao.setRendered(false);
-////                       gridImpressaoView.setRendered(false);                                                    
-////                       grpVerRespSeg.setRendered(true);                       
-////                       grpVerHs.setRendered(false);
-////                       grpVerRespRh.setRendered(false);
-////                       //chkVerRespRh.setDisabled(true);
-////                       ddate = new java.util.Date();
-////                       stVerRespSeg.setText("Tomei conhecimento a " + utils.Utils.dateToYYYYMMDD(ddate));
-////                       
-////                       fillSiprpView(a);
-////                       if(ac != null)
-////                       {
-////                            fillAcidentadoView(ac);                   
-////                       }
-////                       fillDadosAcidenteSegView(a);                        
-////                       fillDadosAcidenteRhView(a);
-////                       fillMedidasViewRh(a);                         
-////                       fillMedicoView(a);                             
-////                       //fillAssinaturaSeg(a);
-////                       break;    
-////                       
-////                   case 2:  //rh
-////                       //txtAssRespRh.setDisabled(false);
-////                       butGravar.setRendered(false);
-////                       gridSiprp.setRendered(false);
-////                       gridAcidentado.setRendered(false);
-////                       gridDadosAcidenteSeg.setRendered(false);               
-////                       gridDadosAcidenteRh.setRendered(false);
-////                       gridRecomendacoesHS.setRendered(false);
-////                       gridMedidasRH.setRendered(false);   
-////                       gridMedico.setRendered(false);  
-////                       //gridMedicoView.setRendered(false); 
-////                       gridVerificacaoView.setRendered(false);  
-////                       gridImpressao.setRendered(false);
-////                       gridImpressaoView.setRendered(false);                                                    
-////                       grpVerRespRh.setRendered(true);
-////                       grpVerHs.setRendered(false);    
-////                       grpVerRespSeg.setRendered(false);
-////                       //chkVerRespSeg.setDisabled(true); 
-////                       ddate = new java.util.Date();
-////                       stVerRespRh.setText("Tomei conhecimento a " + utils.Utils.dateToYYYYMMDD(ddate));
-////                       
-////                       fillSiprpView(a);
-////                       if(ac != null)
-////                       {
-////                            fillAcidentadoView(ac);                   
-////                       }
-////                       fillDadosAcidenteSegView(a);                        
-////                       fillDadosAcidenteRhView(a);
-////                       fillRecomendacoesViewHs(a);
-////                       fillMedidasViewRh(a);  
-////                       fillMedicoView(a);                             
-////                       break;
-                       
-//                   case 3:  //hs
-//                       //txtAssHS.setDisabled(false);                                              
-//                       gridSiprp.setRendered(false);
-//                       gridAcidentado.setRendered(false);
-//                       gridDadosAcidenteSeg.setRendered(false);               
-//                       gridDadosAcidenteRh.setRendered(false);
-//                       gridRecomendacoesHS.setRendered(false);   
-//                       gridMedidasRH.setRendered(false);
-//                       gridMedidasViewRH.setRendered(false);     
-//                       gridMedico.setRendered(false); 
-//                       gridMedicoView.setRendered(false);               
-//                       fillSiprpView(a);
-//                       if(ac != null)
-//                       {
-//                            fillAcidentadoView(ac);                   
-//                       }
-//                       fillDadosAcidenteSegView(a);                        
-//                       fillDadosAcidenteRhView(a);
-//                       fillRecomendacoesViewHs(a);                       
-//                       break;                       
-//                       
-//                   case 5:  //med
-//                       //txtAssMed.setDisabled(false);                           
-//                       gridSiprp.setRendered(false);
-//                       gridAcidentado.setRendered(false);     
-//                       gridDadosAcidenteSeg.setRendered(false);               
-//                       gridDadosAcidenteRh.setRendered(false);
-//                       gridRecomendacoesHS.setRendered(false);               
-//                       gridMedidasRH.setRendered(false);  
-//                       gridMedico.setRendered(false);               
-//                       fillSiprpView(a);
-//                       if(ac != null)
-//                       {
-//                            fillAcidentadoView(ac);                   
-//                       }
-//                       fillDadosAcidenteSegView(a);                        
-//                       fillDadosAcidenteRhView(a);
-//                       fillRecomendacoesViewHs(a);
-//                       fillMedidasViewRh(a);    
-//                       //fillMedico(a);
-//                       fillMedicoView(a);                                      
-//                       break;                                              
-////               }
-////               break;
-//            case Global.ESTADO_IMPRESSAO:
-//               butCorrecao.setRendered(false);   
-//               butImprimir.setRendered(false);
-//               butGravar.setText("Gravar");                                   
-//               butEnviar.setText("Enviar para Fecho");                  
-//               gridSiprp.setRendered(false);
-//               gridAcidentado.setRendered(false);     
-//               gridDadosAcidenteSeg.setRendered(false);               
-//               gridDadosAcidenteRh.setRendered(false);
-//               gridRecomendacoesHS.setRendered(false);               
-//               gridMedidasRH.setRendered(false);  
-//               gridMedico.setRendered(false); 
-//               gridVerificacao.setRendered(false); 
-//               gridImpressao.setRendered(false);                
-//               gridImpressaoView.setRendered(false);                                            
-//               fillSiprpView(a);
-//               if(ac != null)
-//               {
-//                    fillAcidentadoView(ac);                   
-//               }
-//               fillDadosAcidenteSegView(a);                
-//               fillDadosAcidenteRhView(a);
-//               fillRecomendacoesViewHs(a);
-//               fillMedidasViewRh(a);    
-//               //fillMedico(a);
-//               fillMedicoView(a);   
-//               fillVerificacaoView(a);   
-//               //fillImpressao(a);
-//               //buildPdf(a);
-//
-//               break;                                                              
+
             case Global.ESTADO_FECHAR:
                butCorrecao.setRendered(false);
                butGravar.setRendered(false);
@@ -10283,7 +10148,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
             st = new StaticText();
             st.setId("stVerificacao2");
             st.setEscape(false);
-            txtVer = "Verificado por " + a.getNome_resp_consolidacao() + " (T&eacute;cnico de HST) a ";
+            txtVer = "Verificado por " + a.getNome_resp_consolidacao() + " (T&eacute;cnico de SHST) a ";
             //txtVer += a.getData_assinatura_rh();        
             try
             {
@@ -10452,7 +10317,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
     public String butImagem_action() {
         // TODO: Process the button click action. Return value is a navigation
         // case name where null will return to the same page.
-        
+        getSessionBean1().setIeBug(true);        
         savePageState();
         return "load_image";
     }
@@ -10544,6 +10409,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
     public String butCancelar_action() {
         // TODO: Process the button click action. Return value is a navigation
         // case name where null will return to the same page.
+        getSessionBean1().setIeBug(true);        
         ServletContext theApplicationsServletContext =
              (ServletContext) this.getExternalContext().getContext();
 //        String imageFileFolderTmp = theApplicationsServletContext.getRealPath(Global.IMAGE_FOLDER + "/tmp" + getSessionBean1().getCurrentUser().getLogin());        
@@ -10588,7 +10454,9 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
     public String butGravar_action() {
         // TODO: Process the button click action. Return value is a navigation
         // case name where null will return to the same page.
-
+        
+        System.out.println("BUT GRAVAR");
+        
         if(getSessionBean1().getCurrentAnalise() == null) //new analise
         {
             //if(validationOk())
@@ -10597,28 +10465,46 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
               {
                 AnaliseAcidente a = fillAnaliseFields();
                 Acidentado ac = fillAcidentadoFields();                    
-                
-                try
+                if(fieldsLenOk())
                 {
-                    AnaliseAcidente aa = create(a, ac);   
-                    createImagesFolder(aa);
-                    String navFrom = getSessionBean1().getNavFrom();
-                    if(navFrom.matches("FormSeguranca"))
+                    try
                     {
-                        return "form_seguranca";
-                    }  
-                }
-                catch(Exception ex)
-                {
-                    getSessionBean1().setMsg("Erro na inser&ccedil;&atilde;o da an&aacute;lise !");
-                    ex.printStackTrace();
+                        if(!getSessionBean1().isGravado())
+                        {
+                            getSessionBean1().setGravado(true);
+                            AnaliseAcidente aa = create(a, ac);   
+                            createImagesFolder(aa);
+                            getSessionBean1().setMsg("A Ficha de An&aacute;lise de Acidente n&#186; " + aa.getAnalise_nr() + " foi gravada na sua &aacute;rea de trabalho.");
+                        }
+                        else
+                        {
+                            getSessionBean1().setMsg("A Ficha de An&aacute;lise de Acidente foi gravada na sua &aacute;rea de trabalho.");                        
+                        }
+                        String navFrom = getSessionBean1().getNavFrom();
+                        if(navFrom.matches("FormSeguranca"))
+                        {
+                            return "form_seguranca";
+                        }                                              
+
+                    }
+                    catch(Exception ex)
+                    {
+                        getSessionBean1().setMsg("Erro na inser&ccedil;&atilde;o da an&aacute;lise !");
+                        getSessionBean1().setGravado(false);                    
+                        ex.printStackTrace();
+                    }                    
                 }
-            }            
+
+            } 
+            else
+            {
+                getSessionBean1().setGravado(false);                  
+            }
         }
         else    // edit analise
         {
-            //if(validationOk())
-            //{
+            if(fieldsLenOk())
+            {
 
                 AnaliseAcidente a = fillAnaliseFields();
                 Acidentado ac = null;
@@ -10642,9 +10528,19 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                 }
                 try
                 {
-                    update(a, ac, recs, meds);                
-                    //createImagesFolder(analiseId.toString());
-                    updateImagesFolder(a);
+                    if(! getSessionBean1().isGravado())
+                    {
+                        getSessionBean1().setGravado(true);
+                        update(a, ac, recs, meds);                
+                        //createImagesFolder(analiseId.toString());
+                        updateImagesFolder(a);
+                        getSessionBean1().setMsg("A Ficha de An&aacute;lise de Acidente n&#186; " + a.getAnalise_nr() + " foi gravada na sua &aacute;rea de trabalho.");                    
+                    }
+                    else
+                    {
+                        getSessionBean1().setMsg("A Ficha de An&aacute;lise de Acidente n&#186; " + a.getAnalise_nr() + " foi gravada na sua &aacute;rea de trabalho.");                                                                
+                    }
+
                     if(estado != Global.ESTADO_ASSINATURA_RH)
                     {
                         String navFrom = getSessionBean1().getNavFrom();
@@ -10669,14 +10565,17 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                     {
                         chkVerRespRh.setDisabled(true);
                         // IMPRIMIR HERE
-                    }
+                    }                        
+                    
+
                 }
                 catch(Exception ex)
                 {
                     getSessionBean1().setMsg("Erro na actualiza&ccedil;&atilde;o da an&aacute;lise !");
+                    getSessionBean1().setGravado(false);                                      
                     ex.printStackTrace();
                 }
-            //}                        
+            }                        
         }
         
 
@@ -10686,6 +10585,20 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
     public String butEnviar_action() {
         // TODO: Process the button click action. Return value is a navigation
         // case name where null will return to the same page.
+        
+        System.out.println("BUT ENVIAR 1");
+        
+        //IE bugs
+        if(getSessionBean1().isIeBug())
+        {
+            return null;
+        }
+        if(getSessionBean1().isGravado() )
+        {
+            getSessionBean1().setSubmetido(true);
+        }
+        
+        //
         if(getSessionBean1().getCurrentAnalise() == null) //new analise
         {
             if(validationOk())
@@ -10696,21 +10609,37 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                 a.setEstado(new Integer(Global.ESTADO_RH1));                
                 try
                 {
-                    AnaliseAcidente aa = create(a, ac);                
-                    createImagesFolder(aa);
-                    sendMailToNextUser(a, new Integer(Global.ESTADO_RH1));
+                    if(!getSessionBean1().isSubmetido())
+                    {
+                        getSessionBean1().setSubmetido(true);
+                        AnaliseAcidente aa = create(a, ac);                
+                        createImagesFolder(aa);
+                        sendMailToNextUser(a, new Integer(Global.ESTADO_RH1));
+                        getSessionBean1().setMsg("A Ficha de An&aacute;lise de Acidente n&#186; " + aa.getAnalise_nr() + " foi enviada para a fase seguinte.");
+                    }
+                    else
+                    {
+                        getSessionBean1().setMsg("A Ficha de An&aacute;lise de Acidente foi enviada para a fase seguinte.");                        
+                    }
                     String navFrom = getSessionBean1().getNavFrom();
                     if(navFrom.matches("FormSeguranca"))
                     {
                         return "form_seguranca";
-                    }                
+                    }                                        
+                    
+
                 }
                 catch(Exception ex)
                 {
                     getSessionBean1().setMsg("Erro no envio da an&aacute;lise !");
+                    getSessionBean1().setSubmetido(false);                    
                     ex.printStackTrace();
                 }
-            }            
+            } 
+            else
+            {
+                getSessionBean1().setSubmetido(false);                      
+            }
         }
         else    // edit analise
         {
@@ -10742,14 +10671,20 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                 {
                     a.setCorrecao("n");
                     a.setEstado(a.getEstado_antes_correcao());
+                    novo_estado = a.getEstado_antes_correcao().intValue();
                     a.setEstado_antes_correcao(null);
                     a.setObservacoes_correcao("");
+                    //sendMailToNextUser(a, new Integer(novo_estado));                    
                 }
                 else
                 {
                     if(novo_estado < Global.ESTADO_CONCLUIDO)
                     {
-                        novo_estado++;
+                        if(!getSessionBean1().isSubmetido())
+                        {
+                            novo_estado++;                            
+                        }
+
     //                    if(novo_estado == ESTADO_MEDICO)
     //                    {
     //                        novo_estado++;  //skip medico
@@ -10765,19 +10700,28 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
 
                 try
                 {
-                    update(a, ac, recs, meds);                
-                    //createImagesFolder(analiseId.toString());
-                    updateImagesFolder(a); 
-                    sendMailToNextUser(a, new Integer(novo_estado));                        
-                    //envia email para responsavel hierarquico ao passar da Consolidacao para a Verificacao
-                    if(a.getEstado().intValue() == Global.ESTADO_ASSINATURA_SEG)
+                    if(!getSessionBean1().isSubmetido())
                     {
-                        sendEmailResponsavelHierarquico(a);
+                        getSessionBean1().setSubmetido(true);
+                        update(a, ac, recs, meds);                
+                        //createImagesFolder(analiseId.toString());
+                        updateImagesFolder(a); 
+                        sendMailToNextUser(a, new Integer(novo_estado));                        
+                        //envia email para responsavel hierarquico ao passar da Consolidacao para a Verificacao
+                        if(a.getEstado().intValue() == Global.ESTADO_ASSINATURA_SEG)
+                        {
+                            sendEmailResponsavelHierarquico(a);
+                        }
+                        else if(a.getEstado().intValue() == Global.ESTADO_CONCLUIDO)
+                        {
+                            sendEmailFimProcesso(a);
+                            sendEmailToRhFase4(a);
+                        }
+                        getSessionBean1().setMsg("A Ficha de An&aacute;lise de Acidente n&#186; " + a.getAnalise_nr() + " foi enviada para a fase seguinte.");                    
                     }
-                    else if(a.getEstado().intValue() == Global.ESTADO_CONCLUIDO)
+                    else
                     {
-                        sendEmailFimProcesso(a);
-                        sendEmailToRhFase4(a);
+                        getSessionBean1().setMsg("A Ficha de An&aacute;lise de Acidente n&#186; " + a.getAnalise_nr() + " foi enviada para a fase seguinte.");                                            
                     }
                     String navFrom = getSessionBean1().getNavFrom();
                     if(navFrom.matches("FormSeguranca"))
@@ -10795,19 +10739,26 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                     else if(navFrom.matches("FormMedico"))
                     {
                         return "form_medico";                        
-                    }                                                                                
+                    }                                                                                                                            
+
                 }
                 catch(Exception ex)
                 {
                     getSessionBean1().setMsg("Erro na actualiza&ccedil;&atilde;o da an&aacute;lise !");
+                    getSessionBean1().setSubmetido(false);                          
                     ex.printStackTrace();
                 }
-            }                                    
-        }
-
+            }
+            else
+            {
+                getSessionBean1().setSubmetido(false);                      
+            }
+        }        
+        
         return null;
     }    
     
+    
     private AnaliseAcidente create(AnaliseAcidente a, Acidentado ac) throws Exception
     {
         AnalisesDataProvider adp = new AnalisesDataProvider();
@@ -11056,12 +11007,12 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                         new java.util.Date();
         java.sql.Date sqlToday =
                         new java.sql.Date(today.getTime());          
-        if(a.getData_acidente() == null)
-        {
-            a.setData_acidente(sqlToday);
-        }
-        else
-        {
+        //if(a.getData_acidente() == null)
+        //{
+        //    a.setData_acidente(sqlToday);
+        //}
+        //else
+        //{
             DateFormat formatador = new SimpleDateFormat("yyyy-MM-dd");
 
             java.util.Date ddate  = (java.util.Date) calDataOcorrencia.getValue();
@@ -11075,7 +11026,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
             {
                 a.setData_acidente(null);                        
             }                            
-        }
+        //}
         
         if(a.getData_inicio_processo() == null)
         {
@@ -11598,6 +11549,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
     
     private ArrayList fillAnaliseRecomendacoesHs(AnaliseAcidente a)
     {
+        System.out.println("FILL RECOMENDACOES");
         ArrayList list = new ArrayList();
         ListIterator iter = gridRecomendacoes.getChildren().listIterator();
         while(iter.hasNext())
@@ -12143,15 +12095,363 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         return true;
     }
     
+    private boolean fieldsLenOk()
+    {
+        //System.out.println("VALIDATION GRAVAR OK");
+        AnalisesDataProvider adp = new AnalisesDataProvider();
+        HashMap meta = new HashMap();
+        HashMap meta_ac = new HashMap();
+        try
+        {
+            meta = adp.getMetaData("analises_acidentes");  
+            meta_ac = adp.getMetaData("acidentados");
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+            meta = null;
+            meta_ac = null;
+        }
+        
+        if(meta == null || meta_ac == null)
+        {
+            getSessionBean1().setMsg("Erro na aquisi&ccedil;&atilde;o da metadata!");
+            return false;
+        }
+
+        int estado = 0;
+        if(getSessionBean1().getCurrentAnalise() == null)  //null
+        {
+            estado = Global.ESTADO_SEG;
+        }
+        else
+        {
+            AnaliseAcidente a =  getSessionBean1().getCurrentAnalise();
+            estado = a.getEstado().intValue();
+        }        
+        
+        if(estado == Global.ESTADO_SEG)
+        {
+            if(txtAveriguador.getText() != null)
+            {
+                String averiguador = txtAveriguador.getText().toString();
+                int len = ((Integer)meta.get("averiguador")).intValue();
+                System.out.println("Averiguador : " + len);                
+                if(averiguador.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Averiguador n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }            
+            
+            if(txtLocal.getText() != null)
+            {
+                String local = txtLocal.getText().toString();
+                int len = ((Integer)meta.get("local_trabalho")).intValue();
+                System.out.println("Local : " + len);                
+                if(local.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Local n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }
+            
+            if(txtTarefa.getText() != null)
+            {
+                String tarefa = txtTarefa.getText().toString();
+                int len = ((Integer)meta.get("tarefa")).intValue();
+                System.out.println("Tarefa : " + len);                
+                if(tarefa.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Tarefa n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                    
+            
+            if(txtSubstancias.getText() != null)
+            {
+                String substancias = txtSubstancias.getText().toString();
+                int len = ((Integer)meta.get("substancias")).intValue();
+                System.out.println("Substancias : " + len);                
+                if(substancias.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Substancias n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                                
+            
+            if(txtTestemunhas.getText() != null)
+            {
+                String testemunhas = txtTestemunhas.getText().toString();
+                int len = ((Integer)meta.get("testemunhas")).intValue();
+                System.out.println("Testemunhas : " + len);                
+                if(testemunhas.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Testemunhas n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                    
+            
+            if(txtDescricao.getText() != null)
+            {
+                String descricao = txtDescricao.getText().toString();
+                int len = ((Integer)meta.get("descricao")).intValue();   
+                System.out.println("Descricao : " + len);                                
+                if(descricao.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Descri&ccedil;&atilde;o n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }            
+            
+            if(txtConclusoes.getText() != null)
+            {
+                String conclusoes = txtConclusoes.getText().toString();
+                int len = ((Integer)meta.get("conclusoes")).intValue();                                
+                System.out.println("Conclusoes : " + len);                                
+                if(conclusoes.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Conclus&otilde;es n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                        
+            
+            if(txtAccoes.getText() != null)
+            {
+                String accoes = txtAccoes.getText().toString();
+                int len = ((Integer)meta.get("accoes")).intValue();                                                
+                System.out.println("Accoes : " + len);                                
+                if(accoes.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Acc&otilde;es n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                    
+            
+            if(txtCondicoes.getText() != null)
+            {
+                String condicoes = txtCondicoes.getText().toString();
+                int len = ((Integer)meta.get("condicoes")).intValue();                                                
+                System.out.println("Condicoes : " + len);                                
+                if(condicoes.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Condi&ccedil;&otilde;es n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            } 
+            
+            if(txtAveriguacaoObs.getText() != null)
+            {
+                String averiguacao_obs = txtAveriguacaoObs.getText().toString();
+                int len = ((Integer)meta.get("averiguacao_obs")).intValue();
+                System.out.println("Observacoes : " + len);                
+                if(averiguacao_obs.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Observa&ccedil;&otilde;es n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }            
+        }
+        else if(estado == Global.ESTADO_RH1)
+        {
+            if(txtBI.getText() != null)
+            {
+                String bi = (String) txtBI.getText();
+                int len = ((Integer)meta_ac.get("bilhete_identidade")).intValue();                                                
+                System.out.println("BI : " + len);                                
+                if(bi.length() > len)
+                {
+                    getSessionBean1().setMsg("Campo Bilhete Identidade n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+                try
+                {
+                    int bi_nr = Integer.parseInt(bi);
+                }
+                catch(Exception ex)
+                {
+                    getSessionBean1().setMsg("N&#186; do Bilhete de Identidade tem de ser num&eacute;rico!");
+                    return false;                                            
+                }
+            }
+            
+            if(txtMorada.getText() != null)
+            {
+                String morada = txtMorada.getText().toString();
+                int len = ((Integer)meta_ac.get("morada")).intValue();                                                
+                System.out.println("Morada : " + len);                                
+                if(morada.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Morada n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }   
+            
+            if(txtLocalidade.getText() != null)
+            {
+                String localidade = txtLocalidade.getText().toString();
+                int len = ((Integer)meta_ac.get("localidade")).intValue();                                                
+                System.out.println("Localidade : " + len);                                
+                if(localidade.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Localidade n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                         
+            
+            if(txtContactoTelefonico.getText() != null)
+            {
+                String contacto_telefonico = txtContactoTelefonico.getText().toString();
+                int len = ((Integer)meta_ac.get("contacto_telefonico")).intValue();                                                
+                System.out.println("Contacto Telefonico : " + len);                                
+                if(contacto_telefonico.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Contacto Telef&oacute;nico n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            } 
+            
+            if(txtNomeSuperior.getText() != null)
+            {
+                String nome_superior = txtNomeSuperior.getText().toString();
+                int len = ((Integer)meta_ac.get("nome_superior_hierarquico")).intValue();                                                
+                System.out.println("Nome Superior : " + len);                                
+                if(nome_superior.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Nome do Superior Hier&aacute;rquico n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                     
+            
+            if(txtEmailSuperior.getText() != null)
+            {
+                String email_superior = txtEmailSuperior.getText().toString();
+                int len = ((Integer)meta_ac.get("email_superior_hierarquico")).intValue();                                                
+                System.out.println("Email Superior : " + len);                                
+                if(email_superior.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Email do Superior Hier&aacute;rquico n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                                 
+            
+            if(txtEmailSuperior.getText() != null)
+            {
+                String email_superior = (String) txtEmailSuperior.getText();
+                if(email_superior.trim().length() > 0)
+                {
+                    if(! utils.Utils.isValidEmail(email_superior))
+                    {
+                        getSessionBean1().setMsg("Email do superior hier&aacute;rquico inv&aacute;lido!");                                    
+                        return false;
+                    }
+                }
+            }  
+            
+            if(txtFormacaoSHSTNWhy.getText() != null)
+            {
+                String why = txtFormacaoSHSTNWhy.getText().toString();
+                int len = ((Integer)meta.get("formacao_shst_nao_porque")).intValue();                                                
+                System.out.println("Porque Nao Teve Formacao : " + len);                                
+                if(why.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Porqu&ecirc; o Colaborador N&atilde;o Teve Forma&ccedil;&atilde;o n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                                             
+        }
+        else if(estado == Global.ESTADO_HS)
+        {
+            if(!checkRecomendacoesLen())
+            {
+                return false;
+            }
+        }
+        else if(estado == Global.ESTADO_RH2)
+        {
+            if(!checkMedidasLen())
+            {
+                return false;
+            } 
+            
+            if(txtEspecif1.getText() != null)
+            {
+                String especif = txtEspecif1.getText().toString();
+                int len = ((Integer)meta.get("especif1")).intValue();                                                
+                if(especif.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Especif&iacute;que n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                                 
+            
+            if(txtEspecif2.getText() != null)
+            {
+                String especif = txtEspecif2.getText().toString();
+                int len = ((Integer)meta.get("especif2")).intValue();                                                
+                if(especif.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Especif&iacute;que n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                         
+            
+            if(txtEspecif3.getText() != null)
+            {
+                String especif = txtEspecif3.getText().toString();
+                int len = ((Integer)meta.get("especif3")).intValue();                                                
+                if(especif.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Especif&iacute;que n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                         
+            
+            if(txtEspecif4.getText() != null)
+            {
+                String especif = txtEspecif4.getText().toString();
+                int len = ((Integer)meta.get("especif4")).intValue();                                                
+                if(especif.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Especif&iacute;que n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                                             
+            
+            if(txtTipoLesao.getText() != null)
+            {
+                String tipo_lesao = txtTipoLesao.getText().toString();
+                int len = ((Integer)meta.get("tipo_lesao")).intValue();                                                
+                System.out.println("Tipo Lesao : " + len);                                
+                if(tipo_lesao.length() > len)
+                {
+                    getSessionBean1().setMsg("O campo Tipo Les&atilde;o n&atilde;o pode exceder " + len + " caracteres!");
+                    return false;
+                }
+            }                                     
+        }        
+        
+        return true;
+    }
   
     private boolean validationOk()
     {
+        
+        if(getSessionBean1().isSubmetido() || getSessionBean1().isGravado())
+        {
+            return true;
+        }
         if(getSessionBean1().getAcidentado() == null)
         {
             getSessionBean1().setMsg("N&atilde;o seleccionou trabalhador acidentado!");
             return false;
         }
         
+        if(!fieldsLenOk())
+        {
+            return false;
+        }
+        
         int estado = 0;
         int estado_assinatura = 0;
         if(getSessionBean1().getCurrentAnalise() == null)  //null
@@ -12180,6 +12480,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
                     getSessionBean1().setMsg("Falta averiguador!");
                     return false;
                 }
+
             }
             
             if(drpHours.getSelected() == null || drpMinutes.getSelected() == null)
@@ -13239,6 +13540,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
        butCorrecao.setRendered(false);
        butGravar.setText("Gravar");
        butImprimir.setRendered(false);
+       getSessionBean1().setIeBug(false);  //THIS MUST BE SEEN !!!!!
         if(a.getEstado() == Global.ESTADO_SEG)
         {
            butEnviar.setText("Enviar a RH");                 
@@ -13476,6 +13778,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
 //        getSessionBean1().setNavFrom("AnaliseAcidenteTrabalho");        
 //        getSessionBean1().setModoEdicaoUtilizador("edit");
 //        return "user";
+        getSessionBean1().setIeBug(true);                
         ServletContext theApplicationsServletContext =
              (ServletContext) this.getExternalContext().getContext();
 //        String imageFileFolderTmp = theApplicationsServletContext.getRealPath(Global.IMAGE_FOLDER + "/tmp" + getSessionBean1().getCurrentUser().getLogin());        
@@ -13518,6 +13821,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
 
     public String lnkMoreRec1_action() {
         // TODO: Replace with your code
+        getSessionBean1().setIeBug(true);
         int seq = gridRecomendacoes.getChildren().size();
         seq++;        
         HtmlPanelGrid grd = new HtmlPanelGrid();
@@ -13553,7 +13857,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
 
     public String lnkMoreMed_action() {
         // TODO: Replace with your code
-        
+        getSessionBean1().setIeBug(true);        
         int seq = gridMedidas.getChildren().size();
         seq++;        
         HtmlPanelGrid grd = new HtmlPanelGrid();
@@ -13898,12 +14202,12 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
         try
         {
-            ArrayList list = udp.getUtilizadoresListByTipo(tipo, responsavel_loja);
+            ArrayList list = udp.getUtilizadoresListByTipo(tipo, responsavel_loja, a.getEstabelecimento_id());
             ListIterator iter = list.listIterator();
             while(iter.hasNext())
             {
                 Utilizador u = (Utilizador) iter.next();
-                System.out.println("USER MAIL : " + u.getLogin() + " ; " + u.getEmail());
+                System.out.println("USER MAIL NEXT FASE : " + u.getLogin() + " ; " + u.getEmail());
                 try
                 {
                     sendEmail(u.getEmail(), Global.ENDERECO_ENVIO, assunto, texto_email);                    
@@ -13936,12 +14240,12 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         }
         catch(Exception ex){}
         
-        String texto_email = "<p>Caro(a) Colega,</p>";
-        texto_email += "<p>Na sequ&ecirc;ncia do acidente de trabalho do colaborador ";
+        String texto_email = "<p style='text-align: justify; font-family: arial, sans-serif'>Caro(a) Colega,</p>";
+        texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Na sequ&ecirc;ncia do acidente de trabalho do colaborador ";
         texto_email += ac.getNome();
         texto_email += " no dia " + data_acidente;
         texto_email += ", vimos pelo presente remeter c&oacute;pia da an&aacute;lise do acidente " + a.getAnalise_nr() + " que se encontra em processo de averigua&ccedil;&atilde;o pelo departamento de Seguran&ccedil;a, Recursos Humanos e pela SIPRP para seu conhecimento. Caso tenha qualquer informa&ccedil;&atilde;o importante sobre o processo ou pretenda esclarecimentos adicionais contacte, por favor, a sec&ccedil;&atilde;o de Recursos Humanos.</p>";
-        texto_email += "<p>Cumprimentos.</p>";
+        texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Cumprimentos.</p>";
         try
         {
             sendEmail(ac.getEmail_superior_hierarquico(), Global.ENDERECO_ENVIO, assunto, texto_email);                  
@@ -13964,12 +14268,12 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
              while(iter.hasNext())
              {
                  Utilizador u = (Utilizador) iter.next();
-                String texto_email = "<p>Exmo. (a) Senhor(a), " + u.getNome() + "</p>";
-                texto_email += "<p>Informamos que o processo de an&aacute;lise de acidente de trabalho n&#186; " + a.getAnalise_nr() + " se encontra finalizado, ";
+                String texto_email = "<p style='text-align: justify; font-family: arial, sans-serif'>Exmo. (a) Senhor(a), " + u.getNome() + "</p>";
+                texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Informamos que o processo de an&aacute;lise de acidente de trabalho n&#186; " + a.getAnalise_nr() + " se encontra finalizado, ";
                 texto_email += "pelo que solicitamos a sua impress&atilde;o e arquivamento em pasta pr&oacute;pria, juntamente com a participa&ccedil;&atilde;o de sinistro &agrave; seguradora.</p>";
-                texto_email += "<p>Caso pretenda qualquer esclarecimento, contacte-nos, por favor, atrav&eacute;s de acidentes.auchan@siprp.pt ou pelo telefone 213 504 540.</p>";
-                texto_email += "<p>Os melhores cumprimentos.</p>";
-                texto_email += "<p>SIPRP </p>";                
+                texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Caso pretenda qualquer esclarecimento, contacte-nos, por favor, atrav&eacute;s de acidentes.auchan@siprp.pt ou pelo telefone 213 504 540.</p>";
+                texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Os melhores cumprimentos.</p>";
+                texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>SIPRP </p>";                
                 try
                 {
                     sendEmail(u.getEmail(), Global.ENDERECO_ENVIO, assunto, texto_email);                  
@@ -13986,18 +14290,19 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
   {
       System.out.println("SEND EMAIL TO RH FASE 4");
          Acidentado ac = getSessionBean1().getAcidentado();       
-         String assunto = "SIPRP – Fecho do Processo de Análise de Acidente de Trabalho nº " + a.getAnalise_nr() + " – Ficheiro para Impressão";
+         //String assunto = "SIPRP &#175; Fecho do Processo de An&aacute;lise de Acidente de Trabalho n&#186; " + a.getAnalise_nr() + " &#175; Ficheiro para Impress&atilde;o";
+        String assunto = "SIPRP - Fecho do Processo de Análise de Acidente de Trabalho nº " + a.getAnalise_nr() + " - Ficheiro para Impressão";         
          
          UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
          try
          {
             Utilizador urh = udp.getUtilizador(a.getRh_fase4());  
-            String texto_email = "<p>Exmo. (a) Senhor(a), </p>";    
-            texto_email += "<p>Confirmamos que o processo de An&aacute;lise de Acidente de Trabalho n&#186 " + a.getAnalise_nr()+ " se encontra encerrado ap&oacute;s o preenchimento e valida&ccedil;&atilde;o de todos os intervenientes.</p>";
-            texto_email += "<p>Sugerimos que imprima o ficheiro que enviamos em anexo e o junte &agrave; Participa&ccedil;&atilde;o de Sinistro &agrave; Seguradora para dar conhecimento ao M&eacute;dico do Trabalho do seu estabelecimento. Ap&oacute;s o seu conhecimento, aconselhamos que entregue uma c&oacute;pia da Ficha de An&aacute;lise de Acidente de Trabalho &agrave; equipa de Sa&uacute;de Ocupacional, para que esta a arquive no processo cl&iacute;nico do trabalhador antes de juntar toda a documenta&ccedil;&atilde;o no processo individual do colaborador nos Recursos Humanos.</p>";            
-            texto_email += "<p>Agradecemos a sua colabora&ccedil;&atilde;o e ficamos ao dispor para qualquer esclarecimento atrav&eacute;s dos telefones 213 504 544 (Catarina Leonardo) ou 213 504 542 (S&oacute;nia Campos).</p>";            
-            texto_email += "<p>Os melhores cumprimentos,</p>";            
-            texto_email += "<p>A equipa da SIPRP</p>";    
+            String texto_email = "<p style='text-align: justify; font-family: arial, sans-serif'>Exmo. (a) Senhor(a), </p>";    
+            texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Confirmamos que o processo de An&aacute;lise de Acidente de Trabalho n&#186 " + a.getAnalise_nr()+ " se encontra encerrado ap&oacute;s o preenchimento e valida&ccedil;&atilde;o de todos os intervenientes.</p>";
+            texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Sugerimos que imprima o ficheiro que enviamos em anexo e o junte &agrave; Participa&ccedil;&atilde;o de Sinistro &agrave; Seguradora para dar conhecimento ao M&eacute;dico do Trabalho do seu estabelecimento. Ap&oacute;s o seu conhecimento, aconselhamos que entregue uma c&oacute;pia da Ficha de An&aacute;lise de Acidente de Trabalho &agrave; equipa de Sa&uacute;de Ocupacional, para que esta a arquive no processo cl&iacute;nico do trabalhador antes de juntar toda a documenta&ccedil;&atilde;o no processo individual do colaborador nos Recursos Humanos.</p>";            
+            texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Agradecemos a sua colabora&ccedil;&atilde;o e ficamos ao dispor para qualquer esclarecimento atrav&eacute;s dos telefones 213 504 544 (Catarina Leonardo) ou 213 504 542 (S&oacute;nia Campos).</p>";            
+            texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>Os melhores cumprimentos,</p>";            
+            texto_email += "<p style='text-align: justify; font-family: arial, sans-serif'>A equipa da SIPRP</p>";    
             try
             {
                 sendEmailWithPdf(a, urh.getEmail(), Global.ENDERECO_ENVIO, assunto, texto_email);                  
@@ -14077,7 +14382,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         msg.setFrom(new InternetAddress(emailFrom));
         InternetAddress[] address = {new InternetAddress(emailTo)};
         msg.setRecipients(Message.RecipientType.TO, address);
-        msg.setSubject(assunto);
+        ((MimeMessage)msg).setSubject(assunto, "UTF-8");
         msg.setSentDate(new Date()); 
         Multipart multipart = new MimeMultipart();
         BodyPart msgBodyPart = new MimeBodyPart();
@@ -14089,8 +14394,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         msgBodyPart.setContent(html, "text/html");
         multipart.addBodyPart(msgBodyPart);
         msg.setContent(multipart);           
-        ////////Transport.send(msg); 
-        ////////System.out.println("Email Enviado !!!! ");         
+        Transport.send(msg); 
+        System.out.println("Email Enviado !!!! ");         
       
   }
   
@@ -14149,14 +14454,14 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         msg.setFrom(new InternetAddress(emailFrom));
         InternetAddress[] address = {new InternetAddress(emailTo)};
         msg.setRecipients(Message.RecipientType.TO, address);
-        msg.setSubject(assunto);
+        ((MimeMessage)msg).setSubject(assunto, "UTF-8");
         msg.setSentDate(new Date()); 
         Multipart multipart = new MimeMultipart();
         BodyPart msgBodyPart = new MimeBodyPart();
         String html;    
         html="<html><head>  <meta content='text/html;charset=ISO-8859-1' http-equiv='Content-Type'></head>";
         html+="<body bgcolor='#ffffff' text='#000000'>";
-        html+= texto_email;
+        html+= "<div>" + texto_email + "</div>";
         html+="<body></html>";
         msgBodyPart.setContent(html, "text/html");
         multipart.addBodyPart(msgBodyPart);
@@ -14171,7 +14476,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         multipart.addBodyPart(pdfPart,1);        
         msg.setContent(multipart);           
         Transport.send(msg); 
-        System.out.println("Email Enviado !!!! " + emailTo);               
+        System.out.println("Email Pdf Enviado !!!! " + emailTo);               
   }
 
     public String butImprimir_action() {
@@ -14409,6 +14714,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
 
     public String lnkPOR_action() {
         // TODO: Replace with your code
+        getSessionBean1().setIeBug(true);        
         Trabalhador t = getTrabalhadorRowData();
         Acidentado ac = setAcidentado(t);
         gridSiprp.setRendered(true);   
@@ -14421,6 +14727,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
 
     public String lnkNomeTrabalhador_action() {
         // TODO: Replace with your code
+        getSessionBean1().setIeBug(true);
         Trabalhador t = getTrabalhadorRowData();
         Acidentado ac = setAcidentado(t); 
         gridSiprp.setRendered(true);    
@@ -14433,6 +14740,7 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
 
     public String lnkEstabelecimentoTrabalhador_action() {
         // TODO: Replace with your code
+        getSessionBean1().setIeBug(true);        
         Trabalhador t = getTrabalhadorRowData();
         Acidentado ac = setAcidentado(t);
         gridSiprp.setRendered(true);
@@ -14474,7 +14782,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
     public String butCorrecao_action() {
         // TODO: Process the button click action. Return value is a navigation
         // case name where null will return to the same page.
-        
+        getSessionBean1().setIeBug(true);
+        getSessionBean1().setCorrecao(null);
         return "correcao";
     }
 
@@ -14553,5 +14862,99 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean {
         hidAnchor.setValue("dados");
     }
 
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }   
+        getSessionBean1().setIeBug(true);                
+        return null;
+    }
+    
+    private boolean checkRecomendacoesLen()
+    {
+        AnalisesDataProvider adp = new AnalisesDataProvider();
+        HashMap meta = new HashMap();
+        try
+        {
+            meta = adp.getMetaData("recomendacoes");
+            ArrayList list = new ArrayList();
+            ListIterator iter = gridRecomendacoes.getChildren().listIterator();
+            while(iter.hasNext())
+            {
+                HtmlPanelGrid grd = (HtmlPanelGrid)iter.next();
+                TextArea ta = (TextArea) grd.getChildren().get(1);
+                if(ta.getText() != null )
+                {
+                    String txt = (String) ta.getText();
+                    if(txt.length() > 0)
+                    {
+                        int len = ( (Integer) meta.get("recomendacao") ).intValue();
+                        if(txt.length() > len)
+                        {
+                            getSessionBean1().setMsg("Os Campos Recomenda&ccedil;&otilde;es n&atilde;o podem exceder " + len + " caracteres!");
+                            return false;
+                        }
+                    }
+                }
+            }        
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+            return false;
+        }
+        return true;
+    }   
+    
+    private boolean checkMedidasLen()
+    {
+        AnalisesDataProvider adp = new AnalisesDataProvider();
+        HashMap meta = new HashMap();
+
+        try
+        {
+            meta = adp.getMetaData("medidas");
+            ArrayList list = new ArrayList();
+            ListIterator iter = gridMedidas.getChildren().listIterator();
+            while(iter.hasNext())
+            {
+                HtmlPanelGrid grd = (HtmlPanelGrid)iter.next();
+                TextArea ta = (TextArea) grd.getChildren().get(1);
+                if(ta.getText() != null )
+                {
+                    String txt = (String) ta.getText();
+                    if(txt.length() > 0)
+                    {
+                        int len = ( (Integer) meta.get("medida") ).intValue();
+                        if(txt.length() > len)
+                        {
+                            getSessionBean1().setMsg("Os Campos Medidas n&atilde;o podem exceder " + len + " caracteres!");
+                            return false;
+                        }                        
+                    }
+                }
+            }                    
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+            return false;
+        }
+
+        return true;        
+    }    
+
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java
index 0dc03da1..c0eab6e8 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java
@@ -28,6 +28,7 @@ import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ActionEvent;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -108,254 +109,104 @@ public class Dummy extends AbstractPageBean {
         this.form1 = f;
     }
 
-    private HtmlPanelGrid gridHeader = new HtmlPanelGrid();
-
-    public HtmlPanelGrid getGridHeader() {
-        return gridHeader;
-    }
-
-    public void setGridHeader(HtmlPanelGrid hpg) {
-        this.gridHeader = hpg;
-    }
-
-    private PanelGroup groupPanel5 = new PanelGroup();
-
-    public PanelGroup getGroupPanel5() {
-        return groupPanel5;
-    }
-
-    public void setGroupPanel5(PanelGroup pg) {
-        this.groupPanel5 = pg;
-    }
-
-    private StaticText lblUser2 = new StaticText();
-
-    public StaticText getLblUser2() {
-        return lblUser2;
-    }
-
-    public void setLblUser2(StaticText st) {
-        this.lblUser2 = st;
-    }
-
-    private StaticText staticText7 = new StaticText();
-
-    public StaticText getStaticText7() {
-        return staticText7;
-    }
-
-    public void setStaticText7(StaticText st) {
-        this.staticText7 = st;
-    }
-
-    private Hyperlink lnkEditUser2 = new Hyperlink();
-
-    public Hyperlink getLnkEditUser2() {
-        return lnkEditUser2;
-    }
-
-    public void setLnkEditUser2(Hyperlink h) {
-        this.lnkEditUser2 = h;
-    }
-
-    private StaticText staticText8 = new StaticText();
-
-    public StaticText getStaticText8() {
-        return staticText8;
-    }
-
-    public void setStaticText8(StaticText st) {
-        this.staticText8 = st;
-    }
-
-    private Hyperlink lnkLogout2 = new Hyperlink();
-
-    public Hyperlink getLnkLogout2() {
-        return lnkLogout2;
-    }
-
-    public void setLnkLogout2(Hyperlink h) {
-        this.lnkLogout2 = h;
-    }
-
-    private StaticText staticText9 = new StaticText();
-
-    public StaticText getStaticText9() {
-        return staticText9;
-    }
-
-    public void setStaticText9(StaticText st) {
-        this.staticText9 = st;
-    }
-
-    private HtmlPanelGrid gridPanel2 = new HtmlPanelGrid();
-
-    public HtmlPanelGrid getGridPanel2() {
-        return gridPanel2;
-    }
-
-    public void setGridPanel2(HtmlPanelGrid hpg) {
-        this.gridPanel2 = hpg;
-    }
-
-    private PanelGroup groupPanel3 = new PanelGroup();
-
-    public PanelGroup getGroupPanel3() {
-        return groupPanel3;
-    }
-
-    public void setGroupPanel3(PanelGroup pg) {
-        this.groupPanel3 = pg;
-    }
-
-    private ImageComponent image3 = new ImageComponent();
-
-    public ImageComponent getImage3() {
-        return image3;
-    }
-
-    public void setImage3(ImageComponent ic) {
-        this.image3 = ic;
-    }
-
-    private HtmlPanelGrid gridPanel5 = new HtmlPanelGrid();
-
-    public HtmlPanelGrid getGridPanel5() {
-        return gridPanel5;
-    }
-
-    public void setGridPanel5(HtmlPanelGrid hpg) {
-        this.gridPanel5 = hpg;
-    }
-
-    private StaticText staticText4 = new StaticText();
-
-    public StaticText getStaticText4() {
-        return staticText4;
-    }
-
-    public void setStaticText4(StaticText st) {
-        this.staticText4 = st;
-    }
-
-    private HtmlPanelGrid gridPanel6 = new HtmlPanelGrid();
-
-    public HtmlPanelGrid getGridPanel6() {
-        return gridPanel6;
-    }
-
-    public void setGridPanel6(HtmlPanelGrid hpg) {
-        this.gridPanel6 = hpg;
-    }
-
-    private PanelGroup groupPanel4 = new PanelGroup();
-
-    public PanelGroup getGroupPanel4() {
-        return groupPanel4;
-    }
-
-    public void setGroupPanel4(PanelGroup pg) {
-        this.groupPanel4 = pg;
-    }
-
-    private StaticText staticText5 = new StaticText();
+    private HiddenField hiddenField1 = new HiddenField();
 
-    public StaticText getStaticText5() {
-        return staticText5;
+    public HiddenField getHiddenField1() {
+        return hiddenField1;
     }
 
-    public void setStaticText5(StaticText st) {
-        this.staticText5 = st;
+    public void setHiddenField1(HiddenField hf) {
+        this.hiddenField1 = hf;
     }
 
-    private StaticText stHeaderNr1 = new StaticText();
+    private HiddenField hidConfEnviar = new HiddenField();
 
-    public StaticText getStHeaderNr1() {
-        return stHeaderNr1;
+    public HiddenField getHidConfEnviar() {
+        return hidConfEnviar;
     }
 
-    public void setStHeaderNr1(StaticText st) {
-        this.stHeaderNr1 = st;
+    public void setHidConfEnviar(HiddenField hf) {
+        this.hidConfEnviar = hf;
     }
 
-    private PanelGroup groupPanel6 = new PanelGroup();
+    private HtmlPanelGrid gridPanel1 = new HtmlPanelGrid();
 
-    public PanelGroup getGroupPanel6() {
-        return groupPanel6;
+    public HtmlPanelGrid getGridPanel1() {
+        return gridPanel1;
     }
 
-    public void setGroupPanel6(PanelGroup pg) {
-        this.groupPanel6 = pg;
+    public void setGridPanel1(HtmlPanelGrid hpg) {
+        this.gridPanel1 = hpg;
     }
 
-    private StaticText staticText6 = new StaticText();
+    private StaticText txtMsg1 = new StaticText();
 
-    public StaticText getStaticText6() {
-        return staticText6;
+    public StaticText getTxtMsg1() {
+        return txtMsg1;
     }
 
-    public void setStaticText6(StaticText st) {
-        this.staticText6 = st;
+    public void setTxtMsg1(StaticText st) {
+        this.txtMsg1 = st;
     }
 
-    private StaticText stHeaderDate1 = new StaticText();
+    private Button butEliminar = new Button();
 
-    public StaticText getStHeaderDate1() {
-        return stHeaderDate1;
+    public Button getButEliminar() {
+        return butEliminar;
     }
 
-    public void setStHeaderDate1(StaticText st) {
-        this.stHeaderDate1 = st;
+    public void setButEliminar(Button b) {
+        this.butEliminar = b;
     }
 
-    private ImageComponent image4 = new ImageComponent();
+    private HiddenField hidConfDelete = new HiddenField();
 
-    public ImageComponent getImage4() {
-        return image4;
+    public HiddenField getHidConfDelete() {
+        return hidConfDelete;
     }
 
-    public void setImage4(ImageComponent ic) {
-        this.image4 = ic;
+    public void setHidConfDelete(HiddenField hf) {
+        this.hidConfDelete = hf;
     }
 
-    private HiddenField hiddenField1 = new HiddenField();
+    private PanelGroup groupPanel1 = new PanelGroup();
 
-    public HiddenField getHiddenField1() {
-        return hiddenField1;
+    public PanelGroup getGroupPanel1() {
+        return groupPanel1;
     }
 
-    public void setHiddenField1(HiddenField hf) {
-        this.hiddenField1 = hf;
+    public void setGroupPanel1(PanelGroup pg) {
+        this.groupPanel1 = pg;
     }
 
-    private Button button2 = new Button();
+    private Button butVoltar1 = new Button();
 
-    public Button getButton2() {
-        return button2;
+    public Button getButVoltar1() {
+        return butVoltar1;
     }
 
-    public void setButton2(Button b) {
-        this.button2 = b;
+    public void setButVoltar1(Button b) {
+        this.butVoltar1 = b;
     }
 
-    private StaticText stMsg = new StaticText();
+    private Button butEliminar1 = new Button();
 
-    public StaticText getStMsg() {
-        return stMsg;
+    public Button getButEliminar1() {
+        return butEliminar1;
     }
 
-    public void setStMsg(StaticText st) {
-        this.stMsg = st;
+    public void setButEliminar1(Button b) {
+        this.butEliminar1 = b;
     }
 
-    private ImageComponent image1 = new ImageComponent();
+    private Hyperlink lnkEstabelecimento = new Hyperlink();
 
-    public ImageComponent getImage1() {
-        return image1;
+    public Hyperlink getLnkEstabelecimento() {
+        return lnkEstabelecimento;
     }
 
-    public void setImage1(ImageComponent ic) {
-        this.image1 = ic;
+    public void setLnkEstabelecimento(Hyperlink h) {
+        this.lnkEstabelecimento = h;
     }
     
     // </editor-fold>
@@ -455,31 +306,7 @@ public class Dummy extends AbstractPageBean {
         return (ApplicationBean1)getBean("ApplicationBean1");
     }
 
-    public String button1_action() {
-        
-        java.util.Date now = new java.util.Date();
-        Calendar cal = new GregorianCalendar();
-        cal.setTime(now);        
-        int ano = cal.get(Calendar.YEAR);
-        int mes = cal.MONTH;
-        int dia = cal.DAY_OF_MONTH;
-        
-        Calendar today = new GregorianCalendar(ano, mes, dia);
-        Calendar firstJan = new GregorianCalendar(ano, Calendar.JANUARY, 1);
-        Calendar firstJul = new GregorianCalendar(ano, Calendar.JULY, 1);        
-        
-        if(today.compareTo(firstJan) == 0)
-        {
-            System.out.println("IGUAL !!!!!!!!!");
-        }
-        
-//        GregorianCalendar backDate = new GregorianCalendar(ano, Calendar.MAY, 1);
-//        backDate.add(GregorianCalendar.DATE, 180);
-//        Date d = worldTour.getTime();        
-        
-        
-        return null;
-    }
+ 
 
     public String butCancelar_action() {
         // TODO: Process the button click action. Return value is a navigation
@@ -585,15 +412,38 @@ public class Dummy extends AbstractPageBean {
         System.out.println("LINK");
     }
 
-    public String button2_action() {
+ 
+
+//    public String lnkAjuda_action() {
+//        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }
+//        return null;
+//    }
+
+    public String butVoltar_action() {
+        // TODO: Process the button click action. Return value is a navigation
+        // case name where null will return to the same page.
+        
+        return null;
+    }
+
+    public String butEliminar_action() {
         // TODO: Process the button click action. Return value is a navigation
         // case name where null will return to the same page.
-        //File f = new File(Global.IMAGE_FOLDER);  
-        //stMsg.setText(f.getAbsolutePath() + " ; " + f.exists() + " ; " + f.canRead() + " ; " + f.canWrite());
-        String foldername = Global.IMAGE_FOLDER + "/AAA";
-        File folder = new File(foldername);
-        boolean res = folder.mkdir();     
-        stMsg.setText(res + " ; " + folder.getAbsolutePath());
+        
         return null;
     }
 }
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java
index 173f5453..62b3e39a 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EnviarCorrecao.java
@@ -30,6 +30,7 @@ import java.util.ArrayList;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -429,6 +430,56 @@ public class EnviarCorrecao extends AbstractPageBean {
     public void setStaticText5(StaticText st) {
         this.staticText5 = st;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText7 = new StaticText();
+
+    public StaticText getStaticText7() {
+        return staticText7;
+    }
+
+    public void setStaticText7(StaticText st) {
+        this.staticText7 = st;
+    }
+
+    private Button butConfirmar = new Button();
+
+    public Button getButConfirmar() {
+        return butConfirmar;
+    }
+
+    public void setButConfirmar(Button b) {
+        this.butConfirmar = b;
+    }
+
+    private HtmlPanelGrid gridPanel3 = new HtmlPanelGrid();
+
+    public HtmlPanelGrid getGridPanel3() {
+        return gridPanel3;
+    }
+
+    public void setGridPanel3(HtmlPanelGrid hpg) {
+        this.gridPanel3 = hpg;
+    }
+
+    private StaticText txtMsg = new StaticText();
+
+    public StaticText getTxtMsg() {
+        return txtMsg;
+    }
+
+    public void setTxtMsg(StaticText st) {
+        this.txtMsg = st;
+    }
     
     // </editor-fold>
     
@@ -495,7 +546,9 @@ public class EnviarCorrecao extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
-        fillTabelaEstados();        
+        fillTabelaEstados(); 
+       txtMsg.setText(getSessionBean1().getMsg());
+       getSessionBean1().setMsg("");        
     }
     
     /**
@@ -717,23 +770,27 @@ public class EnviarCorrecao extends AbstractPageBean {
         EstadosCorrecaoDataProvider provider = (EstadosCorrecaoDataProvider) tableRowGroup1.getSourceData();
         ArrayList list = (ArrayList) provider.getList();
         Correcao c = (Correcao)list.get(k);
-        c.setObservacoes("");
-        if(txtObservacoes.getText() != null)
-        {
-            String obs = (String) txtObservacoes.getText();
-            c.setObservacoes(obs);            
-        }
-        AnalisesDataProvider adp = new AnalisesDataProvider();
-        try
-        {
-            adp.changeEstado(c);
-            
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-        }
-        return "form_hs";
+        
+        getSessionBean1().setCorrecao(c);
+        
+//        c.setObservacoes("");
+//        if(txtObservacoes.getText() != null)
+//        {
+//            String obs = (String) txtObservacoes.getText();
+//            c.setObservacoes(obs);            
+//        }
+//        AnalisesDataProvider adp = new AnalisesDataProvider();
+//        try
+//        {
+//            adp.changeEstado(c);
+//            
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }
+//        return "form_hs";
+        return null;
     }
 
     public String lnkNewUser_action() {
@@ -749,5 +806,57 @@ public class EnviarCorrecao extends AbstractPageBean {
         //return "form_hs";
         return "analise_acidente";        
     }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
+
+    public String butConfirmar_action() {
+        // TODO: Process the button click action. Return value is a navigation
+        // case name where null will return to the same page.
+        
+        Correcao c = getSessionBean1().getCorrecao();
+        if(c != null)
+        {
+            c.setObservacoes("");
+            if(txtObservacoes.getText() != null)
+            {
+                String obs = (String) txtObservacoes.getText();
+                c.setObservacoes(obs);            
+            }
+            AnalisesDataProvider adp = new AnalisesDataProvider();
+            try
+            {
+                adp.changeEstado(c);
+
+            }
+            catch(Exception ex)
+            {
+                ex.printStackTrace();
+            }
+            return "form_hs";            
+        }
+        else
+        {
+            getSessionBean1().setMsg("Tem de indicar para onde enviar a correc&ccedil;&atilde;o");
+            return null;
+        }
+
+    }
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java
index 72d1cef1..6c97c727 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FichaUtilizador.java
@@ -32,6 +32,7 @@ import javax.faces.event.ValueChangeEvent;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 import global.Global;
+import javax.servlet.ServletContext;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -732,6 +733,36 @@ public class FichaUtilizador extends AbstractPageBean {
     public void setLnkAnalisesAcidente(Hyperlink h) {
         this.lnkAnalisesAcidente = h;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText16 = new StaticText();
+
+    public StaticText getStaticText16() {
+        return staticText16;
+    }
+
+    public void setStaticText16(StaticText st) {
+        this.staticText16 = st;
+    }
+
+    private StaticText staticText17 = new StaticText();
+
+    public StaticText getStaticText17() {
+        return staticText17;
+    }
+
+    public void setStaticText17(StaticText st) {
+        this.staticText17 = st;
+    }
     
     /**
      * <p>Construct a new Page bean instance.</p>
@@ -1564,5 +1595,24 @@ public class FichaUtilizador extends AbstractPageBean {
         return "gestao_utilizadores";
 
     }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java
index ef14826e..6fb8521f 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java
@@ -28,6 +28,7 @@ import com.sun.rave.web.ui.model.Option;
 import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
+import global.Global;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -35,6 +36,7 @@ import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 
@@ -836,6 +838,66 @@ public class FormDirGerRh extends AbstractPageBean {
     public void setStaticText8(StaticText st) {
         this.staticText8 = st;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText9 = new StaticText();
+
+    public StaticText getStaticText9() {
+        return staticText9;
+    }
+
+    public void setStaticText9(StaticText st) {
+        this.staticText9 = st;
+    }
+
+    private TableColumn tableColumn11 = new TableColumn();
+
+    public TableColumn getTableColumn11() {
+        return tableColumn11;
+    }
+
+    public void setTableColumn11(TableColumn tc) {
+        this.tableColumn11 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaSeg = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaSeg() {
+        return lnkDataAberturaSeg;
+    }
+
+    public void setLnkDataAberturaSeg(Hyperlink h) {
+        this.lnkDataAberturaSeg = h;
+    }
+
+    private TableColumn tableColumn12 = new TableColumn();
+
+    public TableColumn getTableColumn12() {
+        return tableColumn12;
+    }
+
+    public void setTableColumn12(TableColumn tc) {
+        this.tableColumn12 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaConcluida = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaConcluida() {
+        return lnkDataAberturaConcluida;
+    }
+
+    public void setLnkDataAberturaConcluida(Hyperlink h) {
+        this.lnkDataAberturaConcluida = h;
+    }
     
     // </editor-fold>
     
@@ -1029,6 +1091,15 @@ public class FormDirGerRh extends AbstractPageBean {
         return "view_analise";
 
     }
+    
+    public String lnkDataAberturaSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormDirGerRh");        
+        return "view_analise";
+    }    
 
     public String lnkNrSeg_action() {
         // TODO: Replace with your code
@@ -1209,6 +1280,15 @@ public class FormDirGerRh extends AbstractPageBean {
         return "view_analise";
 
     }
+    
+    public String lnkDataAberturaConcluida_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormDirGerRh");        
+        return "view_analise";
+    }    
 
     public String lnkNrConcluida_action() {
         // TODO: Replace with your code
@@ -1332,5 +1412,25 @@ public class FormDirGerRh extends AbstractPageBean {
 //    {
 //        
 //    }    
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
+
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java
index d23f08b3..b679a3c1 100755
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java
@@ -28,6 +28,7 @@ import com.sun.rave.web.ui.model.Option;
 import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
+import global.Global;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -35,6 +36,7 @@ import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 
@@ -836,6 +838,106 @@ public class FormDirSiprp extends AbstractPageBean {
     public void setLnkAnalisesAcidente(Hyperlink h) {
         this.lnkAnalisesAcidente = h;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText2 = new StaticText();
+
+    public StaticText getStaticText2() {
+        return staticText2;
+    }
+
+    public void setStaticText2(StaticText st) {
+        this.staticText2 = st;
+    }
+
+    private HtmlPanelGrid gridPanel2 = new HtmlPanelGrid();
+
+    public HtmlPanelGrid getGridPanel2() {
+        return gridPanel2;
+    }
+
+    public void setGridPanel2(HtmlPanelGrid hpg) {
+        this.gridPanel2 = hpg;
+    }
+
+    private StaticText txtMsg1 = new StaticText();
+
+    public StaticText getTxtMsg1() {
+        return txtMsg1;
+    }
+
+    public void setTxtMsg1(StaticText st) {
+        this.txtMsg1 = st;
+    }
+
+    private TableColumn tableColumn1 = new TableColumn();
+
+    public TableColumn getTableColumn1() {
+        return tableColumn1;
+    }
+
+    public void setTableColumn1(TableColumn tc) {
+        this.tableColumn1 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaSeg1 = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaSeg1() {
+        return lnkDataAberturaSeg1;
+    }
+
+    public void setLnkDataAberturaSeg1(Hyperlink h) {
+        this.lnkDataAberturaSeg1 = h;
+    }
+
+    private TableColumn tableColumn2 = new TableColumn();
+
+    public TableColumn getTableColumn2() {
+        return tableColumn2;
+    }
+
+    public void setTableColumn2(TableColumn tc) {
+        this.tableColumn2 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaConcluida1 = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaConcluida1() {
+        return lnkDataAberturaConcluida1;
+    }
+
+    public void setLnkDataAberturaConcluida1(Hyperlink h) {
+        this.lnkDataAberturaConcluida1 = h;
+    }
+
+    private TableColumn tableColumn3 = new TableColumn();
+
+    public TableColumn getTableColumn3() {
+        return tableColumn3;
+    }
+
+    public void setTableColumn3(TableColumn tc) {
+        this.tableColumn3 = tc;
+    }
+
+    private Hyperlink lnkEstabelecimentoSeg1 = new Hyperlink();
+
+    public Hyperlink getLnkEstabelecimentoSeg1() {
+        return lnkEstabelecimentoSeg1;
+    }
+
+    public void setLnkEstabelecimentoSeg1(Hyperlink h) {
+        this.lnkEstabelecimentoSeg1 = h;
+    }
     
     // </editor-fold>
     
@@ -895,6 +997,8 @@ public class FormDirSiprp extends AbstractPageBean {
      * resources that will be required in your event handlers.</p>
      */
     public void preprocess() {
+       txtMsg1.setText(getSessionBean1().getMsg());
+       getSessionBean1().setMsg("");               
     }
     
     /**
@@ -928,7 +1032,7 @@ public class FormDirSiprp extends AbstractPageBean {
        HttpServletRequest request = (HttpServletRequest) getExternalContext().getRequest();
        String referer = request.getRequestURI();
        String pageFrom = Utils.getPageFrom(referer);
-       if(!pageFrom.matches("FormDirSiprp.jsp"))
+       if((!pageFrom.matches("FormDirSiprp.jsp")) || getSessionBean1().isFromAnaliseDeletion())
        {
            
            try
@@ -1047,6 +1151,15 @@ public class FormDirSiprp extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormDirSiprp");        
         return "view_analise";
     }
+    
+    public String lnkDataAberturaSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormDirSiprp");        
+        return "view_analise";
+    }    
 
     public String lnkNrSeg_action() {
         // TODO: Replace with your code
@@ -1084,6 +1197,16 @@ public class FormDirSiprp extends AbstractPageBean {
         return "view_analise";
     }
     
+    public String lnkEstabelecimentoSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormDirSiprp");        
+        return "view_analise";
+    }
+    
+    
     private AnaliseAcidente getTableSeguimentoRowData()
     {
         RowKey rk = tableRowGroup2.getRowKey();
@@ -1222,6 +1345,15 @@ public class FormDirSiprp extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormDirSiprp");        
         return "view_analise";
     }
+    
+    public String lnkDataAberturaConcluida_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormDirSiprp");        
+        return "view_analise";
+    }    
 
     public String lnkNrConcluida_action() {
         // TODO: Replace with your code
@@ -1340,6 +1472,24 @@ public class FormDirSiprp extends AbstractPageBean {
 //        
 //    }
 
-        
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
+       
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java
index 8909307b..9330c08c 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java
@@ -28,6 +28,7 @@ import com.sun.rave.web.ui.model.Option;
 import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
+import global.Global;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -35,6 +36,7 @@ import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 
@@ -836,6 +838,86 @@ public class FormGestor extends AbstractPageBean {
     public void setStaticText8(StaticText st) {
         this.staticText8 = st;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText9 = new StaticText();
+
+    public StaticText getStaticText9() {
+        return staticText9;
+    }
+
+    public void setStaticText9(StaticText st) {
+        this.staticText9 = st;
+    }
+
+    private TableColumn tableColumn11 = new TableColumn();
+
+    public TableColumn getTableColumn11() {
+        return tableColumn11;
+    }
+
+    public void setTableColumn11(TableColumn tc) {
+        this.tableColumn11 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaSeg1 = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaSeg1() {
+        return lnkDataAberturaSeg1;
+    }
+
+    public void setLnkDataAberturaSeg1(Hyperlink h) {
+        this.lnkDataAberturaSeg1 = h;
+    }
+
+    private TableColumn tableColumn12 = new TableColumn();
+
+    public TableColumn getTableColumn12() {
+        return tableColumn12;
+    }
+
+    public void setTableColumn12(TableColumn tc) {
+        this.tableColumn12 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaConcluida1 = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaConcluida1() {
+        return lnkDataAberturaConcluida1;
+    }
+
+    public void setLnkDataAberturaConcluida1(Hyperlink h) {
+        this.lnkDataAberturaConcluida1 = h;
+    }
+
+    private TableColumn tableColumn13 = new TableColumn();
+
+    public TableColumn getTableColumn13() {
+        return tableColumn13;
+    }
+
+    public void setTableColumn13(TableColumn tc) {
+        this.tableColumn13 = tc;
+    }
+
+    private Hyperlink lnkEstabelecimentoSeg1 = new Hyperlink();
+
+    public Hyperlink getLnkEstabelecimentoSeg1() {
+        return lnkEstabelecimentoSeg1;
+    }
+
+    public void setLnkEstabelecimentoSeg1(Hyperlink h) {
+        this.lnkEstabelecimentoSeg1 = h;
+    }
     
     // </editor-fold>
     
@@ -1046,6 +1128,15 @@ public class FormGestor extends AbstractPageBean {
         return "view_analise";
 
     }
+    
+    public String lnkDataAberturaSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormGestor");        
+        return "view_analise";
+    }    
 
     public String lnkNrSeg_action() {
         // TODO: Replace with your code
@@ -1087,6 +1178,15 @@ public class FormGestor extends AbstractPageBean {
 
     }
     
+    public String lnkEstabelecimentoSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormGestor");        
+        return "view_analise";
+    }    
+    
     private AnaliseAcidente getTableSeguimentoRowData()
     {
         RowKey rk = tableRowGroup1.getRowKey();
@@ -1236,6 +1336,15 @@ public class FormGestor extends AbstractPageBean {
         return "view_analise";
 
     }
+    
+    public String lnkDataAberturaConcluida_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormGestor");        
+        return "view_analise";
+    }    
 
     public String lnkNrConcluida_action() {
         // TODO: Replace with your code
@@ -1350,5 +1459,32 @@ public class FormGestor extends AbstractPageBean {
 //    {
 //        
 //    }    
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
+
+    public String lnkEstabelecimento_action() {
+        // TODO: Replace with your code
+        
+        return null;
+    }
+
+
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java
index 3b30f435..3ebebe5f 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java
@@ -29,6 +29,7 @@ import db.AnalisesActualDataProvider;
 import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
+import global.Global;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -36,6 +37,7 @@ import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 
@@ -1007,6 +1009,146 @@ public class FormHS extends AbstractPageBean {
     public void setStaticText13(StaticText st) {
         this.staticText13 = st;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText14 = new StaticText();
+
+    public StaticText getStaticText14() {
+        return staticText14;
+    }
+
+    public void setStaticText14(StaticText st) {
+        this.staticText14 = st;
+    }
+
+    private HtmlPanelGrid gridPanel10 = new HtmlPanelGrid();
+
+    public HtmlPanelGrid getGridPanel10() {
+        return gridPanel10;
+    }
+
+    public void setGridPanel10(HtmlPanelGrid hpg) {
+        this.gridPanel10 = hpg;
+    }
+
+    private StaticText txtMsg = new StaticText();
+
+    public StaticText getTxtMsg() {
+        return txtMsg;
+    }
+
+    public void setTxtMsg(StaticText st) {
+        this.txtMsg = st;
+    }
+
+    private TableColumn tableColumn16 = new TableColumn();
+
+    public TableColumn getTableColumn16() {
+        return tableColumn16;
+    }
+
+    public void setTableColumn16(TableColumn tc) {
+        this.tableColumn16 = tc;
+    }
+
+    private Hyperlink lnkDataAbertura = new Hyperlink();
+
+    public Hyperlink getLnkDataAbertura() {
+        return lnkDataAbertura;
+    }
+
+    public void setLnkDataAbertura(Hyperlink h) {
+        this.lnkDataAbertura = h;
+    }
+
+    private TableColumn tableColumn17 = new TableColumn();
+
+    public TableColumn getTableColumn17() {
+        return tableColumn17;
+    }
+
+    public void setTableColumn17(TableColumn tc) {
+        this.tableColumn17 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaSeg = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaSeg() {
+        return lnkDataAberturaSeg;
+    }
+
+    public void setLnkDataAberturaSeg(Hyperlink h) {
+        this.lnkDataAberturaSeg = h;
+    }
+
+    private TableColumn tableColumn18 = new TableColumn();
+
+    public TableColumn getTableColumn18() {
+        return tableColumn18;
+    }
+
+    public void setTableColumn18(TableColumn tc) {
+        this.tableColumn18 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaConcluida = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaConcluida() {
+        return lnkDataAberturaConcluida;
+    }
+
+    public void setLnkDataAberturaConcluida(Hyperlink h) {
+        this.lnkDataAberturaConcluida = h;
+    }
+
+    private TableColumn tableColumn19 = new TableColumn();
+
+    public TableColumn getTableColumn19() {
+        return tableColumn19;
+    }
+
+    public void setTableColumn19(TableColumn tc) {
+        this.tableColumn19 = tc;
+    }
+
+    private Hyperlink lnkEstabelecimento = new Hyperlink();
+
+    public Hyperlink getLnkEstabelecimento() {
+        return lnkEstabelecimento;
+    }
+
+    public void setLnkEstabelecimento(Hyperlink h) {
+        this.lnkEstabelecimento = h;
+    }
+
+    private TableColumn tableColumn20 = new TableColumn();
+
+    public TableColumn getTableColumn20() {
+        return tableColumn20;
+    }
+
+    public void setTableColumn20(TableColumn tc) {
+        this.tableColumn20 = tc;
+    }
+
+    private Hyperlink lnkEstabelecimentoSeg = new Hyperlink();
+
+    public Hyperlink getLnkEstabelecimentoSeg() {
+        return lnkEstabelecimentoSeg;
+    }
+
+    public void setLnkEstabelecimentoSeg(Hyperlink h) {
+        this.lnkEstabelecimentoSeg = h;
+    }
     
     // </editor-fold>
     
@@ -1115,12 +1257,15 @@ public class FormHS extends AbstractPageBean {
        HttpServletRequest request = (HttpServletRequest) getExternalContext().getRequest();
        String referer = request.getRequestURI();
        String pageFrom = Utils.getPageFrom(referer);
-       if(!pageFrom.matches("FormHS.jsp"))
+       System.out.println("PAGE FROM : " + pageFrom);
+       if((!pageFrom.matches("FormHS.jsp")) || getSessionBean1().isFromAnaliseDeletion())
        {
            
            try
            {
                 //lblActivos.setRendered(true);
+               System.out.println("CONCLUIDAS TABLE");
+                getSessionBean1().getAnalisesConcluidasDataProvider().setList(null);               
                 table3.setRendered(true);                                      
                 ArrayList concluidasList = adp.getAnalisesConcluidasHsList();
                 getSessionBean1().getAnalisesConcluidasDataProvider().setList(concluidasList);
@@ -1129,10 +1274,14 @@ public class FormHS extends AbstractPageBean {
            {
                //lblActivos.setRendered(false);
                table3.setRendered(false);                   
-               //ex.printStackTrace();
+               ex.printStackTrace();
+               System.out.println("ERRRRRROR : " + ex.getMessage());
            }            
             fillAnoDropDown();       
-       }              
+       }   
+       
+       txtMsg.setText(getSessionBean1().getMsg());
+       getSessionBean1().setMsg("");       
     }
     
     /**
@@ -1193,6 +1342,15 @@ public class FormHS extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormHS");        
         return "analise_acidente";
     }
+    
+    public String lnkDataAbertura_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableActivosRowData();
+        getSessionBean1().setCurrentAnalise(a);
+        getSessionBean1().setNavFrom("FormHS");        
+        return "analise_acidente";
+    }    
 
     public String lnkNr_action() {
         // TODO: Replace with your code
@@ -1230,6 +1388,15 @@ public class FormHS extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormHS");        
         return "view_analise";
     }
+    
+    public String lnkDataAberturaSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormHS");        
+        return "view_analise";
+    }    
 
     public String lnkNrSeg_action() {
         // TODO: Replace with your code
@@ -1521,6 +1688,15 @@ public class FormHS extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormHS");        
         return "view_analise";
     }
+    
+    public String lnkDataAberturaConcluida_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormHS");        
+        return "view_analise";
+    }    
 
     public String lnkNrConcluida_action() {
         // TODO: Replace with your code
@@ -1548,6 +1724,15 @@ public class FormHS extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormHS");        
         return "analise_acidente";
     }
+    
+    public String lnkEstabelecimento_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableActivosRowData();
+        getSessionBean1().setCurrentAnalise(a);
+        getSessionBean1().setNavFrom("FormHS");        
+        return "analise_acidente";
+    }
 
     public String lnkFaseSeg_action() {
         // TODO: Replace with your code
@@ -1557,6 +1742,16 @@ public class FormHS extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormHS");        
         return "view_analise";
     }
+    
+    public String lnkEstabelecimentoSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormHS");        
+        return "view_analise";
+    }
+    
 
     public String lnkPor_action() {
         // TODO: Replace with your code
@@ -1599,5 +1794,27 @@ public class FormHS extends AbstractPageBean {
         
         return null;
     }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
+
+
+
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java
index 0d2dfd5d..06cc90ef 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java
@@ -29,6 +29,7 @@ import db.AnalisesActualDataProvider;
 import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
+import global.Global;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -36,6 +37,7 @@ import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 
@@ -1007,6 +1009,106 @@ public class FormRH extends AbstractPageBean {
     public void setLnkAnalisesAcidente(Hyperlink h) {
         this.lnkAnalisesAcidente = h;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText13 = new StaticText();
+
+    public StaticText getStaticText13() {
+        return staticText13;
+    }
+
+    public void setStaticText13(StaticText st) {
+        this.staticText13 = st;
+    }
+
+    private HtmlPanelGrid gridPanel10 = new HtmlPanelGrid();
+
+    public HtmlPanelGrid getGridPanel10() {
+        return gridPanel10;
+    }
+
+    public void setGridPanel10(HtmlPanelGrid hpg) {
+        this.gridPanel10 = hpg;
+    }
+
+    private StaticText txtMsg1 = new StaticText();
+
+    public StaticText getTxtMsg1() {
+        return txtMsg1;
+    }
+
+    public void setTxtMsg1(StaticText st) {
+        this.txtMsg1 = st;
+    }
+
+    private TableColumn tableColumn16 = new TableColumn();
+
+    public TableColumn getTableColumn16() {
+        return tableColumn16;
+    }
+
+    public void setTableColumn16(TableColumn tc) {
+        this.tableColumn16 = tc;
+    }
+
+    private Hyperlink lnkDataAbertura = new Hyperlink();
+
+    public Hyperlink getLnkDataAbertura() {
+        return lnkDataAbertura;
+    }
+
+    public void setLnkDataAbertura(Hyperlink h) {
+        this.lnkDataAbertura = h;
+    }
+
+    private TableColumn tableColumn17 = new TableColumn();
+
+    public TableColumn getTableColumn17() {
+        return tableColumn17;
+    }
+
+    public void setTableColumn17(TableColumn tc) {
+        this.tableColumn17 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaSeg = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaSeg() {
+        return lnkDataAberturaSeg;
+    }
+
+    public void setLnkDataAberturaSeg(Hyperlink h) {
+        this.lnkDataAberturaSeg = h;
+    }
+
+    private TableColumn tableColumn18 = new TableColumn();
+
+    public TableColumn getTableColumn18() {
+        return tableColumn18;
+    }
+
+    public void setTableColumn18(TableColumn tc) {
+        this.tableColumn18 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaConcluida = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaConcluida() {
+        return lnkDataAberturaConcluida;
+    }
+
+    public void setLnkDataAberturaConcluida(Hyperlink h) {
+        this.lnkDataAberturaConcluida = h;
+    }
     
     // </editor-fold>
     
@@ -1147,7 +1249,10 @@ public class FormRH extends AbstractPageBean {
                //ex.printStackTrace();
            }            
             fillAnoDropDown();       
-       }       
+       }    
+       
+       txtMsg1.setText(getSessionBean1().getMsg());
+       getSessionBean1().setMsg("");       
     }
     
     /**
@@ -1215,6 +1320,15 @@ public class FormRH extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormRH");        
         return "analise_acidente";
     }
+    
+    public String lnkDataAbertura_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableActivosRowData();
+        getSessionBean1().setCurrentAnalise(a);
+        getSessionBean1().setNavFrom("FormRH");        
+        return "analise_acidente";
+    }    
 
     public String lnkNr_action() {
         // TODO: Replace with your code
@@ -1249,16 +1363,25 @@ public class FormRH extends AbstractPageBean {
         
         AnaliseAcidente a = getTableSeguimentoRowData();
         getSessionBean1().setCurrentAnalise(a);      
-        getSessionBean1().setNavFrom("FormRh");        
+        getSessionBean1().setNavFrom("FormRH");        
         return "view_analise";
     }
+    
+    public String lnkDataAberturaSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormRH");        
+        return "view_analise";
+    }    
 
     public String lnkNrSeg_action() {
         // TODO: Replace with your code
         
         AnaliseAcidente a = getTableSeguimentoRowData();
         getSessionBean1().setCurrentAnalise(a);      
-        getSessionBean1().setNavFrom("FormRh");        
+        getSessionBean1().setNavFrom("FormRH");        
         return "view_analise";
     }
 
@@ -1268,7 +1391,7 @@ public class FormRH extends AbstractPageBean {
         
         AnaliseAcidente a = getTableSeguimentoRowData();
         getSessionBean1().setCurrentAnalise(a);      
-        getSessionBean1().setNavFrom("FormRh");        
+        getSessionBean1().setNavFrom("FormRH");        
         return "view_analise";
     }
     
@@ -1544,6 +1667,15 @@ public class FormRH extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormRH");        
         return "view_analise";
     }
+    
+    public String lnkDataAberturaConcluida_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormRH");        
+        return "view_analise";
+    }    
 
     public String lnkNrConcluida_action() {
         // TODO: Replace with your code
@@ -1577,7 +1709,7 @@ public class FormRH extends AbstractPageBean {
         
         AnaliseAcidente a = getTableSeguimentoRowData();
         getSessionBean1().setCurrentAnalise(a);      
-        getSessionBean1().setNavFrom("FormRh");        
+        getSessionBean1().setNavFrom("FormRH");        
         return "view_analise";
     }
 
@@ -1595,7 +1727,7 @@ public class FormRH extends AbstractPageBean {
         
         AnaliseAcidente a = getTableSeguimentoRowData();
         getSessionBean1().setCurrentAnalise(a);      
-        getSessionBean1().setNavFrom("FormRh");        
+        getSessionBean1().setNavFrom("FormRH");        
         return "view_analise";
     }
 
@@ -1624,5 +1756,25 @@ public class FormRH extends AbstractPageBean {
         getSessionBean1().setModoEdicaoUtilizador("new");
         return "user";
     }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
+
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java
index c7a169f0..de46c90b 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java
@@ -29,14 +29,21 @@ import db.AnalisesActualDataProvider;
 import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
+import global.Global;
+import java.io.File;
+import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.ListIterator;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
+import javax.faces.context.FacesContext;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import utils.Utils;
 
 /**
@@ -1037,6 +1044,106 @@ public class FormSeguranca extends AbstractPageBean {
     public void setLnkAnalisesAcidente(Hyperlink h) {
         this.lnkAnalisesAcidente = h;
     }
+
+    private Hyperlink lnkAjuda = new Hyperlink();
+
+    public Hyperlink getLnkAjuda() {
+        return lnkAjuda;
+    }
+
+    public void setLnkAjuda(Hyperlink h) {
+        this.lnkAjuda = h;
+    }
+
+    private StaticText staticText12 = new StaticText();
+
+    public StaticText getStaticText12() {
+        return staticText12;
+    }
+
+    public void setStaticText12(StaticText st) {
+        this.staticText12 = st;
+    }
+
+    private HtmlPanelGrid gridPanel10 = new HtmlPanelGrid();
+
+    public HtmlPanelGrid getGridPanel10() {
+        return gridPanel10;
+    }
+
+    public void setGridPanel10(HtmlPanelGrid hpg) {
+        this.gridPanel10 = hpg;
+    }
+
+    private StaticText txtMsg = new StaticText();
+
+    public StaticText getTxtMsg() {
+        return txtMsg;
+    }
+
+    public void setTxtMsg(StaticText st) {
+        this.txtMsg = st;
+    }
+
+    private TableColumn tableColumn16 = new TableColumn();
+
+    public TableColumn getTableColumn16() {
+        return tableColumn16;
+    }
+
+    public void setTableColumn16(TableColumn tc) {
+        this.tableColumn16 = tc;
+    }
+
+    private Hyperlink lnkDataAbertura = new Hyperlink();
+
+    public Hyperlink getLnkDataAbertura() {
+        return lnkDataAbertura;
+    }
+
+    public void setLnkDataAbertura(Hyperlink h) {
+        this.lnkDataAbertura = h;
+    }
+
+    private TableColumn tableColumn17 = new TableColumn();
+
+    public TableColumn getTableColumn17() {
+        return tableColumn17;
+    }
+
+    public void setTableColumn17(TableColumn tc) {
+        this.tableColumn17 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaSeg = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaSeg() {
+        return lnkDataAberturaSeg;
+    }
+
+    public void setLnkDataAberturaSeg(Hyperlink h) {
+        this.lnkDataAberturaSeg = h;
+    }
+
+    private TableColumn tableColumn18 = new TableColumn();
+
+    public TableColumn getTableColumn18() {
+        return tableColumn18;
+    }
+
+    public void setTableColumn18(TableColumn tc) {
+        this.tableColumn18 = tc;
+    }
+
+    private Hyperlink lnkDataAberturaConcluida = new Hyperlink();
+
+    public Hyperlink getLnkDataAberturaConcluida() {
+        return lnkDataAberturaConcluida;
+    }
+
+    public void setLnkDataAberturaConcluida(Hyperlink h) {
+        this.lnkDataAberturaConcluida = h;
+    }
     
     // </editor-fold>
     
@@ -1165,7 +1272,8 @@ public class FormSeguranca extends AbstractPageBean {
            }            
             fillAnoDropDown();       
        }
-       
+       txtMsg.setText(getSessionBean1().getMsg());
+       getSessionBean1().setMsg("");
     }
     
     /**
@@ -1478,6 +1586,14 @@ public class FormSeguranca extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormSeguranca");        
         return "analise_acidente";
     }
+    
+    public String lnkDataAbertura_action() {
+        // TODO: Replace with your code
+        AnaliseAcidente a = getTableActivosRowData();
+        getSessionBean1().setCurrentAnalise(a);
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "analise_acidente";
+    }    
 
     public String lnkNr_action() {
         // TODO: Replace with your code
@@ -1514,6 +1630,15 @@ public class FormSeguranca extends AbstractPageBean {
         return "view_analise";
 
     }
+    
+    public String lnkDataAberturaSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "view_analise";
+    }    
 
     public String lnkNrSeg_action() {
         // TODO: Replace with your code
@@ -1554,6 +1679,7 @@ public class FormSeguranca extends AbstractPageBean {
     }        
 
     public String lnkEditUser_action() {
+        System.out.println("EDIT USER");
         // TODO: Replace with your code
         getSessionBean1().setNavFrom("FormSeguranca");
         getSessionBean1().setModoEdicaoUtilizador("edit");
@@ -1567,6 +1693,15 @@ public class FormSeguranca extends AbstractPageBean {
         getSessionBean1().setNavFrom("FormSeguranca");        
         return "view_analise";
     }
+    
+    public String lnkDataAberturaConcluida_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "view_analise";
+    }    
 
     public String lnkNrConcluida_action() {
         // TODO: Replace with your code
@@ -1640,5 +1775,57 @@ public class FormSeguranca extends AbstractPageBean {
         
         return null;
     }
+
+    public String lnkAjuda_action() {
+       System.out.println("AJUDA");
+//        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//             return null;
+//         }        
+        return null;
+    }
+    
+    private void showPdf(String pdfFilePath) throws Exception
+    {
+        
+         File pdfFile = new File(pdfFilePath);
+         FileInputStream fis = new FileInputStream(pdfFile);   
+         byte[] buf = new byte[(int)pdfFile.length()];  
+         while ((fis.read(buf)) > 0)
+         {  
+             //fos.write(buf, 0, buf.length);  
+         }  
+         fis.close();
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        if (!ctx.getResponseComplete())
+        {         
+            HttpServletResponse response = (HttpServletResponse)ctx.getExternalContext().getResponse();
+            String contentType = "application/pdf";            
+            response.setContentType(contentType);
+            response.setHeader("Content-Disposition","attachment;filename=\"" + "Ajuda.pdf" + "\"");
+
+            ServletOutputStream out = response.getOutputStream();
+
+            //out.write(model.getInfo().getBytes());
+            out.write(buf, 0, buf.length); 
+            out.flush();
+            out.close();
+            ctx.responseComplete();  
+            ctx.release();
+        }
+    }        
+
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java
index f196fa68..0b25dd18 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/GestaoUtilizadores.java
@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 
@@ -778,6 +779,26 @@ public class GestaoUtilizadores extends AbstractPageBean {
     public void setLnkAnalisesAcidente(Hyperlink h) {
         this.lnkAnalisesAcidente = h;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText4 = new StaticText();
+
+    public StaticText getStaticText4() {
+        return staticText4;
+    }
+
+    public void setStaticText4(StaticText st) {
+        this.staticText4 = st;
+    }
     /**
      * <p>Construct a new Page bean instance.</p>
      */
@@ -1250,5 +1271,24 @@ public class GestaoUtilizadores extends AbstractPageBean {
         }
         return null;
     }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java
index 8964d9bc..8283ce80 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java
@@ -436,6 +436,7 @@ public class Login extends AbstractPageBean {
                         }
                         catch(Exception ex)
                         {
+                            ex.printStackTrace();
                             getSessionBean1().setMsg("Utilizador inv&aacute;lido ! ");						    								    
                         }
                     }
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java
index e46f72e9..68b45cd0 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/NovoUtilizador.java
@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 
@@ -846,24 +847,24 @@ public class NovoUtilizador extends AbstractPageBean {
         this.staticText7 = st;
     }
 
-    private StaticText staticText8 = new StaticText();
+    private StaticText stOutro = new StaticText();
 
-    public StaticText getStaticText8() {
-        return staticText8;
+    public StaticText getStOutro() {
+        return stOutro;
     }
 
-    public void setStaticText8(StaticText st) {
-        this.staticText8 = st;
+    public void setStOutro(StaticText st) {
+        this.stOutro = st;
     }
 
-    private HtmlPanelGrid gridPanel5 = new HtmlPanelGrid();
+    private HtmlPanelGrid gridOutro = new HtmlPanelGrid();
 
-    public HtmlPanelGrid getGridPanel5() {
-        return gridPanel5;
+    public HtmlPanelGrid getGridOutro() {
+        return gridOutro;
     }
 
-    public void setGridPanel5(HtmlPanelGrid hpg) {
-        this.gridPanel5 = hpg;
+    public void setGridOutro(HtmlPanelGrid hpg) {
+        this.gridOutro = hpg;
     }
 
     private StaticText staticText9 = new StaticText();
@@ -1118,6 +1119,26 @@ public class NovoUtilizador extends AbstractPageBean {
     public void setLnkAnalisesAcidente(Hyperlink h) {
         this.lnkAnalisesAcidente = h;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText29 = new StaticText();
+
+    public StaticText getStaticText29() {
+        return staticText29;
+    }
+
+    public void setStaticText29(StaticText st) {
+        this.staticText29 = st;
+    }
     /**
      * <p>Construct a new Page bean instance.</p>
      */
@@ -2039,5 +2060,33 @@ public class NovoUtilizador extends AbstractPageBean {
         
         return null;
     }
+
+    public void rbCatRh_processValueChange(ValueChangeEvent event) {
+        // TODO: Replace with your code
+    }
+
+    public void rbCatHs_processValueChange(ValueChangeEvent event) {
+        // TODO: Replace with your code
+        
+    }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/RecuperarPassword.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/RecuperarPassword.java
index deb5b682..9bd25837 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/RecuperarPassword.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/RecuperarPassword.java
@@ -18,6 +18,7 @@ import com.sun.rave.web.ui.component.PanelGroup;
 import com.sun.rave.web.ui.component.StaticText;
 import com.sun.rave.web.ui.component.TextField;
 import db.UtilizadoresDataProvider;
+import global.Global;
 import java.util.Date;
 import java.util.Properties;
 import javax.faces.FacesException;
@@ -389,13 +390,14 @@ public class RecuperarPassword extends AbstractPageBean {
                     //send mail :
                     try
                     {
-                        sendEmail(u.getEmail(), u.getLogin(), u.getPassword(), "linojose@mail.com");                        
+                        sendEmail(u.getEmail(), u.getLogin(), u.getPassword(), Global.ENDERECO_ENVIO);                        
                         getSessionBean1().setMsg("A sua password foi enviada para o seu email");                        
                         return "login";
                     }
                     catch(Exception ex)
                     {
-                        getSessionBean1().setMsg("Erro no envio da password !");                        
+                        getSessionBean1().setMsg("Erro no envio da password !");
+                        ex.printStackTrace();
                     }
 
                 }
@@ -418,7 +420,7 @@ public class RecuperarPassword extends AbstractPageBean {
   {
         Properties props = new Properties(); 
         //props.put("mail.transport.protocol", "smtp"); 
-        props.put("mail.smtp.host", "smtp.netcabo.pt"); 
+        props.put("mail.smtp.host", "mail2.evolute.pt"); 
         props.put("mail.from", admin_email); 
         Session session1 = Session.getInstance(props); 
         Message msg = new MimeMessage(session1); 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java
index 64bdcbec..3f298e66 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java
@@ -58,6 +58,12 @@ public class SessionBean1 extends AbstractSessionBean {
         setEditUser(null);    
         setUserDeleted(false);
         setMudarPassword(false);
+        setFromAjuda(false);
+        setGravado(false);
+        setSubmetido(false);      
+        setFromAnaliseDeletion(false);
+        setIeBug(false);
+        setCorrecao(null);
     }
     
     /**
@@ -642,4 +648,64 @@ public class SessionBean1 extends AbstractSessionBean {
         this.medico = medico;
     }
 
+    private boolean fromAjuda;
+
+    public boolean isFromAjuda() {
+        return fromAjuda;
+    }
+
+    public void setFromAjuda(boolean fromAjuda) {
+        this.fromAjuda = fromAjuda;
+    }
+
+    private boolean submetido;
+
+    private boolean gravado;
+
+    public boolean isSubmetido() {
+        return submetido;
+    }
+
+    public void setSubmetido(boolean submetido) {
+        this.submetido = submetido;
+    }
+
+    public boolean isGravado() {
+        return gravado;
+    }
+
+    public void setGravado(boolean gravado) {
+        this.gravado = gravado;
+    }
+
+    private boolean fromAnaliseDeletion;
+
+    public boolean isFromAnaliseDeletion() {
+        return fromAnaliseDeletion;
+    }
+
+    public void setFromAnaliseDeletion(boolean fromAnaliseDeletion) {
+        this.fromAnaliseDeletion = fromAnaliseDeletion;
+    }
+
+    private boolean ieBug;
+
+    public boolean isIeBug() {
+        return ieBug;
+    }
+
+    public void setIeBug(boolean ieBug) {
+        this.ieBug = ieBug;
+    }
+
+    private analiseacidentestrabalho.Correcao correcao;
+
+    public analiseacidentestrabalho.Correcao getCorrecao() {
+        return correcao;
+    }
+
+    public void setCorrecao(analiseacidentestrabalho.Correcao correcao) {
+        this.correcao = correcao;
+    }
+
 }
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java
index 482d3bc5..8ace5eb5 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/UtilizadorFields.java
@@ -29,6 +29,7 @@ import global.Global;
 import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
+import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import utils.Utils;
 
@@ -813,6 +814,26 @@ public class UtilizadorFields extends AbstractPageBean {
     public void setLnkAnalisesAcidente(Hyperlink h) {
         this.lnkAnalisesAcidente = h;
     }
+
+    private Hyperlink lnkAjuda = new Hyperlink();
+
+    public Hyperlink getLnkAjuda() {
+        return lnkAjuda;
+    }
+
+    public void setLnkAjuda(Hyperlink h) {
+        this.lnkAjuda = h;
+    }
+
+    private StaticText staticText19 = new StaticText();
+
+    public StaticText getStaticText19() {
+        return staticText19;
+    }
+
+    public void setStaticText19(StaticText st) {
+        this.staticText19 = st;
+    }
     /**
      * <p>Construct a new Page bean instance.</p>
      */
@@ -1702,5 +1723,24 @@ public class UtilizadorFields extends AbstractPageBean {
         // TODO: Replace with your code
         
     }
+
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }        
+        return null;
+    }
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java
index 92ebac19..c410efad 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/ViewAnaliseAcidenteTrabalho.java
@@ -11,6 +11,7 @@ import com.sun.rave.web.ui.component.Body;
 import com.sun.rave.web.ui.component.Button;
 import com.sun.rave.web.ui.component.Form;
 import com.sun.rave.web.ui.component.Head;
+import com.sun.rave.web.ui.component.HiddenField;
 import com.sun.rave.web.ui.component.Html;
 import com.sun.rave.web.ui.component.Hyperlink;
 import com.sun.rave.web.ui.component.ImageComponent;
@@ -1127,16 +1128,6 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
         this.groupPanel5 = pg;
     }
 
-    private Button butVoltar = new Button();
-
-    public Button getButVoltar() {
-        return butVoltar;
-    }
-
-    public void setButVoltar(Button b) {
-        this.butVoltar = b;
-    }
-
     private HtmlPanelGrid gridPanel13 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridPanel13() {
@@ -2176,6 +2167,66 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
     public void setImage5(ImageComponent ic) {
         this.image5 = ic;
     }
+
+    private Hyperlink lnkAjuda1 = new Hyperlink();
+
+    public Hyperlink getLnkAjuda1() {
+        return lnkAjuda1;
+    }
+
+    public void setLnkAjuda1(Hyperlink h) {
+        this.lnkAjuda1 = h;
+    }
+
+    private StaticText staticText1 = new StaticText();
+
+    public StaticText getStaticText1() {
+        return staticText1;
+    }
+
+    public void setStaticText1(StaticText st) {
+        this.staticText1 = st;
+    }
+
+    private HiddenField hidConfDelete = new HiddenField();
+
+    public HiddenField getHidConfDelete() {
+        return hidConfDelete;
+    }
+
+    public void setHidConfDelete(HiddenField hf) {
+        this.hidConfDelete = hf;
+    }
+
+    private PanelGroup groupPanel1 = new PanelGroup();
+
+    public PanelGroup getGroupPanel1() {
+        return groupPanel1;
+    }
+
+    public void setGroupPanel1(PanelGroup pg) {
+        this.groupPanel1 = pg;
+    }
+
+    private Button butVoltar = new Button();
+
+    public Button getButVoltar() {
+        return butVoltar;
+    }
+
+    public void setButVoltar(Button b) {
+        this.butVoltar = b;
+    }
+
+    private Button butEliminar = new Button();
+
+    public Button getButEliminar() {
+        return butEliminar;
+    }
+
+    public void setButEliminar(Button b) {
+        this.butEliminar = b;
+    }
     /**
      * <p>Construct a new Page bean instance.</p>
      */
@@ -2250,6 +2301,66 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
+            getSessionBean1().setFromAnaliseDeletion(false);
+               String confirmacao_analise = (String)getExternalContext().getRequestParameterMap().get("confirmacao_analise");                           
+               if(confirmacao_analise != null)
+               {
+                   if(confirmacao_analise.matches("yes"))
+                   {                
+                        hidConfDelete.setValue("");                                  
+                        try
+                        {
+                            deleteAnalise();        
+                            //booMsgQuizDeleted = true;
+                            getSessionBean1().setFromAnaliseDeletion(true);                            
+                            getSessionBean1().setMsg("An&aacute;lise eliminada !");
+                            AnalisesDataProvider adp = new AnalisesDataProvider();                            
+                            Utilizador u = getSessionBean1().getCurrentUser();
+                            if(u.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_SIPRP)
+                            {
+
+                                try
+                                {
+                                    getExternalContext().redirect("FormDirSiprp.jsp");                   
+                                }
+                                catch(Exception ex1)
+                                {
+                                    ex1.printStackTrace();
+                                }                                                                                                      
+                            }
+                            else if(u.getTipo().intValue() == Global.TIPO_UTILIZADOR_HS)
+                            {
+
+                                try
+                                {
+                                    getExternalContext().redirect("FormHS.jsp");                   
+                                }
+                                catch(Exception ex1)
+                                {
+                                    ex1.printStackTrace();
+                                }                                                                                                                                      
+                            }
+
+                        }
+                        catch(Exception ex)
+                        {
+                            getSessionBean1().setMsg("Erro na elimina&ccedil;&atilde;o da an&aacute;lise");            
+                            ex.printStackTrace();
+//                            try
+//                            {
+//                                getExternalContext().redirect("EditarQuestionario.jsp");                   
+//                            }
+//                            catch(Exception ex1)
+//                            {
+//                                ex1.printStackTrace();
+//                            }                                                                      
+                        }
+                   }                              
+                   else if(confirmacao_analise.matches("no"))
+                   {
+                       hidConfDelete.setValue("");                                                     
+                   }                   
+               }        
     }
     
     /**
@@ -2260,6 +2371,7 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
      * <code>preprocess()</code>, or <code>prerender()</code> methods (or
      * acquired during execution of an event handler).</p>
      */
+    
     public void destroy() {
     }
 
@@ -2323,6 +2435,19 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
 
     private void initializePage()
     {
+        Utilizador u = getSessionBean1().getCurrentUser();
+        if(! (u.getTipo().intValue() == Global.TIPO_UTILIZADOR_DIRECTOR_SIPRP || u.getTipo().intValue() == Global.TIPO_UTILIZADOR_HS))
+        {
+            butEliminar.setRendered(false);
+        }
+        else
+        {
+            AnaliseAcidente a = getSessionBean1().getCurrentAnalise();            
+            if(a.getEstado().intValue() == Global.ESTADO_CONCLUIDO)
+            {
+                butEliminar.setRendered(false);                
+            }
+        }
         fillPage();
         //fillImages();
     }
@@ -4171,7 +4296,7 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
             st = new StaticText();
             st.setId("stVerificacao2");
             st.setEscape(false);
-            txtVer = "Verificado por " + a.getNome_resp_consolidacao() + " (T&eacute;cnico de HST) a ";
+            txtVer = "Verificado por " + a.getNome_resp_consolidacao() + " (T&eacute;cnico de SHST) a ";
             //txtVer += a.getData_assinatura_rh();        
             try
             {
@@ -4326,7 +4451,7 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
         {
             return "form_seguranca";
         }
-        else if(navFrom.matches("FormRh"))
+        else if(navFrom.matches("FormRH"))
         {
             System.out.println("FROM RH ");            
             return "form_rh";
@@ -4436,5 +4561,100 @@ public class ViewAnaliseAcidenteTrabalho extends AbstractPageBean {
         return "user";
     }
 
+    public String lnkAjuda_action() {
+        // TODO: Replace with your code
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+//         String pdfFolderPath = theApplicationsServletContext.getRealPath(Global.PDF_FOLDER_URL); 
+//         String pdfFilePath = pdfFolderPath + "/Ajuda.pdf";  
+//         
+//         Global global = new Global();
+//         try
+//         {
+//            global.showPdf(pdfFilePath);
+//         }
+//         catch(Exception ex)
+//         {
+//             ex.printStackTrace();
+//         }                
+        return null;
+    }
+
+    public String butEliminar_action() {
+        // TODO: Process the button click action. Return value is a navigation
+        // case name where null will return to the same page.
+        hidConfDelete.setValue("apagar");          
+        return null;
+    }
+    
+    private void deleteAnalise()
+    {
+        System.out.println("DELETE ANALISE");
+        AnaliseAcidente a = getSessionBean1().getCurrentAnalise();
+        
+        AnalisesDataProvider adp = new AnalisesDataProvider();
+        
+        try
+        {
+            adp.deleteAnaliseAcidente(a.getId());
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+        }  
+        
+//        try
+//        {
+//            adp.deleteRecomendacoesByAnalise(a.getId());
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }
+//        
+//        try
+//        {
+//            adp.deleteMedidasByAnalise(a.getId());
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }  
+//        
+//        try
+//        {
+//            adp.deleteAnaliseAcidente(a.getId());
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }  
+//        
+//        try
+//        {
+//            adp.deleteAcidentado(a.getAcidentado_id());
+//        }
+//        catch(Exception ex)
+//        {
+//            ex.printStackTrace();
+//        }
+//        
+//        
+//        //delete images folder
+//        String folderName = a.getAnalise_nr().substring(0,2) + a.getAnalise_nr().substring(3);
+//        
+//        ServletContext theApplicationsServletContext =
+//             (ServletContext) this.getExternalContext().getContext();
+////         String imageFileFolder = theApplicationsServletContext.getRealPath(Global.IMAGE_FOLDER + "/" + folderName);                
+//         String imageFileFolder = Global.IMAGE_FOLDER + "/" + folderName;                             
+//        File f = new File(imageFileFolder);
+//        if( f.exists() )        
+//        {
+//            Global global = new Global();
+//            global.deleteFolderFiles(f);
+//            f.delete();
+//        }
+    }
+
 }
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java
index d8ee6ca4..c5979259 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java
@@ -26,10 +26,12 @@ import analiseacidentestrabalho.Trabalhador;
 import com.sun.rave.web.ui.model.Option;
 import global.Global;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.ListIterator;
 import java.util.StringTokenizer;
 import utils.Strings;
@@ -95,11 +97,11 @@ public class AnalisesDataProvider {
         String sql = "";
         if(responsavel_loja.matches("y"))
         {
-            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_SEG + " OR (averiguacao_posterior = 'y' AND averiguacao_obs = '')" + " OR estado = " + Global.ESTADO_ASSINATURA_SEG + ")" + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                
+            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_SEG + " OR (averiguacao_posterior = 'y' AND averiguacao_obs = '')" + " OR estado = " + Global.ESTADO_ASSINATURA_SEG + ")" + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                
         }
         else
         {
-            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_SEG + " OR (averiguacao_posterior = 'y' AND averiguacao_obs = ''))" + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";
+            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_SEG + " OR (averiguacao_posterior = 'y' AND averiguacao_obs = ''))" + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";
         }
 
         ResultSet rs = st.executeQuery(sql);
@@ -113,11 +115,11 @@ public class AnalisesDataProvider {
         String sql = "";
         if(responsavel_loja.matches("y"))
         {
-            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_RH1 +  " OR estado = " + Global.ESTADO_RH2 +  " OR estado = " + Global.ESTADO_ASSINATURA_RH + ") AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                    
+            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_RH1 +  " OR estado = " + Global.ESTADO_RH2 +  " OR estado = " + Global.ESTADO_ASSINATURA_RH + ") AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                    
         }
         else
         {
-            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_RH1 + " OR estado = " + Global.ESTADO_RH2 + ") AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                    
+            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_RH1 + " OR estado = " + Global.ESTADO_RH2 + ") AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                    
         }
 
         ResultSet rs = st.executeQuery(sql);
@@ -128,7 +130,7 @@ public class AnalisesDataProvider {
     public ArrayList getAnalisesActuaisHsList(Integer estabelecimento_id) throws Exception
     {
         Statement st = createStatement();
-        String sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_HS + " OR estado = " + Global.ESTADO_FECHAR + " OR estado = " + Global.ESTADO_CONSOLIDACAO + ")" + " ORDER BY analise_nr"; //AND estabelecimento_id = " + estabelecimento_id;
+        String sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_HS + " OR estado = " + Global.ESTADO_FECHAR + " OR estado = " + Global.ESTADO_CONSOLIDACAO + ")" + " AND apagada = 'n' ORDER BY analise_nr"; //AND estabelecimento_id = " + estabelecimento_id;
         ResultSet rs = st.executeQuery(sql);
         ArrayList list = fillAnaliseFields(rs);
         return list;
@@ -151,16 +153,15 @@ public class AnalisesDataProvider {
         
         if(responsavel_loja.matches("y"))
         {
-            sql ="SELECT * FROM analises_acidentes WHERE estabelecimento_id = " + estabelecimento_id + " AND (estado > " + Global.ESTADO_SEG + " AND estado < " + Global.ESTADO_ASSINATURA_SEG + " AND (averiguacao_posterior = 'n' OR (averiguacao_posterior = 'y' AND averiguacao_obs <> '')) OR (estado > " + Global.ESTADO_ASSINATURA_SEG + " AND estado < " + Global.ESTADO_CONCLUIDO + "))" + " ORDER BY analise_nr";                                    
+            sql ="SELECT * FROM analises_acidentes WHERE estabelecimento_id = " + estabelecimento_id + " AND (estado > " + Global.ESTADO_SEG + " AND estado < " + Global.ESTADO_ASSINATURA_SEG + " AND (averiguacao_posterior = 'n' OR (averiguacao_posterior = 'y' AND averiguacao_obs <> '')) OR (estado > " + Global.ESTADO_ASSINATURA_SEG + " AND estado < " + Global.ESTADO_CONCLUIDO + "))" + " AND apagada = 'n' ORDER BY analise_nr";                                    
 //            sql ="SELECT * FROM analises_acidentes WHERE estabelecimento_id = " + estabelecimento_id + " AND ((estado = 7 and ass_resp_seg = 'y') OR (estado > 1 AND estado < 7 AND (averiguacao_posterior = 'n' OR (averiguacao_posterior = 'y' AND averiguacao_obs <> ''))) OR (estado > 7 AND estado < 10))";                        
         }
         else
         {
 //            sql ="SELECT * FROM analises_acidentes WHERE estabelecimento_id = " + estabelecimento_id + " AND ((estado > " + Global.ESTADO_SEG + " AND estado < 8 AND (averiguacao_posterior = 'n' OR (averiguacao_posterior = 'y' AND averiguacao_obs <> ''))) OR (estado > 7 AND estado < 10))";                                    
-            sql ="SELECT * FROM analises_acidentes WHERE estabelecimento_id = " + estabelecimento_id + " AND ((estado > " + Global.ESTADO_SEG + " AND estado < " + Global.ESTADO_FECHAR + " AND (averiguacao_posterior = 'n' OR (averiguacao_posterior = 'y' AND averiguacao_obs <> ''))) OR estado = " + Global.ESTADO_FECHAR + ")" + " ORDER BY analise_nr";                                               
+            sql ="SELECT * FROM analises_acidentes WHERE estabelecimento_id = " + estabelecimento_id + " AND ((estado > " + Global.ESTADO_SEG + " AND estado < " + Global.ESTADO_FECHAR + " AND (averiguacao_posterior = 'n' OR (averiguacao_posterior = 'y' AND averiguacao_obs <> ''))) OR estado = " + Global.ESTADO_FECHAR + ")" + " AND apagada = 'n' ORDER BY analise_nr";                                               
         }
 
-        System.out.println("SEG SEGUIMENTO SQL : " + sql);
         ResultSet rs = st.executeQuery(sql);
         ArrayList list = fillAnaliseFields(rs); 
         return list;
@@ -171,9 +172,10 @@ public class AnalisesDataProvider {
         Statement st = createStatement();
         String sql = null; 
         
-        sql ="SELECT * FROM analises_acidentes WHERE estado < " + Global.ESTADO_HS + " OR (estado > " + Global.ESTADO_HS + " AND estado < " + Global.ESTADO_CONSOLIDACAO + ") OR (estado > " + Global.ESTADO_CONSOLIDACAO + " AND estado < " + Global.ESTADO_FECHAR + ")" + " ORDER BY analise_nr"; // AND estabelecimento_id = " + estabelecimento_id;            
+        sql ="SELECT * FROM analises_acidentes WHERE (estado < " + Global.ESTADO_HS + " OR (estado > " + Global.ESTADO_HS + " AND estado < " + Global.ESTADO_CONSOLIDACAO + ") OR (estado > " + Global.ESTADO_CONSOLIDACAO + " AND estado < " + Global.ESTADO_FECHAR + "))" + " AND apagada = 'n' ORDER BY analise_nr"; // AND estabelecimento_id = " + estabelecimento_id;            
         
         ResultSet rs = st.executeQuery(sql);
+        System.out.println("SEGUIMENTO HS SQL : " + sql);
         ArrayList list = fillAnaliseFields(rs); 
         return list;
     }        
@@ -187,11 +189,11 @@ public class AnalisesDataProvider {
         {
 //            sql ="SELECT * FROM analises_acidentes WHERE (estado = 1 OR estado = 3 OR estado = 6 OR (estado = 7 AND estado_assinatura < 2) OR estado = 9) AND estabelecimento_id = " + estabelecimento_id;                        
 //            sql ="SELECT * FROM analises_acidentes WHERE (estado = 1 OR estado = 3 OR estado = 6 OR (estado = 7 AND estado_assinatura < 2) OR (estado = 7 and ass_resp_rh = 'y') OR estado = 9) AND estabelecimento_id = " + estabelecimento_id;                                    
-            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_SEG + " OR estado = " + Global.ESTADO_HS + " OR estado = " + Global.ESTADO_CONSOLIDACAO  + " OR estado = " + Global.ESTADO_ASSINATURA_SEG + " OR estado = " + Global.ESTADO_FECHAR + ") AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                
+            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_SEG + " OR estado = " + Global.ESTADO_HS + " OR estado = " + Global.ESTADO_CONSOLIDACAO  + " OR estado = " + Global.ESTADO_ASSINATURA_SEG + " OR estado = " + Global.ESTADO_FECHAR + ") AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                
         }
         else
         {
-            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_SEG + " OR estado = " + Global.ESTADO_HS + " OR estado = " + Global.ESTADO_CONSOLIDACAO + " OR estado = " + Global.ESTADO_ASSINATURA_SEG + " OR estado = " + Global.ESTADO_ASSINATURA_RH + " OR estado = " + Global.ESTADO_FECHAR + ") AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                    
+            sql ="SELECT * FROM analises_acidentes WHERE (estado = " + Global.ESTADO_SEG + " OR estado = " + Global.ESTADO_HS + " OR estado = " + Global.ESTADO_CONSOLIDACAO + " OR estado = " + Global.ESTADO_ASSINATURA_SEG + " OR estado = " + Global.ESTADO_ASSINATURA_RH + " OR estado = " + Global.ESTADO_FECHAR + ") AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                    
         }
 
         
@@ -205,7 +207,7 @@ public class AnalisesDataProvider {
         Statement st = createStatement();
         String sql = null; 
         
-        sql ="SELECT * FROM analises_acidentes WHERE estado < 5 OR (estado = 6 AND estado_assinatura <> 2) OR (estado = 6 AND estado_assinatura = 2  AND ass_med = 'y') OR (estado > 6 AND estado < 9) AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";            
+        sql ="SELECT * FROM analises_acidentes WHERE estado < 5 OR (estado = 6 AND estado_assinatura <> 2) OR (estado = 6 AND estado_assinatura = 2  AND ass_med = 'y') OR (estado > 6 AND estado < 9) AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";            
         
         ResultSet rs = st.executeQuery(sql);
         ArrayList list = fillAnaliseFields(rs); 
@@ -217,7 +219,7 @@ public class AnalisesDataProvider {
         Statement st = createStatement();
         String sql = null; 
         
-        sql ="SELECT * FROM analises_acidentes WHERE estado < " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+        sql ="SELECT * FROM analises_acidentes WHERE estado < " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
         
         ResultSet rs = st.executeQuery(sql);
         ArrayList list = fillAnaliseFields(rs); 
@@ -229,7 +231,7 @@ public class AnalisesDataProvider {
         Statement st = createStatement();
         String sql = null; 
         
-        sql ="SELECT * FROM analises_acidentes WHERE estado < " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+        sql ="SELECT * FROM analises_acidentes WHERE estado < " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
         
         ResultSet rs = st.executeQuery(sql);
         ArrayList list = fillAnaliseFields(rs); 
@@ -243,11 +245,11 @@ public class AnalisesDataProvider {
         
         if(estabelecimento_id == null)
         {
-            sql ="SELECT * FROM analises_acidentes WHERE estado < " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";            
+            sql ="SELECT * FROM analises_acidentes WHERE estado < " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";            
         }
         else
         {
-            sql ="SELECT * FROM analises_acidentes WHERE estado < " +  Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                        
+            sql ="SELECT * FROM analises_acidentes WHERE estado < " +  Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                        
         }
 
         
@@ -264,11 +266,11 @@ public class AnalisesDataProvider {
         String sql = "";
         if(estabelecimento_id == null)
         {
-            sql ="SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+            sql ="SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
         }
         else
         {
-            sql ="SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";            
+            sql ="SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";            
         }
 
         ResultSet rs = st.executeQuery(sql);
@@ -280,7 +282,7 @@ public class AnalisesDataProvider {
     public ArrayList getAnalisesConcluidasHsList() throws Exception
     {
         Statement st = createStatement();
-        String sql ="SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+        String sql ="SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
         ResultSet rs = st.executeQuery(sql);
         ArrayList list = fillAnaliseFields(rs);        
 
@@ -320,22 +322,22 @@ public class AnalisesDataProvider {
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome +  "%') AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome +  "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome +  "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                                                            
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome +  "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                                                            
                         }
                     }
                     else if(por != null)
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                                    
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                                    
                         }
 
                     }                    
@@ -343,22 +345,22 @@ public class AnalisesDataProvider {
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                            
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente = '" + data_acidente + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                            
                         }
                     }
                     else
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente = '" + data_acidente + "' AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente = '" + data_acidente + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente = '" + data_acidente + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                    
+                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente = '" + data_acidente + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                    
                         }
                     }
                 }
@@ -374,22 +376,22 @@ public class AnalisesDataProvider {
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                                                            
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                                                            
                         }
                     }
                     else if(por != null)
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                                    
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                                    
                         }
 
                     }                                        
@@ -397,22 +399,22 @@ public class AnalisesDataProvider {
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                            
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                            
                         }
                     }
                     else
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                            
+                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                            
                         }
 
                     }                    
@@ -431,22 +433,22 @@ public class AnalisesDataProvider {
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                                                           
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                                                           
                         }
                     }
                     else if(por != null)
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND numero_mecanografico LIKE '%" + por + "%' AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND numero_mecanografico LIKE '%" + por + "%' AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND numero_mecanografico LIKE '%" + por + "%' AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                                    
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND numero_mecanografico LIKE '%" + por + "%' AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                                    
                         }
 
                     }                                        
@@ -454,22 +456,22 @@ public class AnalisesDataProvider {
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                   
+                            sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                   
                         }
                     }
                     else
                     {
                         if(estabelecimento_id == null)
                         {
-                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                         }
                         else
                         {
-                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                    
+                            sql = "SELECT * FROM analises_acidentes WHERE data_acidente >= '" + data_acidente_from + "' AND data_acidente <= '" + data_acidente_to + "' AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                    
                         }
                     }
             }
@@ -480,22 +482,22 @@ public class AnalisesDataProvider {
             {
                 if(estabelecimento_id == null)                
                 {
-                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                 }
                 else
                 {
-                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                                            
+                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND (numero_mecanografico LIKE '%" + por + "%' OR nome LIKE '%" + nome + "%') AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                                            
                 }
             }
             else if(por != null)
             {
                 if(estabelecimento_id == null)   
                 {
-                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                 }
                 else
                 {
-                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                            
+                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND numero_mecanografico LIKE '%" + por + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                            
                 }
 
             }
@@ -503,11 +505,11 @@ public class AnalisesDataProvider {
             {
                 if(estabelecimento_id == null)   
                 {
-                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                 }
                 else
                 {
-                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                            
+                    sql = "SELECT * FROM analises_acidentes, acidentados WHERE acidentado_id = acidentados.id AND nome LIKE '%" + nome + "%'  AND estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                            
                 }
 
             }
@@ -515,11 +517,11 @@ public class AnalisesDataProvider {
             {
                 if(estabelecimento_id == null)   
                 {
-                    sql = "SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " ORDER BY analise_nr";
+                    sql = "SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " AND apagada = 'n' ORDER BY analise_nr";
                 }
                 else
                 {
-                    sql = "SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " ORDER BY analise_nr";                                                                            
+                    sql = "SELECT * FROM analises_acidentes WHERE estado = " + Global.ESTADO_CONCLUIDO + " AND estabelecimento_id = " + estabelecimento_id + " AND apagada = 'n' ORDER BY analise_nr";                                                                            
                 }
 
             }
@@ -545,16 +547,17 @@ public class AnalisesDataProvider {
 	{
 	    AnaliseAcidente a = new AnaliseAcidente();
 	    a.setId(new Integer(rs.getInt("id")));
-            //System.out.println("ANALISE ID : " + a.getId());            
+
             nr++;
             a.setNr(new Integer(nr));
             a.setData_acidente(rs.getDate("data_acidente"));
             a.setEmpresa_id(new Integer(rs.getInt("empresa_id")));
             a.setEstabelecimento_id(new Integer(rs.getInt("estabelecimento_id")));
-            String sqllocal1 = "SELECT nome_plain FROM estabelecimentos WHERE id = " + a.getEstabelecimento_id();
+            String sqllocal1 = "SELECT nome FROM estabelecimentos WHERE id = " + a.getEstabelecimento_id();
             ResultSet rslocal1 = stlocal1.executeQuery(sqllocal1);
             rslocal1.first();
-            a.setNome_estabelecimento(rslocal1.getString("nome_plain"));
+            a.setNome_estabelecimento( utils.Utils.unicodeToHTML( rslocal1.getString("nome") ) );
+            
             a.setEstado(new Integer(rs.getInt("estado")));
             a.setEstado_assinatura(new Integer(rs.getInt("estado_assinatura")));
             a.setFase(getFase(a.getEstado().intValue()));
@@ -1261,7 +1264,7 @@ public class AnalisesDataProvider {
         //String seq_str = new Integer(10000 + newId.intValue()).toString();
         int i_analise_nr = c.getLast_analise_nr().intValue() + 1;
         c.setLast_analise_nr(new Integer(i_analise_nr));
-        updateControle(c);
+        //updateControle(c);
         String seq_str = new Integer(10000 + i_analise_nr).toString();        
         String ano_str = new Integer(ano).toString();
         String analise_nr = ano_str.substring(2) + "/" + seq_str.substring(1);
@@ -1329,7 +1332,7 @@ public class AnalisesDataProvider {
 //        sql += a.getNr_relatorio_acidente_outros_colaboradores4() + ")";
         System.out.println("SQL  : " + sql);              
         st.execute(sql);
-        
+        updateControle(c);        
         return a;
     }
     
@@ -1588,11 +1591,27 @@ public class AnalisesDataProvider {
     
     public void deleteRecomendacoesByAnalise(Integer analise_id) throws Exception
     {
+        System.out.println("DELETE RECOMENDACOES");        
         Statement st = createStatement();            
         String sql = "DELETE FROM recomendacoes WHERE analise_id = " + analise_id;
 	st.execute(sql);            
     }
     
+    public void deleteAnaliseAcidente(Integer analise_id) throws Exception
+    {
+        Statement st = createStatement();            
+        //String sql = "DELETE FROM analises_acidentes WHERE id = " + analise_id;
+        String sql = "UPDATE analises_acidentes SET apagada = 'y' WHERE id = " + analise_id;
+	st.execute(sql);            
+    }
+    
+    public void deleteAcidentado(Integer acidentado_id) throws Exception
+    {
+        Statement st = createStatement();            
+        String sql = "DELETE FROM acidentados WHERE id = " + acidentado_id;
+	st.execute(sql);                    
+    }
+    
     public ArrayList getRecomendacoesByAnalise(Integer analiseId) throws Exception
     {
         ArrayList list = new ArrayList();
@@ -2107,7 +2126,7 @@ public class AnalisesDataProvider {
             }
             else if(estado == Global.ESTADO_ASSINATURA_RH)
             {
-                return "FASE 7 - RH - VERIFICAÇÃO RH + IMPRESSÃO";                
+                return "FASE 7 - RH - VERIFICAÇÃO RH";                
             }
             else if(estado == Global.ESTADO_FECHAR)
             {
@@ -2116,6 +2135,26 @@ public class AnalisesDataProvider {
             return null;
     }
     
+    public HashMap getMetaData(String table) throws Exception
+    {
+         Statement st = createStatement();
+         String sql = "select * from " + table;
+
+         ResultSet rs = st.executeQuery(sql);
+         ResultSetMetaData rsmd = rs.getMetaData();
+
+         HashMap hash = new HashMap();
+         int cols = rsmd.getColumnCount();
+
+         for(int i=0; i < cols; i++)
+         {
+             String field = rsmd.getColumnName(i + 1);
+             int len = rsmd.getPrecision(i+1);
+             hash.put(field, new Integer(len));
+         }
+         return hash;
+    }    
+    
     private Statement createStatement()
     {
         Db db = new Db();
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/Dblocal.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/Dblocal.java
index 35445a1f..01b72382 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/db/Dblocal.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/db/Dblocal.java
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpSession;
  * @author lluis
  */
 public class Dblocal {
-    //String connectionURL = "jdbc:postgresql://storage:5432/siprp_local"; //testes
+    //String connectionURL = "jdbc:postgresql://storage/siprp_local"; //testes
     String connectionURL = "jdbc:postgresql://localhost:5436/siprp_local_3";    
     String User = "postgres";
     String Pass = null;
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/UtilizadoresDataProvider.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/UtilizadoresDataProvider.java
index e9e6411f..6dac62c1 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/db/UtilizadoresDataProvider.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/db/UtilizadoresDataProvider.java
@@ -171,18 +171,23 @@ public class UtilizadoresDataProvider {
 	return u;
     }    
     
-    public ArrayList getUtilizadoresListByTipo(Integer tipo, String responsavel_loja) throws Exception
+    public ArrayList getUtilizadoresListByTipo(Integer tipo, String responsavel_loja, Integer estabelecimento_id) throws Exception
     {
         ArrayList list = new ArrayList();
         Statement st = createStatement();
         String sql = "";
+        String estabelecimento_constraint = "";
+        if(tipo.intValue() == Global.TIPO_UTILIZADOR_RH || tipo.intValue() == Global.TIPO_UTILIZADOR_SEGURANCA)
+        {
+            estabelecimento_constraint = " AND estabelecimento_id = " + estabelecimento_id;
+        }
         if(responsavel_loja.matches("y"))
         {
-            sql = "SELECT * FROM utilizadores WHERE responsavel_loja = 'y' AND tipo = " + tipo;            
+            sql = "SELECT * FROM utilizadores WHERE activo = 'y' AND apagado = 'n' AND responsavel_loja = 'y' AND tipo = " + tipo + estabelecimento_constraint;            
         }
         else
         {
-            sql = "SELECT * FROM utilizadores WHERE tipo = " + tipo;            
+            sql = "SELECT * FROM utilizadores WHERE activo = 'y' AND apagado = 'n' AND tipo = " + tipo + estabelecimento_constraint;            
         }
 
         ResultSet rs = st.executeQuery(sql);
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java b/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java
index 77dac1ad..03b6915b 100755
--- a/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/global/Global.java
@@ -14,6 +14,10 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import javax.faces.context.FacesContext;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  *
@@ -52,10 +56,13 @@ public class Global {
     public final static String SERVIDOR_SMTP = "smtp.netcabo.pt";
     public final static String SERVIDOR_SMTP_PASSWORD = "EVOLUTE";    
     public final static String ENDERECO_ENVIO = "acidentes.auchan@siprp.pt";
+    //public final static String ENDERECO_ENVIO = "lluis@evolute.pt";    //testes
     
     public final static String IMAGE_FOLDER = "/home/siprp/imagens_acidentes";    
     //public final static String IMAGE_FOLDER = "/home/lluis/imagens_acidentes";        
-    public final static String RESOURCES_IMAGE_FOLDER = "/resources/images";       
+    public final static String RESOURCES_IMAGE_FOLDER = "/resources/images";  
+    
+    public static final String PDF_FOLDER_URL = "/resources/pdf";     
     /** Creates a new instance of Global */
     public Global() {
     }
@@ -94,4 +101,34 @@ public class Global {
         }
     }
     
+    public void showPdf(String pdfFilePath) throws Exception
+    {
+        
+         File pdfFile = new File(pdfFilePath);
+         FileInputStream fis = new FileInputStream(pdfFile);   
+         byte[] buf = new byte[(int)pdfFile.length()];  
+         while ((fis.read(buf)) > 0)
+         {  
+             //fos.write(buf, 0, buf.length);  
+         }  
+         fis.close();
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        if (!ctx.getResponseComplete())
+        {         
+            HttpServletResponse response = (HttpServletResponse)ctx.getExternalContext().getResponse();
+            String contentType = "application/pdf";            
+            response.setContentType(contentType);
+            response.setHeader("Content-Disposition","attachment;filename=\"" + "Ajuda.pdf" + "\"");
+
+            ServletOutputStream out = response.getOutputStream();
+
+            //out.write(model.getInfo().getBytes());
+            out.write(buf, 0, buf.length); 
+            out.flush();
+            out.close();
+            ctx.responseComplete();  
+            ctx.release();
+        }
+    }    
+    
 }
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java b/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java
index 27393896..41576f84 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/utils/Utils.java
@@ -149,8 +149,13 @@ public class Utils {
     
     public static boolean isValidEmail(String email){
         boolean res = true;
-        
+        System.out.println("IS VALID EMAIL");
         int indexOfAtChar=email.indexOf("@");
+        
+        if(!isValidEmailCharacters(email))
+        {
+            return false;
+        }
 
         if(indexOfAtChar > 0)
         {
@@ -169,7 +174,148 @@ public class Utils {
             res = false;
         }        
         return res;
-    }        
+    }   
+    
+    private static boolean isValidEmailCharacters(String email)
+    {
+        if(email.indexOf("à") != -1)
+        {
+            return false;
+        }
+        else if(email.indexOf("á") != -1)
+        {
+            return false;
+        }
+        else if(email.indexOf("ã") != -1)
+        {
+            return false;
+        }        
+        else if(email.indexOf("â") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("è") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("é") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("ê") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("ì") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("í") != -1)
+        {
+            return false;
+        }                        
+        else if(email.indexOf("ò") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("ó") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("ô") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("õ") != -1)
+        {
+            return false;
+        }                        
+        else if(email.indexOf("ù") != -1)
+        {
+            return false;
+        }                        
+        else if(email.indexOf("ú") != -1)
+        {
+            return false;
+        }                       
+        else if(email.indexOf("û") != -1)
+        {
+            return false;
+        }                               
+        else if(email.indexOf("ç") != -1)
+        {
+            return false;
+        }                        
+        else if(email.indexOf("À") != -1)
+        {
+            return false;
+        }
+        else if(email.indexOf("Á") != -1)
+        {
+            return false;
+        }
+        else if(email.indexOf("Ã") != -1)
+        {
+            return false;
+        }        
+        else if(email.indexOf("Â") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("È") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("É") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("Ê") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("Ì") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("Í") != -1)
+        {
+            return false;
+        }                        
+        else if(email.indexOf("Ò") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("Ó") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("Ô") != -1)
+        {
+            return false;
+        }                
+        else if(email.indexOf("Õ") != -1)
+        {
+            return false;
+        }                        
+        else if(email.indexOf("Ù") != -1)
+        {
+            return false;
+        }                        
+        else if(email.indexOf("Ú") != -1)
+        {
+            return false;
+        }                       
+        else if(email.indexOf("Û") != -1)
+        {
+            return false;
+        }                               
+        else if(email.indexOf("Ç") != -1)
+        {
+            return false;
+        }                                
+        return true;
+    }
     
     public static String dateToYYYYMMDD(Date ddate)
     {
diff --git a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
index 4dbf4591..b195b1ab 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp
@@ -9,19 +9,15 @@
                     <script>
 			function showPdf()
 			{
-                            /*
-                            var hid = document.getElementById("form1:hidPdf");
-                            var url = "./resources/pdfs/" + hid.value + "/" + hid.value + ".pdf";
 			    sOptions = " width = '" + screen.availWidth + "'";
 			    sOptions += " height= '" + screen.availHeight + "'";
 			    var wOpen;
-     			    wOpen = window.open(url,'', sOptions );
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
 			   wOpen.focus();
 			   wOpen.moveTo(0,0);
 			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
-                           */
-			}  
-                        
+			}                        
+
                         function showHideEspecif(chk)
                         {
 
@@ -114,6 +110,12 @@
                             }
                         }
                         
+                        
+                        function disableButton(btn)
+                        {
+                           btn.disabled = true;
+                        }
+                        
                     </script>
                     <style>
                         table.restricoes td {border-bottom: 1px solid #000000}
@@ -123,32 +125,33 @@
                 <ui:body binding="#{AnaliseAcidenteTrabalho.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{AnaliseAcidenteTrabalho.form1}" id="form1">
                         <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridBase1}" columns="1" id="gridBase1"
-                            style="height: 39px; left: 0px; top: 24px; position: absolute; width: 100%" styleClass="centerBlock">
+                            style="height: 39px; left: 0px; top: 20px; position: absolute; width: 100%" styleClass="centerBlock">
                             <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridLayout1}" columns="1" id="gridLayout1" style="height: 24px; width: 80%"
                                 styleClass="centerBlock" width="456">
                                 <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridHeader1}" columnClasses="gridColRightBottom" columns="1" id="gridHeader1"
                                     style="height: 24px; width: 100%" width="624">
-                                    <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel56}" id="groupPanel56" style="height: 24px; width: 310px">
+                                    <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel56}" id="groupPanel56" style="height: 24px">
                                         <ui:staticText binding="#{AnaliseAcidenteTrabalho.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText165}" escape="false" id="staticText165" text="   "/>
+                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText165}" escape="false" id="staticText165" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;"/>
                                         <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkAnalisesAcidente_action}"
                                             binding="#{AnaliseAcidenteTrabalho.lnkAnalisesAcidente}" id="lnkAnalisesAcidente" text="analisar acidentes"/>
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText161}" escape="false" id="staticText161" text=" | "/>
+                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText161}" escape="false" id="staticText161" text="|"/>
                                         <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkNewUser_action}" binding="#{AnaliseAcidenteTrabalho.lnkNewUser1}"
-                                            disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText21}" escape="false" id="staticText21" text=" | "/>
+                                            disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
+                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText21}" escape="false" id="staticText21" text="|"/>
                                         <ui:hyperlink binding="#{AnaliseAcidenteTrabalho.lnkEditUser}" disabled="true" id="lnkEditUser" text="alterar dados utilizador"/>
-                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText166}" escape="false" id="staticText166" text=" | "/>
+                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText166}" escape="false" id="staticText166" text="|"/>
+                                        <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkAjuda_action}" binding="#{AnaliseAcidenteTrabalho.lnkAjuda1}"
+                                            id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda"/>
+                                        <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText8}" id="staticText8" style="width: 0px" text="|"/>
                                         <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkLogout_action}" binding="#{AnaliseAcidenteTrabalho.lnkLogout}"
                                             id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                     <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel114}" columnClasses="gridColLeft, gridColRightBottom" columns="3"
-                                        id="gridPanel114" style="border: 1px solid #000000; height: 24px; width: 100%" width="312">
-                                        <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel57}" id="groupPanel57" style="height: 24px; width: 216px">
-                                            <ui:image binding="#{AnaliseAcidenteTrabalho.image27}" id="image27" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                        </ui:panelGroup>
+                                        id="gridPanel114" style="border: 1px solid #000000; width: 100%" width="312">
+                                        <ui:image binding="#{AnaliseAcidenteTrabalho.image27}" id="image27" url="/resources/images/SIPRP_logo_small.jpg"/>
                                         <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel115}" columnClasses="gridColCenter" columns="1"
-                                            id="gridPanel115" style="height: 24px; width: 100%" width="408">
+                                            id="gridPanel115" style="width: 100%" width="408">
                                             <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText168}" escape="false" id="staticText168"
                                                 style="font-weight: bold; height: 24px; width: 336px" text="AN&amp;Aacute;LISE DE ACIDENTE DE TRABALHO"/>
                                             <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel116}" columns="2" id="gridPanel116" style="height: 24px" width="408">
@@ -217,18 +220,17 @@
                                                 <ui:tableColumn binding="#{AnaliseAcidenteTrabalho.tableColumn1}" headerText="POR" id="tableColumn1"
                                                     sort="numero_mecanografico" style="width: 10%" width="1035">
                                                     <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkPOR_action}" binding="#{AnaliseAcidenteTrabalho.lnkPOR}"
-                                                        id="lnkPOR" style="width: 96px; height: 24px" text="#{currentRow.value['numero_mecanografico']}"/>
+                                                        id="lnkPOR" style="height: 24px" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{AnaliseAcidenteTrabalho.tableColumn2}" headerText="Nome" id="tableColumn2"
                                                     sort="nome" style="width: 75%">
                                                     <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkNomeTrabalhador_action}"
-                                                        binding="#{AnaliseAcidenteTrabalho.lnkNomeTrabalhador}" id="lnkNomeTrabalhador"
-                                                        style="width: 96px; height: 24px" text="#{currentRow.value['nome']}"/>
+                                                        binding="#{AnaliseAcidenteTrabalho.lnkNomeTrabalhador}" id="lnkNomeTrabalhador" style="height: 24px" text="#{currentRow.value['nome']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{AnaliseAcidenteTrabalho.tableColumn3}" headerText="Estabelecimento" id="tableColumn3" style="width: 15%">
                                                     <ui:hyperlink action="#{AnaliseAcidenteTrabalho.lnkEstabelecimentoTrabalhador_action}"
                                                         binding="#{AnaliseAcidenteTrabalho.lnkEstabelecimentoTrabalhador}" id="lnkEstabelecimentoTrabalhador"
-                                                        style="width: 96px; height: 24px" text="#{currentRow.value['estabelecimento']}"/>
+                                                        style="height: 24px" text="#{currentRow.value['estabelecimento']}"/>
                                                 </ui:tableColumn>
                                             </ui:tableRowGroup>
                                         </ui:table>
@@ -484,7 +486,7 @@
                                             style="height: 24px; width: 100%" width="408">
                                             <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel50}" id="groupPanel50" style="height: 24px">
                                                 <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText98}" escape="false" id="staticText98"
-                                                    style="height: 24px; width: 144px" styleClass="labelBold" text="Averiguador:&amp;nbsp;"/>
+                                                    style="height: 24px" styleClass="labelBold" text="Averiguador:&amp;nbsp;"/>
                                                 <ui:textField binding="#{AnaliseAcidenteTrabalho.txtAveriguador}" id="txtAveriguador" style="height: 24px; width: 334px"/>
                                             </ui:panelGroup>
                                         </h:panelGrid>
@@ -496,7 +498,7 @@
                                                 id="calDataOcorrencia" style="height: 24px"/>
                                             <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel9}" id="groupPanel9" style="height: 24px">
                                                 <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText71}" escape="false" id="staticText71"
-                                                    style="height: 24px; width: 120px" styleClass="labelBold" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Hora da ocorr&amp;ecirc;ncia:&amp;nbsp;"/>
+                                                    style="height: 24px" styleClass="labelBold" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Hora da ocorr&amp;ecirc;ncia:&amp;nbsp;"/>
                                                 <ui:dropDown binding="#{AnaliseAcidenteTrabalho.drpHours}" id="drpHours" items="#{SessionBean1.horasOptions}"
                                                     selected="#{SessionBean1.horaChoice}" style="height: 24px; width: 48px"/>
                                                 <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText72}" escape="false" id="staticText72"
@@ -514,19 +516,19 @@
                                             </ui:panelGroup>
                                             <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel10}" id="groupPanel10" style="height: 24px">
                                                 <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText163}" escape="false" id="staticText163"
-                                                    style="height: 24px; width: 288px" styleClass="labelBold" text="Departamento:&amp;nbsp;"/>
+                                                    style="height: 24px" styleClass="labelBold" text="Departamento:&amp;nbsp;"/>
                                                 <ui:dropDown binding="#{AnaliseAcidenteTrabalho.drpDepartamento}" id="drpDepartamento"
                                                     items="#{SessionBean1.departamentoOptions}"
                                                     onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridDadosAcidenteSeg:gridPanel9:gridPanel11:groupPanel10:drpDepartamento');"
                                                     selected="#{SessionBean1.departamentoChoice}" style="height: 24px; width: 216px" valueChangeListener="#{AnaliseAcidenteTrabalho.drpDepartamento_processValueChange}"/>
                                                 <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText17}" escape="false" id="staticText17"
-                                                    style="height: 24px; width: 288px" styleClass="labelBold" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Sec&amp;#231;&amp;#227;o:&amp;nbsp;"/>
+                                                    style="height: 24px" styleClass="labelBold" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Sec&amp;#231;&amp;#227;o:&amp;nbsp;"/>
                                                 <ui:dropDown binding="#{AnaliseAcidenteTrabalho.drpSeccao}" id="drpSeccao" items="#{SessionBean1.seccaoOptions}"
                                                     selected="#{SessionBean1.seccaoChoice}" style="height: 24px; width: 216px"/>
                                             </ui:panelGroup>
                                             <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel11}" id="groupPanel11" style="height: 24px">
                                                 <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText18}" escape="false" id="staticText18"
-                                                    style="height: 24px; width: 288px" styleClass="labelBold" text="Local espec&amp;iacute;fico:&amp;nbsp;"/>
+                                                    style="height: 24px" styleClass="labelBold" text="Local espec&amp;iacute;fico:&amp;nbsp;"/>
                                                 <ui:textField binding="#{AnaliseAcidenteTrabalho.txtLocal}" id="txtLocal" style="height: 24px; width: 200px"/>
                                             </ui:panelGroup>
                                         </h:panelGrid>
@@ -539,7 +541,7 @@
                                         <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel13}" columnClasses="gridColLeft" columns="1" id="gridPanel13"
                                             style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText20}" escape="false" id="staticText20"
-                                                style="height: 24px" styleClass="labelBold" text="Subst&amp;#226;ncias, equipamentos, ferramentas e objetos utilizados:"/>
+                                                style="height: 24px" styleClass="labelBold" text="Subst&amp;#226;ncias, equipamentos, ferramentas e objectos utilizados:"/>
                                             <ui:textField binding="#{AnaliseAcidenteTrabalho.txtSubstancias}" id="txtSubstancias" style="height: 24px; width: 100%"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel16}" columnClasses="gridColLeft" columns="1" id="gridPanel16"
@@ -1468,6 +1470,7 @@
                         <ui:hiddenField binding="#{AnaliseAcidenteTrabalho.hidDisableImprimir}" id="hidDisableImprimir"/>
                         <ui:hyperlink binding="#{AnaliseAcidenteTrabalho.lnkDelImageTmp}" id="lnkDelImageTmp"/>
                         <ui:hiddenField binding="#{AnaliseAcidenteTrabalho.hidAnchor}" id="hidAnchor"/>
+                        <ui:hiddenField binding="#{AnaliseAcidenteTrabalho.hidConfEnviar}" id="hidConfEnviar"/>
                     </ui:form>
                 </ui:body>
             </ui:html>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/Dummy.jsp b/trunk/AnaliseAcidentesTrabalho/web/Dummy.jsp
index 73e9d70a..2a1131e8 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/Dummy.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/Dummy.jsp
@@ -10,49 +10,33 @@
                         table.restricoes td {border-bottom: 1px solid #000000}
                         table.centerBlock td {border: none}                        
                     </style>
+                    <script>
+                        function disable(o)
+                        {
+                            o.disabled=true;
+                            alert(o.disabled);
+                        }
+                        function enable(o)
+                        {
+                            o.disabled=false;
+                        }                        
+                    </script>
                 </ui:head>
                 <ui:body binding="#{Dummy.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{Dummy.form1}" id="form1">
-                        <h:panelGrid binding="#{Dummy.gridHeader}" columnClasses="gridColRightBottom" columns="1" id="gridHeader"
-                            style="height: 24px; width: 100%" width="624">
-                            <ui:panelGroup binding="#{Dummy.groupPanel5}" id="groupPanel5" style="height: 24px; width: 310px">
-                                <ui:staticText binding="#{Dummy.lblUser2}" escape="false" id="lblUser2"/>
-                                <ui:staticText binding="#{Dummy.staticText7}" escape="false" id="staticText7" text="   "/>
-                                <ui:hyperlink action="#{Dummy.lnkEditUser_action}" binding="#{Dummy.lnkEditUser2}" disabled="true" id="lnkEditUser2" text="alterar dados utilizador"/>
-                                <ui:staticText binding="#{Dummy.staticText8}" escape="false" id="staticText8" text=" | "/>
-                                <ui:hyperlink action="#{Dummy.lnkLogout_action}" binding="#{Dummy.lnkLogout2}" id="lnkLogout2" text="sair"/>
-                                <ui:staticText binding="#{Dummy.staticText9}" id="staticText9" text="&gt;&gt;"/>
-                            </ui:panelGroup>
-                            <h:panelGrid binding="#{Dummy.gridPanel2}" columnClasses="gridColLeft, gridColRightBottom" columns="3" id="gridPanel2"
-                                style="border: 1px solid #000000; height: 24px; width: 100%" width="312">
-                                <ui:panelGroup binding="#{Dummy.groupPanel3}" id="groupPanel3" style="height: 24px; width: 216px">
-                                    <ui:image binding="#{Dummy.image3}" id="image3" url="/resources/images/SIPRP_logo_small.jpg"/>
-                                </ui:panelGroup>
-                                <h:panelGrid binding="#{Dummy.gridPanel5}" columnClasses="gridColCenter" columns="1" id="gridPanel5"
-                                    style="height: 24px; width: 100%" width="408">
-                                    <ui:staticText binding="#{Dummy.staticText4}" escape="false" id="staticText4"
-                                        style="font-weight: bold; height: 24px; width: 336px" text="AN&amp;Aacute;LISE DE ACIDENTE DE TRABALHO"/>
-                                    <h:panelGrid binding="#{Dummy.gridPanel6}" columns="2" id="gridPanel6" style="height: 24px" width="408">
-                                        <ui:panelGroup binding="#{Dummy.groupPanel4}" id="groupPanel4">
-                                            <ui:staticText binding="#{Dummy.staticText5}" escape="false" id="staticText5"
-                                                style="font-weight: bold; height: 24px; width: 72px" text="Nº"/>
-                                            <ui:staticText binding="#{Dummy.stHeaderNr1}" escape="false" id="stHeaderNr1" style="height: 24px; width: 72px"/>
-                                        </ui:panelGroup>
-                                        <ui:panelGroup binding="#{Dummy.groupPanel6}" id="groupPanel6">
-                                            <ui:staticText binding="#{Dummy.staticText6}" escape="false" id="staticText6"
-                                                style="font-weight: bold; height: 24px; width: 72px" text="DATA:"/>
-                                            <ui:staticText binding="#{Dummy.stHeaderDate1}" escape="false" id="stHeaderDate1" style="height: 24px; width: 72px"/>
-                                        </ui:panelGroup>
-                                    </h:panelGrid>
-                                </h:panelGrid>
-                                <ui:image binding="#{Dummy.image4}" id="image4" url="/resources/images/logo_auchan_small1.jpg"/>
-                            </h:panelGrid>
-                        </h:panelGrid>
                         <ui:hiddenField binding="#{Dummy.hiddenField1}" id="hiddenField1"/>
-                        <ui:button action="#{Dummy.button2_action}" binding="#{Dummy.button2}" id="button2"
-                            style="position: absolute; left: 312px; top: 288px; width: 144px; height: 24px" text="Button"/>
-                        <ui:staticText binding="#{Dummy.stMsg}" id="stMsg" style="position: absolute; left: 72px; top: 144px; width: 432px; height: 24px"/>
-                        <ui:image binding="#{Dummy.image1}" height="96" id="image1" style="left: 72px; top: 216px; position: absolute" url="/home/lluis/imagens_acidentes/tmp_seguranca/1" width="168"/>
+                        <ui:hiddenField binding="#{Dummy.hidConfEnviar}" id="hidConfEnviar"/>
+                        <h:panelGrid binding="#{Dummy.gridPanel1}" columnClasses="gridColCenter" columns="1" id="gridPanel1"
+                            style="position: absolute; left: 72px; top: 168px; height: 24px" width="504">
+                            <ui:staticText binding="#{Dummy.txtMsg1}" id="txtMsg1" style="color: #cc0000; font-weight: bold; height: 24px; width: 456px"/>
+                        </h:panelGrid>
+                        <ui:button binding="#{Dummy.butEliminar}" id="butEliminar" style="height: 24px; left: 96px; top: 96px; position: absolute; width: 119px" text="Eliminar"/>
+                        <ui:hiddenField binding="#{Dummy.hidConfDelete}" id="hidConfDelete"/>
+                        <ui:panelGroup binding="#{Dummy.groupPanel1}" id="groupPanel1" style="height: 24px; left: 72px; top: 264px; position: absolute; width: 100%">
+                            <ui:button action="#{Dummy.butVoltar_action}" binding="#{Dummy.butVoltar1}" id="butVoltar1" style="height: 24px; width: 96px" text="Voltar"/>
+                            <ui:button action="#{Dummy.butEliminar_action}" binding="#{Dummy.butEliminar1}" id="butEliminar1" style="height: 24px; width: 119px" text="Eliminar"/>
+                        </ui:panelGroup>
+                        <ui:hyperlink binding="#{Dummy.lnkEstabelecimento}" id="lnkEstabelecimento" style=""/>
                     </ui:form>
                 </ui:body>
             </ui:html>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp b/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
index dfe1bbd0..6c5e59b1 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/EnviarCorrecao.jsp
@@ -6,6 +6,18 @@
             <ui:html binding="#{EnviarCorrecao.html1}" id="html1">
                 <ui:head binding="#{EnviarCorrecao.head1}" id="head1">
                     <ui:link binding="#{EnviarCorrecao.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script>
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+                    </script>
                 </ui:head>
                 <ui:body binding="#{EnviarCorrecao.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{EnviarCorrecao.form1}" id="form1">
@@ -18,17 +30,20 @@
                                         <ui:image binding="#{EnviarCorrecao.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
                                         <ui:image binding="#{EnviarCorrecao.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
                                     </ui:panelGroup>
-                                    <ui:panelGroup binding="#{EnviarCorrecao.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
+                                    <ui:panelGroup binding="#{EnviarCorrecao.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%">
                                         <ui:staticText binding="#{EnviarCorrecao.lblUser1}" escape="false" id="lblUser1" styleClass="labelBold "/>
                                         <ui:staticText binding="#{EnviarCorrecao.staticText1}" escape="false" id="staticText1" text="   "/>
                                         <ui:hyperlink action="#{EnviarCorrecao.lnkAnalisesAcidente_action}" binding="#{EnviarCorrecao.lnkAnalisesAcidente}"
                                             id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{EnviarCorrecao.staticText4}" escape="false" id="staticText4" text=" | "/>
                                         <ui:hyperlink action="#{EnviarCorrecao.lnkNewUser_action}" binding="#{EnviarCorrecao.lnkNewUser1}" disabled="true"
-                                            id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                                            id="lnkNewUser1" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{EnviarCorrecao.staticText3}" escape="false" id="staticText3" text=" | "/>
                                         <ui:hyperlink action="#{EnviarCorrecao.lnkEditUser_action}" binding="#{EnviarCorrecao.lnkEditUser1}" id="lnkEditUser1" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{EnviarCorrecao.staticText2}" escape="false" id="staticText2" text=" | "/>
+                                        <ui:hyperlink action="#{EnviarCorrecao.lnkAjuda_action}" binding="#{EnviarCorrecao.lnkAjuda1}" id="lnkAjuda1"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{EnviarCorrecao.staticText7}" id="staticText7" style="height: 22px; width: 0px" text="|"/>
                                         <ui:hyperlink action="#{EnviarCorrecao.lnkLogout_action}" binding="#{EnviarCorrecao.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
@@ -36,6 +51,10 @@
                                     style="height: 15px; position: relative; vertical-align: top; width: 100%" styleClass="centerBlock">
                                     <h:panelGrid binding="#{EnviarCorrecao.gridMain1}" columnClasses="gridColLeft" columns="1" id="gridMain1"
                                         style="height: 24px" styleClass="centerBlock" width="504">
+                                        <h:panelGrid binding="#{EnviarCorrecao.gridPanel3}" columnClasses="gridColCenter" columns="1" id="gridPanel3"
+                                            style="height: 24px; width: 100%" width="504">
+                                            <ui:staticText binding="#{EnviarCorrecao.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
+                                        </h:panelGrid>
                                         <ui:staticText binding="#{EnviarCorrecao.staticText5}" escape="false" id="staticText5" style="height: 24px; width: 96px"
                                             styleClass="labelBold" text="Observa&amp;ccedil;&amp;otilde;es"/>
                                         <ui:textArea binding="#{EnviarCorrecao.txtObservacoes}" id="txtObservacoes" style="height: 48px; width: 100%"/>
@@ -49,10 +68,12 @@
                                             </ui:tableRowGroup>
                                         </ui:table>
                                         <ui:staticText binding="#{EnviarCorrecao.staticText6}" escape="false" id="staticText6" style="height: 24px; width: 48px" text="&amp;nbsp;"/>
-                                        <h:panelGrid binding="#{EnviarCorrecao.gridPanel2}" columnClasses="gridColRight" columns="1" id="gridPanel2"
-                                            style="height: 24px; width: 100%" width="288">
+                                        <h:panelGrid binding="#{EnviarCorrecao.gridPanel2}" columnClasses="gridColLeft, gridColRight" columns="2"
+                                            id="gridPanel2" style="height: 24px; width: 100%" width="288">
                                             <ui:button action="#{EnviarCorrecao.butCancelar_action}" binding="#{EnviarCorrecao.butCancelar}" id="butCancelar"
                                                 style="height: 24px; width: 120px" text="Cancelar"/>
+                                            <ui:button action="#{EnviarCorrecao.butConfirmar_action}" binding="#{EnviarCorrecao.butConfirmar}" id="butConfirmar"
+                                                style="height: 24px; width: 120px" text="Confirmar"/>
                                         </h:panelGrid>
                                     </h:panelGrid>
                                 </h:panelGrid>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
index dbb99a29..2e6b390c 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FichaUtilizador.jsp
@@ -7,6 +7,18 @@
                 <ui:head binding="#{FichaUtilizador.head1}" id="head1">
                     <ui:link binding="#{FichaUtilizador.link1}" id="link1" url="/resources/stylesheet.css"/>
                     <script>
+
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+
                         function confirmeUserDeletion()
                         {
                             var hid = document.getElementById("form1:hidConfDelUser");
@@ -45,12 +57,17 @@
                                             id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{FichaUtilizador.staticText15}" escape="false" id="staticText15" text=" | "/>
                                         <ui:hyperlink action="#{FichaUtilizador.lnkNewUser_action}" binding="#{FichaUtilizador.lnkGerirUtilizadores}"
-                                            id="lnkGerirUtilizadores" style="width: 120px" text="gerir utilizadores"/>
+                                            id="lnkGerirUtilizadores" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{FichaUtilizador.staticText14}" escape="false" id="staticText14" text=" | "/>
                                         <ui:hyperlink action="#{FichaUtilizador.lnkEditUser_action}" binding="#{FichaUtilizador.lnkEditUser}" disabled="true"
                                             id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{FichaUtilizador.staticText2}" escape="false" id="staticText2" text=" | "/>
-                                        <ui:hyperlink action="#{FichaUtilizador.lnkLogout_action}" binding="#{FichaUtilizador.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
+                                        <ui:hyperlink action="#{FichaUtilizador.lnkAjuda_action}" binding="#{FichaUtilizador.lnkAjuda1}" id="lnkAjuda1"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{FichaUtilizador.staticText17}" id="staticText17" style="height: 22px; width: 0px" text="|"/>
+                                        <ui:hyperlink action="#{FichaUtilizador.lnkLogout_action}" binding="#{FichaUtilizador.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;">
+                                            <ui:staticText binding="#{FichaUtilizador.staticText16}" id="staticText16" style="height: 22px; width: 0px" text="|"/>
+                                        </ui:hyperlink>
                                     </ui:panelGroup>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FichaUtilizador.gridMsg1}" columnClasses="gridColCenter" columns="1" id="gridMsg1"
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
index 61dabaed..283899d3 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp
@@ -6,6 +6,18 @@
             <ui:html binding="#{FormDirGerRh.html1}" id="html1">
                 <ui:head binding="#{FormDirGerRh.head1}" id="head1">
                     <ui:link binding="#{FormDirGerRh.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script>
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+                    </script>
                 </ui:head>
                 <ui:body binding="#{FormDirGerRh.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormDirGerRh.form1}" id="form1">
@@ -25,10 +37,13 @@
                                             disabled="true" id="lnkAnalisesAcidente1" text="analisar acidentes"/>
                                         <ui:staticText binding="#{FormDirGerRh.stSep2}" escape="false" id="stSep2" text=" | "/>
                                         <ui:hyperlink action="#{FormDirGerRh.lnkGerirUtilizadores_action}" binding="#{FormDirGerRh.lnkGerirUtilizadores}"
-                                            id="lnkGerirUtilizadores" style="width: 120px" text="gerir utilizadores"/>
+                                            id="lnkGerirUtilizadores" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{FormDirGerRh.stSep3}" escape="false" id="stSep3" text=" | "/>
                                         <ui:hyperlink action="#{FormDirGerRh.lnkEditUser_action}" binding="#{FormDirGerRh.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{FormDirGerRh.staticText1}" escape="false" id="staticText1" text=" | "/>
+                                        <ui:hyperlink action="#{FormDirGerRh.lnkAjuda_action}" binding="#{FormDirGerRh.lnkAjuda1}" id="lnkAjuda1"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{FormDirGerRh.staticText9}" id="staticText9" style="width: 0px" text="|"/>
                                         <ui:hyperlink action="#{FormDirGerRh.lnkLogout_action}" binding="#{FormDirGerRh.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
@@ -52,6 +67,11 @@
                                                         <ui:hyperlink action="#{FormDirGerRh.lnkDataAcidenteSeg_action}"
                                                             binding="#{FormDirGerRh.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormDirGerRh.tableColumn11}" headerText="Data da abertura" id="tableColumn11"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormDirGerRh.lnkDataAberturaSeg_action}"
+                                                            binding="#{FormDirGerRh.lnkDataAberturaSeg}" id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormDirGerRh.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormDirGerRh.lnkNrSeg_action}" binding="#{FormDirGerRh.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
@@ -67,7 +87,7 @@
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormDirGerRh.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%">
                                                         <ui:hyperlink action="#{FormDirGerRh.lnkFaseSeg_action}" binding="#{FormDirGerRh.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -125,6 +145,11 @@
                                                     <ui:hyperlink action="#{FormDirGerRh.lnkDataConcluida_action}" binding="#{FormDirGerRh.lnkDataConcluida}"
                                                         id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
+                                                <ui:tableColumn binding="#{FormDirGerRh.tableColumn12}" headerText="Data da abertura" id="tableColumn12"
+                                                    sort="data_inicio_processo" width="10%">
+                                                    <ui:hyperlink action="#{FormDirGerRh.lnkDataAberturaConcluida_action}"
+                                                        binding="#{FormDirGerRh.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormDirGerRh.tableColumn7}" headerText="Nº acidente" id="tableColumn7"
                                                     sort="analise_nr" style="width: 10%" width="7%">
                                                     <ui:hyperlink action="#{FormDirGerRh.lnkNrConcluida_action}" binding="#{FormDirGerRh.lnkNrConcluida}"
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
index 1674cba2..69adf5f4 100755
--- a/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirSiprp.jsp
@@ -6,6 +6,18 @@
             <ui:html binding="#{FormDirSiprp.html1}" id="html1">
                 <ui:head binding="#{FormDirSiprp.head1}" id="head1">
                     <ui:link binding="#{FormDirSiprp.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script>
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+                    </script>
                 </ui:head>
                 <ui:body binding="#{FormDirSiprp.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormDirSiprp.form1}" id="form1">
@@ -24,14 +36,20 @@
                                         <ui:hyperlink action="#{FormDirSiprp.lnkAnalisesAcidente_action}" binding="#{FormDirSiprp.lnkAnalisesAcidente}"
                                             disabled="true" id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{FormDirSiprp.stSep3}" escape="false" id="stSep3" text=" | "/>
-                                        <ui:hyperlink action="#{FormDirSiprp.lnkNewUser_action}" binding="#{FormDirSiprp.lnkNewUser}" id="lnkNewUser"
-                                            style="width: 120px" text="gerir utilizadores"/>
+                                        <ui:hyperlink action="#{FormDirSiprp.lnkNewUser_action}" binding="#{FormDirSiprp.lnkNewUser}" id="lnkNewUser" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{FormDirSiprp.stSep2}" escape="false" id="stSep2" text=" | "/>
                                         <ui:hyperlink action="#{FormDirSiprp.lnkEditUser_action}" binding="#{FormDirSiprp.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{FormDirSiprp.staticText1}" escape="false" id="staticText1" text=" | "/>
+                                        <ui:hyperlink action="#{FormDirSiprp.lnkAjuda_action}" binding="#{FormDirSiprp.lnkAjuda1}" id="lnkAjuda1"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{FormDirSiprp.staticText2}" id="staticText2" style="width: 0px" text="|"/>
                                         <ui:hyperlink action="#{FormDirSiprp.lnkLogout_action}" binding="#{FormDirSiprp.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
+                                <h:panelGrid binding="#{FormDirSiprp.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
+                                    style="height: 24px; width: 100%" width="504">
+                                    <ui:staticText binding="#{FormDirSiprp.txtMsg1}" escape="false" id="txtMsg1" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
+                                </h:panelGrid>
                                 <h:panelGrid binding="#{FormDirSiprp.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
                                     id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
                                     <h:panelGrid binding="#{FormDirSiprp.gridSeguimento1}" columns="1" id="gridSeguimento1"
@@ -52,6 +70,11 @@
                                                         <ui:hyperlink action="#{FormDirSiprp.lnkDataAcidenteSeg_action}"
                                                             binding="#{FormDirSiprp.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn1}" headerText="Data da abertura" id="tableColumn1"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormDirSiprp.lnkDataAberturaSeg_action}"
+                                                            binding="#{FormDirSiprp.lnkDataAberturaSeg1}" id="lnkDataAberturaSeg1" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormDirSiprp.tableColumn7}" headerText="Nº acidente" id="tableColumn7"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormDirSiprp.lnkNrSeg_action}" binding="#{FormDirSiprp.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
@@ -67,7 +90,11 @@
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormDirSiprp.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%">
                                                         <ui:hyperlink action="#{FormDirSiprp.lnkFaseSeg_action}" binding="#{FormDirSiprp.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormDirSiprp.tableColumn3}" headerText="Estabelecimento" id="tableColumn3" width="15%">
+                                                        <ui:hyperlink action="#{FormDirSiprp.lnkEstabelecimentoSeg_action}"
+                                                            binding="#{FormDirSiprp.lnkEstabelecimentoSeg1}" id="lnkEstabelecimentoSeg1" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -125,6 +152,11 @@
                                                     <ui:hyperlink action="#{FormDirSiprp.lnkDataConcluida_action}" binding="#{FormDirSiprp.lnkDataConcluida}"
                                                         id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
+                                                <ui:tableColumn binding="#{FormDirSiprp.tableColumn2}" headerText="Data da abertura" id="tableColumn2"
+                                                    sort="data_inicio_processo" width="10%">
+                                                    <ui:hyperlink action="#{FormDirSiprp.lnkDataAberturaConcluida_action}"
+                                                        binding="#{FormDirSiprp.lnkDataAberturaConcluida1}" id="lnkDataAberturaConcluida1" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormDirSiprp.tableColumn12}" headerText="Nº acidente" id="tableColumn12"
                                                     sort="analise_nr" style="width: 10%" width="7%">
                                                     <ui:hyperlink action="#{FormDirSiprp.lnkNrConcluida_action}" binding="#{FormDirSiprp.lnkNrConcluida}"
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
index 071c8e14..b2f87812 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormGestor.jsp
@@ -6,6 +6,18 @@
             <ui:html binding="#{FormGestor.html1}" id="html1">
                 <ui:head binding="#{FormGestor.head1}" id="head1">
                     <ui:link binding="#{FormGestor.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script>
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+                    </script>
                 </ui:head>
                 <ui:body binding="#{FormGestor.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormGestor.form1}" id="form1">
@@ -25,10 +37,13 @@
                                             disabled="true" id="lnkAnalisesAcidente1" text="analisar acidentes"/>
                                         <ui:staticText binding="#{FormGestor.stSep2}" escape="false" id="stSep2" text=" | "/>
                                         <ui:hyperlink action="#{FormGestor.lnkGerirUtilizadores_action}" binding="#{FormGestor.lnkGerirUtilizadores}"
-                                            disabled="true" id="lnkGerirUtilizadores" style="width: 120px" text="gerir utilizadores"/>
+                                            disabled="true" id="lnkGerirUtilizadores" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{FormGestor.stSep3}" escape="false" id="stSep3" text=" | "/>
                                         <ui:hyperlink action="#{FormGestor.lnkEditUser_action}" binding="#{FormGestor.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{FormGestor.staticText1}" escape="false" id="staticText1" text=" | "/>
+                                        <ui:hyperlink action="#{FormGestor.lnkAjuda_action}" binding="#{FormGestor.lnkAjuda1}" id="lnkAjuda1"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{FormGestor.staticText9}" id="staticText9" style="height: 22px; width: 0px" text="|"/>
                                         <ui:hyperlink action="#{FormGestor.lnkLogout_action}" binding="#{FormGestor.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
@@ -48,10 +63,15 @@
                                                 <ui:tableRowGroup binding="#{FormGestor.tableRowGroup1}" id="tableRowGroup1"
                                                     sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormGestor.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
-                                                        sort="data_acidente" style="width: 10%" width="10%">
+                                                        sort="data_acidente" style="width: 10%" width="477">
                                                         <ui:hyperlink action="#{FormGestor.lnkDataAcidenteSeg_action}"
                                                             binding="#{FormGestor.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormGestor.tableColumn11}" headerText="Data da abertura" id="tableColumn11"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormGestor.lnkDataAberturaSeg_action}"
+                                                            binding="#{FormGestor.lnkDataAberturaSeg1}" id="lnkDataAberturaSeg1" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormGestor.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormGestor.lnkNrSeg_action}" binding="#{FormGestor.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
@@ -67,7 +87,11 @@
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormGestor.tableColumn5}" headerText="Fase" id="tableColumn5" width="20%">
                                                         <ui:hyperlink action="#{FormGestor.lnkFaseSeg_action}" binding="#{FormGestor.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormGestor.tableColumn13}" headerText="Estabelecimento" id="tableColumn13" width="15%">
+                                                        <ui:hyperlink action="#{FormGestor.lnkEstabelecimentoSeg_action}"
+                                                            binding="#{FormGestor.lnkEstabelecimentoSeg1}" id="lnkEstabelecimentoSeg1" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -117,7 +141,7 @@
                                     <h:panelGrid binding="#{FormGestor.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
                                         style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
                                         <ui:table augmentTitle="false" binding="#{FormGestor.table2}" id="table2" style="width: 89%; height: 48px"
-                                            styleClass="centerBlock" width="707">
+                                            styleClass="centerBlock" width="590">
                                             <ui:tableRowGroup binding="#{FormGestor.tableRowGroup2}" id="tableRowGroup2"
                                                 sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
                                                 <ui:tableColumn binding="#{FormGestor.tableColumn6}" headerText="Data do acidente" id="tableColumn6"
@@ -125,6 +149,11 @@
                                                     <ui:hyperlink action="#{FormGestor.lnkDataConcluida_action}" binding="#{FormGestor.lnkDataConcluida}"
                                                         id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
+                                                <ui:tableColumn binding="#{FormGestor.tableColumn12}" headerText="Data da abertura" id="tableColumn12"
+                                                    sort="data_inicio_processo" width="10%">
+                                                    <ui:hyperlink action="#{FormGestor.lnkDataAberturaConcluida_action}"
+                                                        binding="#{FormGestor.lnkDataAberturaConcluida1}" id="lnkDataAberturaConcluida1" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormGestor.tableColumn7}" headerText="Nº acidente" id="tableColumn7"
                                                     sort="analise_nr" style="width: 10%" width="7%">
                                                     <ui:hyperlink action="#{FormGestor.lnkNrConcluida_action}" binding="#{FormGestor.lnkNrConcluida}"
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
index 911448f2..2350a895 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormHS.jsp
@@ -6,6 +6,18 @@
             <ui:html binding="#{FormHS.html1}" id="html1">
                 <ui:head binding="#{FormHS.head1}" id="head1">
                     <ui:link binding="#{FormHS.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script>
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+                    </script>
                 </ui:head>
                 <ui:body binding="#{FormHS.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormHS.form1}" id="form1">
@@ -18,20 +30,27 @@
                                         <ui:image binding="#{FormHS.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
                                         <ui:image binding="#{FormHS.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
                                     </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormHS.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
+                                    <ui:panelGroup binding="#{FormHS.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%">
                                         <ui:staticText binding="#{FormHS.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
                                         <ui:staticText binding="#{FormHS.staticText1}" escape="false" id="staticText1" text="   "/>
                                         <ui:hyperlink action="#{FormHS.lnkAnalisesAcidente_action}" binding="#{FormHS.lnkAnalisesAcidente}" disabled="true"
                                             id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{FormHS.staticText13}" escape="false" id="staticText13" text=" | "/>
                                         <ui:hyperlink action="#{FormHS.lnkNewUser_action}" binding="#{FormHS.lnkNewUser1}" disabled="true" id="lnkNewUser1"
-                                            style="width: 120px" text="gerir utilizadores"/>
+                                            style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{FormHS.staticText12}" escape="false" id="staticText12" text=" | "/>
                                         <ui:hyperlink action="#{FormHS.lnkEditUser_action}" binding="#{FormHS.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{FormHS.staticText2}" escape="false" id="staticText2" text=" | "/>
+                                        <ui:hyperlink action="#{FormHS.lnkAjuda_action}" binding="#{FormHS.lnkAjuda1}" id="lnkAjuda1" onClick="showPdf();"
+                                            style="" text="ajuda "/>
+                                        <ui:staticText binding="#{FormHS.staticText14}" id="staticText14" style="width: 0px" text="|"/>
                                         <ui:hyperlink action="#{FormHS.lnkLogout_action}" binding="#{FormHS.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
+                                <h:panelGrid binding="#{FormHS.gridPanel10}" columnClasses="gridColCenter" columns="1" id="gridPanel10"
+                                    style="height: 24px; width: 100%" width="504">
+                                    <ui:staticText binding="#{FormHS.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
+                                </h:panelGrid>
                                 <h:panelGrid binding="#{FormHS.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1"
                                     id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
                                     <h:panelGrid binding="#{FormHS.gridActual1}" columnClasses="gridColCenter" columns="1" id="gridActual1"
@@ -44,7 +63,7 @@
                                         <ui:staticText binding="#{FormHS.staticText5}" id="staticText5" styleClass="labelBold" text="Processos com dados pendentes"/>
                                         <h:panelGrid binding="#{FormHS.gridPanel3}" id="gridPanel3" style="height: 24px; width: 100%" styleClass="centerBlock" width="456">
                                             <ui:table augmentTitle="false" binding="#{FormHS.table1}" id="table1" style="width: 80%; height: 48px"
-                                                styleClass="centerBlock" width="100%">
+                                                styleClass="centerBlock" width="933">
                                                 <ui:tableRowGroup binding="#{FormHS.tableRowGroup1}" id="tableRowGroup1"
                                                     sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormHS.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
@@ -52,6 +71,11 @@
                                                         <ui:hyperlink action="#{FormHS.lnkDataAcidente_action}" binding="#{FormHS.lnkDataAcidente}"
                                                             id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn16}" headerText="Data da abertura" id="tableColumn16"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormHS.lnkDataAbertura_action}" binding="#{FormHS.lnkDataAbertura}"
+                                                            id="lnkDataAbertura" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormHS.lnkNr_action}" binding="#{FormHS.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
@@ -60,13 +84,17 @@
                                                         <ui:hyperlink action="#{FormHS.lnkPor_action}" binding="#{FormHS.lnkPor}" id="lnkPor" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
-                                                        sort="nome_acidentado" style="width: 50%" width="50%">
+                                                        sort="nome_acidentado" style="width: 25%" width="25%">
                                                         <ui:hyperlink action="#{FormHS.lnkNomeAcidentado_action}" binding="#{FormHS.lnkNomeAcidentado}"
                                                             id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%">
                                                         <ui:hyperlink action="#{FormHS.lnkFase_action}" binding="#{FormHS.lnkFase}" id="lnkFase"
-                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn19}" headerText="Estabelecimento" id="tableColumn19" width="15%">
+                                                        <ui:hyperlink action="#{FormHS.lnkEstabelecimento_action}" binding="#{FormHS.lnkEstabelecimento}"
+                                                            id="lnkEstabelecimento" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -90,6 +118,11 @@
                                                         <ui:hyperlink action="#{FormHS.lnkDataAcidenteSeg_action}" binding="#{FormHS.lnkDataAcidenteSeg}"
                                                             id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn17}" headerText="Data da abertura" id="tableColumn17"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormHS.lnkDataAberturaSeg_action}" binding="#{FormHS.lnkDataAberturaSeg}"
+                                                            id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn5}" headerText="Nº acidente" id="tableColumn5"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormHS.lnkNrSeg_action}" binding="#{FormHS.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
@@ -104,7 +137,11 @@
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn11}" headerText="Fase" id="tableColumn11" width="20%">
                                                         <ui:hyperlink action="#{FormHS.lnkFaseSeg_action}" binding="#{FormHS.lnkFaseSeg}" id="lnkFaseSeg"
-                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn20}" headerText="Estabelecimento" id="tableColumn20" width="15%">
+                                                        <ui:hyperlink action="#{FormHS.lnkEstabelecimentoSeg_action}" binding="#{FormHS.lnkEstabelecimentoSeg}"
+                                                            id="lnkEstabelecimentoSeg" style="" text="#{currentRow.value['nome_estabelecimento']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -158,6 +195,11 @@
                                                     <ui:hyperlink action="#{FormHS.lnkDataConcluida_action}" binding="#{FormHS.lnkDataConcluida}"
                                                         id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
+                                                <ui:tableColumn binding="#{FormHS.tableColumn18}" headerText="Data da abertura" id="tableColumn18"
+                                                    sort="data_inicio_processo" width="10%">
+                                                    <ui:hyperlink action="#{FormHS.lnkDataAberturaConcluida_action}"
+                                                        binding="#{FormHS.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormHS.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="analise_nr" style="width: 10%">
                                                     <ui:hyperlink action="#{FormHS.lnkNrConcluida_action}" binding="#{FormHS.lnkNrConcluida}"
                                                         id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
index b0b06b14..d952f289 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormRH.jsp
@@ -6,6 +6,18 @@
             <ui:html binding="#{FormRH.html1}" id="html1">
                 <ui:head binding="#{FormRH.head1}" id="head1">
                     <ui:link binding="#{FormRH.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script>
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+                    </script>
                 </ui:head>
                 <ui:body binding="#{FormRH.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormRH.form1}" id="form1">
@@ -18,20 +30,27 @@
                                         <ui:image binding="#{FormRH.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
                                         <ui:image binding="#{FormRH.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
                                     </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormRH.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
+                                    <ui:panelGroup binding="#{FormRH.groupPanel2}" id="groupPanel2" style="height: 24px; top: 90%">
                                         <ui:staticText binding="#{FormRH.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
                                         <ui:staticText binding="#{FormRH.stSep1}" escape="false" id="stSep1" text="   "/>
                                         <ui:hyperlink action="#{FormRH.lnkAnalisesAcidente_action}" binding="#{FormRH.lnkAnalisesAcidente}" disabled="true"
                                             id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{FormRH.staticText12}" escape="false" id="staticText12" text=" | "/>
                                         <ui:hyperlink action="#{FormRH.lnkNewUser_action}" binding="#{FormRH.lnkNewUser1}" disabled="true" id="lnkNewUser1"
-                                            style="width: 120px" text="gerir utilizadores"/>
+                                            style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{FormRH.staticText11}" escape="false" id="staticText11" text=" | "/>
                                         <ui:hyperlink action="#{FormRH.lnkEditUser_action}" binding="#{FormRH.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{FormRH.staticText2}" escape="false" id="staticText2" text=" | "/>
+                                        <ui:hyperlink action="#{FormRH.lnkAjuda_action}" binding="#{FormRH.lnkAjuda1}" id="lnkAjuda1" onClick="showPdf();"
+                                            style="" text="ajuda "/>
+                                        <ui:staticText binding="#{FormRH.staticText13}" id="staticText13" style="width: 0px" text="|"/>
                                         <ui:hyperlink action="#{FormRH.lnkLogout_action}" binding="#{FormRH.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
+                                <h:panelGrid binding="#{FormRH.gridPanel10}" columnClasses="gridColCenter" columns="1" id="gridPanel10"
+                                    style="height: 24px; width: 100%" width="504">
+                                    <ui:staticText binding="#{FormRH.txtMsg1}" escape="false" id="txtMsg1" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
+                                </h:panelGrid>
                                 <h:panelGrid binding="#{FormRH.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1"
                                     id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
                                     <h:panelGrid binding="#{FormRH.gridActual1}" columnClasses="gridColCenter" columns="1" id="gridActual1"
@@ -52,6 +71,11 @@
                                                         <ui:hyperlink action="#{FormRH.lnkDataAcidente_action}" binding="#{FormRH.lnkDataAcidente}"
                                                             id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn16}" headerText="Data da abertura" id="tableColumn16"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormRH.lnkDataAbertura_action}" binding="#{FormRH.lnkDataAbertura}"
+                                                            id="lnkDataAbertura" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormRH.lnkNr_action}" binding="#{FormRH.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
@@ -66,7 +90,7 @@
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%">
                                                         <ui:hyperlink action="#{FormRH.lnkFase_action}" binding="#{FormRH.lnkFase}" id="lnkFase"
-                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -90,6 +114,11 @@
                                                         <ui:hyperlink action="#{FormRH.lnkDataAcidenteSeg_action}" binding="#{FormRH.lnkDataAcidenteSeg}"
                                                             id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn17}" headerText="Data da abertura" id="tableColumn17"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormRH.lnkDataAberturaSeg_action}" binding="#{FormRH.lnkDataAberturaSeg}"
+                                                            id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn5}" headerText="Nº acidente" id="tableColumn5"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormRH.lnkNrSeg_action}" binding="#{FormRH.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
@@ -104,7 +133,7 @@
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn11}" headerText="Fase" id="tableColumn11" width="20%">
                                                         <ui:hyperlink action="#{FormRH.lnkFaseSeg_action}" binding="#{FormRH.lnkFaseSeg}" id="lnkFaseSeg"
-                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -161,6 +190,11 @@
                                                     <ui:hyperlink action="#{FormRH.lnkDataConcluida_action}" binding="#{FormRH.lnkDataConcluida}"
                                                         id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
+                                                <ui:tableColumn binding="#{FormRH.tableColumn18}" headerText="Data da abertura" id="tableColumn18"
+                                                    sort="data_inicio_processo" width="10%">
+                                                    <ui:hyperlink action="#{FormRH.lnkDataAberturaConcluida_action}"
+                                                        binding="#{FormRH.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormRH.tableColumn8}" headerText="Nº acidente" id="tableColumn8" sort="analise_nr"
                                                     style="width: 10%" width="7%">
                                                     <ui:hyperlink action="#{FormRH.lnkNrConcluida_action}" binding="#{FormRH.lnkNrConcluida}"
diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
index 1bca8e06..12d75930 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp
@@ -7,6 +7,18 @@
                 <ui:head binding="#{FormSeguranca.head1}" id="head1">
                     <ui:link binding="#{FormSeguranca.link1}" id="link1" url="/resources/stylesheet.css"/>
                     <ui:link binding="#{FormSeguranca.link2}" id="link2" url="/resources/stylesheet.css"/>
+                    <script>
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+                    </script>
                 </ui:head>
                 <ui:body binding="#{FormSeguranca.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormSeguranca.form1}" id="form1">
@@ -19,7 +31,7 @@
                                         <ui:image binding="#{FormSeguranca.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
                                         <ui:image binding="#{FormSeguranca.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
                                     </ui:panelGroup>
-                                    <ui:panelGroup binding="#{FormSeguranca.groupPanel6}" id="groupPanel6" style="height: 24px; width: 310px; top: 90%">
+                                    <ui:panelGroup binding="#{FormSeguranca.groupPanel6}" id="groupPanel6" style="height: 24px; top: 90%">
                                         <ui:staticText binding="#{FormSeguranca.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
                                         <ui:staticText binding="#{FormSeguranca.staticText18}" escape="false" id="staticText18" text="   "/>
                                         <ui:hyperlink action="#{FormSeguranca.lnkAnalisesAcidente_action}" binding="#{FormSeguranca.lnkAnalisesAcidente}"
@@ -30,9 +42,16 @@
                                         <ui:staticText binding="#{FormSeguranca.staticText9}" escape="false" id="staticText9" text=" | "/>
                                         <ui:hyperlink action="#{FormSeguranca.lnkEditUser_action}" binding="#{FormSeguranca.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{FormSeguranca.staticText19}" escape="false" id="staticText19" text=" | "/>
+                                        <ui:hyperlink action="#{FormSeguranca.lnkAjuda_action}" binding="#{FormSeguranca.lnkAjuda}" id="lnkAjuda"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{FormSeguranca.staticText12}" id="staticText12" style="width: 0px" text="|"/>
                                         <ui:hyperlink action="#{FormSeguranca.lnkLogout_action}" binding="#{FormSeguranca.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
+                                <h:panelGrid binding="#{FormSeguranca.gridPanel10}" columnClasses="gridColCenter" columns="1" id="gridPanel10"
+                                    style="height: 24px; width: 100%" width="504">
+                                    <ui:staticText binding="#{FormSeguranca.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); font-weight: bold; height: 24px"/>
+                                </h:panelGrid>
                                 <h:panelGrid binding="#{FormSeguranca.gridLayoutTop}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="1"
                                     id="gridLayoutTop" style="height: 15px; position: relative; vertical-align: top; width: 100%">
                                     <h:panelGrid binding="#{FormSeguranca.gridActual}" columnClasses="gridColCenter" columns="1" id="gridActual"
@@ -49,7 +68,7 @@
                                         <h:panelGrid binding="#{FormSeguranca.gridPanel4}" id="gridPanel4" style="height: 24px; width: 100%"
                                             styleClass="centerBlock" width="456">
                                             <ui:table augmentTitle="false" binding="#{FormSeguranca.table1}" id="table1" style="width: 80%; height: 48px"
-                                                styleClass="centerBlock" width="100%">
+                                                styleClass="centerBlock" width="816">
                                                 <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup1}" id="tableRowGroup1" rows="10"
                                                     sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
@@ -57,6 +76,11 @@
                                                         <ui:hyperlink action="#{FormSeguranca.lnkDataAcidente_action}"
                                                             binding="#{FormSeguranca.lnkDataAcidente}" id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn16}" headerText="Data da abertura" id="tableColumn16"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormSeguranca.lnkDataAbertura_action}"
+                                                            binding="#{FormSeguranca.lnkDataAbertura}" id="lnkDataAbertura" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn2}" headerText="Nº acidente" id="tableColumn2"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkNr_action}" binding="#{FormSeguranca.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
@@ -66,13 +90,13 @@
                                                             style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
-                                                        sort="nome_acidentado" style="width=50%">
+                                                        sort="nome_acidentado" style="width=40%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkNomeAcidentado_action}"
                                                             binding="#{FormSeguranca.lnkNomeAcidentado}" id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn10}" headerText="Fase" id="tableColumn10" width="20%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkFase_action}" binding="#{FormSeguranca.lnkFase}" id="lnkFase"
-                                                            style="height: 24px; width: 20%" text="#{currentRow.value['fase']}"/>
+                                                            style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -88,7 +112,7 @@
                                         <h:panelGrid binding="#{FormSeguranca.gridPanel5}" id="gridPanel5"
                                             style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
                                             <ui:table augmentTitle="false" binding="#{FormSeguranca.table2}" id="table2" style="width: 80%; height: 48px"
-                                                styleClass="centerBlock" width="100%">
+                                                styleClass="centerBlock" width="816">
                                                 <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup2}" id="tableRowGroup2" rows="10"
                                                     sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
@@ -96,6 +120,11 @@
                                                         <ui:hyperlink action="#{FormSeguranca.lnkDataAcidenteSeg_action}"
                                                             binding="#{FormSeguranca.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormSeguranca.tableColumn17}" headerText="Data da abertura" id="tableColumn17"
+                                                        sort="data_inicio_processo" width="10%">
+                                                        <ui:hyperlink action="#{FormSeguranca.lnkDataAberturaSeg_action}"
+                                                            binding="#{FormSeguranca.lnkDataAberturaSeg}" id="lnkDataAberturaSeg" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                    </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn5}" headerText="Nº acidente" id="tableColumn5"
                                                         sort="analise_nr" style="width: 10%" width="10%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkNrSeg_action}" binding="#{FormSeguranca.lnkNrSeg}"
@@ -106,14 +135,14 @@
                                                             id="lnkPorSeg" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
-                                                        sort="nome_acidentado" style="width: 50%" width="50%">
+                                                        sort="nome_acidentado" style="width: 40%" width="40%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkNomeAcidentadoSeg_action}"
                                                             binding="#{FormSeguranca.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn11}" headerText="Fase" id="tableColumn11"
                                                         style="width: 20%" width="20%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkFaseSeg_action}" binding="#{FormSeguranca.lnkFaseSeg}"
-                                                            id="lnkFaseSeg" style="height: 24px; width: 96px" text="#{currentRow.value['fase']}"/>
+                                                            id="lnkFaseSeg" style="height: 24px" text="#{currentRow.value['fase']}"/>
                                                     </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
@@ -163,7 +192,7 @@
                                     <h:panelGrid binding="#{FormSeguranca.gridPanel7}" columnClasses="gridColCenter" columns="1" id="gridPanel7"
                                         style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
                                         <ui:table augmentTitle="false" binding="#{FormSeguranca.table3}" id="table3" style="width: 89%; height: 48px"
-                                            styleClass="centerBlock" width="100%">
+                                            styleClass="centerBlock" width="816">
                                             <ui:tableRowGroup binding="#{FormSeguranca.tableRowGroup3}" id="tableRowGroup3" rows="10"
                                                 sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
                                                 <ui:tableColumn binding="#{FormSeguranca.tableColumn7}" headerText="Data do acidente" id="tableColumn7"
@@ -171,6 +200,11 @@
                                                     <ui:hyperlink action="#{FormSeguranca.lnkDataConcluida_action}" binding="#{FormSeguranca.lnkDataConcluida}"
                                                         id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
+                                                <ui:tableColumn binding="#{FormSeguranca.tableColumn18}" headerText="Data da abertura" id="tableColumn18"
+                                                    sort="data_inicio_processo" width="10%">
+                                                    <ui:hyperlink action="#{FormSeguranca.lnkDataAberturaConcluida_action}"
+                                                        binding="#{FormSeguranca.lnkDataAberturaConcluida}" id="lnkDataAberturaConcluida" style="" text="#{currentRow.value['data_inicio_processo']}"/>
+                                                </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormSeguranca.tableColumn8}" headerText="Nº acidente" id="tableColumn8"
                                                     sort="analise_nr" style="width: 10%" width="7%">
                                                     <ui:hyperlink action="#{FormSeguranca.lnkNrConcluida_action}" binding="#{FormSeguranca.lnkNrConcluida}"
@@ -181,7 +215,7 @@
                                                         id="lnkPorConcluida" style="" text="#{currentRow.value['numero_mecanografico']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormSeguranca.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
-                                                    sort="nome_acidentado" style="width: 80%" width="60%">
+                                                    sort="nome_acidentado" style="width: 70%" width="50%">
                                                     <ui:hyperlink action="#{FormSeguranca.lnkNomeConcluida_action}" binding="#{FormSeguranca.lnkNomeConcluida}"
                                                         id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp b/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
index 6a08d215..87041ccd 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/GestaoUtilizadores.jsp
@@ -7,6 +7,18 @@
                 <ui:head binding="#{GestaoUtilizadores.head1}" id="head1">
                     <ui:link binding="#{GestaoUtilizadores.link1}" id="link1" url="/resources/stylesheet.css"/>
                     <script>
+
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+
                         function clearEmptyTables()
                         {
                             var t1 = document.getElementById("form1:table3:tableRowGroup3:_emptyDataColumn:_emptyDataText");
@@ -41,11 +53,14 @@
                                             binding="#{GestaoUtilizadores.lnkAnalisesAcidente}" id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{GestaoUtilizadores.stSep3}" escape="false" id="stSep3" text=" | "/>
                                         <ui:hyperlink action="#{GestaoUtilizadores.lnkNewUser_action}" binding="#{GestaoUtilizadores.lnkNewUser1}"
-                                            disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                                            disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{GestaoUtilizadores.stSep2}" escape="false" id="stSep2" text=" | "/>
                                         <ui:hyperlink action="#{GestaoUtilizadores.lnkEditUser_action}" binding="#{GestaoUtilizadores.lnkEditUser1}"
                                             id="lnkEditUser1" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{GestaoUtilizadores.staticText1}" escape="false" id="staticText1" text=" | "/>
+                                        <ui:hyperlink action="#{GestaoUtilizadores.lnkAjuda_action}" binding="#{GestaoUtilizadores.lnkAjuda1}" id="lnkAjuda1"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{GestaoUtilizadores.staticText4}" id="staticText4" style="width: 0px" text="|"/>
                                         <ui:hyperlink action="#{GestaoUtilizadores.lnkLogout_action}" binding="#{GestaoUtilizadores.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
index ec813f01..3395b0fa 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
@@ -7,6 +7,18 @@
                 <ui:head binding="#{NovoUtilizador.head1}" id="head1">
                     <ui:link binding="#{NovoUtilizador.link1}" id="link1" url="/resources/stylesheet.css"/>
                     <script>
+
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+
                         function showPanel(rb)
                         {
                             document.getElementById("form1:gridTrabalhadores").className = "hidden"; 
@@ -76,10 +88,13 @@
                                             id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{NovoUtilizador.staticText28}" escape="false" id="staticText28" text=" | "/>
                                         <ui:hyperlink action="#{NovoUtilizador.lnkNewUser_action}" binding="#{NovoUtilizador.lnkNewUser1}" disabled="true"
-                                            id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                                            id="lnkNewUser1" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{NovoUtilizador.staticText27}" escape="false" id="staticText27" text=" | "/>
                                         <ui:hyperlink action="#{NovoUtilizador.lnkEditUser_action}" binding="#{NovoUtilizador.lnkEditUser1}" id="lnkEditUser1" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{NovoUtilizador.staticText2}" escape="false" id="staticText2" text=" | "/>
+                                        <ui:hyperlink action="#{NovoUtilizador.lnkAjuda_action}" binding="#{NovoUtilizador.lnkAjuda1}" id="lnkAjuda1"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{NovoUtilizador.staticText29}" id="staticText29" style="height: 22px; width: 0px" text="|"/>
                                         <ui:hyperlink action="#{NovoUtilizador.lnkLogout_action}" binding="#{NovoUtilizador.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
@@ -118,7 +133,8 @@
                                                 <ui:checkbox binding="#{NovoUtilizador.chkGestaoGeral}" id="chkGestaoGeral" style="height: 24px; width: 24px"/>
                                             </ui:panelGroup>
                                             <ui:panelGroup binding="#{NovoUtilizador.pgCatHs}" id="pgCatHs" style="height: 24px; width: 312px">
-                                                <ui:radioButton binding="#{NovoUtilizador.rbCatHs}" id="rbCatHs" name="categorias" onClick="showPanel(this);" style="height: 24px; width: 24px"/>
+                                                <ui:radioButton binding="#{NovoUtilizador.rbCatHs}" id="rbCatHs" name="categorias" onClick="showPanel(this);"
+                                                    style="height: 24px; width: 24px" valueChangeListener="#{NovoUtilizador.rbCatHs_processValueChange}"/>
                                                 <ui:staticText binding="#{NovoUtilizador.staticText14}" escape="false" id="staticText14"
                                                     style="height: 24px; width: 240px" text="Higiene e Seguran&amp;ccedil;a&#xa; "/>
                                             </ui:panelGroup>
@@ -128,7 +144,8 @@
                                                     style="height: 24px; width: 240px" text="M&amp;eacute;dico&#xa; "/>
                                             </ui:panelGroup>
                                             <ui:panelGroup binding="#{NovoUtilizador.pgCatRh}" id="pgCatRh" style="height: 24px; width: 312px">
-                                                <ui:radioButton binding="#{NovoUtilizador.rbCatRh}" id="rbCatRh" name="categorias" onClick="showPanel(this);" style="height: 24px; width: 24px"/>
+                                                <ui:radioButton binding="#{NovoUtilizador.rbCatRh}" id="rbCatRh" name="categorias" onClick="showPanel(this);"
+                                                    style="height: 24px; width: 24px" valueChangeListener="#{NovoUtilizador.rbCatRh_processValueChange}"/>
                                                 <ui:staticText binding="#{NovoUtilizador.staticText16}" escape="false" id="staticText16"
                                                     style="height: 24px; width: 240px" text="Recursos Humanos&#xa; "/>
                                             </ui:panelGroup>
@@ -188,10 +205,10 @@
                                                 </ui:table>
                                                 <ui:staticText binding="#{NovoUtilizador.staticText7}" escape="false" id="staticText7"
                                                     style="height: 24px; width: 72px" text=" "/>
-                                                <ui:staticText binding="#{NovoUtilizador.staticText8}" escape="false" id="staticText8"
-                                                    style="height: 24px; width: 72px" styleClass="labelBold" text=" Outro"/>
-                                                <h:panelGrid binding="#{NovoUtilizador.gridPanel5}" columnClasses="gridColLeft15, gridColLeft85" columns="2"
-                                                    id="gridPanel5" style="height: 24px" width="360">
+                                                <ui:staticText binding="#{NovoUtilizador.stOutro}" escape="false" id="stOutro" style="height: 24px; width: 72px"
+                                                    styleClass="labelBold" text=" Outro"/>
+                                                <h:panelGrid binding="#{NovoUtilizador.gridOutro}" columnClasses="gridColLeft15, gridColLeft85" columns="2"
+                                                    id="gridOutro" style="height: 24px" width="360">
                                                     <ui:staticText binding="#{NovoUtilizador.staticText9}" escape="false" id="staticText9" style="width: 72px"
                                                         styleClass="labelBold" text="Designa&amp;ccedil;&amp;atilde;o:"/>
                                                     <ui:textField binding="#{NovoUtilizador.txtNomeOutro}" id="txtNomeOutro" style="height: 18px; width: 216px"/>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp b/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
index ce51cb5b..23accdbc 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp
@@ -14,12 +14,15 @@
                             <h:panelGrid binding="#{RecuperarPassword.gridPanel2}" columns="1" id="gridPanel2" style="height: 24px" styleClass="centerBlock" width="456">
                                 <h:panelGrid binding="#{RecuperarPassword.gridPanel3}" columns="1" id="gridPanel3"
                                     style="border-width: 1px; border-style: solid; border-color: rgb(0, 0, 0) rgb(0, 0, 0) rgb(0, 0, 0) rgb(0, 0, 0); height: 24px" width="432">
-                                    <ui:staticText binding="#{RecuperarPassword.staticText3}" id="staticText3" style="height: 24px; width: 240px" text="Preencha os seguintes dados pessoais"/>
+                                    <ui:staticText binding="#{RecuperarPassword.staticText3}" id="staticText3"
+                                        style="font-weight: bold; height: 24px; width: 240px" text="Preencha os seguintes dados pessoais"/>
                                     <h:panelGrid binding="#{RecuperarPassword.gridPanel4}" columnClasses="gridColLeft, gridColRight" columns="2" id="gridPanel4"
                                         style="height: 72px" width="432">
-                                        <ui:staticText binding="#{RecuperarPassword.staticText1}" id="staticText1" style="height: 24px; width: 144px" text="Utilizador:"/>
+                                        <ui:staticText binding="#{RecuperarPassword.staticText1}" id="staticText1"
+                                            style="font-weight: bold; height: 24px; width: 144px" text="Utilizador:"/>
                                         <ui:textField binding="#{RecuperarPassword.txtUtilizador}" id="txtUtilizador" style="width: 100%"/>
-                                        <ui:staticText binding="#{RecuperarPassword.staticText2}" id="staticText2" style="height: 24px; width: 144px" text="E-mail:"/>
+                                        <ui:staticText binding="#{RecuperarPassword.staticText2}" id="staticText2"
+                                            style="font-weight: bold; height: 24px; width: 144px" text="E-mail:"/>
                                         <ui:textField binding="#{RecuperarPassword.txtEmail}" id="txtEmail" style="width: 100%"/>
                                     </h:panelGrid>
                                     <h:panelGrid binding="#{RecuperarPassword.gridPanel5}" columnClasses="gridColRight" id="gridPanel5"
@@ -32,7 +35,7 @@
                                         </ui:panelGroup>
                                     </h:panelGrid>
                                 </h:panelGrid>
-                                <ui:staticText binding="#{RecuperarPassword.txtMsg}" id="txtMsg" style="height: 24px; width: 240px" styleClass="labelMsg"/>
+                                <ui:staticText binding="#{RecuperarPassword.txtMsg}" escape="false" id="txtMsg" style="height: 24px; width: 240px" styleClass="labelMsg"/>
                             </h:panelGrid>
                         </h:panelGrid>
                         <div class="gridColCenter" style="height: 22px; left: 0px; top: 500px; position: absolute; width: 100%">
diff --git a/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp b/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
index a986770e..9dd6586a 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/UtilizadorFields.jsp
@@ -7,6 +7,18 @@
                 <ui:head binding="#{UtilizadorFields.head1}" id="head1">
                     <ui:link binding="#{UtilizadorFields.link1}" id="link1" url="/resources/stylesheet.css"/>
                     <script>
+
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}                        
+
                         function confirmeUserDeletion()
                         {
                             var hid = document.getElementById("form1:hidConfDelUser");
@@ -45,11 +57,14 @@
                                             id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{UtilizadorFields.staticText18}" escape="false" id="staticText18" text=" | "/>
                                         <ui:hyperlink action="#{UtilizadorFields.lnkNewUser_action}" binding="#{UtilizadorFields.lnkNewUser1}" disabled="true"
-                                            id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                                            id="lnkNewUser1" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{UtilizadorFields.staticText17}" escape="false" id="staticText17" text=" | "/>
                                         <ui:hyperlink action="#{UtilizadorFields.lnkEditUser_action}" binding="#{UtilizadorFields.lnkEditUser1}" disabled="true"
                                             id="lnkEditUser1" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{UtilizadorFields.staticText2}" escape="false" id="staticText2" text=" | "/>
+                                        <ui:hyperlink action="#{UtilizadorFields.lnkAjuda_action}" binding="#{UtilizadorFields.lnkAjuda}" id="lnkAjuda"
+                                            onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{UtilizadorFields.staticText19}" id="staticText19" style="height: 22px; width: 0px" text="|"/>
                                         <ui:hyperlink action="#{UtilizadorFields.lnkLogout_action}" binding="#{UtilizadorFields.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
index ddc784e4..568c661a 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp
@@ -6,8 +6,38 @@
             <ui:html binding="#{ViewAnaliseAcidenteTrabalho.html1}" id="html1">
                 <ui:head binding="#{ViewAnaliseAcidenteTrabalho.head1}" id="head1">
                     <ui:link binding="#{ViewAnaliseAcidenteTrabalho.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <script>
+			function showPdf()
+			{
+			    sOptions = " width = '" + screen.availWidth + "'";
+			    sOptions += " height= '" + screen.availHeight + "'";
+			    var wOpen;
+				wOpen = window.open('./resources/pdf/Ajuda.pdf','', sOptions );
+			   wOpen.focus();
+			   wOpen.moveTo(0,0);
+			   wOpen.resizeTo( screen.availWidth, screen.availHeight );
+			}   
+                        
+                        function confirmeAnaliseDeletion()
+                        {
+                            var hid = document.getElementById("form1:hidConfDelete");
+                            if(hid.value == "apagar")
+                            {
+                                hid.value = null;                            
+                                var conf = confirm("Confirma a eliminação da análise ?");
+                                if(conf)
+                                {
+                                    window.location="ViewAnaliseAcidenteTrabalho.jsp?confirmacao_analise=yes";
+                                }
+                                else
+                                {
+                                    window.location="ViewAnaliseAcidenteTrabalho.jsp?confirmacao_analise=no";                                
+                                }
+                            }
+                        }                                                                        
+                    </script>
                 </ui:head>
-                <ui:body binding="#{ViewAnaliseAcidenteTrabalho.body1}" id="body1" style="-rave-layout: grid">
+                <ui:body binding="#{ViewAnaliseAcidenteTrabalho.body1}" id="body1" onLoad="confirmeAnaliseDeletion();" style="-rave-layout: grid">
                     <ui:form binding="#{ViewAnaliseAcidenteTrabalho.form1}" id="form1">
                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridBase1}" columns="1" id="gridBase1"
                             style="height: 39px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock">
@@ -15,18 +45,21 @@
                                 styleClass="centerBlock" width="456">
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridHeader1}" columnClasses="gridColRightBottom" columns="1"
                                     id="gridHeader1" style="height: 24px; width: 100%" width="624">
-                                    <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel25}" id="groupPanel25" style="height: 24px; width: 310px">
+                                    <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel25}" id="groupPanel25" style="height: 24px">
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblUser}" escape="false" id="lblUser" styleClass="labelBold "/>
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText21}" escape="false" id="staticText21" text="   "/>
                                         <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkAnalisesAcidente_action}"
                                             binding="#{ViewAnaliseAcidenteTrabalho.lnkAnalisesAcidente}" id="lnkAnalisesAcidente" text="analisar acidentes"/>
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText38}" escape="false" id="staticText38" text=" | "/>
                                         <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkNewUser_action}"
-                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkNewUser1}" disabled="true" id="lnkNewUser1" style="width: 120px" text="gerir utilizadores"/>
+                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkNewUser1}" disabled="true" id="lnkNewUser1" style="" text="gerir utilizadores"/>
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText39}" escape="false" id="staticText39" text=" | "/>
                                         <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkEditUser_action}"
                                             binding="#{ViewAnaliseAcidenteTrabalho.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText40}" escape="false" id="staticText40" text=" | "/>
+                                        <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkAjuda_action}" binding="#{ViewAnaliseAcidenteTrabalho.lnkAjuda1}"
+                                            id="lnkAjuda1" onClick="showPdf();" style="" text="ajuda "/>
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText1}" id="staticText1" style="width: 0px" text="|"/>
                                         <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkLogout_action}"
                                             binding="#{ViewAnaliseAcidenteTrabalho.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
                                     </ui:panelGroup>
@@ -248,7 +281,7 @@
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridSubstancias}" columnClasses="gridColLeft" columns="1"
                                             id="gridSubstancias" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblSubstancias}" escape="false" id="lblSubstancias"
-                                                style="height: 24px" styleClass="labelBold" text="Subst&amp;#226;ncias, equipamentos, ferramentas e objetos utilizados:"/>
+                                                style="height: 24px" styleClass="labelBold" text="Subst&amp;#226;ncias, equipamentos, ferramentas e objectos utilizados:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtSubstancias}" id="txtSubstancias" style="height: 24px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridCondicoes}" columnClasses="gridColLeft" columns="1"
@@ -412,11 +445,13 @@
                                             id="gridAssSupView" style="height: 24px; width: 100%" width="240"/>
                                     </h:panelGrid>
                                 </h:panelGrid>
-                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel12}" columnClasses="gridColRight" columns="1" id="gridPanel12"
+                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel12}" columnClasses="gridColLeft" columns="1" id="gridPanel12"
                                     style="height: 24px; width: 100%" width="336">
-                                    <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel5}" id="groupPanel5" style="height: 24px; width: 240px">
+                                    <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel1}" id="groupPanel1" style="height: 24px; width: 100%">
                                         <ui:button action="#{ViewAnaliseAcidenteTrabalho.butVoltar_action}" binding="#{ViewAnaliseAcidenteTrabalho.butVoltar}"
                                             id="butVoltar" style="height: 24px; width: 96px" text="Voltar"/>
+                                        <ui:button action="#{ViewAnaliseAcidenteTrabalho.butEliminar_action}"
+                                            binding="#{ViewAnaliseAcidenteTrabalho.butEliminar}" id="butEliminar" style="height: 24px; width: 119px" text="Eliminar"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel14}" columnClasses="gridColCenter" columns="1" id="gridPanel14" style="height: 24px; width: 100%">
@@ -429,6 +464,8 @@
                                 </h:panelGrid>
                             </h:panelGrid>
                         </h:panelGrid>
+                        <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel5}" id="groupPanel5"/>
+                        <ui:hiddenField binding="#{ViewAnaliseAcidenteTrabalho.hidConfDelete}" id="hidConfDelete"/>
                     </ui:form>
                 </ui:body>
             </ui:html>
diff --git a/trunk/AnaliseAcidentesTrabalho/web/resources/pdfs/Ajuda.pdf b/trunk/AnaliseAcidentesTrabalho/web/resources/pdfs/Ajuda.pdf
new file mode 100644
index 00000000..3adf0eee
Binary files /dev/null and b/trunk/AnaliseAcidentesTrabalho/web/resources/pdfs/Ajuda.pdf differ
diff --git a/trunk/AnaliseAcidentesTrabalho/web/resources/stylesheet.css b/trunk/AnaliseAcidentesTrabalho/web/resources/stylesheet.css
index 1d50d012..e8a45dde 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/resources/stylesheet.css
+++ b/trunk/AnaliseAcidentesTrabalho/web/resources/stylesheet.css
@@ -189,6 +189,8 @@ body {background-color: #bbd400}
     font-weight : bold;
 }
 
+
+
 .show{
   display : inline;
 }