diff --git a/trunk/SIPRPSoft/lib/TableLayout.jar b/trunk/SIPRPSoft/lib/TableLayout.jar
new file mode 100644
index 00000000..81c1fc3c
Binary files /dev/null and b/trunk/SIPRPSoft/lib/TableLayout.jar differ
diff --git a/trunk/SIPRPSoft/lib/iText.jar b/trunk/SIPRPSoft/lib/iText.jar
new file mode 100644
index 00000000..a43148f8
Binary files /dev/null and b/trunk/SIPRPSoft/lib/iText.jar differ
diff --git a/trunk/SIPRPSoft/lib/jdo.jar b/trunk/SIPRPSoft/lib/jdo.jar
new file mode 100755
index 00000000..2cee6e86
Binary files /dev/null and b/trunk/SIPRPSoft/lib/jdo.jar differ
diff --git a/trunk/SIPRPSoft/lib/jdom.jar b/trunk/SIPRPSoft/lib/jdom.jar
new file mode 100644
index 00000000..288e64cb
Binary files /dev/null and b/trunk/SIPRPSoft/lib/jdom.jar differ
diff --git a/trunk/SIPRPSoft/lib/jxl-2.6.jar b/trunk/SIPRPSoft/lib/jxl-2.6.jar
new file mode 100644
index 00000000..313cab7f
Binary files /dev/null and b/trunk/SIPRPSoft/lib/jxl-2.6.jar differ
diff --git a/trunk/SIPRPSoft/lib/postgresql-8.0-317.jdbc3.jar b/trunk/SIPRPSoft/lib/postgresql-8.0-317.jdbc3.jar
new file mode 100644
index 00000000..7ed63133
Binary files /dev/null and b/trunk/SIPRPSoft/lib/postgresql-8.0-317.jdbc3.jar differ
diff --git a/trunk/web/contents/clientes.html b/trunk/web/contents/clientes.html
new file mode 100644
index 00000000..75220e84
--- /dev/null
+++ b/trunk/web/contents/clientes.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+ os
+nossos clientes
+
+
+
+
+
+
+
+
+
+
+ em
+desenvolvimento...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/colaboradores.html b/trunk/web/contents/colaboradores.html
new file mode 100644
index 00000000..4c8488de
--- /dev/null
+++ b/trunk/web/contents/colaboradores.html
@@ -0,0 +1,50 @@
+
+
+
+
+ SIPRP - Colaboradores
+
+
+
+
+
+
+ colaboradores
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/contactos.html b/trunk/web/contents/contactos.html
new file mode 100644
index 00000000..ccd32346
--- /dev/null
+++ b/trunk/web/contents/contactos.html
@@ -0,0 +1,52 @@
+
+
+
+
+ SIPRP - Apresentação
+
+
+
+
+
+
+
+contactos
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/erro.html b/trunk/web/contents/erro.html
new file mode 100644
index 00000000..ce6f9d47
--- /dev/null
+++ b/trunk/web/contents/erro.html
@@ -0,0 +1,44 @@
+
+
+
+
+ SIPRP - Erro
+
+
+
+
+
+
+ erro
+
+
+
+
+
+
+
+
+
+
+
+
+ $msg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/frame_erro.html b/trunk/web/contents/frame_erro.html
new file mode 100644
index 00000000..f97eab0b
--- /dev/null
+++ b/trunk/web/contents/frame_erro.html
@@ -0,0 +1,254 @@
+
+
+
+
+
+ SIPRP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ notícias
+
+
+
+
+
+
+
+
+
+
+
+ A SIPRP apresenta o
+seu novo site em www.siprp.pt.
+
+Além de conteúdos sobre a empresa e o grupo, é
+disponibilizado um portal online com funcionalidades para os seus
+clientes.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/higiene.html b/trunk/web/contents/higiene.html
new file mode 100644
index 00000000..1ef5315b
--- /dev/null
+++ b/trunk/web/contents/higiene.html
@@ -0,0 +1,52 @@
+
+
+
+
+ SIPRP - Higiene
+
+
+
+
+
+
+
+higiene e segurança
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/index.html b/trunk/web/contents/index.html
new file mode 100644
index 00000000..32d07d04
--- /dev/null
+++ b/trunk/web/contents/index.html
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+ SIPRP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ notícias
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/links.html b/trunk/web/contents/links.html
new file mode 100644
index 00000000..ae2134b2
--- /dev/null
+++ b/trunk/web/contents/links.html
@@ -0,0 +1,52 @@
+
+
+
+
+ SIPRP - Links
+
+
+
+
+
+
+
+links úteis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/medicina.html b/trunk/web/contents/medicina.html
new file mode 100644
index 00000000..d52815fb
--- /dev/null
+++ b/trunk/web/contents/medicina.html
@@ -0,0 +1,52 @@
+
+
+
+
+ SIPRP - Medicina
+
+
+
+
+
+
+
+medicina do trabalho
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/politica.html b/trunk/web/contents/politica.html
new file mode 100644
index 00000000..3713c26b
--- /dev/null
+++ b/trunk/web/contents/politica.html
@@ -0,0 +1,52 @@
+
+
+
+
+ SIPRP
+
+
+
+
+
+
+
+política de qualidade e apoio administrativo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/servicos.html b/trunk/web/contents/servicos.html
new file mode 100644
index 00000000..f4585f4f
--- /dev/null
+++ b/trunk/web/contents/servicos.html
@@ -0,0 +1,31 @@
+
+
+
+
+ SIPRP - Serviços
+
+
+
+
+
+
diff --git a/trunk/web/contents/servicos_compl.html b/trunk/web/contents/servicos_compl.html
new file mode 100644
index 00000000..163977df
--- /dev/null
+++ b/trunk/web/contents/servicos_compl.html
@@ -0,0 +1,52 @@
+
+
+
+
+ SIPRP - Serviços
+
+
+
+
+
+
+
+serviços complementares
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/siprp.html b/trunk/web/contents/siprp.html
new file mode 100644
index 00000000..37d5babe
--- /dev/null
+++ b/trunk/web/contents/siprp.html
@@ -0,0 +1,52 @@
+
+
+
+
+ SIPRP - Apresentação
+
+
+
+
+
+
+
+a
+siprp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/user.html b/trunk/web/contents/user.html
new file mode 100644
index 00000000..b3d8a59f
--- /dev/null
+++ b/trunk/web/contents/user.html
@@ -0,0 +1,396 @@
+
+
+
+
+ SIPRP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ acesso restrito
+
+
+
+
+
+
+
+
+
+ #if( $userRole == "manager" && $empresa_nome )
+ Empresa: $!empresa_nome
+ #else
+ Empresa: $!empresa_nome
+ #end
+
+
+
+
+
+ #if( $estabelecimento_id )
+ Estabelecimento : $!estabelecimento_nome
+ #else
+ Estabelecimento:
+ #end
+
+
+
+
+ #if( $query == "trabalhador" )
+ Funcionário : $!funcionario.nome - Data de Nascimento: $!funcionario.data_nascimento
+ #else
+ Funcionário:
+ #end
+
+ #if( $query == "trabalhador" )
+
+ #end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #if( $query == "empresas" )
+ #set( $listaTitle = "empresas" )
+ #elseif( $query == "estabelecimentos" )
+ #set( $listaTitle = "estabelecimentos" )
+ #elseif( $query == "trabalhadores" || $query == "trabalhadores_tudo" || $query == "trabalhadores_pendentes" )
+ #set( $listaTitle = "funcionários:" )
+ #set( $lista_funcionarios = 1 )
+ #else ##( $query == "trabalhador" )
+ #set( $listaTitle = "funcionário" )
+ #end
+
+
+ #if( $lista_funcionarios )
+
+
+
+
+ #else
+ $listaTitle
+ #end
+
+
+
+
+
+ #if ($query == "trabalhador")
+ (*)ECD - Exames Complementares de Diagnóstico
+
+
+ Último ECD(*)
+ Realizado
+ Última Consulta
+ Realizada
+ Resultado
+ Próximo ECD(*)
+ Próxima Consulta
+
+
+
+ $!funcionario.ultimo_exame
+ $!funcionario.realizado
+ $!funcionario.ultima_consulta
+ $!funcionario.realizada
+ $!funcionario.resultado
+ $!funcionario.proximo_exame
+ $!funcionario.proxima_consulta
+
+
+ #elseif( $query == "trabalhadores" )
+ (*)ECD - Exames Complementares de Diagnóstico
+
+
+ Nome
+ Último ECD(*)
+ Última consulta
+ Próxima consulta
+
+ #foreach( $element in $v1 )
+ #set ( $counter = $velocityCount - 1 )
+ #set ( $dados_trabalhador = $v2.get($counter) )
+
+ $dados_trabalhador.Nome
+ $dados_trabalhador.ultimo_exame
+ $dados_trabalhador.ultima_consulta
+ $dados_trabalhador.proxima_consulta
+
+ #end
+
+ #elseif( $query == "trabalhadores_tudo" )
+
+
+ Nome
+ Data da Ficha de Aptidão
+
+ #foreach( $element in $v1 )
+ #set ( $counter = $velocityCount - 1 )
+ #set ( $dados_trabalhador = $v2.get($counter) )
+
+ $dados_trabalhador.Nome
+ $dados_trabalhador.Data
+
+ #end
+
+ #elseif( $query == "trabalhadores_pendentes" )
+ - pendente
+ - marcado
+ - tratado
+ (*)ECD - Exames Complementares de Diagnóstico
+
+
+ Nome
+ ECD(*)
+ Consulta
+
+ #foreach( $element in $v1 )
+ #set ( $counter = $velocityCount - 1 )
+ #set ( $dados_trabalhador = $v2.get($counter) )
+
+ $dados_trabalhador.Nome
+
+
+
+ #end
+
+ #else
+ #foreach( $element in $v1 )
+ #set ( $counter = $velocityCount - 1 )
+ $v2.get($counter)
+ #end
+ #end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/contents/user_print.html b/trunk/web/contents/user_print.html
new file mode 100644
index 00000000..821ac555
--- /dev/null
+++ b/trunk/web/contents/user_print.html
@@ -0,0 +1,284 @@
+
+
+
+
+ SIPRP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Empresa: $!empresa_nome
+
+
+
+
+ Estabelecimento: $!estabelecimento_nome
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #if( $query == "trabalhadores" )
+ #set( $listaTitle = "Todos os Funcionários" )
+ #elseif( $query == "trabalhadores_tudo" )
+ #set( $listaTitle = "Funcionários com Tudo Resolvido" )
+ #elseif( $query == "trabalhadores_pendentes" )
+ #set( $listaTitle = "Funcionários com Pendências" )
+ #end
+
+
+ $listaTitle
+
+
+
+
+
+ #if( $query == "trabalhadores" )
+ (*)ECD - Exames Complementares de Diagnóstico
+
+
+ Nome
+ Último ECD(*)
+ Última consulta
+ Próxima consulta
+
+ #foreach( $element in $v1 )
+ #set ( $counter = $velocityCount - 1 )
+ #set ( $dados_trabalhador = $v2.get($counter) )
+
+ $dados_trabalhador.Nome
+ $dados_trabalhador.ultimo_exame
+ $dados_trabalhador.ultima_consulta
+ $dados_trabalhador.proxima_consulta
+
+ #end
+
+
+ #elseif( $query == "trabalhadores_tudo" )
+
+
+ Nome
+ Data da Ficha de Aptidão
+
+ #foreach( $element in $v1 )
+ #set ( $counter = $velocityCount - 1 )
+ #set ( $dados_trabalhador = $v2.get($counter) )
+
+ $dados_trabalhador.Nome
+ $dados_trabalhador.Data
+
+ #end
+
+ #elseif( $query == "trabalhadores_pendentes" )
+
+ (*)ECD - Exames Complementares de Diagnóstico
+
+
+ Nome
+ ECD(*)
+ Consulta
+
+ #foreach( $element in $v1 )
+ #set ( $counter = $velocityCount - 1 )
+ #set ( $dados_trabalhador = $v2.get($counter) )
+
+
+ $dados_trabalhador.Nome
+ $dados_trabalhador.Exame_estado
+ $dados_trabalhador.Consulta_estado
+
+ #end
+
+ #end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/trunk/web/lib/commons-email-1.0-dev.jar b/trunk/web/lib/commons-email-1.0-dev.jar
new file mode 100644
index 00000000..aab523d5
Binary files /dev/null and b/trunk/web/lib/commons-email-1.0-dev.jar differ
diff --git a/trunk/web/lib/commons-fileupload-1.0.jar b/trunk/web/lib/commons-fileupload-1.0.jar
new file mode 100644
index 00000000..1ca4a9cd
Binary files /dev/null and b/trunk/web/lib/commons-fileupload-1.0.jar differ
diff --git a/trunk/web/lib/mailapi.jar b/trunk/web/lib/mailapi.jar
new file mode 100644
index 00000000..86bdf783
Binary files /dev/null and b/trunk/web/lib/mailapi.jar differ
diff --git a/trunk/web/lib/postgresql-8.2-504.jdbc3.jar b/trunk/web/lib/postgresql-8.2-504.jdbc3.jar
new file mode 100644
index 00000000..b450671d
Binary files /dev/null and b/trunk/web/lib/postgresql-8.2-504.jdbc3.jar differ
diff --git a/trunk/web/lib/velocity-1.4.jar b/trunk/web/lib/velocity-1.4.jar
new file mode 100644
index 00000000..04ec9d2f
Binary files /dev/null and b/trunk/web/lib/velocity-1.4.jar differ