""

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

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/nbproject/build-impl.xml

@@ -400,6 +400,8 @@
         <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}"/>
         <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.5.jar" file="${file.reference.itext-2.0.5.jar}"/>
+        <copy-ear-war file="${file.reference.itext-2.0.5.jar}" propname="included.lib.file.reference.itext-2.0.5.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"/>
@@ -419,7 +421,7 @@
         <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.file.reference.activation.jar} ${included.lib.file.reference.mail.jar} ${included.lib.file.reference.postgresql-8.2-506.jdbc4.jar} "/>
+            <attribute name="Class-Path" value="${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.5.jar} "/>
         </manifest>
         <delete dir="${dist.ear.dir}/temp"/>
     </target>
@@ -427,6 +429,7 @@
         <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.5.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"/>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=f9aca309
+build.xml.data.CRC32=2ba63215
 build.xml.script.CRC32=ab1471e9
 build.xml.stylesheet.CRC32=95be3570
 # 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=f9aca309
+nbproject/build-impl.xml.data.CRC32=2ba63215
-nbproject/build-impl.xml.script.CRC32=39ccfd31
+nbproject/build-impl.xml.script.CRC32=cae04df0
 nbproject/build-impl.xml.stylesheet.CRC32=ac43bae1

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/nbproject/project.properties

@@ -2,7 +2,7 @@ build.classes.dir=${build.web.dir}/WEB-INF/classes
 build.classes.excludes=**/*.java,**/*.form
 build.dir=build
 build.ear.classes.dir=${build.ear.web.dir}/WEB-INF/classes
-build.ear.web.dir=${build.dir}/ear-module
+build.ear.web.dir=${build.dir}/web
 build.generated.dir=${build.dir}/generated
 build.test.classes.dir=${build.dir}/test/classes
 build.test.results.dir=${build.dir}/test/results
@@ -21,6 +21,7 @@ dist.ear.war=${dist.dir}/${war.ear.name}
 dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 file.reference.activation.jar=jars/activation.jar
+file.reference.itext-2.0.5.jar=../../../Download/iText205/itext-2.0.5.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
@@ -35,7 +36,8 @@ javac.classpath=\
     ${libs.jstl11.classpath}:\
     ${file.reference.activation.jar}:\
     ${file.reference.mail.jar}:\
