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

0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Diogo Neves 14 years ago
parent 26a975d625
commit 3202ac85a0

@ -524,13 +524,13 @@ exists or setup the property manually. For example like this:
<copyfiles files="${libs.jstl11.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jstl11.classpath" todir="${dist.ear.dir}"/> <copyfiles files="${libs.jstl11.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.jstl11.classpath" todir="${dist.ear.dir}"/>
<copyfiles files="${libs.rowset-ri.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.rowset-ri.classpath" todir="${dist.ear.dir}"/> <copyfiles files="${libs.rowset-ri.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.rowset-ri.classpath" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.activation.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.activation.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.activation.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.activation.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.ashwood-2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.ashwood-2.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.avalon-framework-4.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.avalon-framework-4.2.0.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.avalon-framework-4.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.avalon-framework-4.2.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.batik-all-1.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.batik-all-1.7.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.batik-all-1.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.batik-all-1.7.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-beanutils-1.8.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-beanutils-1.8.3.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.commons-beanutils-1.8.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-beanutils-1.8.3.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-codec-1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-codec-1.3.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.commons-codec-1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-codec-1.3.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-collections-3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-collections-3.1.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.commons-collections-3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-collections-3.1.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-digester-1.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-digester-1.8.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.commons-digester-1.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-digester-1.8.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-fileupload-1.2.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-fileupload-1.2.1.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-httpclient-3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-httpclient-3.1.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.commons-httpclient-3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-httpclient-3.1.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-io-1.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-io-1.4.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.commons-io-1.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-io-1.4.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-lang-2.4.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-lang-2.4.jar" todir="${dist.ear.dir}"/>
@ -567,6 +567,9 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.xml-apis-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-1.3.04.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.xml-apis-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-1.3.04.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-ext-1.3.04.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-ext-1.3.04.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.xmlgraphics-commons-1.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xmlgraphics-commons-1.3.1.jar" todir="${dist.ear.dir}"/> <copyfiles files="${file.reference.xmlgraphics-commons-1.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xmlgraphics-commons-1.3.1.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-el-1.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-el-1.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.xmlParserAPIs-2.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xmlParserAPIs-2.0.2.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.tomahawk-1.1.10.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.tomahawk-1.1.10.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${libs.jsf-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.jsf-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${libs.jsfsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.jsfsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${libs.webui-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.webui-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
@ -576,7 +579,7 @@ exists or setup the property manually. For example like this:
<copyfiles files="${libs.jstl11.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.jstl11.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/> <mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"> <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
<attribute name="Class-Path" value="${manifest.libs.jsf-designtime.classpath} ${manifest.libs.jsfsupport-designtime.classpath} ${manifest.libs.webui-designtime.classpath} ${manifest.libs.jdbcsupport-designtime.classpath} ${manifest.libs.theme-default.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.rowset-ri.classpath} ${manifest.file.reference.activation.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-beanutils-1.8.3.jar} ${manifest.file.reference.commons-codec-1.3.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-digester-1.8.jar} ${manifest.file.reference.commons-fileupload-1.2.1.jar} ${manifest.file.reference.commons-httpclient-3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-lang-2.4.jar} ${manifest.file.reference.commons-logging-1.1.1.jar} ${manifest.file.reference.commons-validator-1.3.1.jar} ${manifest.file.reference.commons-vfs-1.0.jar} ${manifest.file.reference.dom4j-1.6.1.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.httpclient-4.0.1.jar} ${manifest.file.reference.iText-2.0.8.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jakarta-oro-2.0.8.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar} ${manifest.file.reference.org.springframework.beans-3.0.0.jar} ${manifest.file.reference.org.springframework.context-3.0.0.jar} ${manifest.file.reference.org.springframework.core-3.0.0.jar} ${manifest.file.reference.poi-3.5-beta6-20090622.jar} ${manifest.file.reference.poi-ooxml-3.5-beta6-20090622.jar} ${manifest.file.reference.postgresql-9.0-801.jdbc4.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.jar} ${manifest.file.reference.spring-ws-core-1.5.9.jar} ${manifest.file.reference.spring-ws-core-tiger-1.5.9.jar} ${manifest.file.reference.spring-ws-support-1.5.9.jar} ${manifest.file.reference.spring-xml-1.5.9.jar} ${manifest.file.reference.truelicense.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} "/> <attribute name="Class-Path" value="${manifest.libs.jsf-designtime.classpath} ${manifest.libs.jsfsupport-designtime.classpath} ${manifest.libs.webui-designtime.classpath} ${manifest.libs.jdbcsupport-designtime.classpath} ${manifest.libs.theme-default.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.rowset-ri.classpath} ${manifest.file.reference.activation.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-beanutils-1.8.3.jar} ${manifest.file.reference.commons-codec-1.3.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-digester-1.8.jar} ${manifest.file.reference.commons-httpclient-3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-lang-2.4.jar} ${manifest.file.reference.commons-logging-1.1.1.jar} ${manifest.file.reference.commons-validator-1.3.1.jar} ${manifest.file.reference.commons-vfs-1.0.jar} ${manifest.file.reference.dom4j-1.6.1.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.httpclient-4.0.1.jar} ${manifest.file.reference.iText-2.0.8.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jakarta-oro-2.0.8.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar} ${manifest.file.reference.org.springframework.beans-3.0.0.jar} ${manifest.file.reference.org.springframework.context-3.0.0.jar} ${manifest.file.reference.org.springframework.core-3.0.0.jar} ${manifest.file.reference.poi-3.5-beta6-20090622.jar} ${manifest.file.reference.poi-ooxml-3.5-beta6-20090622.jar} ${manifest.file.reference.postgresql-9.0-801.jdbc4.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.jar} ${manifest.file.reference.spring-ws-core-1.5.9.jar} ${manifest.file.reference.spring-ws-core-tiger-1.5.9.jar} ${manifest.file.reference.spring-ws-support-1.5.9.jar} ${manifest.file.reference.spring-xml-1.5.9.jar} ${manifest.file.reference.truelicense.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.commons-el-1.0.jar} ${manifest.file.reference.xmlParserAPIs-2.0.2.jar} ${manifest.file.reference.tomahawk-1.1.10.jar} "/>
</manifest> </manifest>
</target> </target>
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"> <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@ -588,13 +591,13 @@ exists or setup the property manually. For example like this:
<copyfiles files="${libs.jstl11.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.jstl11.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${libs.rowset-ri.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.rowset-ri.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.activation.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.activation.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.ashwood-2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.avalon-framework-4.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.avalon-framework-4.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.batik-all-1.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.batik-all-1.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-beanutils-1.8.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.commons-beanutils-1.8.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-codec-1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.commons-codec-1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-collections-3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.commons-collections-3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-digester-1.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.commons-digester-1.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-fileupload-1.2.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-httpclient-3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.commons-httpclient-3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-io-1.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.commons-io-1.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@ -631,6 +634,9 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.xml-apis-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.xml-apis-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xmlgraphics-commons-1.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${file.reference.xmlgraphics-commons-1.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-el-1.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xmlParserAPIs-2.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.tomahawk-1.1.10.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${libs.jsf-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.jsf-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${libs.jsfsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.jsfsupport-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${libs.webui-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> <copyfiles files="${libs.webui-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>

@ -6,8 +6,8 @@
<Node id="GestaoUtilizadores.jsp" x="900" y="150" zoom="true"/> <Node id="GestaoUtilizadores.jsp" x="900" y="150" zoom="true"/>
<Node id="FormDirGerRh.jsp" x="150" y="150" zoom="true"/> <Node id="FormDirGerRh.jsp" x="150" y="150" zoom="true"/>
<Node id="FormGestor.jsp" x="1150" y="150" zoom="true"/> <Node id="FormGestor.jsp" x="1150" y="150" zoom="true"/>
<Node id="Acesso.jsp" x="400" y="750" zoom="true"/>
<Node id="Erro.jsp" x="650" y="450" zoom="true"/> <Node id="Erro.jsp" x="650" y="450" zoom="true"/>
<Node id="Acesso.jsp" x="400" y="750" zoom="true"/>
<Node id="FormRH.jsp" x="400" y="150" zoom="true"/> <Node id="FormRH.jsp" x="400" y="150" zoom="true"/>
<Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/> <Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/>
<Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="300" zoom="true"/> <Node id="AnaliseAcidenteTrabalho.jsp" x="150" y="300" zoom="true"/>
@ -22,8 +22,8 @@
<Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/> <Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/>
<Node id="Dummy.jsp" x="150" y="750" zoom="true"/> <Node id="Dummy.jsp" x="150" y="750" zoom="true"/>
<Node id="LoadImage.jsp" x="400" y="600" zoom="true"/> <Node id="LoadImage.jsp" x="400" y="600" zoom="true"/>
<Node id="Login.jsp" x="400" y="300" zoom="true"/>
<Node id="ViewAnaliseAcidenteTrabalho.jsp" x="650" y="300" zoom="true"/> <Node id="ViewAnaliseAcidenteTrabalho.jsp" x="650" y="300" zoom="true"/>
<Node id="Login.jsp" x="400" y="300" zoom="true"/>
</Scope> </Scope>
<Scope Scope="All Faces Configurations"/> <Scope Scope="All Faces Configurations"/>
</Scene> </Scene>

@ -1,8 +1,8 @@
build.xml.data.CRC32=3ee292f1 build.xml.data.CRC32=2d68f117
build.xml.script.CRC32=97b5d0ef build.xml.script.CRC32=97b5d0ef
build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1 build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # 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. # 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=3ee292f1 nbproject/build-impl.xml.data.CRC32=2d68f117
nbproject/build-impl.xml.script.CRC32=eeac4f78 nbproject/build-impl.xml.script.CRC32=0cb83ca1
nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1

@ -10,13 +10,13 @@
<Node id="Erro.jsp" x="900" y="300" zoom="true"/> <Node id="Erro.jsp" x="900" y="300" zoom="true"/>
<Node id="FormRH.jsp" x="400" y="450" zoom="true"/> <Node id="FormRH.jsp" x="400" y="450" zoom="true"/>
<Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/> <Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/>
<Node id="FormSeguranca.jsp" x="400" y="150" zoom="true"/>
<Node id="AnaliseAcidenteTrabalho.jsp" x="900" y="150" zoom="true"/> <Node id="AnaliseAcidenteTrabalho.jsp" x="900" y="150" zoom="true"/>
<Node id="FormSeguranca.jsp" x="400" y="150" zoom="true"/>
<Node id="NovoUtilizador.jsp" x="150" y="300" zoom="true"/> <Node id="NovoUtilizador.jsp" x="150" y="300" zoom="true"/>
<Node id="FormDirSiprp.jsp" x="1400" y="150" zoom="true"/> <Node id="FormDirSiprp.jsp" x="1400" y="150" zoom="true"/>
<Node id="FichaUtilizador.jsp" x="900" y="450" zoom="true"/> <Node id="FichaUtilizador.jsp" x="900" y="450" zoom="true"/>
<Node id="FormMedico.jsp" x="400" y="750" zoom="true"/>
<Node id="FormHS.jsp" x="150" y="150" zoom="true"/> <Node id="FormHS.jsp" x="150" y="150" zoom="true"/>
<Node id="FormMedico.jsp" x="400" y="750" zoom="true"/>
<Node id="EnviarCorrecao.jsp" x="650" y="450" zoom="true"/> <Node id="EnviarCorrecao.jsp" x="650" y="450" zoom="true"/>
<Node id="UtilizadorFields.jsp" x="150" y="750" zoom="true"/> <Node id="UtilizadorFields.jsp" x="150" y="750" zoom="true"/>
<Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/> <Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/>

@ -6,8 +6,8 @@
<Node id="RecuperarPassword.jsp" x="400" y="150" zoom="true"/> <Node id="RecuperarPassword.jsp" x="400" y="150" zoom="true"/>
<Node id="FormDirGerRh.jsp" x="150" y="750" zoom="true"/> <Node id="FormDirGerRh.jsp" x="150" y="750" zoom="true"/>
<Node id="FormGestor.jsp" x="400" y="300" zoom="true"/> <Node id="FormGestor.jsp" x="400" y="300" zoom="true"/>
<Node id="Acesso.jsp" x="400" y="750" zoom="false"/>
<Node id="Erro.jsp" x="650" y="450" zoom="true"/> <Node id="Erro.jsp" x="650" y="450" zoom="true"/>
<Node id="Acesso.jsp" x="400" y="750" zoom="false"/>
<Node id="FormRH.jsp" x="400" y="600" zoom="true"/> <Node id="FormRH.jsp" x="400" y="600" zoom="true"/>
<Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/> <Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/>
<Node id="FormSeguranca.jsp" x="1150" y="150" zoom="true"/> <Node id="FormSeguranca.jsp" x="1150" y="150" zoom="true"/>

@ -21,13 +21,14 @@ dist.javadoc.dir=${dist.dir}/javadoc
dist.war=${dist.dir}/${war.name} dist.war=${dist.dir}/${war.name}
excludes= excludes=
file.reference.activation.jar=lib/activation.jar file.reference.activation.jar=lib/activation.jar
file.reference.ashwood-2.0.jar=lib/ashwood-2.0.jar
file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar
file.reference.batik-all-1.7.jar=lib/batik-all-1.7.jar file.reference.batik-all-1.7.jar=lib/batik-all-1.7.jar
file.reference.commons-beanutils-1.8.3.jar=lib/commons-beanutils-1.8.3.jar file.reference.commons-beanutils-1.8.3.jar=lib/commons-beanutils-1.8.3.jar
file.reference.commons-codec-1.3.jar=lib/commons-codec-1.3.jar file.reference.commons-codec-1.3.jar=lib/commons-codec-1.3.jar
file.reference.commons-collections-3.1.jar=lib/commons-collections-3.1.jar file.reference.commons-collections-3.1.jar=lib/commons-collections-3.1.jar
file.reference.commons-digester-1.8.jar=lib/commons-digester-1.8.jar file.reference.commons-digester-1.8.jar=lib/commons-digester-1.8.jar
file.reference.commons-fileupload-1.2.1.jar=lib/commons-fileupload-1.2.1.jar file.reference.commons-el-1.0.jar=lib/myfaces/commons-el-1.0.jar
file.reference.commons-httpclient-3.1.jar=lib/commons-httpclient-3.1.jar file.reference.commons-httpclient-3.1.jar=lib/commons-httpclient-3.1.jar
file.reference.commons-io-1.4.jar=lib/commons-io-1.4.jar file.reference.commons-io-1.4.jar=lib/commons-io-1.4.jar
file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar
@ -58,12 +59,14 @@ file.reference.spring-ws-core-1.5.9.jar=lib/spring-ws-core-1.5.9.jar
file.reference.spring-ws-core-tiger-1.5.9.jar=lib/spring-ws-core-tiger-1.5.9.jar file.reference.spring-ws-core-tiger-1.5.9.jar=lib/spring-ws-core-tiger-1.5.9.jar
file.reference.spring-ws-support-1.5.9.jar=lib/spring-ws-support-1.5.9.jar file.reference.spring-ws-support-1.5.9.jar=lib/spring-ws-support-1.5.9.jar
file.reference.spring-xml-1.5.9.jar=lib/spring-xml-1.5.9.jar file.reference.spring-xml-1.5.9.jar=lib/spring-xml-1.5.9.jar
file.reference.tomahawk-1.1.10.jar=lib/myfaces/tomahawk-1.1.10.jar
file.reference.truelicense.jar=lib/truelicense.jar file.reference.truelicense.jar=lib/truelicense.jar
file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar
file.reference.xercesImpl-2.7.1.jar=lib/xercesImpl-2.7.1.jar file.reference.xercesImpl-2.7.1.jar=lib/xercesImpl-2.7.1.jar
file.reference.xml-apis-1.3.04.jar=lib/xml-apis-1.3.04.jar file.reference.xml-apis-1.3.04.jar=lib/xml-apis-1.3.04.jar
file.reference.xml-apis-ext-1.3.04.jar=lib/xml-apis-ext-1.3.04.jar file.reference.xml-apis-ext-1.3.04.jar=lib/xml-apis-ext-1.3.04.jar
file.reference.xmlgraphics-commons-1.3.1.jar=lib/xmlgraphics-commons-1.3.1.jar file.reference.xmlgraphics-commons-1.3.1.jar=lib/xmlgraphics-commons-1.3.1.jar
file.reference.xmlParserAPIs-2.0.2.jar=lib/myfaces/xmlParserAPIs-2.0.2.jar
includes=** includes=**
j2ee.deploy.on.save=false j2ee.deploy.on.save=false
j2ee.platform=1.4 j2ee.platform=1.4
@ -78,13 +81,13 @@ javac.classpath=\
${libs.jstl11.classpath}:\ ${libs.jstl11.classpath}:\
${libs.rowset-ri.classpath}:\ ${libs.rowset-ri.classpath}:\
${file.reference.activation.jar}:\ ${file.reference.activation.jar}:\
${file.reference.ashwood-2.0.jar}:\
${file.reference.avalon-framework-4.2.0.jar}:\ ${file.reference.avalon-framework-4.2.0.jar}:\
${file.reference.batik-all-1.7.jar}:\ ${file.reference.batik-all-1.7.jar}:\
${file.reference.commons-beanutils-1.8.3.jar}:\ ${file.reference.commons-beanutils-1.8.3.jar}:\
${file.reference.commons-codec-1.3.jar}:\ ${file.reference.commons-codec-1.3.jar}:\
${file.reference.commons-collections-3.1.jar}:\ ${file.reference.commons-collections-3.1.jar}:\
${file.reference.commons-digester-1.8.jar}:\ ${file.reference.commons-digester-1.8.jar}:\
${file.reference.commons-fileupload-1.2.1.jar}:\
${file.reference.commons-httpclient-3.1.jar}:\ ${file.reference.commons-httpclient-3.1.jar}:\
${file.reference.commons-io-1.4.jar}:\ ${file.reference.commons-io-1.4.jar}:\
${file.reference.commons-lang-2.4.jar}:\ ${file.reference.commons-lang-2.4.jar}:\
@ -120,7 +123,10 @@ javac.classpath=\
${file.reference.xercesImpl-2.7.1.jar}:\ ${file.reference.xercesImpl-2.7.1.jar}:\
${file.reference.xml-apis-1.3.04.jar}:\ ${file.reference.xml-apis-1.3.04.jar}:\
${file.reference.xml-apis-ext-1.3.04.jar}:\ ${file.reference.xml-apis-ext-1.3.04.jar}:\
${file.reference.xmlgraphics-commons-1.3.1.jar} ${file.reference.xmlgraphics-commons-1.3.1.jar}:\
${file.reference.commons-el-1.0.jar}:\
${file.reference.xmlParserAPIs-2.0.2.jar}:\
${file.reference.tomahawk-1.1.10.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs= javac.compilerargs=
javac.debug=true javac.debug=true

@ -39,6 +39,10 @@
<file>${file.reference.activation.jar}</file> <file>${file.reference.activation.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
</library> </library>
<library>
<file>${file.reference.ashwood-2.0.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library> <library>
<file>${file.reference.avalon-framework-4.2.0.jar}</file> <file>${file.reference.avalon-framework-4.2.0.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
@ -63,10 +67,6 @@
<file>${file.reference.commons-digester-1.8.jar}</file> <file>${file.reference.commons-digester-1.8.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
</library> </library>
<library>
<file>${file.reference.commons-fileupload-1.2.1.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library> <library>
<file>${file.reference.commons-httpclient-3.1.jar}</file> <file>${file.reference.commons-httpclient-3.1.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
@ -211,6 +211,18 @@
<file>${file.reference.xmlgraphics-commons-1.3.1.jar}</file> <file>${file.reference.xmlgraphics-commons-1.3.1.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war> <path-in-war>WEB-INF/lib</path-in-war>
</library> </library>
<library>
<file>${file.reference.commons-el-1.0.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.xmlParserAPIs-2.0.2.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.tomahawk-1.1.10.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
</web-module-libraries> </web-module-libraries>
<web-module-additional-libraries> <web-module-additional-libraries>
<library> <library>

@ -2993,50 +2993,78 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
{ {
this.staticText112 = st; this.staticText112 = st;
} }
private com.sun.rave.web.ui.component.Calendar calAvaliacaoIncap = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalAvaliacaoIncap()
// private org.apache.myfaces.custom.date.HtmlInputDate calAvaliacaoIncap = new org.apache.myfaces.custom.date.HtmlInputDate();
// public org.apache.myfaces.custom.date.HtmlInputDate getCalAvaliacaoIncap()
// {
// return calAvaliacaoIncap;
// }
// public void setCalAvaliacaoIncap( org.apache.myfaces.custom.date.HtmlInputDate calAvaliacaoIncap )
// {
// this.calAvaliacaoIncap = calAvaliacaoIncap;
// }
private Date calAvaliacaoIncap = null;
public Date getCalAvaliacaoIncap()
{ {
return calAvaliacaoIncap; return calAvaliacaoIncap;
} }
public void setCalAvaliacaoIncap( Date calAvaliacaoIncap )
public void setCalAvaliacaoIncap( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calAvaliacaoIncap = c; this.calAvaliacaoIncap = calAvaliacaoIncap;
} }
private StaticText staticText113 = new StaticText();
private StaticText staticText113 = new StaticText();
public StaticText getStaticText113() public StaticText getStaticText113()
{ {
return staticText113; return staticText113;
} }
public void setStaticText113( StaticText st ) public void setStaticText113( StaticText st )
{ {
this.staticText113 = st; this.staticText113 = st;
} }
private com.sun.rave.web.ui.component.Calendar calRevisaoIncap = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalRevisaoIncap()
// private org.apache.myfaces.custom.date.HtmlInputDate calRevisaoIncap = new org.apache.myfaces.custom.date.HtmlInputDate();
// public org.apache.myfaces.custom.date.HtmlInputDate getCalRevisaoIncap()
// {
// return calRevisaoIncap;
// }
// public void setCalRevisaoIncap( org.apache.myfaces.custom.date.HtmlInputDate calRevisaoIncap )
// {
// this.calRevisaoIncap = calRevisaoIncap;
// }
private Date calRevisaoIncap = null;
public Date getCalRevisaoIncap()
{ {
return calRevisaoIncap; return calRevisaoIncap;
} }
public void setCalRevisaoIncap( Date calRevisaoIncap )
public void setCalRevisaoIncap( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calRevisaoIncap = c; this.calRevisaoIncap = calRevisaoIncap;
} }
private HtmlPanelGrid gridPanel70 = new HtmlPanelGrid();
private HtmlPanelGrid gridPanel70 = new HtmlPanelGrid();
public HtmlPanelGrid getGridPanel70() public HtmlPanelGrid getGridPanel70()
{ {
return gridPanel70; return gridPanel70;
} }
public void setGridPanel70( HtmlPanelGrid hpg ) public void setGridPanel70( HtmlPanelGrid hpg )
{ {
this.gridPanel70 = hpg; this.gridPanel70 = hpg;
} }
private StaticText staticText114 = new StaticText(); private StaticText staticText114 = new StaticText();
public StaticText getStaticText114() public StaticText getStaticText114()
@ -3048,17 +3076,32 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
{ {
this.staticText114 = st; this.staticText114 = st;
} }
private com.sun.rave.web.ui.component.Calendar calPeridoIncapDe = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalPeridoIncapDe()
// private org.apache.myfaces.custom.date.HtmlInputDate calPeridoIncapDe = new org.apache.myfaces.custom.date.HtmlInputDate();
// public org.apache.myfaces.custom.date.HtmlInputDate getCalPeridoIncapDe()
// {
// return calPeridoIncapDe;
// }
// public void setCalPeridoIncapDe( org.apache.myfaces.custom.date.HtmlInputDate calPeridoIncapDe )
// {
// this.calPeridoIncapDe = calPeridoIncapDe;
// }
private Date calPeriodoIncapDe = null;
public Date getCalPeriodoIncapDe()
{ {
return calPeridoIncapDe; return calPeriodoIncapDe;
} }
public void setCalPeriodoIncapDe( Date calPeriodoIncapDe )
public void setCalPeridoIncapDe( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calPeridoIncapDe = c; this.calPeriodoIncapDe = calPeriodoIncapDe;
} }
private StaticText staticText115 = new StaticText(); private StaticText staticText115 = new StaticText();
public StaticText getStaticText115() public StaticText getStaticText115()
@ -3070,17 +3113,33 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
{ {
this.staticText115 = st; this.staticText115 = st;
} }
private com.sun.rave.web.ui.component.Calendar calPeriodoIncapA = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalPeriodoIncapA()
// private org.apache.myfaces.custom.date.HtmlInputDate calPeriodoIncapA = new org.apache.myfaces.custom.date.HtmlInputDate();
// public org.apache.myfaces.custom.date.HtmlInputDate getCalPeriodoIncapA()
// {
// return calPeriodoIncapA;
// }
// public void setCalPeriodoIncapA( org.apache.myfaces.custom.date.HtmlInputDate calPeriodoIncapA )
// {
// this.calPeriodoIncapA = calPeriodoIncapA;
// }
private Date calPeriodoIncapA = null;
public Date getCalPeriodoIncapA()
{ {
return calPeriodoIncapA; return calPeriodoIncapA;
} }
public void setCalPeriodoIncapA( Date calPeriodoIncapA )
public void setCalPeriodoIncapA( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calPeriodoIncapA = c; this.calPeriodoIncapA = calPeriodoIncapA;
} }
private HtmlPanelGrid gridPanel71 = new HtmlPanelGrid(); private HtmlPanelGrid gridPanel71 = new HtmlPanelGrid();
public HtmlPanelGrid getGridPanel71() public HtmlPanelGrid getGridPanel71()
@ -6887,17 +6946,31 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
{ {
this.staticText15 = st; this.staticText15 = st;
} }
private com.sun.rave.web.ui.component.Calendar calDataOcorrencia = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalDataOcorrencia()
// private org.apache.myfaces.custom.date.HtmlInputDate calDataOcorrencia = new org.apache.myfaces.custom.date.HtmlInputDate();
// public org.apache.myfaces.custom.date.HtmlInputDate getCalDataOcorrencia()
// {
// return calDataOcorrencia;
// }
// public void setCalDataOcorrencia( org.apache.myfaces.custom.date.HtmlInputDate calDataOcorrencia )
// {
// this.calDataOcorrencia = calDataOcorrencia;
// }
private Date calDataOcorrencia = null;
public Date getCalDataOcorrencia()
{ {
return calDataOcorrencia; return calDataOcorrencia;
} }
public void setCalDataOcorrencia( Date calDataOcorrencia )
public void setCalDataOcorrencia( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calDataOcorrencia = c; this.calDataOcorrencia = calDataOcorrencia;
} }
private PanelGroup groupPanel9 = new PanelGroup(); private PanelGroup groupPanel9 = new PanelGroup();
public PanelGroup getGroupPanel9() public PanelGroup getGroupPanel9()
@ -7687,9 +7760,9 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd"); // SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
// stDataAcidente.setText(dateFormat.format(c.getTime())); // stDataAcidente.setText(dateFormat.format(c.getTime()));
txtAveriguador.setText( getSessionBean1().getCurrentUser().getNome() ); txtAveriguador.setText( getSessionBean1().getCurrentUser().getNome() );
java.util.Date today = java.util.Date today = new java.util.Date();
new java.util.Date(); // calDataOcorrencia.setValue( today );
calDataOcorrencia.setValue( today ); setCalDataOcorrencia( today );
//drpMedicos.setSelected(new Integer(0)); //drpMedicos.setSelected(new Integer(0));
// UtilizadoresDataProvider udp = new UtilizadoresDataProvider(); // UtilizadoresDataProvider udp = new UtilizadoresDataProvider();
@ -8426,7 +8499,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
if ( a.getData_acidente() != null ) if ( a.getData_acidente() != null )
{ {
java.util.Date ddate = new java.util.Date( a.getData_acidente().getTime() ); java.util.Date ddate = new java.util.Date( a.getData_acidente().getTime() );
calDataOcorrencia.setValue( ddate ); // calDataOcorrencia.setValue( ddate );
setCalDataOcorrencia( ddate );
} }
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
@ -9624,25 +9698,29 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
if ( a.getData_aval_incapacidade() != null ) if ( a.getData_aval_incapacidade() != null )
{ {
java.util.Date ddate = new java.util.Date( a.getData_aval_incapacidade().getTime() ); java.util.Date ddate = new java.util.Date( a.getData_aval_incapacidade().getTime() );
calAvaliacaoIncap.setValue( ddate ); // calAvaliacaoIncap.setValue( ddate );
setCalAvaliacaoIncap( ddate );
} }
if ( a.getData_rev_incapacidade() != null ) if ( a.getData_rev_incapacidade() != null )
{ {
java.util.Date ddate = new java.util.Date( a.getData_rev_incapacidade().getTime() ); java.util.Date ddate = new java.util.Date( a.getData_rev_incapacidade().getTime() );
calRevisaoIncap.setValue( ddate ); // calRevisaoIncap.setValue( ddate );
setCalRevisaoIncap( ddate );
} }
if ( a.getPeriodo_incapacidade_de() != null ) if ( a.getPeriodo_incapacidade_de() != null )
{ {
java.util.Date ddate = new java.util.Date( a.getPeriodo_incapacidade_de().getTime() ); java.util.Date ddate = new java.util.Date( a.getPeriodo_incapacidade_de().getTime() );
calPeridoIncapDe.setValue( ddate ); // calPeridoIncapDe.setValue( ddate );
setCalPeriodoIncapDe( ddate );
} }
if ( a.getPeriodo_incapacidade_a() != null ) if ( a.getPeriodo_incapacidade_a() != null )
{ {
java.util.Date ddate = new java.util.Date( a.getPeriodo_incapacidade_a().getTime() ); java.util.Date ddate = new java.util.Date( a.getPeriodo_incapacidade_a().getTime() );
calPeriodoIncapA.setValue( ddate ); // calPeriodoIncapA.setValue( ddate );
setCalPeriodoIncapA( ddate );
} }
if ( a.getImg_flexao().matches( "y" ) ) if ( a.getImg_flexao().matches( "y" ) )
@ -11682,7 +11760,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
//{ //{
DateFormat formatador = new SimpleDateFormat( "yyyy-MM-dd" ); DateFormat formatador = new SimpleDateFormat( "yyyy-MM-dd" );
java.util.Date ddate = ( java.util.Date ) calDataOcorrencia.getValue(); // java.util.Date ddate = ( java.util.Date ) calDataOcorrencia.getValue();
Date ddate = getCalDataOcorrencia();
try try
{ {
String ddate_str = formatador.format( ddate ); String ddate_str = formatador.format( ddate );
@ -12384,7 +12463,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
DateFormat formatador = new SimpleDateFormat( "yyyy-MM-dd" ); DateFormat formatador = new SimpleDateFormat( "yyyy-MM-dd" );
java.util.Date ddate = ( java.util.Date ) calAvaliacaoIncap.getValue(); // java.util.Date ddate = ( java.util.Date ) calAvaliacaoIncap.getValue();
Date ddate = getCalAvaliacaoIncap();
try try
{ {
String ddate_str = formatador.format( ddate ); String ddate_str = formatador.format( ddate );
@ -12396,7 +12476,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
a.setData_aval_incapacidade( null ); a.setData_aval_incapacidade( null );
} }
ddate = ( java.util.Date ) calRevisaoIncap.getValue(); // ddate = ( java.util.Date ) calRevisaoIncap.getValue();
ddate = getCalRevisaoIncap();
try try
{ {
@ -12409,7 +12490,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
a.setData_rev_incapacidade( null ); a.setData_rev_incapacidade( null );
} }
ddate = ( java.util.Date ) calPeridoIncapDe.getValue(); // ddate = ( java.util.Date ) calPeridoIncapDe.getValue();
ddate = getCalPeriodoIncapDe();
try try
{ {
String ddate_str = formatador.format( ddate ); String ddate_str = formatador.format( ddate );
@ -12421,7 +12503,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
a.setPeriodo_incapacidade_de( null ); a.setPeriodo_incapacidade_de( null );
} }
ddate = ( java.util.Date ) calPeriodoIncapA.getValue(); // ddate = ( java.util.Date ) calPeriodoIncapA.getValue();
ddate = getCalPeriodoIncapA();
try try
{ {
String ddate_str = formatador.format( ddate ); String ddate_str = formatador.format( ddate );
@ -14037,7 +14120,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
a.setAveriguador( txtAveriguador.getText() ); a.setAveriguador( txtAveriguador.getText() );
a.setData_nascimento( stDataNascimento.getText() ); a.setData_nascimento( stDataNascimento.getText() );
a.setData_admissao( stDataAdmissao1.getText() ); a.setData_admissao( stDataAdmissao1.getText() );
a.setData_acidente( calDataOcorrencia.getValue() ); // a.setData_acidente( calDataOcorrencia.getValue() );
a.setData_acidente( getCalDataOcorrencia() );
a.setBi( stBI.getText() ); a.setBi( stBI.getText() );
a.setMorada( stMorada.getText() ); a.setMorada( stMorada.getText() );
a.setContacto_telefonico( stContactoTelefonico.getText() ); a.setContacto_telefonico( stContactoTelefonico.getText() );
@ -14290,7 +14374,9 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
//////stDataAcidente.setText(a.getData_acidente()); //////stDataAcidente.setText(a.getData_acidente());
txtAveriguador.setText( a.getAveriguador() ); txtAveriguador.setText( a.getAveriguador() );
java.util.Date dtAcidente = ( java.util.Date ) a.getData_acidente(); java.util.Date dtAcidente = ( java.util.Date ) a.getData_acidente();
calDataOcorrencia.setValue( dtAcidente ); // calDataOcorrencia.setValue( dtAcidente );
setCalDataOcorrencia( dtAcidente );
try try
{ {
txtHorasTurno.setText( a.getHoras_turno().toString() ); txtHorasTurno.setText( a.getHoras_turno().toString() );
@ -14609,24 +14695,25 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean
private void initCalendars() private void initCalendars()
{ {
java.util.GregorianCalendar gcalendar = new java.util.GregorianCalendar(); // java.util.GregorianCalendar gcalendar = new java.util.GregorianCalendar();
gcalendar.set( 1900, 1, 1 ); // gcalendar.set( 1900, 1, 1 );
calAvaliacaoIncap.setMinDate( gcalendar.getTime() ); //
java.util.GregorianCalendar gcalendar1 = new java.util.GregorianCalendar(); // calAvaliacaoIncap.setMinDate( gcalendar.getTime() );
gcalendar1.set( 2099, 1, 1 ); // java.util.GregorianCalendar gcalendar1 = new java.util.GregorianCalendar();
calAvaliacaoIncap.setMaxDate( gcalendar1.getTime() ); // gcalendar1.set( 2099, 1, 1 );
// calAvaliacaoIncap.setMaxDate( gcalendar1.getTime() );
calRevisaoIncap.setMinDate( gcalendar.getTime() ); //
calRevisaoIncap.setMaxDate( gcalendar1.getTime() ); // calRevisaoIncap.setMinDate( gcalendar.getTime() );
// calRevisaoIncap.setMaxDate( gcalendar1.getTime() );
calPeridoIncapDe.setMinDate( gcalendar.getTime() ); //
calPeridoIncapDe.setMaxDate( gcalendar1.getTime() ); // calPeridoIncapDe.setMinDate( gcalendar.getTime() );
// calPeridoIncapDe.setMaxDate( gcalendar1.getTime() );
calPeriodoIncapA.setMinDate( gcalendar.getTime() ); //
calPeriodoIncapA.setMaxDate( gcalendar1.getTime() ); // calPeriodoIncapA.setMinDate( gcalendar.getTime() );
// calPeriodoIncapA.setMaxDate( gcalendar1.getTime() );
calDataOcorrencia.setMinDate( gcalendar.getTime() ); //
calDataOcorrencia.setMaxDate( gcalendar1.getTime() ); // calDataOcorrencia.setMinDate( gcalendar.getTime() );
// calDataOcorrencia.setMaxDate( gcalendar1.getTime() );
} }
public void chkMembroSupDir_processValueChange( ValueChangeEvent event ) public void chkMembroSupDir_processValueChange( ValueChangeEvent event )

@ -118,16 +118,27 @@ public class EstatisticasProcesso extends AbstractPageBean
this.textAnoOcorrencia = tf; this.textAnoOcorrencia = tf;
} }
private com.sun.rave.web.ui.component.Calendar calDataOcorrencia = new com.sun.rave.web.ui.component.Calendar(); // private com.sun.rave.web.ui.component.Calendar calDataOcorrencia = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalDataOcorrencia() // public com.sun.rave.web.ui.component.Calendar getCalDataOcorrencia()
// {
// return this.calDataOcorrencia;
// }
// public void setCalDataOcorrencia( com.sun.rave.web.ui.component.Calendar c )
// {
// this.calDataOcorrencia = c;
// }
private Date calDataOcorrencia = null;
public Date getCalDataOcorrencia()
{ {
return this.calDataOcorrencia; return calDataOcorrencia;
} }
public void setCalDataOcorrencia( com.sun.rave.web.ui.component.Calendar c ) public void setCalDataOcorrencia( Date calDataOcorrencia )
{ {
this.calDataOcorrencia = c; this.calDataOcorrencia = calDataOcorrencia;
} }
private TextField textHoraOcorrencia = new TextField(); private TextField textHoraOcorrencia = new TextField();
public TextField getTextHoraOcorrencia() public TextField getTextHoraOcorrencia()
{ {
@ -501,10 +512,12 @@ public class EstatisticasProcesso extends AbstractPageBean
anoOcorrencia = "".equals( anoOcorrencia ) ? null : anoOcorrencia; anoOcorrencia = "".equals( anoOcorrencia ) ? null : anoOcorrencia;
} }
Date dataOcorrencia = null; Date dataOcorrencia = null;
if ( calDataOcorrencia.getValue() != null ) // if ( calDataOcorrencia.getValue() != null )
{ // {
dataOcorrencia = ( Date )calDataOcorrencia.getValue(); // dataOcorrencia = ( Date )calDataOcorrencia.getValue();
} // }
dataOcorrencia = calDataOcorrencia;
String horaOcorrencia = null; String horaOcorrencia = null;
if ( textHoraOcorrencia.getText() != null ) if ( textHoraOcorrencia.getText() != null )
{ {

@ -971,28 +971,32 @@ public class FormDirGerRh extends AbstractPageBean
this.dropEstabelecimentosSeguimento = dropEstabelecimentos; this.dropEstabelecimentosSeguimento = dropEstabelecimentos;
} }
// private TextField textFilterEstabelecimentoSeg = new TextField();
// public TextField getTextFilterEstabelecimentoSeg() // private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
//
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// { // {
// return textFilterEstabelecimentoSeg; // return this.calFilterDateSeg;
// } // }
// public void setTextFilterEstabelecimentoSeg( TextField textFilterEstabelecimentoSeg ) //
// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
// { // {
// this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; // this.calFilterDateSeg = c;
// } // }
private Date calFilterDateSeguimento = null;
private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); public Date getCalFilterDateSeguimento()
public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
{ {
return this.calFilterDateSeg; return calFilterDateSeguimento;
} }
public void setCalFilterDateSeguimento( Date calFilterDateSeguimento )
public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateSeg = c; this.calFilterDateSeguimento = calFilterDateSeguimento;
} }
private TextField textFilterPORSeg = new TextField(); private TextField textFilterPORSeg = new TextField();
public TextField getTextFilterPORSeg() public TextField getTextFilterPORSeg()
@ -1601,7 +1605,8 @@ public class FormDirGerRh extends AbstractPageBean
public String buttonFilterSeg_action() public String buttonFilterSeg_action()
{ {
Date visitaDate = ( Date ) calFilterDateSeg.getValue(); // Date visitaDate = ( Date ) calFilterDateSeg.getValue();
Date visitaDate = calFilterDateSeguimento;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {

@ -1044,28 +1044,32 @@ public class FormDirSiprp extends AbstractPageBean
this.dropEstabelecimentosSeguimento = dropEstabelecimentos; this.dropEstabelecimentosSeguimento = dropEstabelecimentos;
} }
// private TextField textFilterEstabelecimentoSeg = new TextField();
// public TextField getTextFilterEstabelecimentoSeg() // private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
//
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// { // {
// return textFilterEstabelecimentoSeg; // return this.calFilterDateSeg;
// } // }
// public void setTextFilterEstabelecimentoSeg( TextField textFilterEstabelecimentoSeg ) //
// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
// { // {
// this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; // this.calFilterDateSeg = c;
// } // }
private Date calFilterDateSeguimento = null;
private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); public Date getCalFilterDateSeguimento()
public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
{ {
return this.calFilterDateSeg; return calFilterDateSeguimento;
} }
public void setCalFilterDateSeguimento( Date calFilterDateSeguimento )
public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateSeg = c; this.calFilterDateSeguimento = calFilterDateSeguimento;
} }
private TextField textFilterPORSeg = new TextField(); private TextField textFilterPORSeg = new TextField();
public TextField getTextFilterPORSeg() public TextField getTextFilterPORSeg()
@ -1645,7 +1649,8 @@ public class FormDirSiprp extends AbstractPageBean
public String buttonFilterSeg_action() public String buttonFilterSeg_action()
{ {
Date visitaDate = ( Date ) calFilterDateSeg.getValue(); // Date visitaDate = ( Date ) calFilterDateSeg.getValue();
Date visitaDate = calFilterDateSeguimento;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {

@ -970,27 +970,30 @@ public class FormGestor extends AbstractPageBean
this.dropEstabelecimentosSeguimento = dropEstabelecimentos; this.dropEstabelecimentosSeguimento = dropEstabelecimentos;
} }
// private TextField textFilterEstabelecimentoSeg = new TextField();
// public TextField getTextFilterEstabelecimentoSeg() // private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// { // {
// return textFilterEstabelecimentoSeg; // return this.calFilterDateSeg;
// } // }
// public void setTextFilterEstabelecimentoSeg( TextField textFilterEstabelecimentoSeg ) // public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
// { // {
// this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; // this.calFilterDateSeg = c;
// } // }
private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); private Date calFilterDateSeguimento = null;
public Date getCalFilterDateSeguimento()
public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
{ {
return this.calFilterDateSeg; return calFilterDateSeguimento;
} }
public void setCalFilterDateSeguimento( Date calFilterDateSeguimento )
public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateSeg = c; this.calFilterDateSeguimento = calFilterDateSeguimento;
} }
private TextField textFilterPORSeg = new TextField(); private TextField textFilterPORSeg = new TextField();
public TextField getTextFilterPORSeg() public TextField getTextFilterPORSeg()
@ -1656,7 +1659,8 @@ public class FormGestor extends AbstractPageBean
public String buttonFilterSeg_action() public String buttonFilterSeg_action()
{ {
Date visitaDate = ( Date ) calFilterDateSeg.getValue(); // Date visitaDate = ( Date ) calFilterDateSeg.getValue();
Date visitaDate = calFilterDateSeguimento;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {

@ -13,7 +13,6 @@ import com.sun.data.provider.RowKey;
import com.sun.rave.web.ui.appbase.AbstractPageBean; import com.sun.rave.web.ui.appbase.AbstractPageBean;
import com.sun.rave.web.ui.component.Body; import com.sun.rave.web.ui.component.Body;
import com.sun.rave.web.ui.component.Button; import com.sun.rave.web.ui.component.Button;
import com.sun.rave.web.ui.component.Calendar;
import com.sun.rave.web.ui.component.DropDown; import com.sun.rave.web.ui.component.DropDown;
import com.sun.rave.web.ui.component.Form; import com.sun.rave.web.ui.component.Form;
import com.sun.rave.web.ui.component.Head; import com.sun.rave.web.ui.component.Head;
@ -1152,30 +1151,30 @@ public class FormHS extends AbstractPageBean
this.dropEstabelecimentosActuais = dropEstabelecimentos; this.dropEstabelecimentosActuais = dropEstabelecimentos;
} }
// private TextField textFilterEstabelecimentoActual = new TextField();
// // private Calendar calFilterDateActual = new Calendar();
// public TextField getTextFilterEstabelecimentoActual() // public Calendar getCalFilterDateActual()
// { // {
// return textFilterEstabelecimentoActual; // return this.calFilterDateActual;
// } // }
// // public void setCalFilterDateActual( Calendar c )
// public void setTextFilterEstabelecimentoActual( TextField textFilterEstabelecimentoActual )
// { // {
// this.textFilterEstabelecimentoActual = textFilterEstabelecimentoActual; // this.calFilterDateActual = c;
// } // }
private Date calFilterDateActual = null;
private Calendar calFilterDateActual = new Calendar(); public Date getCalFilterDateActual()
public Calendar getCalFilterDateActual()
{ {
return this.calFilterDateActual; return calFilterDateActual;
} }
public void setCalFilterDateActual( Date calFilterDateActual )
public void setCalFilterDateActual( Calendar c )
{ {
this.calFilterDateActual = c; this.calFilterDateActual = calFilterDateActual;
} }
private TextField textFilterPORActual = new TextField(); private TextField textFilterPORActual = new TextField();
public TextField getTextFilterPORActual() public TextField getTextFilterPORActual()
@ -1264,28 +1263,30 @@ public class FormHS extends AbstractPageBean
{ {
this.dropEstabelecimentosSeguimento = dropEstabelecimentos; this.dropEstabelecimentosSeguimento = dropEstabelecimentos;
} }
// private TextField textFilterEstabelecimentoSeg = new TextField();
// public TextField getTextFilterEstabelecimentoSeg()
// private Calendar calFilterDateSeg = new Calendar();
// public Calendar getCalFilterDateSeg()
// { // {
// return textFilterEstabelecimentoSeg; // return this.calFilterDateSeg;
// } // }
// public void setTextFilterEstabelecimentoSeg( TextField textFilterEstabelecimentoSeg ) // public void setCalFilterDateSeg( Calendar c )
// { // {
// this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; // this.calFilterDateSeg = c;
// } // }
private Date calFilterDateSeguimento = null;
private Calendar calFilterDateSeg = new Calendar(); public Date getCalFilterDateSeguimento()
public Calendar getCalFilterDateSeg()
{ {
return this.calFilterDateSeg; return calFilterDateSeguimento;
} }
public void setCalFilterDateSeguimento( Date calFilterDateSeguimento )
public void setCalFilterDateSeg( Calendar c )
{ {
this.calFilterDateSeg = c; this.calFilterDateSeguimento = calFilterDateSeguimento;
} }
private TextField textFilterPORSeg = new TextField(); private TextField textFilterPORSeg = new TextField();
public TextField getTextFilterPORSeg() public TextField getTextFilterPORSeg()
@ -1894,7 +1895,8 @@ public class FormHS extends AbstractPageBean
public String buttonFilterActual_action() public String buttonFilterActual_action()
{ {
Date visitaDate = ( Date ) calFilterDateActual.getValue(); // Date visitaDate = ( Date ) calFilterDateActual.getValue();
Date visitaDate = calFilterDateActual;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {
@ -1958,7 +1960,8 @@ public class FormHS extends AbstractPageBean
public String buttonFilterSeg_action() public String buttonFilterSeg_action()
{ {
Date visitaDate = ( Date ) calFilterDateSeg.getValue(); // Date visitaDate = ( Date ) calFilterDateSeg.getValue();
Date visitaDate = calFilterDateSeguimento;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {

@ -1154,17 +1154,30 @@ public class FormMedico extends AbstractPageBean
{ {
this.textFilterNameActual = tf; this.textFilterNameActual = tf;
} }
private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual()
// private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar();
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual()
// {
// return this.calFilterDateActual;
// }
// public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c )
// {
// this.calFilterDateActual = c;
// }
private Date calFilterDateActual = null;
public Date getCalFilterDateActual()
{ {
return this.calFilterDateActual; return calFilterDateActual;
} }
public void setCalFilterDateActual( Date calFilterDateActual )
public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateActual = c; this.calFilterDateActual = calFilterDateActual;
} }
private TextField textFilterPORActual = new TextField(); private TextField textFilterPORActual = new TextField();
public TextField getTextFilterPORActual() public TextField getTextFilterPORActual()
@ -1231,17 +1244,32 @@ public class FormMedico extends AbstractPageBean
{ {
this.textFilterNameSeg = tf; this.textFilterNameSeg = tf;
} }
private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// {
// return this.calFilterDateSeg;
// }
// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
// {
// this.calFilterDateSeg = c;
// }
private Date calFilterDateSeguimento = null;
public Date getCalFilterDateSeguimento()
{ {
return this.calFilterDateSeg; return calFilterDateSeguimento;
} }
public void setCalFilterDateSeguimento( Date calFilterDateSeguimento )
public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateSeg = c; this.calFilterDateSeguimento = calFilterDateSeguimento;
} }
private TextField textFilterPORSeg = new TextField(); private TextField textFilterPORSeg = new TextField();
public TextField getTextFilterPORSeg() public TextField getTextFilterPORSeg()
@ -1818,7 +1846,8 @@ public class FormMedico extends AbstractPageBean
public String buttonFilterActual_action() public String buttonFilterActual_action()
{ {
Date visitaDate = ( Date ) calFilterDateActual.getValue(); // Date visitaDate = ( Date ) calFilterDateActual.getValue();
Date visitaDate = calFilterDateActual;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {
@ -1867,7 +1896,8 @@ public class FormMedico extends AbstractPageBean
public String buttonFilterSeg_action() public String buttonFilterSeg_action()
{ {
Date visitaDate = ( Date ) calFilterDateSeg.getValue(); // Date visitaDate = ( Date ) calFilterDateSeg.getValue();
Date visitaDate = calFilterDateSeguimento;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {

@ -1201,17 +1201,31 @@ public class FormRH extends AbstractPageBean
{ {
this.textFilterNameActual = tf; this.textFilterNameActual = tf;
} }
private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual()
// private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar();
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual()
// {
// return this.calFilterDateActual;
// }
// public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c )
// {
// this.calFilterDateActual = c;
// }
private Date calFilterDateActual = null;
public Date getCalFilterDateActual()
{ {
return this.calFilterDateActual; return calFilterDateActual;
} }
public void setCalFilterDateActual( Date calFilterDateActual )
public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateActual = c; this.calFilterDateActual = calFilterDateActual;
} }
private TextField textFilterPORActual = new TextField(); private TextField textFilterPORActual = new TextField();
public TextField getTextFilterPORActual() public TextField getTextFilterPORActual()
@ -1278,17 +1292,30 @@ public class FormRH extends AbstractPageBean
{ {
this.textFilterNameSeg = tf; this.textFilterNameSeg = tf;
} }
private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// {
// return this.calFilterDateSeg;
// }
// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
// {
// this.calFilterDateSeg = c;
// }
private Date calFilterDateSeguimento = null;
public Date getCalFilterDateSeguimento()
{ {
return this.calFilterDateSeg; return calFilterDateSeguimento;
} }
public void setCalFilterDateSeguimento( Date calFilterDateSeguimento )
public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateSeg = c; this.calFilterDateSeguimento = calFilterDateSeguimento;
} }
private TextField textFilterPORSeg = new TextField(); private TextField textFilterPORSeg = new TextField();
public TextField getTextFilterPORSeg() public TextField getTextFilterPORSeg()
@ -2009,7 +2036,8 @@ public class FormRH extends AbstractPageBean
public String buttonFilterActual_action() public String buttonFilterActual_action()
{ {
Date visitaDate = ( Date ) calFilterDateActual.getValue(); // Date visitaDate = ( Date ) calFilterDateActual.getValue();
Date visitaDate = calFilterDateActual;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {
@ -2062,7 +2090,8 @@ public class FormRH extends AbstractPageBean
public String buttonFilterSeg_action() public String buttonFilterSeg_action()
{ {
Date visitaDate = ( Date ) calFilterDateSeg.getValue(); // Date visitaDate = ( Date ) calFilterDateSeg.getValue();
Date visitaDate = calFilterDateSeguimento;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {

@ -1238,17 +1238,31 @@ public class FormSeguranca extends AbstractPageBean
{ {
this.textFilterNameSeg = tf; this.textFilterNameSeg = tf;
} }
private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar();
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg()
// {
// return this.calFilterDateSeg;
// }
// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
// {
// this.calFilterDateSeg = c;
// }
private Date calFilterDateSeguimento = null;
public Date getCalFilterDateSeguimento()
{ {
return this.calFilterDateSeg; return calFilterDateSeguimento;
} }
public void setCalFilterDateSeguimento( Date calFilterDateSeguimento )
public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateSeg = c; this.calFilterDateSeguimento = calFilterDateSeguimento;
} }
private TextField textFilterPORSeg = new TextField(); private TextField textFilterPORSeg = new TextField();
public TextField getTextFilterPORSeg() public TextField getTextFilterPORSeg()
@ -1315,17 +1329,30 @@ public class FormSeguranca extends AbstractPageBean
{ {
this.textFilterNameActual = tf; this.textFilterNameActual = tf;
} }
private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar();
public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual()
// private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar();
// public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual()
// {
// return this.calFilterDateActual;
// }
// public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c )
// {
// this.calFilterDateActual = c;
// }
private Date calFilterDateActual = null;
public Date getCalFilterDateActual()
{ {
return this.calFilterDateActual; return calFilterDateActual;
} }
public void setCalFilterDateActual( Date calFilterDateActual )
public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c )
{ {
this.calFilterDateActual = c; this.calFilterDateActual = calFilterDateActual;
} }
private TextField textFilterPORActual = new TextField(); private TextField textFilterPORActual = new TextField();
public TextField getTextFilterPORActual() public TextField getTextFilterPORActual()
@ -1735,7 +1762,8 @@ public class FormSeguranca extends AbstractPageBean
public String buttonFilterActual_action() public String buttonFilterActual_action()
{ {
Date visitaDate = ( Date ) calFilterDateActual.getValue(); // Date visitaDate = ( Date ) calFilterDateActual.getValue();
Date visitaDate = calFilterDateActual;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {
@ -1789,7 +1817,8 @@ public class FormSeguranca extends AbstractPageBean
public String buttonFilterSeg_action() public String buttonFilterSeg_action()
{ {
Date visitaDate = ( Date ) calFilterDateSeg.getValue(); // Date visitaDate = ( Date ) calFilterDateSeg.getValue();
Date visitaDate = calFilterDateSeguimento;
String visitaDateStr = null; String visitaDateStr = null;
if ( visitaDate != null ) if ( visitaDate != null )
{ {

@ -16,13 +16,13 @@ username.siprp_local = postgres
# tests localhost # tests localhost
#server.siprp = localhost #server.siprp = localhost
#port.siprp = 5432 #port.siprp = 5432
#database.siprp = siprp_20110706 #database.siprp = siprp
#username.siprp = postgres #username.siprp = postgres
#password.siprp = Typein #password.siprp = Typein
# #
#server.siprp_local = localhost #server.siprp_local = localhost
#port.siprp_local = 5432 #port.siprp_local = 5432
#database.siprp_local = siprp_local_3_20110706 #database.siprp_local = siprp_local_3
#username.siprp_local = postgres #username.siprp_local = postgres
#password.siprp_local = Typein #password.siprp_local = Typein

@ -72,7 +72,7 @@ public class EvoBaseProvider
String username = DBPropertiesLoader.getInstance().findProperty( DBConstants.USERNAME_SIPRP ); String username = DBPropertiesLoader.getInstance().findProperty( DBConstants.USERNAME_SIPRP );
String password = DBPropertiesLoader.getInstance().findProperty( DBConstants.PASSWORD_SIPRP ); String password = DBPropertiesLoader.getInstance().findProperty( DBConstants.PASSWORD_SIPRP );
System.out.println( "\t" + server + " : " + port + " : " + dbname + " : " + username + " : " + password ); // System.out.println( "\t" + server + " : " + port + " : " + dbname + " : " + username + " : " + password );
String server_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.SERVER_SIPRP_LOCAL ); String server_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.SERVER_SIPRP_LOCAL );
int port_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.PORT_SIPRP_LOCAL, -1 ); int port_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.PORT_SIPRP_LOCAL, -1 );
@ -80,7 +80,7 @@ public class EvoBaseProvider
String username_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.USERNAME_SIPRP_LOCAL ); String username_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.USERNAME_SIPRP_LOCAL );
String password_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.PASSWORD_SIPRP_LOCAL ); String password_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.PASSWORD_SIPRP_LOCAL );
System.out.println( "\t" + server_local + " : " + port_local + " : " + dbname_local + " : " + username_local + " : " + password_local ); // System.out.println( "\t" + server_local + " : " + port_local + " : " + dbname_local + " : " + username_local + " : " + password_local );
init( DBConstants.DB.SIPRP, server, port, dbname, username, password ); init( DBConstants.DB.SIPRP, server, port, dbname, username, password );
init( DBConstants.DB.SIPRP_LOCAL, server_local, port_local, dbname_local, username_local, password_local ); init( DBConstants.DB.SIPRP_LOCAL, server_local, port_local, dbname_local, username_local, password_local );
@ -118,7 +118,7 @@ public class EvoBaseProvider
UnicodeChecker.setUseDoubleSlash( true ); UnicodeChecker.setUseDoubleSlash( true );
// Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); // Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER );
dbManager = manager; dbManager = manager;
System.out.println( "\nDBManager : " + dbManager ); // System.out.println( "\nDBManager : " + dbManager );
} }
else if ( DBConstants.DB.SIPRP_LOCAL.equals( db ) ) else if ( DBConstants.DB.SIPRP_LOCAL.equals( db ) )
{ {
@ -133,7 +133,7 @@ public class EvoBaseProvider
// Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); // Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER );
localDBManager = manager; localDBManager = manager;
Singleton.setInstance( Singleton.DEFAULT_DBMANAGER, localDBManager ); Singleton.setInstance( Singleton.DEFAULT_DBMANAGER, localDBManager );
System.out.println( "\nLocalDBManager : " + localDBManager ); // System.out.println( "\nLocalDBManager : " + localDBManager );
} }
} }

@ -1,24 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?> <?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: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"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:view> <f:view>
<ui:page binding="#{AnaliseAcidenteTrabalho.page1}" id="page1"> <ui:page binding="#{AnaliseAcidenteTrabalho.page1}" id="page1">
<ui:html binding="#{AnaliseAcidenteTrabalho.html1}" id="html1"> <ui:html binding="#{AnaliseAcidenteTrabalho.html1}" id="html1">
<ui:head binding="#{AnaliseAcidenteTrabalho.head1}" id="head1"> <ui:head binding="#{AnaliseAcidenteTrabalho.head1}" id="head1">
<ui:link binding="#{AnaliseAcidenteTrabalho.link1}" id="link1" url="/resources/stylesheet.css"/> <ui:link binding="#{AnaliseAcidenteTrabalho.link1}" id="link1" url="/resources/stylesheet.css"/>
<script> <script type="text/javascript">
function showPdf() function showPdf()
{ {
sOptions = " width = '" + screen.availWidth + "'"; sOptions = " width = '" + screen.availWidth + "'";
sOptions += " height= '" + screen.availHeight + "'"; sOptions += " height= '" + screen.availHeight + "'";
var wOpen; var wOpen;
wOpen = window.open('./resources/pdfs/Ajuda.pdf','', sOptions ); wOpen = window.open('./resources/pdfs/Ajuda.pdf','', sOptions );
wOpen.focus(); wOpen.focus();
wOpen.moveTo(0,0); wOpen.moveTo(0,0);
wOpen.resizeTo( screen.availWidth, screen.availHeight ); wOpen.resizeTo( screen.availWidth, screen.availHeight );
} }
function showHideEspecif(chk) function showHideEspecif( chk )
{ {
if(chk.checked) if(chk.checked)
@ -493,21 +499,25 @@
</ui:panelGroup> </ui:panelGroup>
</h:panelGrid> </h:panelGrid>
<h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel14}" columnClasses="gridColLeft20, gridColLeft5, gridColLeft75" <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel14}" columnClasses="gridColLeft20, gridColLeft5, gridColLeft75"
columns="3" id="gridPanel14" style="height: 24px; width: 100%" width="696"> columns="1" id="gridPanel14" style="height: 24px;" width="100%">
<ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText15}" escape="false" id="staticText15"
style="height: 24px" styleClass="labelBold" text="Data da ocorr&amp;ecirc;ncia:&amp;nbsp;"/> <ui:panelGroup id="calDataOcorrenciaGroup" style="height: 24px">
<ui:calendar binding="#{AnaliseAcidenteTrabalho.calDataOcorrencia}" dateFormatPattern="yyyy/MM/dd" <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText15}" escape="false" id="staticText15"
id="calDataOcorrencia" style="height: 24px"/> style="height: 24px" styleClass="labelBold" text="Data da ocorr&amp;ecirc;ncia:&amp;nbsp;"/>
<ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel9}" id="groupPanel9" style="height: 24px"> <t:inputDate id="calDataOcorrencia" value="#{AnaliseAcidenteTrabalho.calDataOcorrencia}" />
<ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText71}" escape="false" id="staticText71"
style="height: 24px" styleClass="labelBold" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Hora da ocorr&amp;ecirc;ncia:&amp;nbsp;"/> <ui:panelGroup binding="#{AnaliseAcidenteTrabalho.groupPanel9}" id="groupPanel9" style="height: 24px">
<ui:dropDown binding="#{AnaliseAcidenteTrabalho.drpHours}" id="drpHours" items="#{SessionBean1.horasOptions}" <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText71}" escape="false" id="staticText71"
selected="#{SessionBean1.horaChoice}" style="height: 24px; width: 48px"/> style="height: 24px" styleClass="labelBold" text="&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Hora da ocorr&amp;ecirc;ncia:&amp;nbsp;"/>
<ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText72}" escape="false" id="staticText72" <ui:dropDown binding="#{AnaliseAcidenteTrabalho.drpHours}" id="drpHours" items="#{SessionBean1.horasOptions}"
style="font-weight: bold; height: 24px; width: 10px" text="&amp;nbsp;:&amp;nbsp;"/> selected="#{SessionBean1.horaChoice}" style="height: 24px; width: 48px"/>
<ui:dropDown binding="#{AnaliseAcidenteTrabalho.drpMinutes}" id="drpMinutes" <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText72}" escape="false" id="staticText72"
items="#{SessionBean1.minutosOptions}" selected="#{SessionBean1.minutoChoice}" style="height: 24px; width: 48px"/> style="font-weight: bold; height: 24px; width: 10px" text="&amp;nbsp;:&amp;nbsp;"/>
</ui:panelGroup> <ui:dropDown binding="#{AnaliseAcidenteTrabalho.drpMinutes}" id="drpMinutes"
items="#{SessionBean1.minutosOptions}" selected="#{SessionBean1.minutoChoice}" style="height: 24px; width: 48px"/>
</ui:panelGroup>
</ui:panelGroup>
</h:panelGrid> </h:panelGrid>
<h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel11}" columnClasses="gridColLeft" columns="1" id="gridPanel11" <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel11}" columnClasses="gridColLeft" columns="1" id="gridPanel11"
style="height: 24px; width: 100%" width="240"> style="height: 24px; width: 100%" width="240">
@ -1071,26 +1081,32 @@
style="height: 24px; width: 96px" styleClass="labelBold" text="&amp;nbsp;%"/> style="height: 24px; width: 96px" styleClass="labelBold" text="&amp;nbsp;%"/>
</ui:panelGroup> </ui:panelGroup>
</h:panelGrid> </h:panelGrid>
<h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel69}" columns="4" id="gridPanel69" <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel69}" columns="1" id="gridPanel69"
style="height: 24px; width: 75%" width="600"> style="height: 24px; width: 75%" width="600">
<ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText112}" escape="false" id="staticText112"
style="height: 24px; width: 120px" styleClass="labelBold" text="Avalia&amp;ccedil;&amp;atilde;o da incapacidade realizada em &amp;nbsp;&amp;nbsp;"/> <ui:panelGroup id="calAvaliacaoIncapGroup">
<ui:calendar binding="#{AnaliseAcidenteTrabalho.calAvaliacaoIncap}" dateFormatPattern="yyyy/MM/dd" <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText112}" escape="false" id="staticText112"
id="calAvaliacaoIncap" style="height: 24px; width: 144px"/> style="height: 24px; width: 120px" styleClass="labelBold" text="Avalia&amp;ccedil;&amp;atilde;o da incapacidade realizada em &amp;nbsp;&amp;nbsp;"/>
<ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText113}" escape="false" id="staticText113" <t:inputDate id="calAvaliacaoIncap" value="#{AnaliseAcidenteTrabalho.calAvaliacaoIncap}" style="height: 24px; width: 144px" />
style="height: 24px; width: 120px" styleClass="labelBold" text="  Revis&amp;atilde;o de incapacidade&amp;nbsp;&amp;nbsp;"/>
<ui:calendar binding="#{AnaliseAcidenteTrabalho.calRevisaoIncap}" dateFormatPattern="yyyy/MM/dd" <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText113}" escape="false" id="staticText113"
id="calRevisaoIncap" style="height: 24px; width: 144px"/> style="height: 24px; width: 120px" styleClass="labelBold" text="  Revis&amp;atilde;o de incapacidade&amp;nbsp;&amp;nbsp;"/>
<t:inputDate id="calRevisaoIncap" value="#{AnaliseAcidenteTrabalho.calRevisaoIncap}" style="height: 24px; width: 144px" />
</ui:panelGroup>
</h:panelGrid> </h:panelGrid>
<h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel70}" columns="4" id="gridPanel70" style="height: 24px" width="600"> <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel70}" columns="1" id="gridPanel70" style="height: 24px" width="600">
<ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText114}" escape="false" id="staticText114"
style="height: 24px; width: 120px" styleClass="labelBold" text="Per&amp;iacute;odo de incapacidade tempor&amp;aacute;ria de &amp;nbsp;&amp;nbsp;"/> <ui:panelGroup id="calPeriodoIncapDeGroup">
<ui:calendar binding="#{AnaliseAcidenteTrabalho.calPeridoIncapDe}" dateFormatPattern="yyyy/MM/dd" <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText114}" escape="false" id="staticText114"
id="calPeridoIncapDe" style="height: 24px; width: 144px"/> style="height: 24px; width: 120px" styleClass="labelBold" text="Per&amp;iacute;odo de incapacidade tempor&amp;aacute;ria de &amp;nbsp;&amp;nbsp;"/>
<ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText115}" escape="false" id="staticText115" <t:inputDate id="calPeridoIncapDe" value="#{AnaliseAcidenteTrabalho.calPeridoIncapDe}" style="height: 24px; width: 144px" />
style="height: 24px; width: 120px" text="  a&amp;nbsp;&amp;nbsp;"/>
<ui:calendar binding="#{AnaliseAcidenteTrabalho.calPeriodoIncapA}" dateFormatPattern="yyyy/MM/dd" <ui:staticText binding="#{AnaliseAcidenteTrabalho.staticText115}" escape="false" id="staticText115"
id="calPeriodoIncapA" style="height: 24px; width: 144px"/> style="height: 24px; width: 120px" text="  a&amp;nbsp;&amp;nbsp;"/>
<t:inputDate id="calPeriodoIncapA" value="#{AnaliseAcidenteTrabalho.calPeriodoIncapA}" style="height: 24px; width: 144px" />
</ui:panelGroup>
</h:panelGrid> </h:panelGrid>
</h:panelGrid> </h:panelGrid>
<h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel71}" columnClasses="gridColLeft" columns="1" id="gridPanel71" <h:panelGrid binding="#{AnaliseAcidenteTrabalho.gridPanel71}" columnClasses="gridColLeft" columns="1" id="gridPanel71"

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jsp:root version="1.2" <jsp:root version="1.2"
xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:ui="http://www.sun.com/web/ui"> xmlns:h="http://java.sun.com/jsf/html"
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:ui="http://www.sun.com/web/ui"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
@ -89,7 +92,7 @@
<ui:textField id="textAnoOcorrencia" binding="#{EstatisticasProcesso.textAnoOcorrencia}" /> <ui:textField id="textAnoOcorrencia" binding="#{EstatisticasProcesso.textAnoOcorrencia}" />
<ui:staticText id="labelDataOcorrencia" escape="false" text="Data de ocorrência:" styleClass="labelBold" /> <ui:staticText id="labelDataOcorrencia" escape="false" text="Data de ocorrência:" styleClass="labelBold" />
<ui:calendar binding="#{EstatisticasProcesso.calDataOcorrencia}" dateFormatPattern="yyyy-MM-dd" id="calDataOcorrencia" /> <t:inputDate id="calDataOcorrencia" value="#{EstatisticasProcesso.calDataOcorrencia}" />
<ui:staticText id="labelHoraOcorrencia" escape="false" text="Hora de ocorrência:" styleClass="labelBold" /> <ui:staticText id="labelHoraOcorrencia" escape="false" text="Hora de ocorrência:" styleClass="labelBold" />
<ui:textField id="textHoraOcorrencia" binding="#{EstatisticasProcesso.textHoraOcorrencia}" /> <ui:textField id="textHoraOcorrencia" binding="#{EstatisticasProcesso.textHoraOcorrencia}" />

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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: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"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:view> <f:view>
<ui:page binding="#{FormDirGerRh.page1}" id="page1"> <ui:page binding="#{FormDirGerRh.page1}" id="page1">
@ -85,7 +91,9 @@
<h:panelGrid binding="#{FormDirGerRh.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock"> <h:panelGrid binding="#{FormDirGerRh.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" /> <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
<ui:calendar binding="#{FormDirGerRh.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg" />
<t:inputDate id="calFilterDateSeg" value="#{FormDirGerRh.calFilterDateSeguimento}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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: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"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:view> <f:view>
<ui:page binding="#{FormDirSiprp.page1}" id="page1"> <ui:page binding="#{FormDirSiprp.page1}" id="page1">
@ -91,7 +97,7 @@
<h:panelGrid binding="#{FormDirSiprp.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock"> <h:panelGrid binding="#{FormDirSiprp.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" /> <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
<ui:calendar binding="#{FormDirSiprp.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg" /> <t:inputDate id="calFilterDateSeg" value="#{FormDirSiprp.calFilterDateSeguimento}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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: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"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:view> <f:view>
<ui:page binding="#{FormGestor.page1}" id="page1"> <ui:page binding="#{FormGestor.page1}" id="page1">
@ -84,7 +90,8 @@
<h:panelGrid binding="#{FormGestor.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock"> <h:panelGrid binding="#{FormGestor.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" /> <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
<ui:calendar binding="#{FormGestor.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg" />
<t:inputDate id="calFilterDateSeg" value="#{FormGestor.calFilterDateSeguimento}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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: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"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:view> <f:view>
<ui:page binding="#{FormHS.page1}" id="page1"> <ui:page binding="#{FormHS.page1}" id="page1">
@ -89,7 +95,8 @@
<h:panelGrid binding="#{FormHS.gridPanelFilterActual}" columns="5" id="gridPanelFilterActual" styleClass="centerBlock"> <h:panelGrid binding="#{FormHS.gridPanelFilterActual}" columns="5" id="gridPanelFilterActual" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText escape="false" id="labelFilterDateActual" styleClass="labelBold" text="Data do acidente:"/> <ui:staticText escape="false" id="labelFilterDateActual" styleClass="labelBold" text="Data do acidente:"/>
<ui:calendar binding="#{FormHS.calFilterDateActual}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateActual"/>
<t:inputDate id="calFilterDateActual" value="#{FormHS.calFilterDateActual}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText escape="false" id="labelFilterPORActual" styleClass="labelBold" text="POR:"/> <ui:staticText escape="false" id="labelFilterPORActual" styleClass="labelBold" text="POR:"/>
@ -152,7 +159,7 @@
<h:panelGrid binding="#{FormHS.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock"> <h:panelGrid binding="#{FormHS.gridPanelFilterSeg}" columns="5" id="gridPanelFilterSeg" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText escape="false" id="labelFilterDateSeg" styleClass="labelBold" text="Data do acidente:"/> <ui:staticText escape="false" id="labelFilterDateSeg" styleClass="labelBold" text="Data do acidente:"/>
<ui:calendar binding="#{FormHS.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg"/> <t:inputDate id="calFilterDateSeg" value="#{FormHS.calFilterDateSeguimento}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText escape="false" id="labelFilterPORSeg" styleClass="labelBold" text="POR:"/> <ui:staticText escape="false" id="labelFilterPORSeg" styleClass="labelBold" text="POR:"/>

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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: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"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:view> <f:view>
<ui:page binding="#{FormMedico.page1}" id="page1"> <ui:page binding="#{FormMedico.page1}" id="page1">
@ -64,7 +70,7 @@
<h:panelGrid binding="#{FormMedico.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock"> <h:panelGrid binding="#{FormMedico.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" /> <ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" />
<ui:calendar binding="#{FormMedico.calFilterDateActual}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateActual" /> <t:inputDate id="calFilterDateActual" value="#{FormMedico.calFilterDateActual}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORActual" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORActual" escape="false" text="POR:" styleClass="labelBold" />
@ -128,7 +134,7 @@
<h:panelGrid binding="#{FormMedico.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock"> <h:panelGrid binding="#{FormMedico.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" /> <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
<ui:calendar binding="#{FormMedico.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg" /> <t:inputDate id="calFilterDateSeg" value="#{FormMedico.calFilterDateSeguimento}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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: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"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:view> <f:view>
<ui:page binding="#{FormRH.page1}" id="page1"> <ui:page binding="#{FormRH.page1}" id="page1">
@ -85,7 +91,7 @@
<h:panelGrid binding="#{FormRH.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock"> <h:panelGrid binding="#{FormRH.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" /> <ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" />
<ui:calendar binding="#{FormRH.calFilterDateActual}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateActual" /> <t:inputDate id="calFilterDateActual" value="#{FormRH.calFilterDateActual}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORActual" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORActual" escape="false" text="POR:" styleClass="labelBold" />
@ -154,7 +160,7 @@
<h:panelGrid binding="#{FormRH.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock"> <h:panelGrid binding="#{FormRH.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" /> <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
<ui:calendar binding="#{FormRH.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg" /> <t:inputDate id="calFilterDateSeg" value="#{FormRH.calFilterDateSeguimento}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?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: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"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/> <jsp:directive.page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"/>
<f:view> <f:view>
<ui:page binding="#{FormSeguranca.page1}" id="page1"> <ui:page binding="#{FormSeguranca.page1}" id="page1">
@ -92,7 +98,7 @@
<h:panelGrid binding="#{FormSeguranca.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock"> <h:panelGrid binding="#{FormSeguranca.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" /> <ui:staticText id="labelFilterDateActual" escape="false" text="Data do acidente:" styleClass="labelBold" />
<ui:calendar binding="#{FormSeguranca.calFilterDateActual}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateActual" /> <t:inputDate id="calFilterDateActual" value="#{FormSeguranca.calFilterDateActual}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORActual" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORActual" escape="false" text="POR:" styleClass="labelBold" />
@ -164,7 +170,7 @@
<h:panelGrid binding="#{FormSeguranca.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock"> <h:panelGrid binding="#{FormSeguranca.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" styleClass="centerBlock">
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" /> <ui:staticText id="labelFilterDateSeg" escape="false" styleClass="labelBold" text="Data do acidente:" />
<ui:calendar binding="#{FormSeguranca.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg" /> <t:inputDate id="calFilterDateSeg" value="#{FormSeguranca.calFilterDateSeguimento}" />
</ui:panelGroup> </ui:panelGroup>
<ui:panelGroup> <ui:panelGroup>
<ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" /> <ui:staticText id="labelFilterPORSeg" escape="false" text="POR:" styleClass="labelBold" />

@ -1,5 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<!-- tomahawk -->
<filter>
<filter-name>MyFacesExtensionsFilter</filter-name>
<filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
<init-param>
<param-name>uploadMaxFileSize</param-name>
<param-value>20m</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>MyFacesExtensionsFilter</filter-name>
<servlet-name>FacesServlet</servlet-name>
</filter-mapping>
<!-- este mapping causa problemas nos acentos - só é necessario para as resources (images, por ex.) do tomahawk ... -->
<!-- url-pattern faz com que seja o primeiro filter aplicado ... se descomentar, dá WARNING porque MyFaces tem de correr depois do RichFaces -->
<!--<filter-mapping>
<filter-name>MyFacesExtensionsFilter</filter-name>
<url-pattern>/faces/*</url-pattern>
</filter-mapping>-->
<!-- tomahawk -->
<context-param> <context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name> <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value> <param-value>server</param-value>

Loading…
Cancel
Save