-    ${file.reference.postgresql-8.2-506.jdbc4.jar}
+    ${file.reference.postgresql-8.2-506.jdbc4.jar}:\
+    ${file.reference.itext-2.0.5.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true
@@ -83,3 +85,4 @@ war.ear.name=AnaliseAcidentesTrabalho.war
 war.name=AnaliseAcidentesTrabalho.war
 war.package=true
 web.docbase.dir=web
+webinf.dir=web/WEB-INF

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/nbproject/project.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.web.project</type>
     <configuration>
-        <creator-data xmlns="http://www.sun.com/creator/ns" jsf.current.theme="theme-default" jsf.pagebean.package="analiseacidentestrabalho" jsf.project.libraries.dir="lib" jsf.startPage="Login.jsp"/>
+        <creator-data xmlns="http://www.sun.com/creator/ns" jsf.current.theme="theme-default" jsf.pagebean.package="analiseacidentestrabalho" jsf.project.libraries.dir="lib" jsf.project.version="3.0" jsf.startPage="Login.jsp"/>
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
             <name>AnaliseAcidentesTrabalho</name>
             <minimum-ant-version>1.6</minimum-ant-version>
@@ -37,6 +37,10 @@
                     <file>${file.reference.postgresql-8.2-506.jdbc4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library files="1">
+                    <file>${file.reference.itext-2.0.5.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries>
                 <library files="6">

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Acidentado.java

@@ -0,0 +1,138 @@
+/*
+ * Acidentado.java
+ *
+ * Created on October 16, 2007, 2:36 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package analiseacidentestrabalho;
+
+/**
+ *
+ * @author lluis
+ */
+public class Acidentado {
+    private Integer id;
+    private String nome;
+    private java.sql.Date data_nascimento;
+    private String bilhete_identidade;
+    private String morada;
+    private String cod_postal;
+    private String localidade;
+    private String contacto_telefonico;
+    private java.sql.Date data_admissao;
+    private String funcao;
+    private String turno;
+    private Integer trabalhador_id;
+    private String numero_mecanografico;    
+    /** Creates a new instance of Acidentado */
+    public Acidentado() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public java.sql.Date getData_nascimento() {
+        return data_nascimento;
+    }
+
+    public void setData_nascimento(java.sql.Date data_nascimento) {
+        this.data_nascimento = data_nascimento;
+    }
+
+    public String getBilhete_identidade() {
+        return bilhete_identidade;
+    }
+
+    public void setBilhete_identidade(String bilhete_identidade) {
+        this.bilhete_identidade = bilhete_identidade;
+    }
+
+    public String getMorada() {
+        return morada;
+    }
+
+    public void setMorada(String morada) {
+        this.morada = morada;
+    }
+
+    public String getCod_postal() {
+        return cod_postal;
+    }
+
+    public void setCod_postal(String cod_postal) {
+        this.cod_postal = cod_postal;
+    }
+
+    public String getLocalidade() {
+        return localidade;
+    }
+
+    public void setLocalidade(String localidade) {
+        this.localidade = localidade;
+    }
+
+    public String getContacto_telefonico() {
+        return contacto_telefonico;
+    }
+
+    public void setContacto_telefonico(String contacto_telefonico) {
+        this.contacto_telefonico = contacto_telefonico;
+    }
+
+    public java.sql.Date getData_admissao() {
+        return data_admissao;
+    }
+
+    public void setData_admissao(java.sql.Date data_admissao) {
+        this.data_admissao = data_admissao;
+    }
+
+    public String getFuncao() {
+        return funcao;
+    }
+
+    public void setFuncao(String funcao) {
+        this.funcao = funcao;
+    }
+
+    public Integer getTrabalhador_id() {
+        return trabalhador_id;
+    }
+
+    public void setTrabalhador_id(Integer trabalhador_id) {
+        this.trabalhador_id = trabalhador_id;
+    }
+
+    public String getNome() {
+        return nome;
+    }
+
+    public void setNome(String nome) {
+        this.nome = nome;
+    }
+
+    public String getTurno() {
+        return turno;
+    }
+
+    public void setTurno(String turno) {
+        this.turno = turno;
+    }
+
+    public String getNumero_mecanografico() {
+        return numero_mecanografico;
+    }
+
+    public void setNumero_mecanografico(String numero_mecanografico) {
+        this.numero_mecanografico = numero_mecanografico;
+    }
+
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidente.java

@@ -10,6 +10,7 @@
 package analiseacidentestrabalho;
 
 import java.sql.Date;
+import java.sql.Time;
 
 /**
  *
@@ -18,11 +19,15 @@ import java.sql.Date;
 public class AnaliseAcidente {
     private Integer id;
     private Integer nr;
+    private String analise_nr;
     private Date data_acidente;
-    private Integer trabalhador_id;
+    private Integer acidentado_id;
     private String nome_acidentado;
+    private Integer empresa_id;
     private Integer estabelecimento_id;
     private Integer estado;
+    private Integer estado_assinatura;
+    private String fase;
     
     private String morada;
     private String telefone;
@@ -39,6 +44,77 @@ public class AnaliseAcidente {
     private String conclusoes;
     private String accoes;
     
+    private Time hora_acidente;
+    private String formacao_shst;
+    private String formacao_shst_nao_porque;
+    private String outros_acidentes_com_colaborador;
+    private Integer nr_acidentes_com_colaborador;
+    private Integer nr_relatorio_acidente_colaborador1;
+    private Integer nr_relatorio_acidente_colaborador2;
+    private Integer nr_relatorio_acidente_colaborador3;
+    private Integer nr_relatorio_acidente_colaborador4;    
+    private String acidentes_outros_colaboradores;
+    private Integer nr_acidentes_outros_colaboradores;
+    private Integer nr_relatorio_acidente_outros_colaboradores1;
+    private Integer nr_relatorio_acidente_outros_colaboradores2;
+    private Integer nr_relatorio_acidente_outros_colaboradores3;
+    private Integer nr_relatorio_acidente_outros_colaboradores4;    
+    
+    private String lesao_cabeca;
+    private String lesao_pescoco;
+    private String lesao_tronco;
+    private String lesao_membro_sup_dir;
+    private String lesao_membro_sup_esq;    
+    private String lesao_membro_inf_dir;    
+    private String lesao_membro_inf_esq;
+    private String especif1;
+    private String especif2;
+    private String especif3;
+    private String especif4;    
+    private String tipo_lesao;
+    private String tipo_incapacidade;  // 't' ou 'p'
+    private Integer coef_incapacidade;
+    private Date data_aval_incapacidade;
+    private Date data_rev_incapacidade;    
+    private Date periodo_incapacidade_de;    
+    private Date periodo_incapacidade_a;        
+    private String img_flexao;
+    private String img_ext1;
+    private String img_ext2;    
+    private String img_cab2;    
+    private String img_cab3;        
+    private String img_ma2;        
+    private String img_ma3;        
+    private String img_ma5;        
+    private String img_ma6;        
+    private String img_ma8;        
+    private String img_ma10;     
+    
+    private String img_rot1;
+    private String img_rot2;    
+    private String img_cab1;    
+    private String img_cab4;        
+    private String img_ma1;    
+    private String img_ma4;            
+    private String img_ma7;    
+    private String img_ma9;            
+    
+    private Integer restricao_carga;
+    private String restricao_motricidade;
+    private String restricao_conducao;
+    private String restricao_vibracoes;
+    private String restricao_outras;
+    private String med_observ;
+    
+    private Integer medico_id;
+    private Integer tecnico_saude_id;
+    
+    private String ass_resp_seg;
+    private String ass_seg;
+    private String ass_hs;
+    private String ass_med;
+    private String ass_resp_rh;
+    
     /** Creates a new instance of AnaliseAcidente */
     public AnaliseAcidente() {
     }
@@ -59,12 +135,12 @@ public class AnaliseAcidente {
         this.data_acidente = data_acidente;
     }
 
-    public Integer getTrabalhador_id() {
+    public Integer getAcidentado_id() {
-        return trabalhador_id;
+        return acidentado_id;
     }
 
-    public void setTrabalhador_id(Integer trabalhador_id) {
+    public void setAcidentado_id(Integer acidentado_id) {
-        this.trabalhador_id = trabalhador_id;
+        this.acidentado_id = acidentado_id;
     }
 
     public Integer getEstado() {
@@ -211,4 +287,556 @@ public class AnaliseAcidente {
         this.accoes = accoes;
     }
 
+    public Time getHora_acidente() {
+        return hora_acidente;
+    }
+
+    public void setHora_acidente(Time hora_acidente) {
+        this.hora_acidente = hora_acidente;
+    }
+
+    public String getFormacao_shst() {
+        return formacao_shst;
+    }
+
+    public void setFormacao_shst(String formacao_shst) {
+        this.formacao_shst = formacao_shst;
+    }
+
+    public String getFormacao_shst_nao_porque() {
+        return formacao_shst_nao_porque;
+    }
+
+    public void setFormacao_shst_nao_porque(String formacao_shst_nao_porque) {
+        this.formacao_shst_nao_porque = formacao_shst_nao_porque;
+    }
+
+    public String getOutros_acidentes_com_colaborador() {
+        return outros_acidentes_com_colaborador;
+    }
+
+    public void setOutros_acidentes_com_colaborador(String outros_acidentes_com_colaborador) {
+        this.outros_acidentes_com_colaborador = outros_acidentes_com_colaborador;
+    }
+
+    public Integer getNr_acidentes_com_colaborador() {
+        return nr_acidentes_com_colaborador;
+    }
+
+    public void setNr_acidentes_com_colaborador(Integer nr_acidentes_com_colaborador) {
+        this.nr_acidentes_com_colaborador = nr_acidentes_com_colaborador;
+    }
+
+    public Integer getNr_relatorio_acidente_colaborador1() {
+        return nr_relatorio_acidente_colaborador1;
+    }
+
+    public void setNr_relatorio_acidente_colaborador1(Integer nr_relatorio_acidente_colaborador1) {
+        this.nr_relatorio_acidente_colaborador1 = nr_relatorio_acidente_colaborador1;
+    }
+
+    public Integer getNr_relatorio_acidente_colaborador2() {
+        return nr_relatorio_acidente_colaborador2;
+    }
+
+    public void setNr_relatorio_acidente_colaborador2(Integer nr_relatorio_acidente_colaborador2) {
+        this.nr_relatorio_acidente_colaborador2 = nr_relatorio_acidente_colaborador2;
+    }
+
+    public Integer getNr_relatorio_acidente_colaborador3() {
+        return nr_relatorio_acidente_colaborador3;
+    }
+
+    public void setNr_relatorio_acidente_colaborador3(Integer nr_relatorio_acidente_colaborador3) {
+        this.nr_relatorio_acidente_colaborador3 = nr_relatorio_acidente_colaborador3;
+    }
+
+    public Integer getNr_relatorio_acidente_colaborador4() {
+        return nr_relatorio_acidente_colaborador4;
+    }
+
+    public void setNr_relatorio_acidente_colaborador4(Integer nr_relatorio_acidente_colaborador4) {
+        this.nr_relatorio_acidente_colaborador4 = nr_relatorio_acidente_colaborador4;
+    }
+
+    public String getAcidentes_outros_colaboradores() {
+        return acidentes_outros_colaboradores;
+    }
+
+    public void setAcidentes_outros_colaboradores(String acidentes_outros_colaboradores) {
+        this.acidentes_outros_colaboradores = acidentes_outros_colaboradores;
+    }
+
+    public Integer getNr_acidentes_outros_colaboradores() {
+        return nr_acidentes_outros_colaboradores;
+    }
+
+    public void setNr_acidentes_outros_colaboradores(Integer nr_acidentes_outros_colaboradores) {
+        this.nr_acidentes_outros_colaboradores = nr_acidentes_outros_colaboradores;
+    }
+
+    public Integer getNr_relatorio_acidente_outros_colaboradores1() {
+        return nr_relatorio_acidente_outros_colaboradores1;
+    }
+
+    public void setNr_relatorio_acidente_outros_colaboradores1(Integer nr_relatorio_acidente_outros_colaboradores1) {
+        this.nr_relatorio_acidente_outros_colaboradores1 = nr_relatorio_acidente_outros_colaboradores1;
+    }
+
+    public Integer getNr_relatorio_acidente_outros_colaboradores2() {
+        return nr_relatorio_acidente_outros_colaboradores2;
+    }
+
+    public void setNr_relatorio_acidente_outros_colaboradores2(Integer nr_relatorio_acidente_outros_colaboradores2) {
+        this.nr_relatorio_acidente_outros_colaboradores2 = nr_relatorio_acidente_outros_colaboradores2;
+    }
+
+    public Integer getNr_relatorio_acidente_outros_colaboradores3() {
+        return nr_relatorio_acidente_outros_colaboradores3;
+    }
+
+    public void setNr_relatorio_acidente_outros_colaboradores3(Integer nr_relatorio_acidente_outros_colaboradores3) {
+        this.nr_relatorio_acidente_outros_colaboradores3 = nr_relatorio_acidente_outros_colaboradores3;
+    }
+
+    public Integer getNr_relatorio_acidente_outros_colaboradores4() {
+        return nr_relatorio_acidente_outros_colaboradores4;
+    }
+
+    public void setNr_relatorio_acidente_outros_colaboradores4(Integer nr_relatorio_acidente_outros_colaboradores4) {
+        this.nr_relatorio_acidente_outros_colaboradores4 = nr_relatorio_acidente_outros_colaboradores4;
+    }
+
+    public String getLesao_cabeca() {
+        return lesao_cabeca;
+    }
+
+    public void setLesao_cabeca(String lesao_cabeca) {
+        this.lesao_cabeca = lesao_cabeca;
+    }
+
+    public String getLesao_pescoco() {
+        return lesao_pescoco;
+    }
+
+    public void setLesao_pescoco(String lesao_pescoco) {
+        this.lesao_pescoco = lesao_pescoco;
+    }
+
+    public String getLesao_tronco() {
+        return lesao_tronco;
+    }
+
+    public void setLesao_tronco(String lesao_tronco) {
+        this.lesao_tronco = lesao_tronco;
+    }
+
+    public String getLesao_membro_sup_dir() {
+        return lesao_membro_sup_dir;
+    }
+
+    public void setLesao_membro_sup_dir(String lesao_membro_sup_dir) {
+        this.lesao_membro_sup_dir = lesao_membro_sup_dir;
+    }
+
+    public String getLesao_membro_sup_esq() {
+        return lesao_membro_sup_esq;
+    }
+
+    public void setLesao_membro_sup_esq(String lesao_membro_sup_esq) {
+        this.lesao_membro_sup_esq = lesao_membro_sup_esq;
+    }
+
+    public String getLesao_membro_inf_dir() {
+        return lesao_membro_inf_dir;
+    }
+
+    public void setLesao_membro_inf_dir(String lesao_membro_inf_dir) {
+        this.lesao_membro_inf_dir = lesao_membro_inf_dir;
+    }
+
+    public String getLesao_membro_inf_esq() {
+        return lesao_membro_inf_esq;
+    }
+
+    public void setLesao_membro_inf_esq(String lesao_membro_inf_esq) {
+        this.lesao_membro_inf_esq = lesao_membro_inf_esq;
+    }
+
+    public String getEspecif1() {
+        return especif1;
+    }
+
+    public void setEspecif1(String especif1) {
+        this.especif1 = especif1;
+    }
+
+    public String getEspecif2() {
+        return especif2;
+    }
+
+    public void setEspecif2(String especif2) {
+        this.especif2 = especif2;
+    }
+
+    public String getEspecif3() {
+        return especif3;
+    }
+
+    public void setEspecif3(String especif3) {
+        this.especif3 = especif3;
+    }
+
+    public String getEspecif4() {
+        return especif4;
+    }
+
+    public void setEspecif4(String especif4) {
+        this.especif4 = especif4;
+    }
+
+    public String getTipo_incapacidade() {
+        return tipo_incapacidade;
+    }
+
+    public void setTipo_incapacidade(String tipo_incapacidade) {
+        this.tipo_incapacidade = tipo_incapacidade;
+    }
+
+    public Integer getCoef_incapacidade() {
+        return coef_incapacidade;
+    }
+
+    public void setCoef_incapacidade(Integer coef_incapacidade) {
+        this.coef_incapacidade = coef_incapacidade;
+    }
+
+    public Date getData_aval_incapacidade() {
+        return data_aval_incapacidade;
+    }
+
+    public void setData_aval_incapacidade(Date data_aval_incapacidade) {
+        this.data_aval_incapacidade = data_aval_incapacidade;
+    }
+
+    public Date getData_rev_incapacidade() {
+        return data_rev_incapacidade;
+    }
+
+    public void setData_rev_incapacidade(Date data_rev_incapacidade) {
+        this.data_rev_incapacidade = data_rev_incapacidade;
+    }
+
+    public Date getPeriodo_incapacidade_de() {
+        return periodo_incapacidade_de;
+    }
+
+    public void setPeriodo_incapacidade_de(Date periodo_incapacidade_de) {
+        this.periodo_incapacidade_de = periodo_incapacidade_de;
+    }
+
+    public Date getPeriodo_incapacidade_a() {
+        return periodo_incapacidade_a;
+    }
+
+    public void setPeriodo_incapacidade_a(Date periodo_incapacidade_a) {
+        this.periodo_incapacidade_a = periodo_incapacidade_a;
+    }
+
+    public String getImg_flexao() {
+        return img_flexao;
+    }
+
+    public void setImg_flexao(String img_flexao) {
+        this.img_flexao = img_flexao;
+    }
+
+    public String getImg_ext1() {
+        return img_ext1;
+    }
+
+    public void setImg_ext1(String img_ext1) {
+        this.img_ext1 = img_ext1;
+    }
+
+    public String getImg_ext2() {
+        return img_ext2;
+    }
+
+    public void setImg_ext2(String img_ext2) {
+        this.img_ext2 = img_ext2;
+    }
+
+    public String getImg_cab2() {
+        return img_cab2;
+    }
+
+    public void setImg_cab2(String img_cab2) {
+        this.img_cab2 = img_cab2;
+    }
+
+    public String getImg_cab3() {
+        return img_cab3;
+    }
+
+    public void setImg_cab3(String img_cab3) {
+        this.img_cab3 = img_cab3;
+    }
+
+    public String getImg_ma2() {
+        return img_ma2;
+    }
+
+    public void setImg_ma2(String img_ma2) {
+        this.img_ma2 = img_ma2;
+    }
+
+    public String getImg_ma3() {
+        return img_ma3;
+    }
+
+    public void setImg_ma3(String img_ma3) {
+        this.img_ma3 = img_ma3;
+    }
+
+    public String getImg_ma5() {
+        return img_ma5;
+    }
+
+    public void setImg_ma5(String img_ma5) {
+        this.img_ma5 = img_ma5;
+    }
+
+    public String getImg_ma6() {
+        return img_ma6;
+    }
+
+    public void setImg_ma6(String img_ma6) {
+        this.img_ma6 = img_ma6;
+    }
+
+    public String getImg_ma8() {
+        return img_ma8;
+    }
+
+    public void setImg_ma8(String img_ma8) {
+        this.img_ma8 = img_ma8;
+    }
+
+    public String getImg_ma10() {
+        return img_ma10;
+    }
+
+    public void setImg_ma10(String img_ma10) {
+        this.img_ma10 = img_ma10;
+    }
+
+    public Integer getRestricao_carga() {
+        return restricao_carga;
+    }
+
+    public void setRestricao_carga(Integer restricao_carga) {
+        this.restricao_carga = restricao_carga;
+    }
+
+    public String getRestricao_motricidade() {
+        return restricao_motricidade;
+    }
+
+    public void setRestricao_motricidade(String restricao_motricidade) {
+        this.restricao_motricidade = restricao_motricidade;
+    }
+
+    public String getRestricao_conducao() {
+        return restricao_conducao;
+    }
+
+    public void setRestricao_conducao(String restricao_conducao) {
+        this.restricao_conducao = restricao_conducao;
+    }
+
+    public String getRestricao_vibracoes() {
+        return restricao_vibracoes;
+    }
+
+    public void setRestricao_vibracoes(String restricao_vibracoes) {
+        this.restricao_vibracoes = restricao_vibracoes;
+    }
+
+    public String getRestricao_outras() {
+        return restricao_outras;
+    }
+
+    public void setRestricao_outras(String restricao_outras) {
+        this.restricao_outras = restricao_outras;
+    }
+
+    public String getMed_observ() {
+        return med_observ;
+    }
+
+    public void setMed_observ(String med_observ) {
+        this.med_observ = med_observ;
+    }
+
+    public String getTipo_lesao() {
+        return tipo_lesao;
+    }
+
+    public void setTipo_lesao(String tipo_lesao) {
+        this.tipo_lesao = tipo_lesao;
+    }
+
+    public String getImg_rot1() {
+        return img_rot1;
+    }
+
+    public void setImg_rot1(String img_rot1) {
+        this.img_rot1 = img_rot1;
+    }
+
+    public String getImg_rot2() {
+        return img_rot2;
+    }
+
+    public void setImg_rot2(String img_rot2) {
+        this.img_rot2 = img_rot2;
+    }
+
+    public String getImg_cab1() {
+        return img_cab1;
+    }
+
+    public void setImg_cab1(String img_cab1) {
+        this.img_cab1 = img_cab1;
+    }
+
+    public String getImg_cab4() {
+        return img_cab4;
+    }
+
+    public void setImg_cab4(String img_cab4) {
+        this.img_cab4 = img_cab4;
+    }
+
+    public String getImg_ma1() {
+        return img_ma1;
+    }
+
+    public void setImg_ma1(String img_ma1) {
+        this.img_ma1 = img_ma1;
+    }
+
+    public String getImg_ma4() {
+        return img_ma4;
+    }
+
+    public void setImg_ma4(String img_ma4) {
+        this.img_ma4 = img_ma4;
+    }
+
+    public String getImg_ma7() {
+        return img_ma7;
+    }
+
+    public void setImg_ma7(String img_ma7) {
+        this.img_ma7 = img_ma7;
+    }
+
+    public String getImg_ma9() {
+        return img_ma9;
+    }
+
+    public void setImg_ma9(String img_ma9) {
+        this.img_ma9 = img_ma9;
+    }
+
+    public Integer getEmpresa_id() {
+        return empresa_id;
+    }
+
+    public void setEmpresa_id(Integer empresa_id) {
+        this.empresa_id = empresa_id;
+    }
+
+    public Integer getMedico_id() {
+        return medico_id;
+    }
+
+    public void setMedico_id(Integer medico_id) {
+        this.medico_id = medico_id;
+    }
+
+    public Integer getTecnico_saude_id() {
+        return tecnico_saude_id;
+    }
+
+    public void setTecnico_saude_id(Integer tecnico_saude_id) {
+        this.tecnico_saude_id = tecnico_saude_id;
+    }
+
+    public String getAnalise_nr() {
+        return analise_nr;
+    }
+
+    public void setAnalise_nr(String analise_nr) {
+        this.analise_nr = analise_nr;
+    }
+
+    public String getFase() {
+        return fase;
+    }
+
+    public void setFase(String fase) {
+        this.fase = fase;
+    }
+
+    public Integer getEstado_assinatura() {
+        return estado_assinatura;
+    }
+
+    public void setEstado_assinatura(Integer estado_assinatura) {
+        this.estado_assinatura = estado_assinatura;
+    }
+
+    public String getAss_resp_seg() {
+        return ass_resp_seg;
+    }
+
+    public void setAss_resp_seg(String ass_resp_seg) {
+        this.ass_resp_seg = ass_resp_seg;
+    }
+
+    public String getAss_seg() {
+        return ass_seg;
+    }
+
+    public void setAss_seg(String ass_seg) {
+        this.ass_seg = ass_seg;
+    }
+
+    public String getAss_hs() {
+        return ass_hs;
+    }
+
+    public void setAss_hs(String ass_hs) {
+        this.ass_hs = ass_hs;
+    }
+
+    public String getAss_med() {
+        return ass_med;
+    }
+
+    public void setAss_med(String ass_med) {
+        this.ass_med = ass_med;
+    }
+
+    public String getAss_resp_rh() {
+        return ass_resp_rh;
+    }
+
+    public void setAss_resp_rh(String ass_resp_rh) {
+        this.ass_resp_rh = ass_resp_rh;
+    }
+    
 }

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Dummy.java

@@ -1,6 +1,7 @@
 /*
  * Dummy.java
  *
+ *
  * Created on September 19, 2007, 10:56 AM
  * Copyright lluis
  */
@@ -9,9 +10,12 @@ package analiseacidentestrabalho;
 import com.sun.rave.web.ui.appbase.AbstractPageBean;
 import com.sun.rave.web.ui.component.Body;
 import com.sun.rave.web.ui.component.Button;
+import com.sun.rave.web.ui.component.Calendar;
+import com.sun.rave.web.ui.component.Checkbox;
 import com.sun.rave.web.ui.component.DropDown;
 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;
@@ -19,7 +23,12 @@ import com.sun.rave.web.ui.component.ImageHyperlink;
 import com.sun.rave.web.ui.component.Link;
 import com.sun.rave.web.ui.component.Page;
 import com.sun.rave.web.ui.component.PanelGroup;
+import com.sun.rave.web.ui.component.PasswordField;
+import com.sun.rave.web.ui.component.RadioButton;
 import com.sun.rave.web.ui.component.StaticText;
+import com.sun.rave.web.ui.component.Table;
+import com.sun.rave.web.ui.component.TableColumn;
+import com.sun.rave.web.ui.component.TableRowGroup;
 import com.sun.rave.web.ui.component.TextArea;
 import com.sun.rave.web.ui.component.TextField;
 import com.sun.rave.web.ui.component.Upload;
@@ -106,34 +115,64 @@ public class Dummy extends AbstractPageBean {
         this.form1 = f;
     }
 
-    private HtmlPanelGrid gridPanel3 = new HtmlPanelGrid();
+    private HtmlPanelGrid gridPanel1 = new HtmlPanelGrid();
 
-    public HtmlPanelGrid getGridPanel3() {
+    public HtmlPanelGrid getGridPanel1() {
-        return gridPanel3;
+        return gridPanel1;
     }
 
-    public void setGridPanel3(HtmlPanelGrid hpg) {
+    public void setGridPanel1(HtmlPanelGrid hpg) {
-        this.gridPanel3 = hpg;
+        this.gridPanel1 = hpg;
     }
 
-    private TextField txtIn = new TextField();
+    private PanelGroup groupPanel1 = new PanelGroup();
 
-    public TextField getTxtIn() {
+    public PanelGroup getGroupPanel1() {
-        return txtIn;
+        return groupPanel1;
     }
 
-    public void setTxtIn(TextField tf) {
+    public void setGroupPanel1(PanelGroup pg) {
-        this.txtIn = tf;
+        this.groupPanel1 = pg;
     }
 
-    private Button button1 = new Button();
+    private ImageComponent image1 = new ImageComponent();
 
-    public Button getButton1() {
+    public ImageComponent getImage1() {
-        return button1;
+        return image1;
     }
 
-    public void setButton1(Button b) {
+    public void setImage1(ImageComponent ic) {
-        this.button1 = b;
+        this.image1 = ic;
+    }
+
+    private ImageComponent image2 = new ImageComponent();
+
+    public ImageComponent getImage2() {
+        return image2;
+    }
+
+    public void setImage2(ImageComponent ic) {
+        this.image2 = ic;
+    }
+
+    private PanelGroup groupPanel2 = new PanelGroup();
+
+    public PanelGroup getGroupPanel2() {
+        return groupPanel2;
+    }
+
+    public void setGroupPanel2(PanelGroup pg) {
+        this.groupPanel2 = pg;
+    }
+
+    private StaticText lblUser1 = new StaticText();
+
+    public StaticText getLblUser1() {
+        return lblUser1;
+    }
+
+    public void setLblUser1(StaticText st) {
+        this.lblUser1 = st;
     }
 
     private StaticText staticText1 = new StaticText();
@@ -146,14 +185,384 @@ public class Dummy extends AbstractPageBean {
         this.staticText1 = st;
     }
 
-    private Hyperlink lnkLblTrabalhador = new Hyperlink();
+    private Hyperlink lnkEditUser1 = new Hyperlink();
+
+    public Hyperlink getLnkEditUser1() {
+        return lnkEditUser1;
+    }
+
+    public void setLnkEditUser1(Hyperlink h) {
+        this.lnkEditUser1 = h;
+    }
+
+    private StaticText staticText2 = new StaticText();
+
+    public StaticText getStaticText2() {
+        return staticText2;
+    }
+
+    public void setStaticText2(StaticText st) {
+        this.staticText2 = st;
+    }
+
+    private Hyperlink lnkLogout1 = new Hyperlink();
+
+    public Hyperlink getLnkLogout1() {
+        return lnkLogout1;
+    }
+
+    public void setLnkLogout1(Hyperlink h) {
+        this.lnkLogout1 = h;
+    }
+
+    private StaticText staticText3 = new StaticText();
+
+    public StaticText getStaticText3() {
+        return staticText3;
+    }
+
+    public void setStaticText3(StaticText st) {
+        this.staticText3 = st;
+    }
+
+    private HtmlPanelGrid gridPanel4 = new HtmlPanelGrid();
+
+    public HtmlPanelGrid getGridPanel4() {
+        return gridPanel4;
+    }
+
+    public void setGridPanel4(HtmlPanelGrid hpg) {
+        this.gridPanel4 = hpg;
+    }
+
+    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 Hyperlink getLnkLblTrabalhador() {
+    public ImageComponent getImage3() {
-        return lnkLblTrabalhador;
+        return image3;
     }
 
-    public void setLnkLblTrabalhador(Hyperlink h) {
+    public void setImage3(ImageComponent ic) {
-        this.lnkLblTrabalhador = h;
+        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();
+
+    public StaticText getStaticText5() {
+        return staticText5;
+    }
+
+    public void setStaticText5(StaticText st) {
+        this.staticText5 = st;
+    }
+
+    private StaticText stHeaderNr1 = new StaticText();
+
+    public StaticText getStHeaderNr1() {
+        return stHeaderNr1;
+    }
+
+    public void setStHeaderNr1(StaticText st) {
+        this.stHeaderNr1 = st;
+    }
+
+    private PanelGroup groupPanel6 = new PanelGroup();
+
+    public PanelGroup getGroupPanel6() {
+        return groupPanel6;
+    }
+
+    public void setGroupPanel6(PanelGroup pg) {
+        this.groupPanel6 = pg;
+    }
+
+    private StaticText staticText6 = new StaticText();
+
+    public StaticText getStaticText6() {
+        return staticText6;
+    }
+
+    public void setStaticText6(StaticText st) {
+        this.staticText6 = st;
+    }
+
+    private StaticText stHeaderDate1 = new StaticText();
+
+    public StaticText getStHeaderDate1() {
+        return stHeaderDate1;
+    }
+
+    public void setStHeaderDate1(StaticText st) {
+        this.stHeaderDate1 = st;
+    }
+
+    private ImageComponent image4 = new ImageComponent();
+
+    public ImageComponent getImage4() {
+        return image4;
+    }
+
+    public void setImage4(ImageComponent ic) {
+        this.image4 = ic;
+    }
+
+    private RadioButton radioButton1 = new RadioButton();
+
+    public RadioButton getRadioButton1() {
+        return radioButton1;
+    }
+
+    public void setRadioButton1(RadioButton rb) {
+        this.radioButton1 = rb;
+    }
+
+    private PanelGroup groupPanel7 = new PanelGroup();
+
+    public PanelGroup getGroupPanel7() {
+        return groupPanel7;
+    }
+
+    public void setGroupPanel7(PanelGroup pg) {
+        this.groupPanel7 = pg;
+    }
+
+    private StaticText staticText10 = new StaticText();
+
+    public StaticText getStaticText10() {
+        return staticText10;
+    }
+
+    public void setStaticText10(StaticText st) {
+        this.staticText10 = st;
+    }
+
+    private StaticText staticText11 = new StaticText();
+
+    public StaticText getStaticText11() {
+        return staticText11;
+    }
+
+    public void setStaticText11(StaticText st) {
+        this.staticText11 = st;
+    }
+
+    private StaticText staticText12 = new StaticText();
+
+    public StaticText getStaticText12() {
+        return staticText12;
+    }
+
+    public void setStaticText12(StaticText st) {
+        this.staticText12 = st;
+    }
+
+    private StaticText staticText13 = new StaticText();
+
+    public StaticText getStaticText13() {
+        return staticText13;
+    }
+
+    public void setStaticText13(StaticText st) {
+        this.staticText13 = st;
+    }
+
+    private StaticText staticText14 = new StaticText();
+
+    public StaticText getStaticText14() {
+        return staticText14;
+    }
+
+    public void setStaticText14(StaticText st) {
+        this.staticText14 = st;
+    }
+
+    private RadioButton rbTurnoManha = new RadioButton();
+
+    public RadioButton getRbTurnoManha() {
+        return rbTurnoManha;
+    }
+
+    public void setRbTurnoManha(RadioButton rb) {
+        this.rbTurnoManha = rb;
+    }
+
+    private RadioButton rbTurnoTarde = new RadioButton();
+
+    public RadioButton getRbTurnoTarde() {
+        return rbTurnoTarde;
+    }
+
+    public void setRbTurnoTarde(RadioButton rb) {
+        this.rbTurnoTarde = rb;
+    }
+
+    private RadioButton rbTurnoNoite = new RadioButton();
+
+    public RadioButton getRbTurnoNoite() {
+        return rbTurnoNoite;
+    }
+
+    public void setRbTurnoNoite(RadioButton rb) {
+        this.rbTurnoNoite = rb;
+    }
+
+    private Button button1 = new Button();
+
+    public Button getButton1() {
+        return button1;
+    }
+
+    public void setButton1(Button b) {
+        this.button1 = b;
+    }
+
+    private HiddenField hiddenField1 = new HiddenField();
+
+    public HiddenField getHiddenField1() {
+        return hiddenField1;
+    }
+
+    public void setHiddenField1(HiddenField hf) {
+        this.hiddenField1 = hf;
     }
     
     // </editor-fold>
@@ -218,7 +627,7 @@ public class Dummy extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
-        txtIn.setText("OLA");
+        //txtIn.setText("OLA");
     }
     
     /**
@@ -256,7 +665,65 @@ public class Dummy extends AbstractPageBean {
     public String button1_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("TEXT : " + txtIn.getText().toString());
+        //System.out.println("TEXT : " + txtIn.getText().toString());
+        return null;
+    }
+
+    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.
+        
+        return null;
+    }
+
+    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.
+        
+        return null;
+    }
+
+    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.
+        
+        return null;
+    }
+
+    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.
+        
+        return null;
+    }
+
+    public String lnkMoreMed1_action() {
+        // TODO: Replace with your code
+        
+        return null;
+    }
+
+    public String lnkNome_action() {
+        // TODO: Replace with your code
+        
+        return null;
+    }
+
+    public String lnkDataNascimento_action() {
+        // TODO: Replace with your code
+        
+        return null;
+    }
+
+    public String lnkEditUser_action() {
+        // TODO: Replace with your code
+        
+        return null;
+    }
+
+    public String lnkLogout_action() {
+        // TODO: Replace with your code
+        
         return null;
     }
 }

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Estabelecimento.java

@@ -0,0 +1,40 @@
+/*
+ * Empresa.java
+ *
+ * Created on October 11, 2007, 5:19 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package analiseacidentestrabalho;
+
+/**
+ *
+ * @author lluis
+ */
+public class Estabelecimento {
+    private Integer id;
+    private String nome_plain;
+    
+    /** Creates a new instance of Empresa */
+    public Estabelecimento() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getNome_plain() {
+        return nome_plain;
+    }
+
+    public void setNome_plain(String nome_plain) {
+        this.nome_plain = nome_plain;
+    }
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java

@@ -26,6 +26,7 @@ import com.sun.rave.web.ui.component.TableRowGroup;
 import com.sun.rave.web.ui.component.TextField;
 import com.sun.rave.web.ui.model.Option;
 import db.AnalisesActualDataProvider;
+import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
 import java.util.ArrayList;
@@ -36,6 +37,7 @@ import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
 import javax.servlet.http.HttpServletRequest;
+import utils.Utils;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -206,14 +208,14 @@ public class FormHS extends AbstractPageBean {
         this.staticText1 = st;
     }
 
-    private Hyperlink lnkChangePassword1 = new Hyperlink();
+    private Hyperlink lnkEditUser = new Hyperlink();
 
-    public Hyperlink getLnkChangePassword1() {
+    public Hyperlink getLnkEditUser() {
-        return lnkChangePassword1;
+        return lnkEditUser;
     }
 
-    public void setLnkChangePassword1(Hyperlink h) {
+    public void setLnkEditUser(Hyperlink h) {
-        this.lnkChangePassword1 = h;
+        this.lnkEditUser = h;
     }
 
     private StaticText staticText2 = new StaticText();
@@ -236,16 +238,6 @@ public class FormHS extends AbstractPageBean {
         this.lnkLogout = h;
     }
 
-    private StaticText staticText3 = new StaticText();
-
-    public StaticText getStaticText3() {
-        return staticText3;
-    }
-
-    public void setStaticText3(StaticText st) {
-        this.staticText3 = st;
-    }
-
     private HtmlPanelGrid gridLayoutTop1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridLayoutTop1() {
@@ -716,14 +708,14 @@ public class FormHS extends AbstractPageBean {
         this.tableColumn7 = tc;
     }
 
-    private Hyperlink hyperlink1 = new Hyperlink();
+    private Hyperlink lnkDataConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink1() {
+    public Hyperlink getLnkDataConcluida() {
-        return hyperlink1;
+        return lnkDataConcluida;
     }
 
-    public void setHyperlink1(Hyperlink h) {
+    public void setLnkDataConcluida(Hyperlink h) {
-        this.hyperlink1 = h;
+        this.lnkDataConcluida = h;
     }
 
     private TableColumn tableColumn8 = new TableColumn();
@@ -736,14 +728,14 @@ public class FormHS extends AbstractPageBean {
         this.tableColumn8 = tc;
     }
 
-    private Hyperlink hyperlink2 = new Hyperlink();
+    private Hyperlink lnkNrConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink2() {
+    public Hyperlink getLnkNrConcluida() {
-        return hyperlink2;
+        return lnkNrConcluida;
     }
 
-    public void setHyperlink2(Hyperlink h) {
+    public void setLnkNrConcluida(Hyperlink h) {
-        this.hyperlink2 = h;
+        this.lnkNrConcluida = h;
     }
 
     private TableColumn tableColumn9 = new TableColumn();
@@ -756,14 +748,14 @@ public class FormHS extends AbstractPageBean {
         this.tableColumn9 = tc;
     }
 
-    private Hyperlink hyperlink3 = new Hyperlink();
+    private Hyperlink lnkNomeConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink3() {
+    public Hyperlink getLnkNomeConcluida() {
-        return hyperlink3;
+        return lnkNomeConcluida;
     }
 
-    public void setHyperlink3(Hyperlink h) {
+    public void setLnkNomeConcluida(Hyperlink h) {
-        this.hyperlink3 = h;
+        this.lnkNomeConcluida = h;
     }
 
     private StaticText txtSearchMsg = new StaticText();
@@ -776,6 +768,46 @@ public class FormHS extends AbstractPageBean {
         this.txtSearchMsg = st;
     }
 
+    private TableColumn tableColumn10 = new TableColumn();
+
+    public TableColumn getTableColumn10() {
+        return tableColumn10;
+    }
+
+    public void setTableColumn10(TableColumn tc) {
+        this.tableColumn10 = tc;
+    }
+
+    private Hyperlink lnkFase = new Hyperlink();
+
+    public Hyperlink getLnkFase() {
+        return lnkFase;
+    }
+
+    public void setLnkFase(Hyperlink h) {
+        this.lnkFase = h;
+    }
+
+    private TableColumn tableColumn11 = new TableColumn();
+
+    public TableColumn getTableColumn11() {
+        return tableColumn11;
+    }
+
+    public void setTableColumn11(TableColumn tc) {
+        this.tableColumn11 = tc;
+    }
+
+    private Hyperlink lnkFaseSeg = new Hyperlink();
+
+    public Hyperlink getLnkFaseSeg() {
+        return lnkFaseSeg;
+    }
+
+    public void setLnkFaseSeg(Hyperlink h) {
+        this.lnkFaseSeg = h;
+    }
+    
     // </editor-fold>
     
     /**
@@ -854,7 +886,8 @@ public class FormHS extends AbstractPageBean {
             //lblActivos.setRendered(true);
             table1.setRendered(true);                                      
 
-            ArrayList actuaisList = adp.getAnalisesActuaisList(getSessionBean1().getCurrentUser().getEstabelecimento_id(), new Integer(3));
+            //ArrayList actuaisList = adp.getAnalisesActuaisList(getSessionBean1().getCurrentUser().getEstabelecimento_id(), new Integer(3));
+            ArrayList actuaisList = adp.getAnalisesActuaisHsList( getSessionBean1().getCurrentUser().getEstabelecimento_id() );            
             getSessionBean1().getAnalisesActualDataProvider().setList(actuaisList);
        }
        catch(Exception ex)
@@ -869,7 +902,7 @@ public class FormHS extends AbstractPageBean {
             //lblActivos.setRendered(true);
             table2.setRendered(true);                                      
 
-            ArrayList seguimentoList = adp.getAnalisesSeguimentoList(getSessionBean1().getCurrentUser().getEstabelecimento_id(), new Integer(3));
+            ArrayList seguimentoList = adp.getAnalisesSeguimentoHsList(getSessionBean1().getCurrentUser().getEstabelecimento_id());
             getSessionBean1().getAnalisesSeguimentoDataProvider().setList(seguimentoList);
        }
        catch(Exception ex)
@@ -881,7 +914,7 @@ public class FormHS extends AbstractPageBean {
        
        HttpServletRequest request = (HttpServletRequest) getExternalContext().getRequest();
        String referer = request.getRequestURI();
-       String pageFrom = getPageFrom(referer);
+       String pageFrom = Utils.getPageFrom(referer);
        if(!pageFrom.matches("FormHS.jsp"))
        {
            
@@ -949,7 +982,7 @@ public class FormHS extends AbstractPageBean {
         
         AnaliseAcidente a = getTableActivosRowData();
         getSessionBean1().setCurrentAnalise(a);
-        getSessionBean1().setNavFrom("FormSeguranca");        
+        getSessionBean1().setNavFrom("FormHS");        
         return "analise_acidente";
     }
 
@@ -958,7 +991,7 @@ public class FormHS extends AbstractPageBean {
         
         AnaliseAcidente a = getTableActivosRowData();
         getSessionBean1().setCurrentAnalise(a);
-        getSessionBean1().setNavFrom("FormSeguranca");        
+        getSessionBean1().setNavFrom("FormHS");        
         return "analise_acidente";
     }
 
@@ -967,7 +1000,7 @@ public class FormHS extends AbstractPageBean {
         
         AnaliseAcidente a = getTableActivosRowData();
         getSessionBean1().setCurrentAnalise(a);
-        getSessionBean1().setNavFrom("FormSeguranca");        
+        getSessionBean1().setNavFrom("FormHS");        
         return "analise_acidente";
     }
     
@@ -1018,6 +1051,16 @@ public class FormHS extends AbstractPageBean {
         return a;
     }   
     
+    private AnaliseAcidente getTableConcluidasRowData()
+    {
+        RowKey rk = tableRowGroup3.getRowKey();
+        int k = Integer.parseInt(rk.getRowId());        
+        AnalisesConcluidasDataProvider provider = (AnalisesConcluidasDataProvider) tableRowGroup3.getSourceData();
+        ArrayList list = (ArrayList) provider.getList();
+        AnaliseAcidente a = (AnaliseAcidente)list.get(k);
+        return a;
+    }            
+
     public void drpAno_processValueChange(ValueChangeEvent event) {
         // TODO: Replace with your code
         Object ano = event.getNewValue();
@@ -1124,11 +1167,11 @@ public class FormHS extends AbstractPageBean {
         return null;
     }
     
-    private String getPageFrom(String referer)
+//    private String getPageFrom(String referer)
-    {
+//    {
-        String pageFrom = referer.substring(referer.lastIndexOf("/")+1);
+//        String pageFrom = referer.substring(referer.lastIndexOf("/")+1);
-        return pageFrom;
+//        return pageFrom;
-    }    
+//    }    
     
     private void fillAnoDropDown()
     {
@@ -1228,5 +1271,57 @@ public class FormHS extends AbstractPageBean {
 //        int day = cal.get(Calendar.DAY_OF_MONTH); 
 //        drpDia.setSelected( new Integer(0) );                        
     }            
+
+    public String lnkEditUser_action() {
+        // TODO: Replace with your code
+        getSessionBean1().setNavFrom("FormHS");        
+        getSessionBean1().setModoEdicaoUtilizador("edit");
+        return "user";
+    }
+
+    public String lnkDataConcluida_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
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormHS");        
+        return "view_analise";
+    }
+
+    public String lnkNomeConcluida_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormHS");        
+        return "view_analise";
+    }
+
+    public String lnkFase_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
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "view_analise";
+    }
 }
 

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java

@@ -26,6 +26,7 @@ import com.sun.rave.web.ui.component.TableRowGroup;
 import com.sun.rave.web.ui.component.TextField;
 import com.sun.rave.web.ui.model.Option;
 import db.AnalisesActualDataProvider;
+import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
 import java.util.ArrayList;
@@ -36,6 +37,7 @@ import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
 import javax.servlet.http.HttpServletRequest;
+import utils.Utils;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -206,14 +208,14 @@ public class FormRH extends AbstractPageBean {
         this.staticText1 = st;
     }
 
-    private Hyperlink lnkChangePassword1 = new Hyperlink();
+    private Hyperlink lnkEditUser = new Hyperlink();
 
-    public Hyperlink getLnkChangePassword1() {
+    public Hyperlink getLnkEditUser() {
-        return lnkChangePassword1;
+        return lnkEditUser;
     }
 
-    public void setLnkChangePassword1(Hyperlink h) {
+    public void setLnkEditUser(Hyperlink h) {
-        this.lnkChangePassword1 = h;
+        this.lnkEditUser = h;
     }
 
     private StaticText staticText2 = new StaticText();
@@ -236,16 +238,6 @@ public class FormRH extends AbstractPageBean {
         this.lnkLogout = h;
     }
 
-    private StaticText staticText3 = new StaticText();
-
-    public StaticText getStaticText3() {
-        return staticText3;
-    }
-
-    public void setStaticText3(StaticText st) {
-        this.staticText3 = st;
-    }
-
     private HtmlPanelGrid gridLayoutTop1 = new HtmlPanelGrid();
 
     public HtmlPanelGrid getGridLayoutTop1() {
@@ -716,14 +708,14 @@ public class FormRH extends AbstractPageBean {
         this.tableColumn7 = tc;
     }
 
-    private Hyperlink hyperlink1 = new Hyperlink();
+    private Hyperlink lnkDataConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink1() {
+    public Hyperlink getLnkDataConcluida() {
-        return hyperlink1;
+        return lnkDataConcluida;
     }
 
-    public void setHyperlink1(Hyperlink h) {
+    public void setLnkDataConcluida(Hyperlink h) {
-        this.hyperlink1 = h;
+        this.lnkDataConcluida = h;
     }
 
     private TableColumn tableColumn8 = new TableColumn();
@@ -736,14 +728,14 @@ public class FormRH extends AbstractPageBean {
         this.tableColumn8 = tc;
     }
 
-    private Hyperlink hyperlink2 = new Hyperlink();
+    private Hyperlink lnkNrConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink2() {
+    public Hyperlink getLnkNrConcluida() {
-        return hyperlink2;
+        return lnkNrConcluida;
     }
 
-    public void setHyperlink2(Hyperlink h) {
+    public void setLnkNrConcluida(Hyperlink h) {
-        this.hyperlink2 = h;
+        this.lnkNrConcluida = h;
     }
 
     private TableColumn tableColumn9 = new TableColumn();
@@ -756,14 +748,14 @@ public class FormRH extends AbstractPageBean {
         this.tableColumn9 = tc;
     }
 
-    private Hyperlink hyperlink3 = new Hyperlink();
+    private Hyperlink lnkNomeConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink3() {
+    public Hyperlink getLnkNomeConcluida() {
-        return hyperlink3;
+        return lnkNomeConcluida;
     }
 
-    public void setHyperlink3(Hyperlink h) {
+    public void setLnkNomeConcluida(Hyperlink h) {
-        this.hyperlink3 = h;
+        this.lnkNomeConcluida = h;
     }
 
     private StaticText txtSearchMsg = new StaticText();
@@ -776,6 +768,46 @@ public class FormRH extends AbstractPageBean {
         this.txtSearchMsg = st;
     }
 
+    private TableColumn tableColumn10 = new TableColumn();
+
+    public TableColumn getTableColumn10() {
+        return tableColumn10;
+    }
+
+    public void setTableColumn10(TableColumn tc) {
+        this.tableColumn10 = tc;
+    }
+
+    private Hyperlink lnkFase = new Hyperlink();
+
+    public Hyperlink getLnkFase() {
+        return lnkFase;
+    }
+
+    public void setLnkFase(Hyperlink h) {
+        this.lnkFase = h;
+    }
+
+    private TableColumn tableColumn11 = new TableColumn();
+
+    public TableColumn getTableColumn11() {
+        return tableColumn11;
+    }
+
+    public void setTableColumn11(TableColumn tc) {
+        this.tableColumn11 = tc;
+    }
+
+    private Hyperlink lnkFaseSeg = new Hyperlink();
+
+    public Hyperlink getLnkFaseSeg() {
+        return lnkFaseSeg;
+    }
+
+    public void setLnkFaseSeg(Hyperlink h) {
+        this.lnkFaseSeg = h;
+    }
+    
     // </editor-fold>
     
     /**
@@ -854,7 +886,8 @@ public class FormRH extends AbstractPageBean {
             //lblActivos.setRendered(true);
             table1.setRendered(true);                                      
 
-            ArrayList actuaisList = adp.getAnalisesActuaisList(getSessionBean1().getCurrentUser().getEstabelecimento_id());
+            //ArrayList actuaisList = adp.getAnalisesActuaisList(getSessionBean1().getCurrentUser().getEstabelecimento_id());
+            ArrayList actuaisList = adp.getAnalisesActuaisRhList(getSessionBean1().getCurrentUser().getEstabelecimento_id());            
             getSessionBean1().getAnalisesActualDataProvider().setList(actuaisList);
        }
        catch(Exception ex)
@@ -869,7 +902,7 @@ public class FormRH extends AbstractPageBean {
             //lblActivos.setRendered(true);
             table2.setRendered(true);                                      
 
-            ArrayList seguimentoList = adp.getAnalisesSeguimentoList(getSessionBean1().getCurrentUser().getEstabelecimento_id(), new Integer(2));
+            ArrayList seguimentoList = adp.getAnalisesSeguimentoRhList(getSessionBean1().getCurrentUser().getEstabelecimento_id());
             getSessionBean1().getAnalisesSeguimentoDataProvider().setList(seguimentoList);
        }
        catch(Exception ex)
@@ -881,7 +914,7 @@ public class FormRH extends AbstractPageBean {
        
        HttpServletRequest request = (HttpServletRequest) getExternalContext().getRequest();
        String referer = request.getRequestURI();
-       String pageFrom = getPageFrom(referer);
+       String pageFrom = Utils.getPageFrom(referer);
        if(!pageFrom.matches("FormRH.jsp"))
        {
            
@@ -956,7 +989,7 @@ public class FormRH extends AbstractPageBean {
         
         AnaliseAcidente a = getTableActivosRowData();
         getSessionBean1().setCurrentAnalise(a);
-        getSessionBean1().setNavFrom("FormSeguranca");        
+        getSessionBean1().setNavFrom("FormRH");        
         return "analise_acidente";
     }
 
@@ -965,7 +998,7 @@ public class FormRH extends AbstractPageBean {
         
         AnaliseAcidente a = getTableActivosRowData();
         getSessionBean1().setCurrentAnalise(a);
-        getSessionBean1().setNavFrom("FormSeguranca");        
+        getSessionBean1().setNavFrom("FormRH");        
         return "analise_acidente";
     }
 
@@ -974,7 +1007,7 @@ public class FormRH extends AbstractPageBean {
         
         AnaliseAcidente a = getTableActivosRowData();
         getSessionBean1().setCurrentAnalise(a);
-        getSessionBean1().setNavFrom("FormSeguranca");        
+        getSessionBean1().setNavFrom("FormRH");        
         return "analise_acidente";
     }
     
@@ -1026,6 +1059,16 @@ public class FormRH extends AbstractPageBean {
         return a;
     }    
     
+    private AnaliseAcidente getTableConcluidasRowData()
+    {
+        RowKey rk = tableRowGroup3.getRowKey();
+        int k = Integer.parseInt(rk.getRowId());        
+        AnalisesConcluidasDataProvider provider = (AnalisesConcluidasDataProvider) tableRowGroup3.getSourceData();
+        ArrayList list = (ArrayList) provider.getList();
+        AnaliseAcidente a = (AnaliseAcidente)list.get(k);
+        return a;
+    }            
+
     public void drpAno_processValueChange(ValueChangeEvent event) {
         // TODO: Replace with your code
         Object ano = event.getNewValue();
@@ -1132,11 +1175,11 @@ public class FormRH extends AbstractPageBean {
         return null;
     }
     
-    private String getPageFrom(String referer)
+//    private String getPageFrom(String referer)
-    {
+//    {
-        String pageFrom = referer.substring(referer.lastIndexOf("/")+1);
+//        String pageFrom = referer.substring(referer.lastIndexOf("/")+1);
-        return pageFrom;
+//        return pageFrom;
-    }    
+//    }    
     
     private void fillAnoDropDown()
     {
@@ -1236,5 +1279,57 @@ public class FormRH extends AbstractPageBean {
 //        int day = cal.get(Calendar.DAY_OF_MONTH); 
 //        drpDia.setSelected( new Integer(0) );                        
     }        
+
+    public String lnkEditUser_action() {
+        // TODO: Replace with your code
+        getSessionBean1().setNavFrom("FormRH");        
+        getSessionBean1().setModoEdicaoUtilizador("edit");
+        return "user";
+    }
+
+    public String lnkDataConcluida_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
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormRH");        
+        return "view_analise";
+    }
+
+    public String lnkNomeConcluida_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormRH");        
+        return "view_analise";
+    }
+
+    public String lnkFase_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableActivosRowData();
+        getSessionBean1().setCurrentAnalise(a);
+        getSessionBean1().setNavFrom("FormRH");        
+        return "analise_acidente";
+    }
+
+    public String lnkFaseSeg_action() {
+        // TODO: Replace with your code
+        
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "view_analise";
+    }
 }
 

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java

@@ -26,6 +26,7 @@ import com.sun.rave.web.ui.component.TableRowGroup;
 import com.sun.rave.web.ui.component.TextField;
 import com.sun.rave.web.ui.model.Option;
 import db.AnalisesActualDataProvider;
+import db.AnalisesConcluidasDataProvider;
 import db.AnalisesDataProvider;
 import db.AnalisesSeguimentoDataProvider;
 import java.util.ArrayList;
@@ -36,6 +37,7 @@ import javax.faces.FacesException;
 import javax.faces.component.html.HtmlPanelGrid;
 import javax.faces.event.ValueChangeEvent;
 import javax.servlet.http.HttpServletRequest;
+import utils.Utils;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -656,14 +658,14 @@ public class FormSeguranca extends AbstractPageBean {
         this.staticText18 = st;
     }
 
-    private Hyperlink lnkChangePassword = new Hyperlink();
+    private Hyperlink lnkEditUser = new Hyperlink();
 
-    public Hyperlink getLnkChangePassword() {
+    public Hyperlink getLnkEditUser() {
-        return lnkChangePassword;
+        return lnkEditUser;
     }
 
-    public void setLnkChangePassword(Hyperlink h) {
+    public void setLnkEditUser(Hyperlink h) {
-        this.lnkChangePassword = h;
+        this.lnkEditUser = h;
     }
 
     private StaticText staticText19 = new StaticText();
@@ -746,34 +748,34 @@ public class FormSeguranca extends AbstractPageBean {
         this.lnkNomeAcidentadoSeg = h;
     }
 
-    private Hyperlink hyperlink7 = new Hyperlink();
+    private Hyperlink lnkDataConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink7() {
+    public Hyperlink getLnkDataConcluida() {
-        return hyperlink7;
+        return lnkDataConcluida;
     }
 
-    public void setHyperlink7(Hyperlink h) {
+    public void setLnkDataConcluida(Hyperlink h) {
-        this.hyperlink7 = h;
+        this.lnkDataConcluida = h;
     }
 
-    private Hyperlink hyperlink8 = new Hyperlink();
+    private Hyperlink lnkNrConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink8() {
+    public Hyperlink getLnkNrConcluida() {
-        return hyperlink8;
+        return lnkNrConcluida;
     }
 
-    public void setHyperlink8(Hyperlink h) {
+    public void setLnkNrConcluida(Hyperlink h) {
-        this.hyperlink8 = h;
+        this.lnkNrConcluida = h;
     }
 
-    private Hyperlink hyperlink9 = new Hyperlink();
+    private Hyperlink lnkNomeConcluida = new Hyperlink();
 
-    public Hyperlink getHyperlink9() {
+    public Hyperlink getLnkNomeConcluida() {
-        return hyperlink9;
+        return lnkNomeConcluida;
     }
 
-    public void setHyperlink9(Hyperlink h) {
+    public void setLnkNomeConcluida(Hyperlink h) {
-        this.hyperlink9 = h;
+        this.lnkNomeConcluida = h;
     }
 
     private StaticText txtSearchMsg = new StaticText();
@@ -786,14 +788,44 @@ public class FormSeguranca extends AbstractPageBean {
         this.txtSearchMsg = st;
     }
 
-    private StaticText staticText5 = new StaticText();
+    private TableColumn tableColumn10 = new TableColumn();
 
-    public StaticText getStaticText5() {
+    public TableColumn getTableColumn10() {
-        return staticText5;
+        return tableColumn10;
     }
 
-    public void setStaticText5(StaticText st) {
+    public void setTableColumn10(TableColumn tc) {
-        this.staticText5 = st;
+        this.tableColumn10 = tc;
+    }
+
+    private TableColumn tableColumn11 = new TableColumn();
+
+    public TableColumn getTableColumn11() {
+        return tableColumn11;
+    }
+
+    public void setTableColumn11(TableColumn tc) {
+        this.tableColumn11 = tc;
+    }
+
+    private Hyperlink lnkFase = new Hyperlink();
+
+    public Hyperlink getLnkFase() {
+        return lnkFase;
+    }
+
+    public void setLnkFase(Hyperlink h) {
+        this.lnkFase = h;
+    }
+
+    private Hyperlink lnkFaseSeg = new Hyperlink();
+
+    public Hyperlink getLnkFaseSeg() {
+        return lnkFaseSeg;
+    }
+
+    public void setLnkFaseSeg(Hyperlink h) {
+        this.lnkFaseSeg = h;
     }
     
     // </editor-fold>
@@ -875,7 +907,8 @@ public class FormSeguranca extends AbstractPageBean {
             //lblActivos.setRendered(true);
             table1.setRendered(true);                                      
 
-            ArrayList actuaisList = adp.getAnalisesActuaisList(getSessionBean1().getCurrentUser().getEstabelecimento_id(), new Integer(1));
+            //ArrayList actuaisList = adp.getAnalisesActuaisList(getSessionBean1().getCurrentUser().getEstabelecimento_id(), new Integer(1));
+            ArrayList actuaisList = adp.getAnalisesActuaisSegList( getSessionBean1().getCurrentUser().getEstabelecimento_id() );            
             getSessionBean1().getAnalisesActualDataProvider().setList(actuaisList);
        }
        catch(Exception ex)
@@ -890,7 +923,7 @@ public class FormSeguranca extends AbstractPageBean {
             //lblActivos.setRendered(true);
             table2.setRendered(true);                                      
 
-            ArrayList seguimentoList = adp.getAnalisesSeguimentoList(getSessionBean1().getCurrentUser().getEstabelecimento_id(), new Integer(1));
+            ArrayList seguimentoList = adp.getAnalisesSeguimentoSegList(getSessionBean1().getCurrentUser().getEstabelecimento_id());
             getSessionBean1().getAnalisesSeguimentoDataProvider().setList(seguimentoList);
        }
        catch(Exception ex)
@@ -902,7 +935,7 @@ public class FormSeguranca extends AbstractPageBean {
        
        HttpServletRequest request = (HttpServletRequest) getExternalContext().getRequest();
        String referer = request.getRequestURI();
-       String pageFrom = getPageFrom(referer);
+       String pageFrom = Utils.getPageFrom(referer);
        if(!pageFrom.matches("FormSeguranca.jsp"))
        {
            
@@ -1178,11 +1211,11 @@ public class FormSeguranca extends AbstractPageBean {
         
     }    
     
-    private String getPageFrom(String referer)
+//    private String getPageFrom(String referer)
-    {
+//    {
-        String pageFrom = referer.substring(referer.lastIndexOf("/")+1);
+//        String pageFrom = referer.substring(referer.lastIndexOf("/")+1);
-        return pageFrom;
+//        return pageFrom;
-    }
+//    }
 
     public String butNovaAnalise_action() {
         // TODO: Process the button click action. Return value is a navigation
@@ -1265,5 +1298,62 @@ public class FormSeguranca extends AbstractPageBean {
         return a;
     }    
     
+    private AnaliseAcidente getTableConcluidasRowData()
+    {
+        RowKey rk = tableRowGroup3.getRowKey();
+        int k = Integer.parseInt(rk.getRowId());        
+        AnalisesConcluidasDataProvider provider = (AnalisesConcluidasDataProvider) tableRowGroup3.getSourceData();
+        ArrayList list = (ArrayList) provider.getList();
+        AnaliseAcidente a = (AnaliseAcidente)list.get(k);
+        return a;
+    }        
+
+    public String lnkEditUser_action() {
+        // TODO: Replace with your code
+        getSessionBean1().setNavFrom("FormSeguranca");
+        getSessionBean1().setModoEdicaoUtilizador("edit");
+        return "user";        
+    }
+
+    public String lnkDataConcluida_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
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "view_analise";
+    }
+
+    public String lnkNomeConcluida_action() {
+        // TODO: Replace with your code
+        AnaliseAcidente a = getTableConcluidasRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "view_analise";
+    }
+
+    public String lnkFase_action() {
+        // TODO: Replace with your code
+        AnaliseAcidente a = getTableActivosRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "analise_acidente";        
+    }
+
+    public String lnkFaseSeg_action() {
+        // TODO: Replace with your code
+        AnaliseAcidente a = getTableSeguimentoRowData();
+        getSessionBean1().setCurrentAnalise(a);      
+        getSessionBean1().setNavFrom("FormSeguranca");        
+        return "view_analise";        
+    }
+
 }
 

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java

@@ -18,6 +18,8 @@ import com.sun.rave.web.ui.component.Page;
 import com.sun.rave.web.ui.component.PasswordField;
 import com.sun.rave.web.ui.component.StaticText;
 import com.sun.rave.web.ui.component.TextField;
+import com.sun.rave.web.ui.model.Option;
+import db.AnalisesDataProvider;
 import db.UtilizadoresDataProvider;
 import java.sql.Connection;
 import javax.faces.FacesException;
@@ -295,6 +297,7 @@ public class Login extends AbstractPageBean {
      * this page.</p>
      */
     public void prerender() {
+
         txtMsg.setText(getSessionBean1().getMsg());
         getSessionBean1().setMsg("");
     }
@@ -350,49 +353,68 @@ public class Login extends AbstractPageBean {
                         try
                         {
                             Utilizador u = udp.getUtilizador(utilizador);
-                            if(!password.equals(u.getPassword()))
+                            if(u.getActivo().matches("y"))
-                            {
-                                getSessionBean1().setMsg("Palavra-chave inv&aacute;lida !");						    								    					
-                            }
-                            else
                             {
-                                //if(u.getOwner_id().intValue() == 0 ) 
+                                if(!password.equals(u.getPassword()))
+                                {
+                                    getSessionBean1().setMsg("Palavra-chave inv&aacute;lida !");						    								    					
+                                }
+                                else
+                                {
+                                    //if(u.getOwner_id().intValue() == 0 ) 
 
-                                //Login Ok !
+                                    //Login Ok !
 
-                                try
+                                    try
-                                {
-                                    Integer permissao = udp.getPermissionCode(u.getId());                                    
-                                    if(permissao.intValue() == 1)   //seguranca
                                     {
-                                        sRet = "form_seguranca";
+                                        Integer permissao = udp.getPermissionCode(u.getId());                                    
+                                        if(permissao.intValue() == 1)   //seguranca
+                                        {
+                                            sRet = "form_seguranca";
+                                        }
+                                        else if(permissao.intValue() == 2)  // rh
+                                        {
+                                            sRet = "form_rh";                                        
+                                        }
+                                        else if(permissao.intValue() == 3)  // hs
+                                        {
+                                            System.out.println("PERMISSAO : HS");
+                                            sRet = "form_hs";                                        
+                                        }                  
+                                        else if(permissao.intValue() == 5)  // medico
+                                        {
+                                            sRet = "form_medico";                                        
+                                        }   
+                                        else if(permissao.intValue() == 6)  // administrador de loja
+                                        {
+                                            //sRet = "loja_admin";                                        
+                                        }                                       
+                                        u.setCodigo_permissao(permissao);
+                                        getSessionBean1().setCurrentUser( u ); 
+                                        getSessionBean1().setLoggedIn(true);
+                                        initializeClock();   
+                                        initializeDropDownOptions();                                        
+
+                                        // só para testes. retirar depois :
+                                        ///getSessionBean1().setModoEdicaoUtilizador("new");
+                                        ///sRet = "create_user";                                    
                                     }
-                                    else if(permissao.intValue() == 2)  // rh
+                                    catch(Exception e1)
                                     {
-                                        sRet = "form_rh";                                        
+                                        e1.printStackTrace();
+                                        getSessionBean1().setMsg("N&atilde;o tem permiss&atilde;o para entrar na aplica&ccedil;&atilde;o !");
                                     }
-                                    else if(permissao.intValue() == 3)  // hs
-                                    {
-                                        sRet = "form_hs";                                        
-                                    }                  
-                                    else if(permissao.intValue() == 5)  // medico
-                                    {
-                                        //sRet = "form_rh";                                        
-                                    }   
-                                    u.setCodigo_permissao(permissao);
-                                    getSessionBean1().setCurrentUser( u ); 
-                                    getSessionBean1().setLoggedIn(true);	                                    
-                                }
-                                catch(Exception e1)
-                                {
-                                    e1.printStackTrace();
-                                    getSessionBean1().setMsg("N&atilde;o tem permiss&atilde;o para entrar na aplica&ccedil;&atilde;o !");
                                 }                                
+
+                            }
+                            else
+                            {
+                                getSessionBean1().setMsg("Utilizador inv&aacute;lido ! ");						    								                                    
                             }
                         }
                         catch(Exception ex)
                         {
-                            getSessionBean1().setMsg("Utilizador inv&aacute;lido ! " + ex.getMessage());						    								    
+                            getSessionBean1().setMsg("Utilizador inv&aacute;lido ! ");						    								    
                         }
                     }
                     else
@@ -443,5 +465,50 @@ public class Login extends AbstractPageBean {
 	    ex.printStackTrace();
 	}
     }
+    
+    private void initializeClock()
+    {
+        com.sun.rave.web.ui.model.Option[] horasOptions = new com.sun.rave.web.ui.model.Option[24];        
+        for(int i=0; i < 24; i++)
+        {
+            
+            horasOptions[i] = new Option(new Integer(i), new Integer(i).toString());
+        }    
+        getSessionBean1().setHorasOptions(horasOptions);
+        
+        com.sun.rave.web.ui.model.Option[] minutosOptions = new com.sun.rave.web.ui.model.Option[12];        
+        int j = 0;
+        for(int i=0; i < 12; i++)
+        {
+            
+            minutosOptions[i] = new Option(new Integer(j), new Integer(j).toString());
+            j += 5;
+        }    
+        getSessionBean1().setMinutosOptions(minutosOptions);        
+    }
+    
+    private void initializeDropDownOptions()
+    {
+           UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
+           try
+           {
+                getSessionBean1().setTecnicosOptions(udp.getTecnicosSaudeList());    
+                //drpTipo.setSelected(new Integer(0));
+           }
+           catch(Exception ex)
+           {
+               ex.printStackTrace();
+           }            
+           
+           try
+           {
+                getSessionBean1().setMedicosOptions(udp.getMedicosList());    
+                //drpTipo.setSelected(new Integer(0));
+           }
+           catch(Exception ex)
+           {
+               ex.printStackTrace();
+           }                       
+    }
 }
 

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Medico.java

@@ -0,0 +1,53 @@
+/*
+ * Medico.java
+ *
+ * Created on October 12, 2007, 11:00 AM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package analiseacidentestrabalho;
+
+/**
+ *
+ * @author lluis
+ */
+public class Medico {
+    private Integer id;
+    private String nome;
+    private String numero_cedula;
+    
+    /** Creates a new instance of Medico */
+    public Medico() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getNome() {
+        return nome;
+    }
+
+    public void setNome(String nome) {
+        this.nome = nome;
+    }
+
+    public String getNumero_cedula() {
+        return numero_cedula;
+    }
+
+    public void setNumero_cedula(String numero_cedula) {
+        this.numero_cedula = numero_cedula;
+    }
+    
+    public String toString() {    
+        return utils.Utils.unicodeToHTML(nome);
+    }
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Medida.java

@@ -0,0 +1,49 @@
+/*
+ * Medida.java
+ *
+ * Created on October 19, 2007, 4:59 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package analiseacidentestrabalho;
+
+/**
+ *
+ * @author lluis
+ */
+public class Medida {
+    private Integer id;
+    private Integer analise_id;
+    private String medida;
+    
+    /** Creates a new instance of Medida */
+    public Medida() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getAnalise_id() {
+        return analise_id;
+    }
+
+    public void setAnalise_id(Integer analise_id) {
+        this.analise_id = analise_id;
+    }
+
+    public String getMedida() {
+        return medida;
+    }
+
+    public void setMedida(String medida) {
+        this.medida = medida;
+    }
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Permissao.java

@@ -0,0 +1,49 @@
+/*
+ * Permissao.java
+ *
+ * Created on October 25, 2007, 4:40 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package analiseacidentestrabalho;
+
+/**
+ *
+ * @author lluis
+ */
+public class Permissao {
+    private Integer id;
+    private Integer user_id;
+    private Integer codigo_permissao;
+    
+    /** Creates a new instance of Permissao */
+    public Permissao() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(Integer user_id) {
+        this.user_id = user_id;
+    }
+
+    public Integer getCodigo_permissao() {
+        return codigo_permissao;
+    }
+
+    public void setCodigo_permissao(Integer codigo_permissao) {
+        this.codigo_permissao = codigo_permissao;
+    }
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Recomendacao.java

@@ -0,0 +1,49 @@
+/*
+ * Recomendacao.java
+ *
+ * Created on October 16, 2007, 3:13 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package analiseacidentestrabalho;
+
+/**
+ *
+ * @author lluis
+ */
+public class Recomendacao {
+    private Integer id;
+    private Integer analise_id;
+    private String recomendacao;
+    
+    /** Creates a new instance of Recomendacao */
+    public Recomendacao() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getAnalise_id() {
+        return analise_id;
+    }
+
+    public void setAnalise_id(Integer analise_id) {
+        this.analise_id = analise_id;
+    }
+
+    public String getRecomendacao() {
+        return recomendacao;
+    }
+
+    public void setRecomendacao(String recomendacao) {
+        this.recomendacao = recomendacao;
+    }
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/RecuperarPassword.java

@@ -31,6 +31,7 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
+import utils.Utils;
 
 /**
  * <p>Page bean that corresponds to a similarly named JSP page.  This
@@ -292,13 +293,13 @@ public class RecuperarPassword extends AbstractPageBean {
         // Perform application initialization that must complete
         // *after* managed components are initialized
         // TODO - add your own initialization code here
-	if (!getSessionBean1().isLoggedIn()) {
+//	if (!getSessionBean1().isLoggedIn()) {
-	    try {
+//	    try {
-		getExternalContext().redirect("Login.jsp");
+//		getExternalContext().redirect("Login.jsp");
-	    } catch(Exception e) {  
+//	    } catch(Exception e) {  
-	    // . . .  handle exception . . .              
+//	    // . . .  handle exception . . .              
-	    }
+//	    }
-	}	        
+//	}	        
     }
     
     /**
@@ -454,7 +455,6 @@ public class RecuperarPassword extends AbstractPageBean {
     
     private boolean fieldsValidationOk()
     {
-
         if(txtUtilizador.getText() != null)
         {
             String utilizador = (String) txtUtilizador.getText();
@@ -480,7 +480,7 @@ public class RecuperarPassword extends AbstractPageBean {
             }
             else
             {
-                if(! isValidEmail(email))
+                if(! Utils.isValidEmail(email))
                 {
                     getSessionBean1().setMsg("Email inv&aacute;lido !");
                     return false;
@@ -496,29 +496,29 @@ public class RecuperarPassword extends AbstractPageBean {
         return true;
     }
     
-    private boolean isValidEmail(String email){
+//    private boolean isValidEmail(String email){
-        boolean res = true;
+//        boolean res = true;
-        
+//        
-        int indexOfAtChar=email.indexOf("@");
+//        int indexOfAtChar=email.indexOf("@");
-
+//
-        if(indexOfAtChar > 0)
+//        if(indexOfAtChar > 0)
-        {
+//        {
-            int indexOfDotChar =
+//            int indexOfDotChar =
-                email.indexOf(".",indexOfAtChar);
+//                email.indexOf(".",indexOfAtChar);
-            if(indexOfDotChar > 0)
+//            if(indexOfDotChar > 0)
-            {
+//            {
-              res = true;
+//              res = true;
-            }
+//            }
-            else
+//            else
-            {
+//            {
-                res = false;
+//                res = false;
-            }
+//            }
-        }
+//        }
-        else{
+//        else{
-            res = false;
+//            res = false;
-        }        
+//        }        
-        return res;
+//        return res;
-    }        
+//    }        
 
 
 }

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java

@@ -48,6 +48,9 @@ public class SessionBean1 extends AbstractSessionBean {
         setAcidentado(null);
         setCurrentAnalise(null);
         setLoggedIn(false);
+        
+        modoEdicaoUtilizador = "";
+        setIdSequence(1);
     }
     
     /**
@@ -264,13 +267,13 @@ public class SessionBean1 extends AbstractSessionBean {
         this.navFrom = navFrom;
     }
     
-    private Trabalhador acidentado;
+    private Acidentado acidentado;
 
-    public Trabalhador getAcidentado() {
+    public Acidentado getAcidentado() {
         return acidentado;
     }
 
-    public void setAcidentado(Trabalhador acidentado) {
+    public void setAcidentado(Acidentado acidentado) {
         this.acidentado = acidentado;
     }
     
@@ -306,4 +309,151 @@ public class SessionBean1 extends AbstractSessionBean {
             this.loggedIn = loggedIn;
     }    
     
+    private String modoEdicaoUtilizador;
+
+    public String getModoEdicaoUtilizador() {
+        return modoEdicaoUtilizador;
+    }
+
+    public void setModoEdicaoUtilizador(String modoEdicaoUtilizador) {
+        this.modoEdicaoUtilizador = modoEdicaoUtilizador;
+    }
+    
+    private Integer tipoChoice;
+
+    public Integer getTipoChoice() {
+        return tipoChoice;
+    }
+
+    public void setTipoChoice(Integer tipoChoice) {
+        this.tipoChoice = tipoChoice;
+    }
+    
+    private com.sun.rave.web.ui.model.Option[] tiposOptions;    
+
+    public com.sun.rave.web.ui.model.Option[] getTiposOptions() {
+        return tiposOptions;
+    }
+
+    public void setTiposOptions(com.sun.rave.web.ui.model.Option[] tiposOptions) {
+        this.tiposOptions = tiposOptions;
+    }        
+    
+    
+    private Integer estabelecimentoChoice;
+
+    public Integer getEstabelecimentoChoice() {
+        return estabelecimentoChoice;
+    }
+
+    public void setEstabelecimentoChoice(Integer estabelecimentoChoice) {
+        this.estabelecimentoChoice = estabelecimentoChoice;
+    }
+    
+    private com.sun.rave.web.ui.model.Option[] estabelecimentosOptions;    
+
+    public com.sun.rave.web.ui.model.Option[] getEstabelecimentosOptions() {
+        return estabelecimentosOptions;
+    }
+
+    public void setEstabelecimentosOptions(com.sun.rave.web.ui.model.Option[] estabelecimentosOptions) {
+        this.estabelecimentosOptions = estabelecimentosOptions;
+    } 
+    
+    
+    private Integer tecnicoChoice;
+
+    public Integer getTecnicoChoice() {
+        return tecnicoChoice;
+    }
+
+    public void setTecnicoChoice(Integer tecnicoChoice) {
+        this.tecnicoChoice = tecnicoChoice;
+    }
+    
+    private com.sun.rave.web.ui.model.Option[] tecnicosOptions;    
+
+    public com.sun.rave.web.ui.model.Option[] getTecnicosOptions() {
+        return tecnicosOptions;
+    }
+
+    public void setTecnicosOptions(com.sun.rave.web.ui.model.Option[] tecnicosOptions) {
+        this.tecnicosOptions = tecnicosOptions;
+    } 
+    
+    
+    private Integer medicoChoice;
+
+    public Integer getMedicoChoice() {
+        return medicoChoice;
+    }
+
+    public void setMedicoChoice(Integer medicoChoice) {
+        this.medicoChoice = medicoChoice;
+    }
+    
+    private com.sun.rave.web.ui.model.Option[] medicosOptions;    
+
+    public com.sun.rave.web.ui.model.Option[] getMedicosOptions() {
+        return medicosOptions;
+    }
+
+    public void setMedicosOptions(com.sun.rave.web.ui.model.Option[] medicosOptions) {
+        this.medicosOptions = medicosOptions;
+    } 
+    
+    
+    // Clock :
+    private Integer horaChoice;
+
+    public Integer getHoraChoice() {
+        return horaChoice;
+    }
+
+    public void setHoraChoice(Integer horaChoice) {
+        this.horaChoice = horaChoice;
+    }
+    
+    private com.sun.rave.web.ui.model.Option[] horasOptions;    
+
+    public com.sun.rave.web.ui.model.Option[] getHorasOptions() {
+        return horasOptions;
+    }
+
+    public void setHorasOptions(com.sun.rave.web.ui.model.Option[] horasOptions) {
+        this.horasOptions = horasOptions;
+    }     
+    
+    
+    private Integer minutoChoice;
+
+    public Integer getMinutoChoice() {
+        return minutoChoice;
+    }
+
+    public void setMinutoChoice(Integer minutoChoice) {
+        this.minutoChoice = minutoChoice;
+    }
+    
+    private com.sun.rave.web.ui.model.Option[] minutosOptions;    
+
+    public com.sun.rave.web.ui.model.Option[] getMinutosOptions() {
+        return minutosOptions;
+    }
+
+    public void setMinutosOptions(com.sun.rave.web.ui.model.Option[] minutosOptions) {
+        this.minutosOptions = minutosOptions;
+    }       
+    
+    
+    private int idSequence;
+
+    public int getIdSequence() {
+        return idSequence;
+    }
+
+    public void setIdSequence(int idSequence) {
+        this.idSequence = idSequence;
+    }
+
 }

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/TecnicoSaude.java

@@ -0,0 +1,44 @@
+/*
+ * TecnicoSaude.java
+ *
+ * Created on October 12, 2007, 11:00 AM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package analiseacidentestrabalho;
+
+/**
+ *
+ * @author lluis
+ */
+public class TecnicoSaude {
+    private Integer id;
+    private String nome;
+    
+    /** Creates a new instance of TecnicoSaude */
+    public TecnicoSaude() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getNome() {
+        return nome;
+    }
+
+    public void setNome(String nome) {
+        this.nome = nome;
+    }
+    
+    public String toString() {    
+        return utils.Utils.unicodeToHTML(nome);
+    }    
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/TipoUtilizador.java

@@ -0,0 +1,67 @@
+/*
+ * TipoUtilizador.java
+ *
+ * Created on October 11, 2007, 4:32 PM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package analiseacidentestrabalho;
+    
+/**
+ *
+ * @author lluis
+ */
+public class TipoUtilizador {
+    private Integer id;
+    private Integer tipo;
+    private String descricao;
+    private String activo;
+    private Integer ordem;
+    
+    /** Creates a new instance of TipoUtilizador */
+    public TipoUtilizador() {
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTipo() {
+        return tipo;
+    }
+
+    public void setTipo(Integer tipo) {
+        this.tipo = tipo;
+    }
+
+    public String getDescricao() {
+        return descricao;
+    }
+
+    public void setDescricao(String descricao) {
+        this.descricao = descricao;
+    }
+
+    public String getActivo() {
+        return activo;
+    }
+
+    public void setActivo(String activo) {
+        this.activo = activo;
+    }
+
+    public Integer getOrdem() {
+        return ordem;
+    }
+
+    public void setOrdem(Integer ordem) {
+        this.ordem = ordem;
+    }
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Trabalhador.java

@@ -17,6 +17,10 @@ public class Trabalhador {
     private Integer id;
     private String nome;
     private java.sql.Date data_nascimento;
+    private String funcao;
+    private java.sql.Date data_admissao;
+    private String numero_mecanografico;
+    
     
     /** Creates a new instance of Trabalhador */
     public Trabalhador() {
@@ -46,4 +50,28 @@ public class Trabalhador {
         this.data_nascimento = data_nascimento;
     }
 
+    public String getFuncao() {
+        return funcao;
+    }
+
+    public void setFuncao(String funcao) {
+        this.funcao = funcao;
+    }
+
+    public java.sql.Date getData_admissao() {
+        return data_admissao;
+    }
+
+    public void setData_admissao(java.sql.Date data_admissao) {
+        this.data_admissao = data_admissao;
+    }
+
+    public String getNumero_mecanografico() {
+        return numero_mecanografico;
+    }
+
+    public void setNumero_mecanografico(String numero_mecanografico) {
+        this.numero_mecanografico = numero_mecanografico;
+    }
+    
 }

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Utilizador.java

@@ -21,9 +21,19 @@ public class Utilizador {
     private Integer empresa_id;
     private Integer estabelecimento_id;
     private String administrador;
+    private Integer tipo;
+    private String numero_cedula;
+    private String cap;
     
     private Integer codigo_permissao;
     
+    private String nome;
+    
+    private Integer medico_id;
+    private Integer funcionario_hst_id;
+    
+    private String activo;
+    
     /** Creates a new instance of Utilizador */
     public Utilizador() {
     }
@@ -92,4 +102,60 @@ public class Utilizador {
         this.codigo_permissao = codigo_permissao;
     }
 
+    public Integer getTipo() {
+        return tipo;
+    }
+
+    public void setTipo(Integer tipo) {
+        this.tipo = tipo;
+    }
+
+    public String getNumero_cedula() {
+        return numero_cedula;
+    }
+
+    public void setNumero_cedula(String numero_cedula) {
+        this.numero_cedula = numero_cedula;
+    }
+
+    public String getCap() {
+        return cap;
+    }
+
+    public void setCap(String cap) {
+        this.cap = cap;
+    }
+
+    public String getNome() {
+        return nome;
+    }
+
+    public void setNome(String nome) {
+        this.nome = nome;
+    }
+
+    public Integer getMedico_id() {
+        return medico_id;
+    }
+
+    public void setMedico_id(Integer medico_id) {
+        this.medico_id = medico_id;
+    }
+
+    public Integer getFuncionario_hst_id() {
+        return funcionario_hst_id;
+    }
+
+    public void setFuncionario_hst_id(Integer funcionario_hst_id) {
+        this.funcionario_hst_id = funcionario_hst_id;
+    }
+
+    public String getActivo() {
+        return activo;
+    }
+
+    public void setActivo(String activo) {
+        this.activo = activo;
+    }
+    
 }

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/db/UtilizadoresDataProvider.java

@@ -9,9 +9,16 @@
 
 package db;
 
+import analiseacidentestrabalho.Medico;
+import analiseacidentestrabalho.Permissao;
+import analiseacidentestrabalho.TecnicoSaude;
 import analiseacidentestrabalho.Utilizador;
+import com.sun.rave.web.ui.model.Option;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.ListIterator;
+import utils.Utils;
 
 /**
  *
@@ -26,16 +33,21 @@ public class UtilizadoresDataProvider {
     public Integer getMaxUserId()
     {
         Statement st = createStatement();
-        String sql = "SELECT max(qst_users.id)+1 AS MAXUSERID FROM utilizadores";
+        String sql = "SELECT max(utilizadores.id)+1 AS MAXUSERID FROM utilizadores";
         try
         {
             ResultSet rs = st.executeQuery(sql);
             rs.first();
             Integer newId = new Integer(rs.getInt("MAXUSERID"));
+            if(newId.intValue() == 0)
+            {
+                newId = new Integer(1);
+            }
             return newId;            
         }
         catch(Exception ex)
         {
+            ex.printStackTrace();            
             return new Integer(1);
         }
     }  
@@ -45,14 +57,23 @@ public class UtilizadoresDataProvider {
         Statement st = createStatement();
         Integer newUserId = getMaxUserId();	
 	
-        st.execute("INSERT INTO utilizadores (id, login, password, email, empresa_id, estabelecimento_id, administrador) VALUES (" + newUserId  + ", '" + u.getLogin() + "', '" + u.getPassword() + "', '" + u.getEmail() + "', " + u.getEmpresa_id() + ", " + u.getEstabelecimento_id() + ", '" + u.getAdministrador() + "')");        
+        String sql = "INSERT INTO utilizadores (id, login, password, email, empresa_id, estabelecimento_id, administrador, tipo, numero_cedula, cap, nome, medico_id, funcionario_hst_id, activo) VALUES (" + newUserId  + ", '" + u.getLogin() + "', '" + u.getPassword() + "', '" + u.getEmail() + "', " + u.getEmpresa_id() + ", " + u.getEstabelecimento_id() + ", '" + u.getAdministrador() + "', " + u.getTipo() + ", '" + u.getNumero_cedula() + "', '" + u.getCap() + "', '" + u.getNome() + "', " + u.getMedico_id() + ", " + u.getFuncionario_hst_id() + ", '" + u.getActivo() + "')";
+        System.out.println("SQL CREATE : " + sql);
+        st.execute(sql);        
         return newUserId;	
     }
     
     public void updateUtilizador(Utilizador u) throws Exception
     {
         Statement st = createStatement();
-	String sql = "UPDATE utilizadores SET login = '" + u.getLogin() +  "', password = '" + u.getPassword() + "', email = '" + u.getEmail() + "', empresa_id = " + u.getEmpresa_id() + ", estabelecimento_id = " + u.getEstabelecimento_id() + ", administrador = '" + u.getAdministrador() + "' WHERE id = " + u.getId();
+	String sql = "UPDATE utilizadores SET login = '" + u.getLogin() +  "', password = '" + u.getPassword() + "', email = '" + u.getEmail() + "', empresa_id = " + u.getEmpresa_id() + ", estabelecimento_id = " + u.getEstabelecimento_id() + ", administrador = '" + u.getAdministrador() + "', tipo = " + u.getTipo() + ", numero_cedula = '" + u.getNumero_cedula() + "', cap = '" + u.getCap() + "', nome = '" + u.getNome() + "', medico_id = " + u.getMedico_id() + ", funcionario_hst_id = " + u.getFuncionario_hst_id() + ", activo = '" + u.getActivo()  + "' WHERE id = " + u.getId();
+        st.execute(sql);           	
+    }
+    
+    public void deleteUser(Integer userId) throws Exception
+    {
+        Statement st = createStatement();
+        String sql = "UPDATE utilizadores SET activo = 'n' WHERE id = " + userId;
         st.execute(sql);           	
     }
     
@@ -70,9 +91,171 @@ public class UtilizadoresDataProvider {
         u.setEmpresa_id(new Integer(rs.getInt("empresa_id")));
         u.setEstabelecimento_id(new Integer(rs.getInt("estabelecimento_id")));
         u.setAdministrador(rs.getString("administrador"));      
+        u.setTipo(new Integer(rs.getInt("tipo")));
+        u.setNumero_cedula(rs.getString("numero_cedula"));
+        u.setCap(rs.getString("cap"));
+        u.setNome(rs.getString("nome"));
+        u.setMedico_id(new Integer(rs.getInt("medico_id")));
+        u.setFuncionario_hst_id(new Integer(rs.getInt("funcionario_hst_id"))); 
+        u.setActivo(rs.getString("activo"));
 	return u;
     }
     
+    public Utilizador getUtilizador(Integer id) throws Exception
+    {
+	Utilizador u = new Utilizador();
+        Statement st = createStatement();
+        String sql = "SELECT * FROM utilizadores WHERE id = " + id;
+        ResultSet rs = st.executeQuery(sql);
+        rs.first();
+	u.setId(new Integer(rs.getInt("id")));
+	u.setLogin(rs.getString("login"));
+	u.setPassword(rs.getString("password"));
+        u.setEmail(rs.getString("email"));
+        u.setEmpresa_id(new Integer(rs.getInt("empresa_id")));
+        u.setEstabelecimento_id(new Integer(rs.getInt("estabelecimento_id")));
+        u.setAdministrador(rs.getString("administrador"));      
+        u.setTipo(new Integer(rs.getInt("tipo")));
+        u.setNumero_cedula(rs.getString("numero_cedula"));
+        u.setCap(rs.getString("cap"));
+        u.setNome(rs.getString("nome"));
+        u.setMedico_id(new Integer(rs.getInt("medico_id")));
+        u.setFuncionario_hst_id(new Integer(rs.getInt("funcionario_hst_id"))); 
+        u.setActivo(rs.getString("activo"));
+	return u;
+    }    
+    
+    public ArrayList getUtilizadoresListByTipo(Integer tipo) throws Exception
+    {
+        ArrayList list = new ArrayList();
+        Statement st = createStatement();
+        String sql = "SELECT * FROM utilizadores WHERE tipo = " + tipo;
+        ResultSet rs = st.executeQuery(sql);
+        rs.first();
+        do
+        {
+            Utilizador u = new Utilizador();
+            u.setId(new Integer(rs.getInt("id")));
+            u.setLogin(rs.getString("login"));
+            u.setPassword(rs.getString("password"));
+            u.setEmail(rs.getString("email"));
+            u.setEmpresa_id(new Integer(rs.getInt("empresa_id")));
+            u.setEstabelecimento_id(new Integer(rs.getInt("estabelecimento_id")));
+            u.setAdministrador(rs.getString("administrador"));      
+            u.setTipo(new Integer(rs.getInt("tipo")));
+            u.setNumero_cedula(rs.getString("numero_cedula"));
+            u.setCap(rs.getString("cap"));
+            u.setNome(rs.getString("nome"));
+            u.setMedico_id(new Integer(rs.getInt("medico_id")));
+            u.setFuncionario_hst_id(new Integer(rs.getInt("funcionario_hst_id"))); 
+            u.setActivo(rs.getString("activo"));    
+            list.add(u);
+        }while(rs.next());
+        return list;
+    }
+    
+    public com.sun.rave.web.ui.model.Option[] getMedicosList() throws Exception
+    {
+//        Dblocal dblocal = new Dblocal();
+//        dblocal.connect();
+//        Statement stlocal = dblocal.createStatement();                
+        Statement st = createStatement();        
+        ArrayList list = new ArrayList();
+        Medico m = new Medico();
+        m.setId(new Integer(0));
+        m.setNome("");
+        list.add(m);
+        String sql ="SELECT * FROM utilizadores WHERE activo = 'y' AND tipo = 5";
+        ResultSet rs = st.executeQuery(sql);
+        rs.first();
+	do
+	{
+	    m = new Medico();
+	    m.setId(new Integer(rs.getInt("id")));
+            m.setNome(Utils.unicodeToHTML(rs.getString("nome")));
+	    list.add(m);
+	}while(rs.next());
+        com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
+        ListIterator iter = list.listIterator();
+        int i = 0;
+        while(iter.hasNext())
+        {
+            m = (Medico) iter.next();
+            
+            listOptions[i] = new Option(m.getId(), Utils.unicodeToHTML(m.getNome()));
+            i++;
+        }
+//        dblocal.close();                
+        return listOptions;                
+    }  
+    
+    public com.sun.rave.web.ui.model.Option[] getTecnicosSaudeList() throws Exception
+    {
+//        Dblocal dblocal = new Dblocal();
+//        dblocal.connect();
+//        Statement stlocal = dblocal.createStatement();    
+        Statement st = createStatement();           
+        ArrayList list = new ArrayList();
+        TecnicoSaude t = new TecnicoSaude();
+        t.setId(new Integer(0));
+        t.setNome("");
+        list.add(t);
+        String sql ="SELECT * FROM utilizadores WHERE activo = 'y' AND tipo = 3";
+        ResultSet rs = st.executeQuery(sql);
+        rs.first();
+	do
+	{
+	    t = new TecnicoSaude();
+	    t.setId(new Integer(rs.getInt("id")));
+            t.setNome(Utils.unicodeToHTML(rs.getString("nome")));
+	    list.add(t);
+	}while(rs.next());
+        com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];        
+        ListIterator iter = list.listIterator();
+        int i = 0;
+        while(iter.hasNext())
+        {
+            t = (TecnicoSaude) iter.next();
+            
+            listOptions[i] = new Option(t.getId(), Utils.unicodeToHTML(t.getNome()));
+            i++;
+        }
+//        dblocal.close();                
+        return listOptions;                        
+    }        
+    
+    public Integer getMaxPermissaoId()
+    {
+        Statement st = createStatement();
+        String sql = "SELECT max(permissoes.id)+1 AS MAXPERMISSAOID FROM permissoes";
+        try
+        {
+            ResultSet rs = st.executeQuery(sql);
+            rs.first();
+            Integer newId = new Integer(rs.getInt("MAXPERMISSAOID"));
+            if(newId.intValue() == 0)
+            {
+                newId = new Integer(1);
+            }
+            return newId;            
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();            
+            return new Integer(1);
+        }
+    }  
+    
+    public Integer createPermissao(Permissao p) throws Exception
+    {
+        Statement st = createStatement();
+        Integer newId = getMaxPermissaoId();	
+	
+        String sql = "INSERT INTO permissoes (id, user_id, codigo_permissao) VALUES (" + newId  + ", " + p.getUser_id() + ", " + p.getCodigo_permissao() + ")";
+        st.execute(sql);        
+        return newId;	
+    }    
+    
     public Integer getPermissionCode(Integer userId) throws Exception
     {
         Statement st = createStatement();

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/pagestate/AnaliseAcidenteTrabalhoState.java

@@ -14,12 +14,25 @@ package pagestate;
  * @author lluis
  */
 public class AnaliseAcidenteTrabalhoState {
+    private int estado;
+    private Object empresa;
     private Object estabelecimento;
     private Object trabalhador;
     private Object data_nascimento;
+    
+    private Object bi;
+    private Object morada;
+    private Object cod_postal1;
+    private Object cod_postal2;    
+    private Object localidade;
+    private Object contacto_telefonico;
+    private String turno;
+    
     private Object horas_turno;
     private Object seccao;
     private Object local_trabalho;
+    private Integer hours;
+    private Integer minutes;
     private Object tarefa;
     private Object substancias;
     
@@ -31,6 +44,24 @@ public class AnaliseAcidenteTrabalhoState {
     private Object conclusoes;
     private Object accoes;
     
+    
+    private String formacao_shst;
+    private Object formacao_shsht_n_why;
+    private String acidentes_colaborador;
+    private Object nr_acidentes_colaborador;
+    private String acidentes_colaboradores;
+    private Object nr_acidentes_colaboradores;
+    
+    private Object nr_relatorio_acidentes_colaborador_1;
+    private Object nr_relatorio_acidentes_colaborador_2;    
+    private Object nr_relatorio_acidentes_colaborador_3;    
+    private Object nr_relatorio_acidentes_colaborador_4;    
+    
+    private Object nr_relatorio_acidentes_colaboradores_1;
+    private Object nr_relatorio_acidentes_colaboradores_2;    
+    private Object nr_relatorio_acidentes_colaboradores_3;    
+    private Object nr_relatorio_acidentes_colaboradores_4;    
+    
     /** Creates a new instance of AnaliseAcidenteTrabalhoState */
     public AnaliseAcidenteTrabalhoState() {
     }
@@ -155,4 +186,206 @@ public class AnaliseAcidenteTrabalhoState {
         this.conclusoes = conclusoes;
     }
 
+    public Object getEmpresa() {
+        return empresa;
+    }
+
+    public void setEmpresa(Object empresa) {
+        this.empresa = empresa;
+    }
+
+    public int getEstado() {
+        return estado;
+    }
+
+    public void setEstado(int estado) {
+        this.estado = estado;
+    }
+
+    public Object getBi() {
+        return bi;
+    }
+
+    public void setBi(Object bi) {
+        this.bi = bi;
+    }
+
+    public Object getMorada() {
+        return morada;
+    }
+
+    public void setMorada(Object morada) {
+        this.morada = morada;
+    }
+
+    public Object getCod_postal1() {
+        return cod_postal1;
+    }
+
+    public void setCod_postal1(Object cod_postal1) {
+        this.cod_postal1 = cod_postal1;
+    }
+
+    public Object getCod_postal2() {
+        return cod_postal2;
+    }
+
+    public void setCod_postal2(Object cod_postal2) {
+        this.cod_postal2 = cod_postal2;
+    }
+
+    public Object getLocalidade() {
+        return localidade;
+    }
+
+    public void setLocalidade(Object localidade) {
+        this.localidade = localidade;
+    }
+
+    public Object getContacto_telefonico() {
+        return contacto_telefonico;
+    }
+
+    public void setContacto_telefonico(Object contacto_telefonico) {
+        this.contacto_telefonico = contacto_telefonico;
+    }
+
+    public String getTurno() {
+        return turno;
+    }
+
+    public void setTurno(String turno) {
+        this.turno = turno;
+    }
+
+    public Integer getHours() {
+        return hours;
+    }
+
+    public void setHours(Integer hours) {
+        this.hours = hours;
+    }
+
+    public Integer getMinutes() {
+        return minutes;
+    }
+
+    public void setMinutes(Integer minutes) {
+        this.minutes = minutes;
+    }
+
+    public String getFormacao_shst() {
+        return formacao_shst;
+    }
+
+    public void setFormacao_shst(String formacao_shst) {
+        this.formacao_shst = formacao_shst;
+    }
+
+    public Object getFormacao_shsht_n_why() {
+        return formacao_shsht_n_why;
+    }
+
+    public void setFormacao_shsht_n_why(Object formacao_shsht_n_why) {
+        this.formacao_shsht_n_why = formacao_shsht_n_why;
+    }
+
+    public String getAcidentes_colaborador() {
+        return acidentes_colaborador;
+    }
+
+    public void setAcidentes_colaborador(String acidentes_colaborador) {
+        this.acidentes_colaborador = acidentes_colaborador;
+    }
+
+    public Object getNr_acidentes_colaborador() {
+        return nr_acidentes_colaborador;
+    }
+
+    public void setNr_acidentes_colaborador(Object nr_acidentes_colaborador) {
+        this.nr_acidentes_colaborador = nr_acidentes_colaborador;
+    }
+
+    public String getAcidentes_colaboradores() {
+        return acidentes_colaboradores;
+    }
+
+    public void setAcidentes_colaboradores(String acidentes_colaboradores) {
+        this.acidentes_colaboradores = acidentes_colaboradores;
+    }
+
+    public Object getNr_acidentes_colaboradores() {
+        return nr_acidentes_colaboradores;
+    }
+
+    public void setNr_acidentes_colaboradores(Object nr_acidentes_colaboradores) {
+        this.nr_acidentes_colaboradores = nr_acidentes_colaboradores;
+    }
+
+    public Object getNr_relatorio_acidentes_colaborador_1() {
+        return nr_relatorio_acidentes_colaborador_1;
+    }
+
+    public void setNr_relatorio_acidentes_colaborador_1(Object nr_relatorio_acidentes_colaborador_1) {
+        this.nr_relatorio_acidentes_colaborador_1 = nr_relatorio_acidentes_colaborador_1;
+    }
+
+    public Object getNr_relatorio_acidentes_colaborador_2() {
+        return nr_relatorio_acidentes_colaborador_2;
+    }
+
+    public void setNr_relatorio_acidentes_colaborador_2(Object nr_relatorio_acidentes_colaborador_2) {
+        this.nr_relatorio_acidentes_colaborador_2 = nr_relatorio_acidentes_colaborador_2;
+    }
+
+    public Object getNr_relatorio_acidentes_colaborador_3() {
+        return nr_relatorio_acidentes_colaborador_3;
+    }
+
+    public void setNr_relatorio_acidentes_colaborador_3(Object nr_relatorio_acidentes_colaborador_3) {
+        this.nr_relatorio_acidentes_colaborador_3 = nr_relatorio_acidentes_colaborador_3;
+    }
+
+    public Object getNr_relatorio_acidentes_colaborador_4() {
+        return nr_relatorio_acidentes_colaborador_4;
+    }
+
+    public void setNr_relatorio_acidentes_colaborador_4(Object nr_relatorio_acidentes_colaborador_4) {
+        this.nr_relatorio_acidentes_colaborador_4 = nr_relatorio_acidentes_colaborador_4;
+    }
+
+    public Object getNr_relatorio_acidentes_colaboradores_1() {
+        return nr_relatorio_acidentes_colaboradores_1;
+    }
+
+    public void setNr_relatorio_acidentes_colaboradores_1(Object nr_relatorio_acidentes_colaboradores_1) {
+        this.nr_relatorio_acidentes_colaboradores_1 = nr_relatorio_acidentes_colaboradores_1;
+    }
+
+    public Object getNr_relatorio_acidentes_colaboradores_2() {
+        return nr_relatorio_acidentes_colaboradores_2;
+    }
+
+    public void setNr_relatorio_acidentes_colaboradores_2(Object nr_relatorio_acidentes_colaboradores_2) {
+        this.nr_relatorio_acidentes_colaboradores_2 = nr_relatorio_acidentes_colaboradores_2;
+    }
+
+    public Object getNr_relatorio_acidentes_colaboradores_3() {
+        return nr_relatorio_acidentes_colaboradores_3;
+    }
+
+    public void setNr_relatorio_acidentes_colaboradores_3(Object nr_relatorio_acidentes_colaboradores_3) {
+        this.nr_relatorio_acidentes_colaboradores_3 = nr_relatorio_acidentes_colaboradores_3;
+    }
+
+    public Object getNr_relatorio_acidentes_colaboradores_4() {
+        return nr_relatorio_acidentes_colaboradores_4;
+    }
+
+    public void setNr_relatorio_acidentes_colaboradores_4(Object nr_relatorio_acidentes_colaboradores_4) {
+        this.nr_relatorio_acidentes_colaboradores_4 = nr_relatorio_acidentes_colaboradores_4;
+    }
+
+
+    
 }

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/pdf/Pdf.java

@@ -0,0 +1,168 @@
+/*
+ * Pdf.java
+ *
+ * Created on November 13, 2007, 11:33 AM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package pdf;
+
+import analiseacidentestrabalho.Acidentado;
+import analiseacidentestrabalho.AnaliseAcidente;
+import com.lowagie.text.Chunk;
+import com.lowagie.text.Document;
+import com.lowagie.text.Font;
+import com.lowagie.text.FontFactory;
+import com.lowagie.text.Paragraph;
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.pdf.BaseFont;
+import com.lowagie.text.pdf.PdfAction;
+import com.lowagie.text.pdf.PdfPCell;
+import com.lowagie.text.pdf.PdfPTable;
+import com.lowagie.text.pdf.PdfWriter;
+import db.AnalisesDataProvider;
+import java.awt.Color;
+import java.io.FileOutputStream;
+import javax.faces.context.FacesContext;
+
+/**
+ *
+ * @author lluis
+ */
+public class Pdf {
+
+    PdfPCell cell = null;
+    Paragraph p = null;
+    private final static int FONT_SIZE = 5;      
+    /** Creates a new instance of Pdf */
+    public Pdf() {
+    }
+    
+    public void generatePdf(String folder, AnaliseAcidente a)
+    {
+        PdfPTable table = null;
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        ////HttpServletResponse response = (HttpServletResponse)ctx.getExternalContext().getResponse();
+        Document document = new Document();           
+        ////response.setContentType("application/pdf"); 
+
+        try
+        {
+            ////PdfWriter writer = PdfWriter.getInstance(document, response.getOutputStream());
+            PdfWriter.getInstance(document, new FileOutputStream(folder + "/" + a.getId().toString() + ".pdf"));                    
+            document.open();
+            //document.add(new Paragraph("Hello World"));
+            //document.add(new Paragraph(new Date().toString()));
+            
+            table = createTableEmpresa(a);
+            document.add(table);
+        }
+        catch(Exception ex)
+        {
+            ex.printStackTrace();
+        }
+        document.close();                            
+    }
+    
+    private PdfPTable createTableHeader(AnaliseAcidente a) 
+    {
+        PdfPTable table = new PdfPTable(3);
+        return table;
+    }
+
+    private PdfPTable createTableEmpresa(AnaliseAcidente a) 
+    {
+        String empresa_str = "";
+        String estabelecimento_str = "";
+        String trabalhador_str = "";
+        AnalisesDataProvider adp = new AnalisesDataProvider();
+        try
+        {
+            String nome_empresa = adp.getEmpresaNome(a.getEmpresa_id());
+            empresa_str = utils.Utils.unicodeToHTML(nome_empresa);
+        }
+        catch(Exception ex)
+        {
+           ex.printStackTrace();
+        }                 
+        try
+        {
+            estabelecimento_str = adp.getEstabelecimentoNome(a.getEstabelecimento_id());
+        }
+        catch(Exception ex)
+        {
+           ex.printStackTrace();
+        }         
+        
+        Acidentado ac = null;
+        try
+        {
+            ac = adp.getAcidentado(a.getAcidentado_id());
+            trabalhador_str = ac.getNome();
+        }
+        catch(Exception ex)
+        {
+           ex.printStackTrace();
+        }    
+        
+        //TableEvents event = new TableEvents();
+        
+        float[] widths = { 1f, 4f };                
+        PdfPTable table = new PdfPTable(widths);
+        table.getDefaultCell().setBorder(Rectangle.LEFT | Rectangle.RIGHT | Rectangle.TOP | Rectangle.BOTTOM);
+        //PdfPCell cell = new PdfPCell(new Paragraph("header with colspan 3"));                                                
+        //cell.setColspan(3);
+        //table.addCell(cell); 
+        
+
+        
+         
+        cell = new PdfPCell(new Paragraph("Empresa:", FontFactory.getFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED, FONT_SIZE)));
+        cell.setBorder(Rectangle.NO_BORDER); 
+        cell.setBackgroundColor(new Color(102, 133, 151));           
+        table.addCell(cell);
+        
+        cell = new PdfPCell(new Paragraph(empresa_str, FontFactory.getFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED, FONT_SIZE, Font.NORMAL, new Color(255, 255, 255))    ));
+        cell.setBorder(Rectangle.NO_BORDER); 
+        cell.setBackgroundColor(new Color(102, 133, 151));                   
+        table.addCell(cell);        
+        
+        cell = new PdfPCell(new Paragraph("Estabelecimento:", FontFactory.getFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED, FONT_SIZE)));
+        cell.setBorder(Rectangle.NO_BORDER); 
+        cell.setBackgroundColor(new Color(102, 133, 151));           
+        table.addCell(cell);                
+
+        cell = new PdfPCell(new Paragraph(estabelecimento_str, FontFactory.getFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED, FONT_SIZE, Font.NORMAL, new Color(255, 255, 255))));
+        cell.setBorder(Rectangle.NO_BORDER); 
+        cell.setBackgroundColor(new Color(102, 133, 151));           
+        table.addCell(cell);   
+        
+        cell = new PdfPCell(new Paragraph("Trabalhador:", FontFactory.getFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED, FONT_SIZE)));
+        cell.setBorder(Rectangle.NO_BORDER); 
+        cell.setBackgroundColor(new Color(102, 133, 151));    
+        
+        table.addCell(cell);  
+        
+        cell = new PdfPCell(new Paragraph(trabalhador_str, FontFactory.getFont(BaseFont.HELVETICA, BaseFont.WINANSI, BaseFont.NOT_EMBEDDED, FONT_SIZE, Font.NORMAL, new Color(255, 255, 255))));
+        cell.setBorder(Rectangle.NO_BORDER); 
+        cell.setBackgroundColor(new Color(102, 133, 151));           
+        table.addCell(cell);   
+        table.getDefaultCell().setBackgroundColor(new Color(102, 133, 151));   
+        table.getDefaultCell().setPadding(0f);
+        table.setSpacingAfter(0f);
+        table.setSpacingBefore(0f);
+        return table;        
+    }    
+    
+    private PdfPTable createTableEmpresaHs(AnaliseAcidente a) 
+    {
+        PdfPTable table = new PdfPTable(3);
+        return table;        
+    }  
+    
+    
+    
+
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/utils/Strings.java

@@ -0,0 +1,151 @@
+/*
+ * Strings.java
+ *
+ * Created on October 8, 2007, 9:17 AM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package utils;
+
+/**
+ *
+ * @author lluis
+ */
+public class Strings {
+	public static String unicodeToHTML( String text )
+	{
+		if( text == null || text.length() < 6 )
+		{
+			return text;
+		}
+
+		String output = text;
+		output = output.replace( "\\u0009", " " );
+		output = output.replace( "\\u000a", "<br>" );
+
+		output = output.replace( "\\u00a0", "&nbsp;" );
+		output = output.replace( "\\u00aa", "&ordf;" );
+		output = output.replace( "\\u00ba", "&ordm;" );
+
+		output = output.replace( "\\u00c0", "À" );
+		output = output.replace( "\\u00c1", "Á" );
+		output = output.replace( "\\u00c2", "Â" );
+		output = output.replace( "\\u00c3", "Ã" );
+		output = output.replace( "\\u00c7", "Ç" );
+		output = output.replace( "\\u00c8", "È" );
+		output = output.replace( "\\u00c9", "É" );
+                
+		output = output.replace( "\\u00ca", "Ê" );
+		output = output.replace( "\\u00cc", "Ì" );
+		output = output.replace( "\\u00cd", "Í" );
+		output = output.replace( "\\u00ce", "Î" );
+		output = output.replace( "\\u00d2", "ò" );
+		output = output.replace( "\\u00d3", "ó" );
+		output = output.replace( "\\u00d4", "ô" );
+		output = output.replace( "\\u00d5", "õ" );
+		output = output.replace( "\\u00d9", "Ù" );
+		output = output.replace( "\\u00da", "Ú" );
+		output = output.replace( "\\u00db", "Û" );
+
+		output = output.replace( "\\u00e0", "à" );
+		output = output.replace( "\\u00e1", "á" );
+		output = output.replace( "\\u00e2", "â" );
+		output = output.replace( "\\u00e3", "ã" );
+		output = output.replace( "\\u00e7", "ç" );
+		output = output.replace( "\\u00e8", "è" );
+		output = output.replace( "\\u00e9", "é" );
+		output = output.replace( "\\u00ea", "ê" );
+		output = output.replace( "\\u00ec", "ì" );
+		output = output.replace( "\\u00ed", "í" );
+		output = output.replace( "\\u00ee", "î" );
+		output = output.replace( "\\u00f2", "ò" );
+		output = output.replace( "\\u00f3", "ó" );
+		output = output.replace( "\\u00f4", "ô" );
+		output = output.replace( "\\u00f5", "õ" );
+		output = output.replace( "\\u00f9", "ù" );
+		output = output.replace( "\\u00fa", "ú" );
+		output = output.replace( "\\u00fb", "û" );
+
+		output = output.replace( "\\u0153", "&#156;" );
+
+		output = output.replace( "\\u2013", "-" );
+		output = output.replace( "\\u2014", "-" );
+		output = output.replace( "\\u2018|\\u2019", "'" );
+		output = output.replace( "\\u201c|\\u201d", "\"" );
+
+		output = output.replace( "\\u2022", "*" );
+		output = output.replace( "\\u2026", "..." );
+
+		return output;
+	}
+        
+	public static String textToUnicode( String text )
+        {
+		String output = text;    
+		output = output.replace( "À", "\\u00c0" );
+		output = output.replace( "Á", "\\u00c1" );
+		output = output.replace( "Â", "\\u00c2" );
+		output = output.replace( "Ã", "\\u00c3" );
+		output = output.replace( "Ç", "\\u00c7" );
+		output = output.replace( "È", "\\u00c8" );
+		output = output.replace( "É", "\\u00c9" );
+                
+		output = output.replace( "Ê", "\\u00ca" );
+		output = output.replace( "Ì", "\\u00cc" );
+		output = output.replace( "Í", "\\u00cd" );
+		output = output.replace( "Î", "\\u00ce" );
+		output = output.replace( "ò", "\\u00d2" );
+		output = output.replace( "ó", "\\u00d3" );
+		output = output.replace( "ô", "\\u00d4" );
+		output = output.replace( "õ", "\\u00d5" );
+		output = output.replace( "Ù", "\\u00d9" );
+		output = output.replace( "Ú", "\\u00da" );
+		output = output.replace( "Û", "\\u00db" );
+
+		output = output.replace( "à", "\\u00e0" );
+		output = output.replace( "á", "\\u00e1" );
+		output = output.replace( "â", "\\u00e2" );
+		output = output.replace( "ã", "\\u00e3" );
+		output = output.replace( "ç", "\\u00e7" );
+		output = output.replace( "è", "\\u00e8" );
+		output = output.replace( "é", "\\u00e9" );
+		output = output.replace( "ê", "\\u00ea" );
+		output = output.replace( "ì", "\\u00ec" );
+		output = output.replace( "í", "\\u00ed" );
+		output = output.replace( "î", "\\u00ee" );
+		output = output.replace( "ò", "\\u00f2" );
+		output = output.replace( "ó", "\\u00f3" );
+		output = output.replace( "ô", "\\u00f4" );
+		output = output.replace( "õ", "\\u00f5" );
+		output = output.replace( "ù", "\\u00f9" );
+		output = output.replace( "ú", "\\u00fa" );
+		output = output.replace( "û", "\\u00fb" );    
+                
+		return output;                
+        }
+	
+	public static String RTFToUnicode( String text )
+	{
+		if( text == null || text.length() < 4 )
+		{
+			return text;
+		}
+		String output = text;
+		output = output.replaceAll( "\\'", "\\u00" );
+		return output;
+	}
+	
+	public static String unicodeToRTF( String text )
+	{
+		if( text == null || text.length() < 6 )
+		{
+			return text;
+		}
+		String output = text;
+		output = output.replaceAll( "\\\\u00", "\\\\'" );
+		return output;
+	}
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/src/java/utils/Utils.java

@@ -0,0 +1,133 @@
+/*
+ * Utils.java
+ *
+ * Created on October 12, 2007, 9:39 AM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+/**
+ *
+ * @author lluis
+ */
+public class Utils {
+    
+    /** Creates a new instance of Utils */
+    public Utils() {
+    }
+    
+	public static String unicodeToHTML( String text )
+	{
+		if( text == null || text.length() < 6 )
+		{
+			return text;
+		}
+
+		String output = text;
+		output = output.replace( "\\u0009", " " );
+		output = output.replace( "\\u000a", "<br>" );
+
+		output = output.replace( "\\u00a0", "&nbsp;" );
+		output = output.replace( "\\u00aa", "&ordf;" );
+		output = output.replace( "\\u00ba", "&ordm;" );
+
+		output = output.replace( "\\u00c0", "À" );
+		output = output.replace( "\\u00c1", "Á" );
+		output = output.replace( "\\u00c2", "Â" );
+		output = output.replace( "\\u00c3", "Ã" );
+		output = output.replace( "\\u00c7", "Ç" );
+		output = output.replace( "\\u00c8", "È" );
+		output = output.replace( "\\u00c9", "É" );
+                
+		output = output.replace( "\\u00ca", "Ê" );
+		output = output.replace( "\\u00cc", "Ì" );
+		output = output.replace( "\\u00cd", "Í" );
+		output = output.replace( "\\u00ce", "Î" );
+		output = output.replace( "\\u00d2", "ò" );
+		output = output.replace( "\\u00d3", "ó" );
+		output = output.replace( "\\u00d4", "ô" );
+		output = output.replace( "\\u00d5", "õ" );
+		output = output.replace( "\\u00d9", "Ù" );
+		output = output.replace( "\\u00da", "Ú" );
+		output = output.replace( "\\u00db", "Û" );
+
+		output = output.replace( "\\u00e0", "à" );
+		output = output.replace( "\\u00e1", "á" );
+		output = output.replace( "\\u00e2", "â" );
+		output = output.replace( "\\u00e3", "ã" );
+		output = output.replace( "\\u00e7", "ç" );
+		output = output.replace( "\\u00e8", "è" );
+		output = output.replace( "\\u00e9", "é" );
+		output = output.replace( "\\u00ea", "ê" );
+		output = output.replace( "\\u00ec", "ì" );
+		output = output.replace( "\\u00ed", "í" );
+		output = output.replace( "\\u00ee", "î" );
+		output = output.replace( "\\u00f2", "ò" );
+		output = output.replace( "\\u00f3", "ó" );
+		output = output.replace( "\\u00f4", "ô" );
+		output = output.replace( "\\u00f5", "õ" );
+		output = output.replace( "\\u00f9", "ù" );
+		output = output.replace( "\\u00fa", "ú" );
+		output = output.replace( "\\u00fb", "û" );
+
+		output = output.replace( "\\u0153", "&#156;" );
+
+		output = output.replace( "\\u2013", "-" );
+		output = output.replace( "\\u2014", "-" );
+		output = output.replace( "\\u2018|\\u2019", "'" );
+		output = output.replace( "\\u201c|\\u201d", "\"" );
+
+		output = output.replace( "\\u2022", "*" );
+		output = output.replace( "\\u2026", "..." );
+
+		return output;
+	}    
+        
+    public static String getPageFrom(String referer)
+    {
+        String pageFrom = referer.substring(referer.lastIndexOf("/")+1);
+        return pageFrom;
+    } 
+    
+    public static boolean isValidEmail(String email){
+        boolean res = true;
+        
+        int indexOfAtChar=email.indexOf("@");
+
+        if(indexOfAtChar > 0)
+        {
+            int indexOfDotChar =
+                email.indexOf(".",indexOfAtChar);
+            if(indexOfDotChar > 0)
+            {
+              res = true;
+            }
+            else
+            {
+                res = false;
+            }
+        }
+        else{
+            res = false;
+        }        
+        return res;
+    }        
+    
+    public static String dateToYYYYMMDD(Date ddate)
+    {
+        Calendar cal = new GregorianCalendar();
+        cal.setTime(ddate);  
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
+        String date_str = dateFormat.format(cal.getTime());
+        return date_str;
+    }
+    
+}

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/Dummy.jsp

@@ -6,16 +6,77 @@
             <ui:html binding="#{Dummy.html1}" id="html1">
                 <ui:head binding="#{Dummy.head1}" id="head1">
                     <ui:link binding="#{Dummy.link1}" id="link1" url="/resources/stylesheet.css"/>
+                    <style>
+                        table.restricoes td {border-bottom: 1px solid #000000}
+                        table.centerBlock td {border: none}                        
+                    </style>
                 </ui:head>
                 <ui:body binding="#{Dummy.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{Dummy.form1}" id="form1">
-                        <h:panelGrid binding="#{Dummy.gridPanel3}" columnClasses="gridColLeft, gridColRight" columns="2" id="gridPanel3"
+                        <h:panelGrid binding="#{Dummy.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
-                            style="height: 24px; left: 48px; top: 192px; width: 100%" width="336"/>
+                            style="border-bottom: solid rgb(0, 0, 0) 1px; height: 24px; left: 0px; top: 312px; position: absolute; width: 100%" width="312">
-                        <ui:textField binding="#{Dummy.txtIn}" id="txtIn" style="position: absolute; left: 72px; top: 144px"/>
+                            <ui:panelGroup binding="#{Dummy.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
-                        <ui:button action="#{Dummy.button1_action}" binding="#{Dummy.button1}" id="button1"
+                                <ui:image binding="#{Dummy.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
-                            style="position: absolute; left: 312px; top: 144px; width: 96px; height: 24px" text="Button"/>
+                                <ui:image binding="#{Dummy.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
-                        <ui:staticText binding="#{Dummy.staticText1}" id="staticText1" style="position: absolute; left: 72px; top: 216px; width: 216px; height: 24px"/>
+                            </ui:panelGroup>
-                        <ui:hyperlink binding="#{Dummy.lnkLblTrabalhador}" id="lnkLblTrabalhador" style="position: absolute; left: 336px; top: 240px" text="Trabalhador:"/>
+                            <ui:panelGroup binding="#{Dummy.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
+                                <ui:staticText binding="#{Dummy.lblUser1}" escape="false" id="lblUser1"/>
+                                <ui:staticText binding="#{Dummy.staticText1}" escape="false" id="staticText1" text="   "/>
+                                <ui:hyperlink action="#{Dummy.lnkEditUser_action}" binding="#{Dummy.lnkEditUser1}" disabled="true" id="lnkEditUser1" text="alterar dados utilizador"/>
+                                <ui:staticText binding="#{Dummy.staticText2}" escape="false" id="staticText2" text=" | "/>
+                                <ui:hyperlink action="#{Dummy.lnkLogout_action}" binding="#{Dummy.lnkLogout1}" id="lnkLogout1" text="sair"/>
+                                <ui:staticText binding="#{Dummy.staticText3}" id="staticText3" text="&gt;&gt;"/>
+                            </ui:panelGroup>
+                        </h:panelGrid>
+                        <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>
+                        <h:panelGrid binding="#{Dummy.gridPanel4}" columns="1" id="gridPanel4" style="height: 24px; left: 24px; top: 336px; position: absolute" width="624"/>
+                        <ui:radioButton binding="#{Dummy.radioButton1}" id="radioButton1" name="radioButton-group-form1" style="position: absolute; left: 96px; top: 144px; width: 24px; height: 24px"/>
+                        <ui:panelGroup binding="#{Dummy.groupPanel7}" id="groupPanel7" style="height: 24px; left: 96px; top: 192px; position: absolute; width: 432px">
+                            <ui:radioButton binding="#{Dummy.rbTurnoManha}" id="rbTurnoManha" name="rbTurno" style="height: 24px; width: 24px"/>
+                            <ui:staticText binding="#{Dummy.staticText10}" escape="false" id="staticText10" style="height: 24px; width: 288px" text="Manh&amp;atilde;"/>
+                            <ui:staticText binding="#{Dummy.staticText11}" escape="false" id="staticText11" style="height: 24px; width: 24px" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;"/>
+                            <ui:radioButton binding="#{Dummy.rbTurnoTarde}" id="rbTurnoTarde" name="rbTurno" style="height: 24px; width: 24px"/>
+                            <ui:staticText binding="#{Dummy.staticText12}" escape="false" id="staticText12" style="height: 24px; width: 288px" text="Tarde"/>
+                            <ui:staticText binding="#{Dummy.staticText13}" escape="false" id="staticText13" style="height: 24px; width: 24px" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;"/>
+                            <ui:radioButton binding="#{Dummy.rbTurnoNoite}" id="rbTurnoNoite" name="rbTurno" style="height: 24px; width: 24px"/>
+                            <ui:staticText binding="#{Dummy.staticText14}" escape="false" id="staticText14" style="height: 24px; width: 288px" text="Noite"/>
+                        </ui:panelGroup>
+                        <ui:button binding="#{Dummy.button1}" id="button1" style="height: 24px; left: 288px; top: 240px; position: absolute; width: 95px" text="Imprimir"/>
+                        <ui:hiddenField binding="#{Dummy.hiddenField1}" id="hiddenField1"/>
                     </ui:form>
                 </ui:body>
             </ui:html>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/Footer.jspf

@@ -2,7 +2,7 @@
 <div style="height: 200px; width: 100%; -rave-layout: grid" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://www.sun.com/web/ui">
     <f:subview id="Footer">
         <h:panelGrid binding="#{Footer.gridPanel1}" columnClasses="gridColCenter" columns="1" id="gridPanel1" style="height: 24px; left: 0px; top: 0px; position: absolute; width: 100%">
-            <ui:panelGroup binding="#{Footer.groupPanel1}" id="groupPanel1" style="width: 200px">
+            <ui:panelGroup binding="#{Footer.groupPanel1}" id="groupPanel1" style="border-bottom: solid #ffffff 1px; height: 21px; width: 200px">
                 <ui:staticText binding="#{Footer.staticText1}" id="staticText1" text="Software desenvolvido por "/>
                 <ui:image binding="#{Footer.image1}" height="21" id="image1" url="/resources/images/logo_evolute_small.png" width="100"/>
                 <ui:staticText binding="#{Footer.staticText2}" escape="false" id="staticText2" text="&amp;nbsp;&amp;copy; 2008 "/>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/FormHS.jsp

@@ -9,9 +9,6 @@
                 </ui:head>
                 <ui:body binding="#{FormHS.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormHS.form1}" id="form1">
-                        <div class="gridColCenter" style="height: 22px; left: 0px; top: 0px; position: absolute; width: 100%">
-                            <jsp:directive.include file="Header.jspf"/>
-                        </div>
                         <h:panelGrid binding="#{FormHS.gridBase1}" columns="1" id="gridBase1"
                             style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
                             <h:panelGrid binding="#{FormHS.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
@@ -22,12 +19,11 @@
                                         <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:staticText binding="#{FormHS.lblUser}" escape="false" id="lblUser"/>
+                                        <ui:staticText binding="#{FormHS.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
                                         <ui:staticText binding="#{FormHS.staticText1}" escape="false" id="staticText1" text="   "/>
-                                        <ui:hyperlink binding="#{FormHS.lnkChangePassword1}" id="lnkChangePassword1" text="alterar palavra-chave"/>
+                                        <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.lnkLogout_action}" binding="#{FormHS.lnkLogout}" id="lnkLogout" text="sair"/>
+                                        <ui:hyperlink action="#{FormHS.lnkLogout_action}" binding="#{FormHS.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
-                                        <ui:staticText binding="#{FormHS.staticText3}" id="staticText3" text="&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormHS.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
@@ -42,7 +38,7 @@
                                         <ui:staticText binding="#{FormHS.staticText5}" id="staticText5" 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="358">
+                                                styleClass="centerBlock" width="560">
                                                 <ui:tableRowGroup binding="#{FormHS.tableRowGroup1}" id="tableRowGroup1"
                                                     sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormHS.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
@@ -51,13 +47,17 @@
                                                             id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn2}" headerText="Nr" id="tableColumn2" sort="nr" style="width: 10%">
-                                                        <ui:hyperlink action="#{FormHS.lnkNr_action}" binding="#{FormHS.lnkNr}" id="lnkNr" text="#{currentRow.value['nr']}"/>
+                                                        <ui:hyperlink action="#{FormHS.lnkNr_action}" binding="#{FormHS.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
                                                         sort="nome_acidentado" style="width: 80%" width="119">
                                                         <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="200">
+                                                        <ui:hyperlink action="#{FormHS.lnkFase_action}" binding="#{FormHS.lnkFase}" id="lnkFase"
+                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -72,7 +72,7 @@
                                         <h:panelGrid binding="#{FormHS.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%"
                                             styleClass="centerBlock" width="456">
                                             <ui:table augmentTitle="false" binding="#{FormHS.table2}" id="table2" style="width: 80%; height: 48px"
-                                                styleClass="centerBlock" width="358">
+                                                styleClass="centerBlock" width="560">
                                                 <ui:tableRowGroup binding="#{FormHS.tableRowGroup2}" id="tableRowGroup2"
                                                     sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormHS.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
@@ -81,13 +81,17 @@
                                                             id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn5}" headerText="Nr" id="tableColumn5" sort="column2" style="width: 10%">
-                                                        <ui:hyperlink action="#{FormHS.lnkNrSeg_action}" binding="#{FormHS.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['nr']}"/>
+                                                        <ui:hyperlink action="#{FormHS.lnkNrSeg_action}" binding="#{FormHS.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormHS.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
                                                         sort="column3" style="width: 80%" width="119">
                                                         <ui:hyperlink action="#{FormHS.lnkNomeAcidentadoSeg_action}" binding="#{FormHS.lnkNomeAcidentadoSeg}"
                                                             id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormHS.tableColumn11}" headerText="Fase" id="tableColumn11" width="200">
+                                                        <ui:hyperlink action="#{FormHS.lnkFaseSeg_action}" binding="#{FormHS.lnkFaseSeg}" id="lnkFaseSeg"
+                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -131,14 +135,17 @@
                                             <ui:tableRowGroup binding="#{FormHS.tableRowGroup3}" id="tableRowGroup3"
                                                 sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
                                                 <ui:tableColumn binding="#{FormHS.tableColumn7}" headerText="Data do acidente" id="tableColumn7" sort="column1" style="width: 10%">
-                                                    <ui:hyperlink binding="#{FormHS.hyperlink1}" id="hyperlink1" text="#{currentRow.value['data_acidente']}"/>
+                                                    <ui:hyperlink action="#{FormHS.lnkDataConcluida_action}" binding="#{FormHS.lnkDataConcluida}"
+                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormHS.tableColumn8}" headerText="Nr" id="tableColumn8" sort="column2" style="width: 10%">
-                                                    <ui:hyperlink binding="#{FormHS.hyperlink2}" id="hyperlink2" text="#{currentRow.value['nr']}"/>
+                                                    <ui:hyperlink action="#{FormHS.lnkNrConcluida_action}" binding="#{FormHS.lnkNrConcluida}"
+                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormHS.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
                                                     sort="column3" style="width: 80%">
-                                                    <ui:hyperlink binding="#{FormHS.hyperlink3}" id="hyperlink3" text="#{currentRow.value['nome_acidentado']}"/>
+                                                    <ui:hyperlink action="#{FormHS.lnkNomeConcluida_action}" binding="#{FormHS.lnkNomeConcluida}"
+                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
                                             </ui:tableRowGroup>
                                         </ui:table>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/FormMedico.jsp

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jsp:root version="1.2" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:ui="http://www.sun.com/web/ui">
+    <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
+    <f:view>
+        <ui:page binding="#{FormMedico.page1}" id="page1">
+            <ui:html binding="#{FormMedico.html1}" id="html1">
+                <ui:head binding="#{FormMedico.head1}" id="head1">
+                    <ui:link binding="#{FormMedico.link1}" id="link1" url="/resources/stylesheet.css"/>
+                </ui:head>
+                <ui:body binding="#{FormMedico.body1}" id="body1" style="-rave-layout: grid">
+                    <ui:form binding="#{FormMedico.form1}" id="form1">
+                        <h:panelGrid binding="#{FormMedico.gridBase1}" columns="1" id="gridBase1"
+                            style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
+                            <h:panelGrid binding="#{FormMedico.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
+                                <h:panelGrid binding="#{FormMedico.gridPanel1}" columnClasses="gridColLeft, gridColRightBottom" columns="2" id="gridPanel1"
+                                    style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="312">
+                                    <ui:panelGroup binding="#{FormMedico.groupPanel1}" id="groupPanel1" style="height: 24px; width: 216px">
+                                        <ui:image binding="#{FormMedico.image1}" id="image1" url="/resources/images/SIPRP_logo_small.jpg"/>
+                                        <ui:image binding="#{FormMedico.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
+                                    </ui:panelGroup>
+                                    <ui:panelGroup binding="#{FormMedico.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
+                                        <ui:staticText binding="#{FormMedico.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
+                                        <ui:staticText binding="#{FormMedico.staticText1}" escape="false" id="staticText1" text="   "/>
+                                        <ui:hyperlink action="#{FormMedico.lnkEditUser_action}" binding="#{FormMedico.lnkEditUser}" id="lnkEditUser" text="alterar dados utilizador"/>
+                                        <ui:staticText binding="#{FormMedico.staticText2}" escape="false" id="staticText2" text=" | "/>
+                                        <ui:hyperlink action="#{FormMedico.lnkLogout_action}" binding="#{FormMedico.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
+                                    </ui:panelGroup>
+                                </h:panelGrid>
+                                <h:panelGrid binding="#{FormMedico.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
+                                    id="gridLayoutTop1" style="height: 15px; position: relative; vertical-align: top; width: 100%">
+                                    <h:panelGrid binding="#{FormMedico.gridActual}" columnClasses="gridColCenter" columns="1" id="gridActual"
+                                        style="background-color: #f6f4e8; height: 24px; position: relative; width: 100%" width="360">
+                                        <h:panelGrid binding="#{FormMedico.gridPanel2}" columnClasses="gridColCenter" columns="1" id="gridPanel2"
+                                            style="height: 24px; width: 100%" width="264">
+                                            <ui:staticText binding="#{FormMedico.staticText4}" id="staticText4"
+                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Actual"/>
+                                        </h:panelGrid>
+                                        <ui:staticText binding="#{FormMedico.staticText5}" id="staticText5" text="Processos com dados pendentes"/>
+                                        <h:panelGrid binding="#{FormMedico.gridPanel3}" id="gridPanel3" style="height: 24px; width: 100%"
+                                            styleClass="centerBlock" width="456">
+                                            <ui:table augmentTitle="false" binding="#{FormMedico.table1}" id="table1" style="width: 80%; height: 48px"
+                                                styleClass="centerBlock" width="560">
+                                                <ui:tableRowGroup binding="#{FormMedico.tableRowGroup1}" id="tableRowGroup1"
+                                                    sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
+                                                        sort="data_acidente" style="width: 10%">
+                                                        <ui:hyperlink action="#{FormMedico.lnkDataAcidente_action}" binding="#{FormMedico.lnkDataAcidente}"
+                                                            id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn2}" headerText="Nr" id="tableColumn2" sort="nr" style="width: 10%">
+                                                        <ui:hyperlink action="#{FormMedico.lnkNr_action}" binding="#{FormMedico.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
+                                                        sort="nome_acidentado" style="width: 80%" width="119">
+                                                        <ui:hyperlink action="#{FormMedico.lnkNomeAcidentado_action}" binding="#{FormMedico.lnkNomeAcidentado}"
+                                                            id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn10}" headerText="Fase" id="tableColumn10" width="200">
+                                                        <ui:hyperlink action="#{FormMedico.lnkFase_action}" binding="#{FormMedico.lnkFase}" id="lnkFase"
+                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
+                                                </ui:tableRowGroup>
+                                            </ui:table>
+                                        </h:panelGrid>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{FormMedico.gridSeguimento}" columns="1" id="gridSeguimento"
+                                        style="background-color: #f6f4e8; position: relative; width: 100%" width="360">
+                                        <h:panelGrid binding="#{FormMedico.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4"
+                                            style="height: 24px; width: 100%" width="264">
+                                            <ui:staticText binding="#{FormMedico.staticText6}" id="staticText6"
+                                                style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Em seguimento"/>
+                                        </h:panelGrid>
+                                        <h:panelGrid binding="#{FormMedico.gridPanel5}" id="gridPanel5"
+                                            style="background-color: #f6f4e8; height: 24px; width: 100%" styleClass="centerBlock" width="456">
+                                            <ui:table augmentTitle="false" binding="#{FormMedico.table2}" id="table2" style="width: 80%; height: 48px"
+                                                styleClass="centerBlock" width="560">
+                                                <ui:tableRowGroup binding="#{FormMedico.tableRowGroup2}" id="tableRowGroup2"
+                                                    sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
+                                                        sort="column1" style="width: 10%">
+                                                        <ui:hyperlink action="#{FormMedico.lnkDataAcidenteSeg_action}"
+                                                            binding="#{FormMedico.lnkDataAcidenteSeg}" id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn5}" headerText="Nr" id="tableColumn5" sort="column2" style="width: 10%">
+                                                        <ui:hyperlink action="#{FormMedico.lnkNrSeg_action}" binding="#{FormMedico.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
+                                                        sort="column3" style="width: 80%" width="119">
+                                                        <ui:hyperlink action="#{FormMedico.lnkNomeAcidentadoSeg_action}"
+                                                            binding="#{FormMedico.lnkNomeAcidentadoSeg}" id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
+                                                    </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormMedico.tableColumn11}" headerText="Fase" id="tableColumn11" width="200">
+                                                        <ui:hyperlink action="#{FormMedico.lnkFaseSeg_action}" binding="#{FormMedico.lnkFaseSeg}"
+                                                            id="lnkFaseSeg" style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
+                                                </ui:tableRowGroup>
+                                            </ui:table>
+                                        </h:panelGrid>
+                                    </h:panelGrid>
+                                </h:panelGrid>
+                                <h:panelGrid binding="#{FormMedico.gridConcluidos}" columns="1" id="gridConcluidos"
+                                    style="border: 1px solid #000000; height: 24px; background-color: #f6f4e8; width: 100%" width="360">
+                                    <h:panelGrid binding="#{FormMedico.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
+                                        style="height: 24px; width: 100%" width="264">
+                                        <ui:staticText binding="#{FormMedico.staticText7}" escape="false" id="staticText7"
+                                            style="font-size: 18px; font-weight: bold; height: 24px; width: 168px" text="Concluídos"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{FormMedico.gridPanel7}" columns="5" id="gridPanel7" style="height: 24px" width="576">
+                                        <ui:panelGroup binding="#{FormMedico.groupPanel3}" id="groupPanel3" style="height: 24px; width: 94px">
+                                            <ui:staticText binding="#{FormMedico.staticText8}" id="staticText8" style="height: 24px; width: 22px" text="Ano:"/>
+                                            <ui:dropDown binding="#{FormMedico.drpAno}" id="drpAno" items="#{SessionBean1.anoOptions}"
+                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos:gridPanel7:groupPanel3:drpAno');"
+                                                selected="#{SessionBean1.anoChoice}" style="width: 70px" valueChangeListener="#{FormMedico.drpAno_processValueChange}"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup binding="#{FormMedico.groupPanel4}" id="groupPanel4" style="height: 24px; width: 94px">
+                                            <ui:staticText binding="#{FormMedico.lblMes}" escape="false" id="lblMes" style="height: 24px; width: 22px"
+                                                text="Mês:" visible="false"/>
+                                            <ui:dropDown binding="#{FormMedico.drpMes}" id="drpMes" items="#{SessionBean1.mesOptions}"
+                                                onChange="common_timeoutSubmitForm(this.form, 'gridBase1:gridLayout1:gridConcluidos:gridPanel7:groupPanel4:drpMes');"
+                                                selected="#{SessionBean1.mesChoice}" style="width: 69px"
+                                                valueChangeListener="#{FormMedico.drpMes_processValueChange}" visible="false"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup binding="#{FormMedico.groupPanel5}" id="groupPanel5" style="height: 24px; width: 94px">
+                                            <ui:staticText binding="#{FormMedico.lblDia}" id="lblDia" style="height: 24px; width: 22px" text="Dia:" visible="false"/>
+                                            <ui:dropDown binding="#{FormMedico.drpDia}" id="drpDia" items="#{SessionBean1.diaOptions}"
+                                                selected="#{SessionBean1.diaChoice}" valueChangeListener="#{FormMedico.drpDia_processValueChange}" visible="false"/>
+                                        </ui:panelGroup>
+                                        <ui:panelGroup binding="#{FormMedico.groupPanel6}" id="groupPanel6" style="height: 24px; width: 262px">
+                                            <ui:staticText binding="#{FormMedico.staticText9}" id="staticText9" style="height: 24px; width: 46px" text="Nome:"/>
+                                            <ui:textField binding="#{FormMedico.txtNome}" id="txtNome"/>
+                                        </ui:panelGroup>
+                                        <ui:button action="#{FormMedico.butPesquisar_action}" binding="#{FormMedico.butPesquisar}" id="butPesquisar" text="Pesquisar"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{FormMedico.gridPanel8}" columnClasses="gridColCenter" columns="1" id="gridPanel8"
+                                        style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
+                                        <ui:table augmentTitle="false" binding="#{FormMedico.table3}" id="table3" style="width: 89%; height: 48px" styleClass="centerBlock">
+                                            <ui:tableRowGroup binding="#{FormMedico.tableRowGroup3}" id="tableRowGroup3"
+                                                sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
+                                                <ui:tableColumn binding="#{FormMedico.tableColumn7}" headerText="Data do acidente" id="tableColumn7"
+                                                    sort="column1" style="width: 10%">
+                                                    <ui:hyperlink action="#{FormMedico.lnkDataConcluida_action}" binding="#{FormMedico.lnkDataConcluida}"
+                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
+                                                </ui:tableColumn>
+                                                <ui:tableColumn binding="#{FormMedico.tableColumn8}" headerText="Nr" id="tableColumn8" sort="column2" style="width: 10%">
+                                                    <ui:hyperlink action="#{FormMedico.lnkNrConcluida_action}" binding="#{FormMedico.lnkNrConcluida}"
+                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
+                                                </ui:tableColumn>
+                                                <ui:tableColumn binding="#{FormMedico.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
+                                                    sort="column3" style="width: 80%">
+                                                    <ui:hyperlink action="#{FormMedico.lnkNomeConcluida_action}" binding="#{FormMedico.lnkNomeConcluida}"
+                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
+                                                </ui:tableColumn>
+                                            </ui:tableRowGroup>
+                                        </ui:table>
+                                        <ui:staticText binding="#{FormMedico.txtSearchMsg}" escape="false" id="txtSearchMsg" rendered="false" style="color: rgb(204, 0, 0); height: 24px; width: 336px"/>
+                                    </h:panelGrid>
+                                </h:panelGrid>
+                            </h:panelGrid>
+                        </h:panelGrid>
+                        <div class="gridColCenter, footer" style="height: 22px; width: 100%">
+                            <jsp:directive.include file="Footer.jspf"/>
+                        </div>
+                    </ui:form>
+                </ui:body>
+            </ui:html>
+        </ui:page>
+    </f:view>
+</jsp:root>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/FormRH.jsp

@@ -9,9 +9,6 @@
                 </ui:head>
                 <ui:body binding="#{FormRH.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormRH.form1}" id="form1">
-                        <div class="gridColCenter" style="height: 22px; left: 0px; top: 0px; position: absolute; width: 100%">
-                            <jsp:directive.include file="Header.jspf"/>
-                        </div>
                         <h:panelGrid binding="#{FormRH.gridBase1}" columns="1" id="gridBase1"
                             style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
                             <h:panelGrid binding="#{FormRH.gridLayout1}" columns="1" id="gridLayout1" style="height: 15px; width: 80%" styleClass="centerBlock">
@@ -22,12 +19,11 @@
                                         <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:staticText binding="#{FormRH.lblUser}" escape="false" id="lblUser"/>
+                                        <ui:staticText binding="#{FormRH.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
                                         <ui:staticText binding="#{FormRH.staticText1}" escape="false" id="staticText1" text="   "/>
-                                        <ui:hyperlink binding="#{FormRH.lnkChangePassword1}" id="lnkChangePassword1" text="alterar palavra-chave"/>
+                                        <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.lnkLogout_action}" binding="#{FormRH.lnkLogout}" id="lnkLogout" text="sair"/>
+                                        <ui:hyperlink action="#{FormRH.lnkLogout_action}" binding="#{FormRH.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
-                                        <ui:staticText binding="#{FormRH.staticText3}" id="staticText3" text="&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormRH.gridLayoutTop1}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
@@ -42,7 +38,7 @@
                                         <ui:staticText binding="#{FormRH.staticText5}" id="staticText5" text="Processos com dados pendentes"/>
                                         <h:panelGrid binding="#{FormRH.gridPanel3}" id="gridPanel3" style="height: 24px; width: 100%" styleClass="centerBlock" width="456">
                                             <ui:table augmentTitle="false" binding="#{FormRH.table1}" id="table1" style="width: 80%; height: 48px"
-                                                styleClass="centerBlock" width="359">
+                                                styleClass="centerBlock" width="560">
                                                 <ui:tableRowGroup binding="#{FormRH.tableRowGroup1}" id="tableRowGroup1"
                                                     sourceData="#{SessionBean1.analisesActualDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormRH.tableColumn1}" headerText="Data do acidente" id="tableColumn1"
@@ -51,13 +47,17 @@
                                                             id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn2}" headerText="Nr" id="tableColumn2" sort="nr" style="width: 10%">
-                                                        <ui:hyperlink action="#{FormRH.lnkNr_action}" binding="#{FormRH.lnkNr}" id="lnkNr" text="#{currentRow.value['nr']}"/>
+                                                        <ui:hyperlink action="#{FormRH.lnkNr_action}" binding="#{FormRH.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
                                                         sort="nome_acidentado" style="width: 80%" width="119">
                                                         <ui:hyperlink action="#{FormRH.lnkNomeAcidentado_action}" binding="#{FormRH.lnkNomeAcidentado}"
                                                             id="lnkNomeAcidentado" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn10}" headerText="Fase" id="tableColumn10" width="200">
+                                                        <ui:hyperlink action="#{FormRH.lnkFase_action}" binding="#{FormRH.lnkFase}" id="lnkFase"
+                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -72,7 +72,7 @@
                                         <h:panelGrid binding="#{FormRH.gridPanel5}" id="gridPanel5" style="background-color: #f6f4e8; height: 24px; width: 100%"
                                             styleClass="centerBlock" width="456">
                                             <ui:table augmentTitle="false" binding="#{FormRH.table2}" id="table2" style="width: 80%; height: 48px"
-                                                styleClass="centerBlock" width="359">
+                                                styleClass="centerBlock" width="544">
                                                 <ui:tableRowGroup binding="#{FormRH.tableRowGroup2}" id="tableRowGroup2"
                                                     sourceData="#{SessionBean1.analisesSeguimentoDataProvider}" sourceVar="currentRow">
                                                     <ui:tableColumn binding="#{FormRH.tableColumn4}" headerText="Data do acidente" id="tableColumn4"
@@ -80,14 +80,19 @@
                                                         <ui:hyperlink action="#{FormRH.lnkDataAcidenteSeg_action}" binding="#{FormRH.lnkDataAcidenteSeg}"
                                                             id="lnkDataAcidenteSeg" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
-                                                    <ui:tableColumn binding="#{FormRH.tableColumn5}" headerText="Nr" id="tableColumn5" sort="column2" style="width: 10%">
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn5}" headerText="Nr" id="tableColumn5" sort="column2"
-                                                        <ui:hyperlink action="#{FormRH.lnkNrSeg_action}" binding="#{FormRH.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['nr']}"/>
+                                                        style="width: 10%" width="25">
+                                                        <ui:hyperlink action="#{FormRH.lnkNrSeg_action}" binding="#{FormRH.lnkNrSeg}" id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormRH.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
                                                         sort="column3" style="width: 80%" width="119">
                                                         <ui:hyperlink action="#{FormRH.lnkNomeAcidentadoSeg_action}" binding="#{FormRH.lnkNomeAcidentadoSeg}"
                                                             id="lnkNomeAcidentadoSeg" text="#{currentRow.value['nome_acidentado']}"/>
                                                     </ui:tableColumn>
+                                                    <ui:tableColumn binding="#{FormRH.tableColumn11}" headerText="Fase" id="tableColumn11" width="200">
+                                                        <ui:hyperlink action="#{FormRH.lnkFaseSeg_action}" binding="#{FormRH.lnkFaseSeg}" id="lnkFaseSeg"
+                                                            style="width: 96px; height: 24px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -131,14 +136,17 @@
                                             <ui:tableRowGroup binding="#{FormRH.tableRowGroup3}" id="tableRowGroup3"
                                                 sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
                                                 <ui:tableColumn binding="#{FormRH.tableColumn7}" headerText="Data do acidente" id="tableColumn7" sort="column1" style="width: 10%">
-                                                    <ui:hyperlink binding="#{FormRH.hyperlink1}" id="hyperlink1" text="#{currentRow.value['data_acidente']}"/>
+                                                    <ui:hyperlink action="#{FormRH.lnkDataConcluida_action}" binding="#{FormRH.lnkDataConcluida}"
+                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormRH.tableColumn8}" headerText="Nr" id="tableColumn8" sort="column2" style="width: 10%">
-                                                    <ui:hyperlink binding="#{FormRH.hyperlink2}" id="hyperlink2" text="#{currentRow.value['nr']}"/>
+                                                    <ui:hyperlink action="#{FormRH.lnkNrConcluida_action}" binding="#{FormRH.lnkNrConcluida}"
+                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormRH.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
                                                     sort="column3" style="width: 80%">
-                                                    <ui:hyperlink binding="#{FormRH.hyperlink3}" id="hyperlink3" text="#{currentRow.value['nome_acidentado']}"/>
+                                                    <ui:hyperlink action="#{FormRH.lnkNomeConcluida_action}" binding="#{FormRH.lnkNomeConcluida}"
+                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
                                             </ui:tableRowGroup>
                                         </ui:table>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/FormSeguranca.jsp

@@ -10,9 +10,6 @@
                 </ui:head>
                 <ui:body binding="#{FormSeguranca.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{FormSeguranca.form1}" id="form1">
-                        <div class="gridColCenter" style="height: 22px; left: 0px; top: 0px; position: absolute; width: 100%">
-                            <jsp:directive.include file="Header.jspf"/>
-                        </div>
                         <h:panelGrid binding="#{FormSeguranca.gridBase}" columns="1" id="gridBase"
                             style="height: 24px; left: 0px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock" width="648">
                             <h:panelGrid binding="#{FormSeguranca.gridLayout}" columns="1" id="gridLayout" style="height: 15px; width: 80%" styleClass="centerBlock">
@@ -23,12 +20,11 @@
                                         <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:staticText binding="#{FormSeguranca.lblUser}" escape="false" id="lblUser"/>
+                                        <ui:staticText binding="#{FormSeguranca.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
                                         <ui:staticText binding="#{FormSeguranca.staticText18}" escape="false" id="staticText18" text="   "/>
-                                        <ui:hyperlink binding="#{FormSeguranca.lnkChangePassword}" id="lnkChangePassword" text="alterar palavra-chave"/>
+                                        <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.lnkLogout_action}" binding="#{FormSeguranca.lnkLogout}" id="lnkLogout" text="sair"/>
+                                        <ui:hyperlink action="#{FormSeguranca.lnkLogout_action}" binding="#{FormSeguranca.lnkLogout}" id="lnkLogout" text="sair&gt;&gt;"/>
-                                        <ui:staticText binding="#{FormSeguranca.staticText5}" id="staticText5" text="&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{FormSeguranca.gridLayoutTop}" columnClasses="gridLayoutTopCols, gridLayoutTopCols" columns="2"
@@ -45,7 +41,8 @@
                                         <ui:staticText binding="#{FormSeguranca.staticText4}" id="staticText4" text="Processos com dados pendentes"/>
                                         <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">
+                                            <ui:table augmentTitle="false" binding="#{FormSeguranca.table1}" id="table1" style="width: 80%; height: 48px"
+                                                styleClass="centerBlock" width="560">
                                                 <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"
@@ -54,13 +51,17 @@
                                                             binding="#{FormSeguranca.lnkDataAcidente}" id="lnkDataAcidente" text="#{currentRow.value['data_acidente']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn2}" headerText="Nr" id="tableColumn2" sort="nr" style="width: 10%">
-                                                        <ui:hyperlink action="#{FormSeguranca.lnkNr_action}" binding="#{FormSeguranca.lnkNr}" id="lnkNr" text="#{currentRow.value['nr']}"/>
+                                                        <ui:hyperlink action="#{FormSeguranca.lnkNr_action}" binding="#{FormSeguranca.lnkNr}" id="lnkNr" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn3}" headerText="Nome do acidentado" id="tableColumn3"
                                                         sort="nome_acidentado" style="width: 80%" width="119">
                                                         <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="200">
+                                                        <ui:hyperlink action="#{FormSeguranca.lnkFase_action}" binding="#{FormSeguranca.lnkFase}" id="lnkFase"
+                                                            style="height: 24px; width: 96px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -74,7 +75,8 @@
                                         </h:panelGrid>
                                         <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">
+                                            <ui:table augmentTitle="false" binding="#{FormSeguranca.table2}" id="table2" style="width: 80%; height: 48px"
+                                                styleClass="centerBlock" width="560">
                                                 <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"
@@ -84,13 +86,17 @@
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn5}" headerText="Nr" id="tableColumn5" sort="column2" style="width: 10%">
                                                         <ui:hyperlink action="#{FormSeguranca.lnkNrSeg_action}" binding="#{FormSeguranca.lnkNrSeg}"
-                                                            id="lnkNrSeg" text="#{currentRow.value['nr']}"/>
+                                                            id="lnkNrSeg" text="#{currentRow.value['analise_nr']}"/>
                                                     </ui:tableColumn>
                                                     <ui:tableColumn binding="#{FormSeguranca.tableColumn6}" headerText="Nome do acidentado" id="tableColumn6"
                                                         sort="column3" style="width: 80%" width="119">
                                                         <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" width="200">
+                                                        <ui:hyperlink action="#{FormSeguranca.lnkFaseSeg_action}" binding="#{FormSeguranca.lnkFaseSeg}"
+                                                            id="lnkFaseSeg" style="height: 24px; width: 96px" text="#{currentRow.value['fase']}"/>
+                                                    </ui:tableColumn>
                                                 </ui:tableRowGroup>
                                             </ui:table>
                                         </h:panelGrid>
@@ -136,14 +142,17 @@
                                                 sourceData="#{SessionBean1.analisesConcluidasDataProvider}" sourceVar="currentRow">
                                                 <ui:tableColumn binding="#{FormSeguranca.tableColumn7}" headerText="Data do acidente" id="tableColumn7"
                                                     sort="column1" style="width: 10%">
-                                                    <ui:hyperlink binding="#{FormSeguranca.hyperlink7}" id="hyperlink7" text="#{currentRow.value['data_acidente']}"/>
+                                                    <ui:hyperlink action="#{FormSeguranca.lnkDataConcluida_action}" binding="#{FormSeguranca.lnkDataConcluida}"
+                                                        id="lnkDataConcluida" text="#{currentRow.value['data_acidente']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormSeguranca.tableColumn8}" headerText="Nr" id="tableColumn8" sort="column2" style="width: 10%">
-                                                    <ui:hyperlink binding="#{FormSeguranca.hyperlink8}" id="hyperlink8" text="#{currentRow.value['nr']}"/>
+                                                    <ui:hyperlink action="#{FormSeguranca.lnkNrConcluida_action}" binding="#{FormSeguranca.lnkNrConcluida}"
+                                                        id="lnkNrConcluida" text="#{currentRow.value['analise_nr']}"/>
                                                 </ui:tableColumn>
                                                 <ui:tableColumn binding="#{FormSeguranca.tableColumn9}" headerText="Nome do acidentado" id="tableColumn9"
                                                     sort="column3" style="width: 80%">
-                                                    <ui:hyperlink binding="#{FormSeguranca.hyperlink9}" id="hyperlink9" text="#{currentRow.value['nome_acidentado']}"/>
+                                                    <ui:hyperlink action="#{FormSeguranca.lnkNomeConcluida_action}" binding="#{FormSeguranca.lnkNomeConcluida}"
+                                                        id="lnkNomeConcluida" text="#{currentRow.value['nome_acidentado']}"/>
                                                 </ui:tableColumn>
                                             </ui:tableRowGroup>
                                         </ui:table>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/Login.jsp

@@ -34,9 +34,6 @@
                                 <ui:staticText binding="#{Login.txtMsg}" escape="false" id="txtMsg" style="color: rgb(204, 0, 0); height: 24px; width: 240px"/>
                             </h:panelGrid>
                         </h:panelGrid>
-                        <div class="gridColCenter" style="height: 22px; left: 0px; top: 0px; position: absolute; width: 100%">
-                            <jsp:directive.include file="Header.jspf"/>
-                        </div>
                         <div class="gridColCenter" style="height: 22px; left: 0px; top: 500px; position: absolute; width: 100%">
                             <jsp:directive.include file="Footer.jspf"/>
                         </div>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/RecuperarPassword.jsp

@@ -35,9 +35,6 @@
                                 <ui:staticText binding="#{RecuperarPassword.txtMsg}" id="txtMsg" style="color: rgb(204, 0, 0); height: 24px; width: 240px"/>
                             </h:panelGrid>
                         </h:panelGrid>
-                        <div class="gridColCenter" style="height: 22px; left: 0px; top: 0px; position: absolute; width: 100%">
-                            <jsp:directive.include file="Header.jspf"/>
-                        </div>
                         <div class="gridColCenter" style="height: 22px; left: 0px; top: 500px; position: absolute; width: 100%">
                             <jsp:directive.include file="Footer.jspf"/>
                         </div>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/ViewAnaliseAcidenteTrabalho.jsp

@@ -9,9 +9,6 @@
                 </ui:head>
                 <ui:body binding="#{ViewAnaliseAcidenteTrabalho.body1}" id="body1" style="-rave-layout: grid">
                     <ui:form binding="#{ViewAnaliseAcidenteTrabalho.form1}" id="form1">
-                        <div class="gridColCenter" style="height: 22px; left: 0px; top: 0px; position: absolute; width: 100%">
-                            <jsp:directive.include file="Header.jspf"/>
-                        </div>
                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridBase1}" columns="1" id="gridBase1"
                             style="height: 39px; top: 60px; position: absolute; width: 100%" styleClass="centerBlock">
                             <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridLayout1}" columns="1" id="gridLayout1" style="height: 24px; width: 80%"
@@ -23,129 +20,165 @@
                                         <ui:image binding="#{ViewAnaliseAcidenteTrabalho.image2}" id="image2" url="/resources/images/logo_auchan_small1.jpg"/>
                                     </ui:panelGroup>
                                     <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel2}" id="groupPanel2" style="height: 24px; width: 310px; top: 90%">
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblUser1}" escape="false" id="lblUser1"/>
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblUser}" escape="false" id="lblUser" styleClass="labelBold"/>
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText1}" escape="false" id="staticText1" text="   "/>
-                                        <ui:hyperlink binding="#{ViewAnaliseAcidenteTrabalho.lnkChangePassword1}" id="lnkChangePassword1" text="alterar palavra-chave"/>
+                                        <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkEditUser_action}"
+                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkEditUser}" disabled="true" id="lnkEditUser" text="alterar dados utilizador"/>
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText2}" escape="false" id="staticText2" text=" | "/>
                                         <ui:hyperlink action="#{ViewAnaliseAcidenteTrabalho.lnkLogout_action}"
-                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkLogout1}" id="lnkLogout1" text="sair"/>
+                                            binding="#{ViewAnaliseAcidenteTrabalho.lnkLogout1}" id="lnkLogout1" text="sair&gt;&gt;"/>
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText3}" id="staticText3" text="&gt;&gt;"/>
                                     </ui:panelGroup>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridMsg1}" columnClasses="gridColCenter" columns="1" id="gridMsg1"
                                     style="height: 24px; width: 100%" width="96">
                                     <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtMsg1}" escape="false" id="txtMsg1" style="color: rgb(204, 0, 51); height: 24px; width: 384px"/>
                                 </h:panelGrid>
-                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridCabecalho1}" columns="1" id="gridCabecalho1" style="background-color: #f6f4e8; border: 1px solid #000000; height: 39px; width: 100%">
+                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridCabecalho1}" columns="1" id="gridCabecalho1" style="background-color: #668597; border: 1px solid #000000; height: 39px; width: 100%">
                                     <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel2}" columnClasses="gridColLeft15, gridColLeft85" columns="2"
                                         id="gridPanel2" style="height: 24px; width: 70%" width="336">
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblEmpresa1}" id="lblEmpresa1" style="height: 24px; width: 120px" text="Empresa:"/>
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblEmpresa1}" id="lblEmpresa1" style="height: 24px; width: 120px"
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtEmpresa}" id="txtEmpresa" style="height: 24px; width: 120px"/>
+                                            styleClass="labelBold" text="Empresa:"/>
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText4}" id="staticText4" text="Estabelecimento:"/>
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtEmpresa}" id="txtEmpresa" style="color: #ffffff; height: 24px; width: 120px"/>
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtEstabelecimento}" id="txtEstabelecimento" style="height: 24px; width: 120px"/>
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText4}" id="staticText4" styleClass="labelBold" text="Estabelecimento:"/>
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblTrabalhador1}" id="lblTrabalhador1" text="Trabalhador:"/>
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtEstabelecimento}" id="txtEstabelecimento" style="color: #ffffff; height: 24px; width: 120px"/>
-                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtTrabalhador}" id="txtTrabalhador" style="height: 24px; width: 120px"/>
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.lblTrabalhador1}" id="lblTrabalhador1" styleClass="labelBold" text="Trabalhador:"/>
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtTrabalhador}" id="txtTrabalhador" style="color: #ffffff; height: 24px; width: 120px"/>
                                     </h:panelGrid>
                                 </h:panelGrid>
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridSiprp1}" cellpadding="0" cellspacing="0" columns="1" id="gridSiprp1" 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); background-color: rgb(246, 244, 232); height: 39px; width: 100%">
                                     <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel5}" columnClasses="gridColLeft" columns="1" id="gridPanel5"
-                                        style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
+                                        style="background-color: #668597; border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText6}" escape="false" id="staticText6"
-                                            style="height: 24px; width: 168px" text="Empresa prestadora de serviços de segurança, higiene e saúde do trabalho"/>
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="EMPRESA PRESTADORA DE SERVI&amp;Ccedil;OS DE SEGURAN&amp;Ccedil;A, HIGIENE E SA&amp;Uacute;DE DO TRABALHO"/>
                                     </h:panelGrid>
                                     <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel6}" columnClasses="gridColCenter" columns="1" id="gridPanel6"
                                         style="height: 24px; width: 90%" styleClass="centerBlock" width="456">
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel7}" columnClasses="gridColLeft, gridColLeft" columns="2"
                                             id="gridPanel7" style="height: 24px; width: 100%" width="240">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText7}" escape="false" id="staticText7"
-                                                style="height: 24px; width: 144px" text="Identificação:"/>
+                                                style="height: 24px; width: 144px" styleClass="labelBold" text="Identificação:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText8}" escape="false" id="staticText8" text="SIPRP - Sociedade Ib&amp;#233;rica de Preven&amp;#231;&amp;#227;o de Riscos Profissionais Unipessoal Lda."/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText9}" escape="false" id="staticText9"
-                                                style="height: 24px; width: 144px" text="T&amp;#233;cnico(a) Superior de Higiene e Seguran&amp;#231;a do Trabalho:"/>
+                                                style="height: 24px; width: 144px" styleClass="labelBold" text="T&amp;#233;cnico(a) Superior de Higiene e Seguran&amp;#231;a do Trabalho:"/>
                                             <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel3}" id="groupPanel3" style="height: 24px; width: 288px">
                                                 <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtTecnicoSuperior}" id="txtTecnicoSuperior" style="height: 24px; width: 216px"/>
                                                 <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText10}" escape="false" id="staticText10"
-                                                    style="height: 24px; width: 168px" text="C.A.P. n&amp;#186;:"/>
+                                                    style="height: 24px; width: 168px" text="&amp;nbsp;&amp;nbsp;C.A.P. n&amp;#186;:&amp;nbsp;&amp;nbsp;"/>
                                                 <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtCap1}" id="txtCap1" style="height: 24px; width: 120px"/>
                                             </ui:panelGroup>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText11}" escape="false" id="staticText11"
-                                                style="height: 24px; width: 288px" text="M&amp;#233;dico(a) do Trabalho:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="M&amp;#233;dico(a) do Trabalho:"/>
                                             <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel4}" id="groupPanel4" style="height: 24px; width: 288px">
                                                 <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtMedicoTrabalho}" id="txtMedicoTrabalho" style="height: 24px; width: 216px"/>
                                                 <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText12}" escape="false" id="staticText12"
-                                                    style="height: 24px; width: 168px" text="C&amp;#233;dula Prof. n&amp;#186;:"/>
+                                                    style="height: 24px; width: 168px" text="&amp;nbsp;&amp;nbsp;C&amp;#233;dula Prof. n&amp;#186;:&amp;nbsp;&amp;nbsp;"/>
                                                 <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtCedula1}" id="txtCedula1" style="height: 24px; width: 120px"/>
                                             </ui:panelGroup>
                                         </h:panelGrid>
                                     </h:panelGrid>
                                 </h:panelGrid>
+                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridAcidentadoView1}" cellpadding="0" cellspacing="0" columns="1"
+                                    id="gridAcidentadoView1" 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); background-color: rgb(246, 244, 232); height: 39px; width: 100%">
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel30}" columnClasses="gridColLeft" columns="1" id="gridPanel30"
+                                        style="background-color: #668597; border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText37}" escape="false" id="staticText37"
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="ACIDENTADO(A)"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel31}" columnClasses="gridColCenter" columns="1" id="gridPanel31"
+                                        style="height: 24px; width: 90%" styleClass="centerBlock" width="456">
+                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel32}" columnClasses="gridColLeft, gridColLeft" columns="2"
+                                            id="gridPanel32" style="height: 24px; width: 100%" width="240">
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText38}" escape="false" id="staticText38"
+                                                style="height: 24px; width: 144px" styleClass="labelBold" text="Nome:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stNomeAcidentado}" escape="false" id="stNomeAcidentado"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText39}" escape="false" id="staticText39"
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Data de nascimento:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stDataNascimento}" escape="false" id="stDataNascimento"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText40}" escape="false" id="staticText40"
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Bilhete de Identidade nº:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stBI}" escape="false" id="stBI" style="height: 24px; width: 288px"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText41}" escape="false" id="staticText41"
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Morada:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stMorada}" escape="false" id="stMorada" style="height: 24px; width: 288px"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText42}" escape="false" id="staticText42" style="height: 24px; width: 288px"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stCodPostal}" escape="false" id="stCodPostal" style="height: 24px; width: 288px"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText43}" escape="false" id="staticText43"
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Contacto telef&amp;oacute;nico:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stContactoTelefonico}" escape="false"
+                                                id="stContactoTelefonico" style="height: 24px; width: 288px"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText44}" escape="false" id="staticText44"
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Data admissão:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stDataAdmissao}" escape="false" id="stDataAdmissao" style="height: 24px; width: 288px"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText45}" escape="false" id="staticText45"
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Função:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stFuncao}" escape="false" id="stFuncao" style="height: 24px; width: 288px"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText46}" escape="false" id="staticText46"
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Turno de Trabalho:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stTurno}" escape="false" id="stTurno" style="height: 24px; width: 288px"/>
+                                        </h:panelGrid>
+                                    </h:panelGrid>
+                                </h:panelGrid>
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridAcidentado1}" cellpadding="0" cellspacing="0" columns="1"
                                     id="gridAcidentado1" 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); background-color: rgb(246, 244, 232); height: 39px; width: 100%">
                                     <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel8}" columnClasses="gridColLeft" columns="1" id="gridPanel8"
-                                        style="border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
+                                        style="background-color: #668597; border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
                                         <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText13}" escape="false" id="staticText13"
-                                            style="height: 24px; width: 168px" text="Acidentado(a)"/>
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="DADOS DO ACIDENTE DE TRABALHO"/>
                                     </h:panelGrid>
                                     <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel9}" columnClasses="gridColCenter" columns="1" id="gridPanel9"
                                         style="height: 24px; width: 90%" styleClass="centerBlock" width="456">
-                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel10}" columnClasses="gridColLeft, gridColLeft" columns="2"
+                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel10}" columnClasses="gridColLeft25, gridColLeft75"
-                                            id="gridPanel10" style="height: 24px; width: 100%" width="240">
+                                            columns="2" id="gridPanel10" style="height: 24px; width: 100%" width="240">
-                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText14}" escape="false" id="staticText14"
-                                                style="height: 24px; width: 144px" text="Nome:"/>
-                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtNomeAcidentado}" escape="false" id="txtNomeAcidentado"/>
-                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText15}" escape="false" id="staticText15"
-                                                style="height: 24px; width: 288px" text="Data de nascimento:"/>
-                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtDataNascimento}" escape="false" id="txtDataNascimento"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText16}" escape="false" id="staticText16"
-                                                style="height: 24px; width: 288px" text="N&amp;#186; horas trabalhadas no turno:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="N&amp;#186; horas trabalhadas no turno:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtHorasTurno}" id="txtHorasTurno" style="height: 24px; width: 216px"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText17}" escape="false" id="staticText17"
-                                                style="height: 24px; width: 288px" text="Sec&amp;#231;&amp;#227;o:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Sec&amp;#231;&amp;#227;o:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtSeccao}" id="txtSeccao" style="height: 24px; width: 216px"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText18}" escape="false" id="staticText18"
-                                                style="height: 24px; width: 288px" text="Local espec&amp;#237;fico:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Local espec&amp;#237;fico:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtLocal}" id="txtLocal" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel11}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel11" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText19}" escape="false" id="staticText19"
-                                                style="height: 24px; width: 288px" text="Tarefa/Actividade que se encontra a realizar:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Tarefa/Actividade que se encontra a realizar:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtTarefa}" id="txtTarefa" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel12}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel12" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText20}" escape="false" id="staticText20"
-                                                style="height: 24px; width: 288px" text="Subst&amp;#226;ncias, equipamentos, ferramentas e objetos utilizados:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Subst&amp;#226;ncias, equipamentos, ferramentas e objetos utilizados:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtSubstancias}" id="txtSubstancias" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel13}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel13" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText21}" escape="false" id="staticText21"
-                                                style="height: 24px; width: 288px" text="Identifica&amp;#231;&amp;#227;o do superior hier&amp;#225;rquico/respons&amp;#225;vel superior do posto de trabalho:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Identifica&amp;#231;&amp;#227;o do superior hier&amp;#225;rquico/respons&amp;#225;vel superior do posto de trabalho:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtSuperior}" id="txtSuperior" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel14}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel14" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText22}" escape="false" id="staticText22"
-                                                style="height: 24px; width: 288px" text="Condi&amp;#231;&amp;#245;es que contribu&amp;#237;ram para o acidente e respectiva explica&amp;#231;&amp;#227;o da sua exist&amp;#234;ncia:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Condi&amp;#231;&amp;#245;es que contribu&amp;#237;ram para o acidente e respectiva explica&amp;#231;&amp;#227;o da sua exist&amp;#234;ncia:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtCondicoes}" id="txtCondicoes" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel15}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel15" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText23}" escape="false" id="staticText23"
-                                                style="height: 24px; width: 288px" text="Testemunhas:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Testemunhas:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtTestemunhas}" id="txtTestemunhas" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel16}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel16" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText24}" escape="false" id="staticText24"
-                                                style="height: 24px; width: 288px" text="Causas do acidente:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Causas do acidente:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtCausas}" id="txtCausas" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel17}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel17" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText25}" escape="false" id="staticText25"
-                                                style="height: 24px; width: 288px" text="Descri&amp;#231;&amp;#227;o do acidente:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Descri&amp;#231;&amp;#227;o do acidente:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtDescricao}" id="txtDescricao" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel18}" columnClasses="gridColLeft" columns="1"
@@ -153,7 +186,7 @@
                                             <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel19}" columnClasses="gridColLeft," columns="1"
                                                 id="gridPanel19" style="height: 24px; width: 100%" width="480">
                                                 <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText26}" escape="false" id="staticText26"
-                                                    style="height: 24px; width: 288px" text="Fotografia(s) e/ou croqui(s) do local do acidente:"/>
+                                                    style="height: 24px; width: 288px" styleClass="labelBold" text="Fotografia(s) e/ou croqui(s) do local do acidente:"/>
                                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridImages}" columns="1" id="gridImages"
                                                     style="height: 24px; width: 100%" width="96"/>
                                             </h:panelGrid>
@@ -161,17 +194,97 @@
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel20}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel20" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText27}" escape="false" id="staticText27"
-                                                style="height: 24px; width: 288px" text="Conclus&amp;#245;es:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Conclus&amp;#245;es:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtConclusoes}" id="txtConclusoes" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                         <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel21}" columnClasses="gridColLeft" columns="1"
                                             id="gridPanel21" style="height: 24px; width: 100%" width="480">
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText28}" escape="false" id="staticText28"
-                                                style="height: 24px; width: 288px" text="Ac&amp;#231;&amp;#245;es imediatas tomadas:"/>
+                                                style="height: 24px; width: 288px" styleClass="labelBold" text="Ac&amp;#231;&amp;#245;es imediatas tomadas:"/>
                                             <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.txtAccoes}" id="txtAccoes" style="height: 24px; width: 216px"/>
                                         </h:panelGrid>
                                     </h:panelGrid>
                                 </h:panelGrid>
+                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridDadosAcidenteRhView1}" cellpadding="0" cellspacing="0" columns="1"
+                                    id="gridDadosAcidenteRhView1" 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); background-color: rgb(246, 244, 232); height: 39px; width: 100%">
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel3}" columnClasses="gridColLeft" columns="1" id="gridPanel3"
+                                        style="background-color: #668597; border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText5}" escape="false" id="staticText5"
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="DADOS DO ACIDENTE DE TRABALHO"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel4}" columnClasses="gridColCenter" columns="1" id="gridPanel4"
+                                        style="height: 24px; width: 90%" styleClass="centerBlock" width="456">
+                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridSHST}" columnClasses="gridColLeft" columns="1" id="gridSHST"
+                                            style="height: 24px; width: 100%" width="480"/>
+                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridColaborador}" columnClasses="gridColLeft" columns="1"
+                                            id="gridColaborador" style="height: 24px; width: 100%" width="480"/>
+                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridColaboradores}" columnClasses="gridColLeft" columns="1"
+                                            id="gridColaboradores" style="height: 24px; width: 100%" width="480"/>
+                                    </h:panelGrid>
+                                </h:panelGrid>
+                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridRecomendacoesViewHS1}" cellpadding="0" cellspacing="0" columns="1"
+                                    id="gridRecomendacoesViewHS1" 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); background-color: rgb(246, 244, 232); height: 39px; width: 100%">
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel23}" columnClasses="gridColLeft" columns="1" id="gridPanel23"
+                                        style="background-color: #668597; border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText29}" escape="false" id="staticText29"
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="RECOMENDA&amp;Ccedil;&amp;Otilde;ES PROPOSTAS"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridRecomendacoesView}" columnClasses="gridColCenter" columns="1"
+                                        id="gridRecomendacoesView" style="height: 24px; width: 90%" styleClass="centerBlock" width="456"/>
+                                </h:panelGrid>
+                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridMedidasViewRH1}" cellpadding="0" cellspacing="0" columns="1"
+                                    id="gridMedidasViewRH1" 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); background-color: rgb(246, 244, 232); height: 39px; width: 100%">
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel24}" columnClasses="gridColLeft" columns="1" id="gridPanel24"
+                                        style="background-color: #668597; border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText30}" escape="false" id="staticText30"
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="MEDIDAS A ADOPTAR PELA ENTIDADE EMPREGADORA"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridMedidasView}" columnClasses="gridColCenter" columns="1"
+                                        id="gridMedidasView" style="height: 24px; width: 90%" styleClass="centerBlock" width="456"/>
+                                </h:panelGrid>
+                                <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridMedicoView1}" cellpadding="0" cellspacing="0" columns="1"
+                                    id="gridMedicoView1" 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); background-color: rgb(246, 244, 232); height: 39px; width: 100%">
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel25}" columnClasses="gridColLeft" columns="1" id="gridPanel25"
+                                        style="background-color: #668597; border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText31}" escape="false" id="staticText31"
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="LES&amp;Atilde;O"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridLesao}" columnClasses="gridColLeft" columns="1" id="gridLesao"
+                                        style="height: 24px; width: 90%" styleClass="centerBlock" width="456">
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText32}" escape="false" id="staticText32"
+                                            style="height: 24px; width: 456px" styleClass="labelBold" text="&amp;Aacute;rea(s) corporal(is) espec&amp;iacute;fica(s):"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel26}" columnClasses="gridColLeft" columns="1" id="gridPanel26"
+                                        style="background-color: #668597; border-bottom: solid #000000 1px; height: 24px; width: 100%" width="192">
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText33}" escape="false" id="staticText33"
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="INCAPACIDADE"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridIncapacidade}" columnClasses="gridColLeft" columns="1"
+                                        id="gridIncapacidade" style="height: 24px; width: 90%" styleClass="centerBlock" width="456"/>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel27}" columnClasses="gridColLeft" columns="1" id="gridPanel27"
+                                        style="border-bottom: solid rgb(0, 0, 0) 1px; background-color: rgb(102, 133, 151); height: 24px; width: 100%" width="192">
+                                        <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText34}" escape="false" id="staticText34"
+                                            style="height: 24px; width: 168px" styleClass="labelBold" text="RESTRI&amp;Ccedil;&amp;Otilde;ES M&amp;Eacute;DICAS AP&amp;Oacute;S LES&amp;Atilde;O/INCIDENTE"/>
+                                    </h:panelGrid>
+                                    <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridRestricoes}" columnClasses="gridColRestricoes" columns="1"
+                                        id="gridRestricoes" style="height: 24px; width: 100%" styleClass="restricoes" width="456">
+                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel28}" columnClasses="gridColRestricoes" columns="1"
+                                            id="gridPanel28" style="height: 24px; width: 90%" styleClass="centerBlock" width="432">
+                                            <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridImagesRestricoes}" columns="1" id="gridImagesRestricoes" style="height: 24px; width: 100%"/>
+                                        </h:panelGrid>
+                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridOutrasRestricoes}" columnClasses="gridColLeft" columns="1"
+                                            id="gridOutrasRestricoes" style="height: 24px; width: 90%" styleClass="centerBlock" width="432">
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText35}" escape="false" id="staticText35"
+                                                style="font-weight: bold; height: 24px; width: 312px" text="Outras restrições:"/>
+                                        </h:panelGrid>
+                                        <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel29}" columnClasses="gridColLeft" columns="1"
+                                            id="gridPanel29" style="height: 24px; width: 90%" styleClass="centerBlock" width="432">
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.staticText36}" escape="false" id="staticText36"
+                                                style="height: 24px; width: 240px" text="Observa&amp;ccedil;&amp;otilde;es:"/>
+                                            <ui:staticText binding="#{ViewAnaliseAcidenteTrabalho.stObservacoes}" escape="false" id="stObservacoes" style="height: 24px; width: 480px"/>
+                                        </h:panelGrid>
+                                    </h:panelGrid>
+                                </h:panelGrid>
                                 <h:panelGrid binding="#{ViewAnaliseAcidenteTrabalho.gridPanel22}" columnClasses="gridColRight" columns="1" id="gridPanel22"
                                     style="height: 24px; width: 100%" width="336">
                                     <ui:panelGroup binding="#{ViewAnaliseAcidenteTrabalho.groupPanel5}" id="groupPanel5" style="height: 24px; width: 240px">

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/WEB-INF/managed-beans.xml

@@ -82,4 +82,14 @@
         <managed-bean-class>analiseacidentestrabalho.FormHS</managed-bean-class>
         <managed-bean-scope>request</managed-bean-scope>
     </managed-bean>
+    <managed-bean>
+        <managed-bean-name>FichaUtilizador</managed-bean-name>
+        <managed-bean-class>analiseacidentestrabalho.FichaUtilizador</managed-bean-class>
+        <managed-bean-scope>request</managed-bean-scope>
+    </managed-bean>
+    <managed-bean>
+        <managed-bean-name>FormMedico</managed-bean-name>
+        <managed-bean-class>analiseacidentestrabalho.FormMedico</managed-bean-class>
+        <managed-bean-scope>request</managed-bean-scope>
+    </managed-bean>
 </faces-config>

AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalho/web/WEB-INF/navigation.xml

@@ -24,6 +24,14 @@
             <from-outcome>form_hs</from-outcome>
             <to-view-id>/FormHS.jsp</to-view-id>
         </navigation-case>
+        <navigation-case>
+            <from-outcome>form_medico</from-outcome>
+            <to-view-id>/FormMedico.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>create_user</from-outcome>
+            <to-view-id>/FichaUtilizador.jsp</to-view-id>
+        </navigation-case>
     </navigation-rule>
     <navigation-rule>
         <from-view-id>/RecuperarPassword.jsp</from-view-id>
@@ -46,6 +54,10 @@
             <from-outcome>view_analise</from-outcome>
             <to-view-id>/ViewAnaliseAcidenteTrabalho.jsp</to-view-id>
         </navigation-case>
+        <navigation-case>
+            <from-outcome>user</from-outcome>
+            <to-view-id>/FichaUtilizador.jsp</to-view-id>
+        </navigation-case>
     </navigation-rule>
     <navigation-rule>
         <from-view-id>/FormRH.jsp</from-view-id>
@@ -61,6 +73,10 @@
             <from-outcome>view_analise</from-outcome>
             <to-view-id>/ViewAnaliseAcidenteTrabalho.jsp</to-view-id>
         </navigation-case>
+        <navigation-case>
+            <from-outcome>user</from-outcome>
+            <to-view-id>/FichaUtilizador.jsp</to-view-id>
+        </navigation-case>
     </navigation-rule>
     <navigation-rule>
         <from-view-id>/FormHS.jsp</from-view-id>
@@ -76,6 +92,29 @@
             <from-outcome>view_analise</from-outcome>
             <to-view-id>/ViewAnaliseAcidenteTrabalho.jsp</to-view-id>
         </navigation-case>
+        <navigation-case>
+            <from-outcome>user</from-outcome>
+            <to-view-id>/FichaUtilizador.jsp</to-view-id>
+        </navigation-case>
+    </navigation-rule>
+    <navigation-rule>
+        <from-view-id>/FormMedico.jsp</from-view-id>
+        <navigation-case>
+            <from-outcome>login</from-outcome>
+            <to-view-id>/Login.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>analise_acidente</from-outcome>
+            <to-view-id>/AnaliseAcidenteTrabalho.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>view_analise</from-outcome>
+            <to-view-id>/ViewAnaliseAcidenteTrabalho.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>user</from-outcome>
+            <to-view-id>/FichaUtilizador.jsp</to-view-id>
+        </navigation-case>
     </navigation-rule>
     <navigation-rule>
         <from-view-id>/AnaliseAcidenteTrabalho.jsp</from-view-id>
@@ -87,6 +126,22 @@
             <from-outcome>form_seguranca</from-outcome>
             <to-view-id>/FormSeguranca.jsp</to-view-id>
         </navigation-case>
+        <navigation-case>
+            <from-outcome>form_rh</from-outcome>
+            <to-view-id>/FormRH.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>form_hs</from-outcome>
+            <to-view-id>/FormHS.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>form_medico</from-outcome>
+            <to-view-id>/FormMedico.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>user</from-outcome>
+            <to-view-id>/FichaUtilizador.jsp</to-view-id>
+        </navigation-case>
         <navigation-case>
             <from-outcome>login</from-outcome>
             <to-view-id>/Login.jsp</to-view-id>
@@ -99,4 +154,62 @@
             <to-view-id>/AnaliseAcidenteTrabalho.jsp</to-view-id>
         </navigation-case>
     </navigation-rule>
+    <navigation-rule>
+        <from-view-id>/FichaUtilizador.jsp</from-view-id>
+        <navigation-case>
+            <from-outcome>form_seguranca</from-outcome>
+            <to-view-id>/FormSeguranca.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>form_rh</from-outcome>
+            <to-view-id>/FormRH.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>form_hs</from-outcome>
+            <to-view-id>/FormHS.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>form_medico</from-outcome>
+            <to-view-id>/FormMedico.jsp</to-view-id>
+        </navigation-case>        
+        <navigation-case>
+            <from-outcome>analise_acidente</from-outcome>
+            <to-view-id>/AnaliseAcidenteTrabalho.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>view_analise</from-outcome>
+            <to-view-id>/ViewAnaliseAcidenteTrabalho.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>login</from-outcome>
+            <to-view-id>/Login.jsp</to-view-id>
+        </navigation-case>
+    </navigation-rule>
+    <navigation-rule>
+        <from-view-id>/ViewAnaliseAcidenteTrabalho.jsp</from-view-id>
+        <navigation-case>
+            <from-outcome>login</from-outcome>
+            <to-view-id>/Login.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>user</from-outcome>
+            <to-view-id>/FichaUtilizador.jsp</to-view-id>
+        </navigation-case> 
+        <navigation-case>
+            <from-outcome>form_seguranca</from-outcome>
+            <to-view-id>/FormSeguranca.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>form_rh</from-outcome>
+            <to-view-id>/FormRH.jsp</to-view-id>
+        </navigation-case>
+        <navigation-case>
+            <from-outcome>form_hs</from-outcome>
+            <to-view-id>/FormHS.jsp</to-view-id>
+        </navigation-case>        
+        <navigation-case>
+            <from-outcome>form_medico</from-outcome>
+            <to-view-id>/FormMedico.jsp</to-view-id>
+        </navigation-case>                
+    </navigation-rule>
 </faces-config>