lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
lxbfYeaa
Diogo Neves 15 years ago
parent 26b6a03026
commit 26a975d625
36 changed files with 543 additions and 560 deletions
Show Stats Download Patch File Download Diff File

BIN
trunk/PlanosActuacao/lib/commons-codec-1.3.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/dom4j-1.6.1.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/evologger.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/evolute.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/myfaces/oro-2.0.8.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/myfaces/tomahawk12-1.1.10.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/myfaces/xmlParserAPIs-2.0.2.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/org.springframework.beans-3.0.0.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/org.springframework.context-3.0.0.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/org.springframework.core-3.0.0.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/richfaces-impl-jsf2-3.3.3.Final.jar
View File

Binary file not shown.

0
trunk/PlanosActuacao/lib/richfaces-api-3.3.3.Final.jar → trunk/PlanosActuacao/lib/richfaces/richfaces-api-3.3.3.Final.jar
Unescape View File

0
trunk/PlanosActuacao/lib/richfaces-impl-3.3.3.Final.jar → trunk/PlanosActuacao/lib/richfaces/richfaces-impl-3.3.3.Final.jar
Unescape View File

0
trunk/PlanosActuacao/lib/richfaces-ui-3.3.3.Final.jar → trunk/PlanosActuacao/lib/richfaces/richfaces-ui-3.3.3.Final.jar
Unescape View File

BIN
trunk/PlanosActuacao/lib/spring-ws-core-1.5.9.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/spring-ws-core-tiger-1.5.9.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/spring-ws-support-1.5.9.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/spring-xml-1.5.9.jar
View File

Binary file not shown.

BIN
trunk/PlanosActuacao/lib/truelicense.jar
View File

Binary file not shown.

46
trunk/PlanosActuacao/nbproject/build-impl.xml
Unescape View File

@ -526,14 +526,17 @@ exists or setup the property manually. For example like this:
<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.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-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-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-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-logging-1.1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-logging-1.1.1.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.commons-validator-1.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-validator-1.3.1.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.cursos.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.cursos.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.dom4j-1.6.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.dom4j-1.6.1.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.evologger.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.evologger.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.evolute.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.evolute.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.fop.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.fop.jar" todir="${dist.ear.dir}"/>
@ -542,23 +545,32 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.jdom.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jdom.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.log4j-1.2.15.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.log4j-1.2.15.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.mail.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.mail.jar-1" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.richfaces-api-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-api-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.org.springframework.beans-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.org.springframework.beans-3.0.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.org.springframework.context-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.org.springframework.context-3.0.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.org.springframework.core-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.org.springframework.core-3.0.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.postgresql-9.0-801.jdbc4.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.richfaces-impl-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-impl-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-impl-jsf2-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.richfaces-ui-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-ui-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.serializer-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.serializer-2.7.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.shst.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.shst.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.spring-ws-core-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-ws-core-1.5.9.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.spring-ws-core-tiger-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-ws-core-tiger-1.5.9.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.spring-ws-support-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-ws-support-1.5.9.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.spring-xml-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-xml-1.5.9.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.truelicense.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.truelicense.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.xalan-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xalan-2.7.0.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.xercesImpl-2.7.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xercesImpl-2.7.1.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.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-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.richfaces-api-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-api-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.richfaces-impl-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-impl-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.richfaces-ui-3.3.3.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.richfaces-ui-3.3.3.Final.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.oro-2.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.oro-2.0.8.jar" todir="${dist.ear.dir}"/>
<copyfiles files="${file.reference.tomahawk12-1.1.10.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.tomahawk12-1.1.10.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="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
<attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.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-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-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.cursos.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.richfaces-api-3.3.3.Final.jar} ${manifest.file.reference.postgresql-9.0-801.jdbc4.jar} ${manifest.file.reference.richfaces-impl-3.3.3.Final.jar} ${manifest.file.reference.richfaces-impl-jsf2-3.3.3.Final.jar} ${manifest.file.reference.richfaces-ui-3.3.3.Final.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.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-httpclient-3.1.jar} "/>
<attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.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-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.cursos.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.jai_imageio.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar-1} ${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.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.richfaces-api-3.3.3.Final.jar} ${manifest.file.reference.richfaces-impl-3.3.3.Final.jar} ${manifest.file.reference.richfaces-ui-3.3.3.Final.jar} ${manifest.file.reference.oro-2.0.8.jar} ${manifest.file.reference.tomahawk12-1.1.10.jar} ${manifest.file.reference.xmlParserAPIs-2.0.2.jar} "/>
</manifest>
</target>
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@ -572,14 +584,17 @@ exists or setup the property manually. For example like this:
<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.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-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-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-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-logging-1.1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.commons-validator-1.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.cursos.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.dom4j-1.6.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.evologger.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.evolute.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.fop.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@ -588,19 +603,28 @@ exists or setup the property manually. For example like this:
<copyfiles files="${file.reference.jdom.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.log4j-1.2.15.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.mail.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.richfaces-api-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.org.springframework.beans-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.org.springframework.context-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.org.springframework.core-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.richfaces-impl-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.richfaces-ui-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.serializer-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.shst.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.spring-ws-core-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.spring-ws-core-tiger-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.spring-ws-support-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.spring-xml-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.truelicense.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xalan-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xercesImpl-2.7.1.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.xmlgraphics-commons-1.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.richfaces-api-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.richfaces-impl-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.richfaces-ui-3.3.3.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.oro-2.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.tomahawk12-1.1.10.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="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">

2
trunk/PlanosActuacao/nbproject/faces-config.NavData
Unescape View File

@ -3,8 +3,8 @@
<Scope Scope="Faces Configuration Only"/>
<Scope Scope="Project">
<Node id="ListaPlanos.jsp" x="349" y="128" zoom="false"/>
<Node id="Erro.jsp" x="257" y="64" zoom="true"/>
<Node id="EnviarCorrecao.jsp" x="150" y="150" zoom="false"/>
<Node id="Erro.jsp" x="257" y="64" zoom="true"/>
<Node id="Footer.jsp" x="650" y="150" zoom="true"/>
<Node id="EditarPlano.jsp" x="609" y="83" zoom="false"/>
<Node id="Dummy.jsp" x="867" y="46" zoom="true"/>

6
trunk/PlanosActuacao/nbproject/genfiles.properties
Unescape View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=a84a30bd
build.xml.data.CRC32=19ca635b
build.xml.script.CRC32=50b8b881
build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=a84a30bd
nbproject/build-impl.xml.script.CRC32=ccb167f0
nbproject/build-impl.xml.data.CRC32=19ca635b
nbproject/build-impl.xml.script.CRC32=75fcbdeb
nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1

6
trunk/PlanosActuacao/nbproject/private/private.properties
Unescape View File

@ -4,9 +4,9 @@ auxiliary.org-netbeans-modules-web-client-tools-api.FIREFOX=true
auxiliary.org-netbeans-modules-web-client-tools-api.INTERNET_5f_EXPLORER=false
auxiliary.org-netbeans-modules-web-client-tools-api.serverdebug=true
deploy.ant.properties.file=/home/dneves/.netbeans/6.7/tomcat60.properties
j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/bin/tomcat-juli.jar
j2ee.server.instance=tomcat60:home=/usr/local/apache-tomcat-6.0.18:base=apache-tomcat-6.0.18_base
j2ee.platform.classpath=/home/dneves/Software/apache-tomcat-6.0.18/lib/jasper.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/jsp-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-ant.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-ha.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/servlet-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/el-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/annotations-api.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/jasper-el.jar:/home/dneves/Software/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/home/dneves/Software/apache-tomcat-6.0.18/bin/tomcat-juli.jar
j2ee.server.instance=tomcat60:home=/home/dneves/Software/apache-tomcat-6.0.18
javac.debug=true
javadoc.preview=true
jaxws.endorsed.dir=/usr/local/netbeans-6.7.1/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.7.1/ide11/modules/ext/jaxb/api
jaxws.endorsed.dir=/home/dneves/Software/netbeans-6.7.1/java2/modules/ext/jaxws21/api:/home/dneves/Software/netbeans-6.7.1/ide11/modules/ext/jaxb/api
user.properties.file=/home/dneves/.netbeans/6.7/build.properties

48
trunk/PlanosActuacao/nbproject/project.properties
Unescape View File

@ -15,7 +15,7 @@ debug.client=false
debug.server=true
debug.test.classpath=\
${run.test.classpath}
display.browser=true
display.browser=false
dist.dir=dist
dist.ear.war=${dist.dir}/${war.ear.name}
dist.javadoc.dir=${dist.dir}/javadoc
@ -27,6 +27,7 @@ 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.common-src=../common/src
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-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-fileupload-1.2.1.jar=lib/commons-fileupload-1.2.1.jar
@ -36,6 +37,7 @@ file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar
file.reference.commons-logging-1.1.1.jar=lib/commons-logging-1.1.1.jar
file.reference.commons-validator-1.3.1.jar=lib/commons-validator-1.3.1.jar
file.reference.cursos.jar=lib/cursos.jar
file.reference.dom4j-1.6.1.jar=lib/dom4j-1.6.1.jar
file.reference.evologger.jar=lib/evologger.jar
file.reference.evolute.jar=lib/evolute.jar
file.reference.fop.jar=lib/fop.jar
@ -44,18 +46,28 @@ file.reference.jdbcappender.jar=lib/jdbcappender.jar
file.reference.jdom.jar=lib/jdom.jar
file.reference.log4j-1.2.15.jar=lib/log4j-1.2.15.jar
file.reference.mail.jar-1=lib/mail.jar
file.reference.org.springframework.beans-3.0.0.jar=lib/org.springframework.beans-3.0.0.jar
file.reference.org.springframework.context-3.0.0.jar=lib/org.springframework.context-3.0.0.jar
file.reference.org.springframework.core-3.0.0.jar=lib/org.springframework.core-3.0.0.jar
file.reference.oro-2.0.8.jar=lib/myfaces/oro-2.0.8.jar
file.reference.postgresql-9.0-801.jdbc4.jar=lib/postgresql-9.0-801.jdbc4.jar
file.reference.richfaces-api-3.3.3.Final.jar=lib/richfaces-api-3.3.3.Final.jar
file.reference.richfaces-impl-3.3.3.Final.jar=lib/richfaces-impl-3.3.3.Final.jar
file.reference.richfaces-impl-jsf2-3.3.3.Final.jar=lib/richfaces-impl-jsf2-3.3.3.Final.jar
file.reference.richfaces-ui-3.3.3.Final.jar=lib/richfaces-ui-3.3.3.Final.jar
file.reference.richfaces-api-3.3.3.Final.jar=lib/richfaces/richfaces-api-3.3.3.Final.jar
file.reference.richfaces-impl-3.3.3.Final.jar=lib/richfaces/richfaces-impl-3.3.3.Final.jar
file.reference.richfaces-ui-3.3.3.Final.jar=lib/richfaces/richfaces-ui-3.3.3.Final.jar
file.reference.serializer-2.7.0.jar=lib/serializer-2.7.0.jar
file.reference.shst.jar=lib/shst.jar
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-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.tomahawk12-1.1.10.jar=lib/myfaces/tomahawk12-1.1.10.jar
file.reference.truelicense.jar=lib/truelicense.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.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.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=**
j2ee.deploy.on.save=false
j2ee.platform=1.5
@ -72,14 +84,17 @@ javac.classpath=\
${file.reference.avalon-framework-4.2.0.jar}:\
${file.reference.batik-all-1.7.jar}:\
${file.reference.commons-beanutils-1.8.3.jar}:\
${file.reference.commons-codec-1.3.jar}:\
${file.reference.commons-collections-3.1.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-io-1.4.jar}:\
${file.reference.commons-lang-2.4.jar}:\
${file.reference.commons-logging-1.1.1.jar}:\
${file.reference.commons-validator-1.3.1.jar}:\
${file.reference.cursos.jar}:\
${file.reference.dom4j-1.6.1.jar}:\
${file.reference.evologger.jar}:\
${file.reference.evolute.jar}:\
${file.reference.fop.jar}:\
@ -88,25 +103,34 @@ javac.classpath=\
${file.reference.jdom.jar}:\
${file.reference.log4j-1.2.15.jar}:\
${file.reference.mail.jar-1}:\
${file.reference.richfaces-api-3.3.3.Final.jar}:\
${file.reference.org.springframework.beans-3.0.0.jar}:\
${file.reference.org.springframework.context-3.0.0.jar}:\
${file.reference.org.springframework.core-3.0.0.jar}:\
${file.reference.postgresql-9.0-801.jdbc4.jar}:\
${file.reference.richfaces-impl-3.3.3.Final.jar}:\
${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar}:\
${file.reference.richfaces-ui-3.3.3.Final.jar}:\
${file.reference.serializer-2.7.0.jar}:\
${file.reference.shst.jar}:\
${file.reference.spring-ws-core-1.5.9.jar}:\
${file.reference.spring-ws-core-tiger-1.5.9.jar}:\
${file.reference.spring-ws-support-1.5.9.jar}:\
${file.reference.spring-xml-1.5.9.jar}:\
${file.reference.truelicense.jar}:\
${file.reference.xalan-2.7.0.jar}:\
${file.reference.xercesImpl-2.7.1.jar}:\
${file.reference.xml-apis-1.3.04.jar}:\
${file.reference.xml-apis-ext-1.3.04.jar}:\
${file.reference.xmlgraphics-commons-1.3.1.jar}:\
${file.reference.commons-httpclient-3.1.jar}
${file.reference.richfaces-api-3.3.3.Final.jar}:\
${file.reference.richfaces-impl-3.3.3.Final.jar}:\
${file.reference.richfaces-ui-3.3.3.Final.jar}:\
${file.reference.oro-2.0.8.jar}:\
${file.reference.tomahawk12-1.1.10.jar}:\
${file.reference.xmlParserAPIs-2.0.2.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
javac.deprecation=false
javac.source=1.5
javac.target=1.5
javac.source=1.6
javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\

66
trunk/PlanosActuacao/nbproject/project.xml
Unescape View File

@ -47,6 +47,10 @@
<file>${file.reference.commons-beanutils-1.8.3.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.commons-codec-1.3.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.commons-collections-3.1.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
@ -59,6 +63,10 @@
<file>${file.reference.commons-fileupload-1.2.1.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.commons-httpclient-3.1.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.commons-io-1.4.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
@ -79,6 +87,10 @@
<file>${file.reference.cursos.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.dom4j-1.6.1.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.evologger.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
@ -112,7 +124,15 @@
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.richfaces-api-3.3.3.Final.jar}</file>
<file>${file.reference.org.springframework.beans-3.0.0.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.org.springframework.context-3.0.0.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.org.springframework.core-3.0.0.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
@ -120,23 +140,31 @@
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.richfaces-impl-3.3.3.Final.jar}</file>
<file>${file.reference.serializer-2.7.0.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar}</file>
<file>${file.reference.shst.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.richfaces-ui-3.3.3.Final.jar}</file>
<file>${file.reference.spring-ws-core-1.5.9.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.serializer-2.7.0.jar}</file>
<file>${file.reference.spring-ws-core-tiger-1.5.9.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.shst.jar}</file>
<file>${file.reference.spring-ws-support-1.5.9.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.spring-xml-1.5.9.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.truelicense.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
@ -160,7 +188,27 @@
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.commons-httpclient-3.1.jar}</file>
<file>${file.reference.richfaces-api-3.3.3.Final.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.richfaces-impl-3.3.3.Final.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.richfaces-ui-3.3.3.Final.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.oro-2.0.8.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library>
<file>${file.reference.tomahawk12-1.1.10.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>
</web-module-libraries>
@ -177,5 +225,9 @@
<root id="test.src.dir"/>
</test-roots>
</data>
<spring-data xmlns="http://www.netbeans.org/ns/spring-data/1">
<config-files/>
<config-file-groups/>
</spring-data>
</configuration>
</project>

11
trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java
Unescape View File

@ -25,7 +25,6 @@ import db.entidades.Risco;
import db.entidades.Valor;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@ -200,7 +199,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider
System.out.println("AREAS BY PLANO SQL : " + sql);
ResultSet rs = st.executeQuery(sql);
List<Area> areas = new ArrayList();
List< Area > areas = new LinkedList< Area >();
if(rs.isBeforeFirst())
{
rs.first();
@ -257,7 +256,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider
System.out.println("RISCOS BY AREA SQL : " + sql);
ResultSet rs = st.executeQuery(sql);
List< Risco > riscos = new ArrayList();
List< Risco > riscos = new LinkedList< Risco >();
if ( rs.isBeforeFirst() )
{
rs.first();
@ -304,7 +303,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider
sql += "order by subquery.valor";
System.out.println("VALORES BY RISCO : " + sql);
ResultSet rs = st.executeQuery(sql);
List<Valor> valores = new ArrayList<Valor>();
List< Valor > valores = new LinkedList< Valor >();
// Integer valor = null;
if(rs.isBeforeFirst())
{
@ -399,7 +398,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider
sql += "order by subquery.medida_id, valor";
System.out.println("MEDIDAS BY RISCO SQL : " + sql);
ResultSet rs = st.executeQuery(sql);
List<Medida> medidas = new ArrayList();
List< Medida > medidas = new LinkedList< Medida >();
if(rs.isBeforeFirst())
{
rs.first();
@ -468,7 +467,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider
//sql += "where valor = " + v.getValor();
System.out.println("POSTOS BY MEDIDA SQL : " + sql);
ResultSet rs = st.executeQuery(sql);
List<PostoTrabalho> postos = new ArrayList();
List< PostoTrabalho > postos = new LinkedList< PostoTrabalho >();
if(rs.isBeforeFirst())
{
rs.first();

4
trunk/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java
Unescape View File

@ -17,11 +17,9 @@ import com.evolute.utils.db.DBException;
import com.evolute.utils.db.DBManager;
import com.evolute.utils.db.Executer;
import com.evolute.utils.db.JDBCManager;
import com.evolute.utils.db.keyretrievers.PostgresqlAutoKeyRetriever;
import com.evolute.utils.error.ErrorLogger;
import com.evolute.utils.jdbc.DBStatementExecuter;
import com.evolute.utils.jdbc.StatementExecuterFactory;
import com.evolute.utils.sql.Insert;
import com.evolute.utils.sql.SQLQuery;
import com.evolute.utils.strings.UnicodeChecker;
import db.DBConstants;
@ -64,7 +62,7 @@ public class EvoBaseProvider
private void init() throws DBException
{
System.out.println( "EvoBaseProvider . init() : " );
// System.out.println( "EvoBaseProvider . init() : " );
String server = DBPropertiesLoader.getInstance().findProperty( DBConstants.SERVER_SIPRP );
int port = DBPropertiesLoader.getInstance().findProperty( DBConstants.PORT_SIPRP, -1 );

80
trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java
Unescape View File

@ -29,7 +29,6 @@ import db.entidades.Utilizador;
import global.Global;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@ -54,23 +53,23 @@ public class PlanosDataProvider extends GenericDataProvider
return INSTANCE;
}
public void updatePlano(PlanoActuacao p) throws Exception
public void updatePlano( PlanoActuacao p ) throws Exception
{
if ( p.getConcluidoPorDesactivacao() == null )
{
p.setConcluidoPorDesactivacao( false );
}
if(p.getObs_correcao() == null)
if ( p.getObs_correcao() == null )
{
p.setObs_correcao("");
p.setObs_correcao( "" );
}
if(p.getObservacoes_dl() == null)
if ( p.getObservacoes_dl() == null )
{
p.setObservacoes_dl("");
p.setObservacoes_dl( "" );
}
if(p.getObservacoes_dns() == null)
if ( p.getObservacoes_dns() == null )
{
p.setObservacoes_dns("");
p.setObservacoes_dns( "" );
}
if ( p.getUser_dir_loja() != null && p.getUser_dir_loja().intValue() == 0 )
{
@ -124,29 +123,29 @@ public class PlanosDataProvider extends GenericDataProvider
public void updateRisco( Risco r ) throws Exception
{
if(r.getResponsavel_execucao() == null)
if ( r.getResponsavel_execucao() == null )
{
r.setResponsavel_execucao("");
r.setResponsavel_execucao( "" );
}
if(r.getPor() == null)
if ( r.getPor() == null )
{
r.setPor("");
r.setPor( "" );
}
if(r.getRecursos_necessarios() == null)
if ( r.getRecursos_necessarios() == null )
{
r.setRecursos_necessarios("");
r.setRecursos_necessarios( "" );
}
if(r.getParecer_dl() == null)
if ( r.getParecer_dl() == null )
{
r.setParecer_dl("");
r.setParecer_dl( "" );
}
if(r.getParecer_dns() == null)
if ( r.getParecer_dns() == null )
{
r.setParecer_dns("");
r.setParecer_dns( "" );
}
if(r.getVerificacao_siprp() == null)
if ( r.getVerificacao_siprp() == null )
{
r.setVerificacao_siprp("");
r.setVerificacao_siprp( "" );
}
Expression where = new Field( "id" ).isEqual( r.getId() );
@ -181,8 +180,7 @@ public class PlanosDataProvider extends GenericDataProvider
Expression where = new Field( "id" ).isEqual( m.getId() ).and( new Field( "risco_id" ).isEqual( risco.getId() ) );
Update upd = new Update( PlanoMedidasData.TABLENAME, new Assignment[]
{
Update upd = new Update( PlanoMedidasData.TABLENAME, new Assignment[] {
new Assignment( new Field( PlanoMedidasData.ESTADO_MEDIDAS_ID ), emID )
}, where );
@ -352,9 +350,9 @@ public class PlanosDataProvider extends GenericDataProvider
}
private ArrayList getFullPlanos( ResultSet rs ) throws Exception
private List< PlanoActuacao > getFullPlanos( ResultSet rs ) throws Exception
{
ArrayList list = new ArrayList();
List< PlanoActuacao > list = new LinkedList< PlanoActuacao >();
if ( rs.isBeforeFirst() )
{
rs.first();
@ -362,29 +360,29 @@ public class PlanosDataProvider extends GenericDataProvider
{
PlanoActuacao pa = new PlanoActuacao();
pa.setId( new Integer( rs.getInt("id") ) );
pa.setEstabelecimento_id(new Integer(rs.getInt("estabelecimento_id")));
pa.setEstabelecimento_id( new Integer( rs.getInt( "estabelecimento_id" ) ) );
pa.setNome_estabelecimento( Utils.unicodeToHTML( rs.getString( "nome_estabelecimento" ) ) );
pa.setNome_empresa( Utils.unicodeToHTML( rs.getString( "nome_empresa" ) ) );
pa.setFase( new Integer( rs.getInt("fase") ) );
java.sql.Date sqlDate = rs.getDate("data_visita");
pa.setData_visita(new java.util.Date(sqlDate.getTime()));
pa.setValidacao_director_loja(new Boolean( rs.getBoolean("validacao_director_loja") ));
pa.setValidacao_dns(new Boolean( rs.getBoolean("validacao_dns") ));
pa.setValidacao_hs(new Boolean( rs.getBoolean("validacao_hs") ));
pa.setFase( new Integer( rs.getInt( "fase" ) ) );
java.sql.Date sqlDate = rs.getDate( "data_visita" );
pa.setData_visita( new java.util.Date( sqlDate.getTime() ) );
pa.setValidacao_director_loja( new Boolean( rs.getBoolean( "validacao_director_loja" ) ) );
pa.setValidacao_dns( new Boolean( rs.getBoolean("validacao_dns") ) );
pa.setValidacao_hs( new Boolean( rs.getBoolean("validacao_hs") ) );
pa.setObservacoes_dl( Utils.unicodeToHTML( rs.getString("observacoes_dl") ) );
pa.setObservacoes_dns( Utils.unicodeToHTML( rs.getString("observacoes_dns") ) );
pa.setObs_correcao( Utils.unicodeToHTML( rs.getString("obs_correcao") ) );
pa.setAreas( getAreasByPlano( pa ) );
pa.setTotal_riscos( getTotalRiscosByPlano( pa.getId() ) );
pa.setCorrecao( Utils.unicodeToHTML( rs.getString("correcao") ) );
pa.setFase_antes_correcao(new Integer(rs.getInt("fase_antes_correcao")));
pa.setData_validacao_dir_loja(rs.getDate("data_validacao_dir_loja"));
pa.setUser_dir_loja(new Integer(rs.getInt("user_dir_loja")));
pa.setData_validacao_dns(rs.getDate("data_validacao_dns"));
pa.setUser_dns(new Integer(rs.getInt("user_dns")));
pa.setData_validacao_hs(rs.getDate("data_validacao_hs"));
pa.setUser_hs(new Integer(rs.getInt("user_hs")));
pa.setTecnico_hs_id(new Integer(rs.getInt("tecnico_hs_id")));
pa.setCorrecao( Utils.unicodeToHTML( rs.getString( "correcao") ) );
pa.setFase_antes_correcao( new Integer( rs.getInt( "fase_antes_correcao" ) ) );
pa.setData_validacao_dir_loja( rs.getDate( "data_validacao_dir_loja" ) );
pa.setUser_dir_loja( new Integer( rs.getInt( "user_dir_loja" ) ) );
pa.setData_validacao_dns( rs.getDate( "data_validacao_dns" ) );
pa.setUser_dns( new Integer( rs.getInt( "user_dns" ) ) );
pa.setData_validacao_hs( rs.getDate( "data_validacao_hs" ) );
pa.setUser_hs( new Integer( rs.getInt( "user_hs" ) ) );
pa.setTecnico_hs_id( new Integer( rs.getInt( "tecnico_hs_id" ) ) );
pa.setTecnico_hs_nome( Utils.unicodeToHTML( rs.getString("tecnico_hs_nome") ) );
pa.setConcluidoPorDesactivacao( new Boolean( rs.getBoolean( "concluido_por_desactivacao" ) ) );
pa.setDataDesactivacao( rs.getDate( "data_desactivacao" ) );
@ -499,7 +497,7 @@ public class PlanosDataProvider extends GenericDataProvider
}
private List<Medida> getMedidasByRisco( Risco r ) throws Exception
private List< Medida > getMedidasByRisco( Risco r ) throws Exception
{
List< Medida > list = new LinkedList< Medida >();

16
trunk/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java
Unescape View File

@ -16,7 +16,7 @@ import db.entidades.Risco;
import db.entidades.Valor;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import utils.Utils;
@ -75,8 +75,8 @@ public class RelatoriosDataProvider extends GenericDataProvider
System.out.println("AREAS BY PLANO SQL : " + sql);
ResultSet rs = st.executeQuery(sql);
List<Area> areas = new ArrayList();
if(rs.isBeforeFirst())
List< Area > areas = new LinkedList< Area >();
if ( rs.isBeforeFirst() )
{
rs.first();
do
@ -122,7 +122,7 @@ public class RelatoriosDataProvider extends GenericDataProvider
sql += "order by hs_relatorio_risco.id ";
System.out.println("RISCOS BY AREA SQL : " + sql);
ResultSet rs = st.executeQuery(sql);
List<Risco> riscos = new ArrayList();
List< Risco > riscos = new LinkedList< Risco >();
if(rs.isBeforeFirst())
{
@ -171,7 +171,7 @@ public class RelatoriosDataProvider extends GenericDataProvider
sql += "order by subquery.valor";
System.out.println("VALORES BY RISCO : " + sql);
ResultSet rs = st.executeQuery(sql);
List<Valor> valores = new ArrayList();
List< Valor > valores = new LinkedList< Valor >();
Integer valor = null;
if(rs.isBeforeFirst())
{
@ -268,8 +268,8 @@ public class RelatoriosDataProvider extends GenericDataProvider
sql += "order by subquery.medida_id, valor";
System.out.println("MEDIDAS BY RISCO SQL : " + sql);
ResultSet rs = st.executeQuery(sql);
List<Medida> medidas = new ArrayList();
if(rs.isBeforeFirst())
List< Medida > medidas = new LinkedList< Medida >();
if ( rs.isBeforeFirst() )
{
rs.first();
do
@ -339,7 +339,7 @@ public class RelatoriosDataProvider extends GenericDataProvider
//sql += "where valor = " + v.getValor();
System.out.println("POSTOS BY MEDIDA SQL : " + sql);
ResultSet rs = st.executeQuery(sql);
List<PostoTrabalho> postos = new ArrayList();
List< PostoTrabalho > postos = new LinkedList< PostoTrabalho >();
if(rs.isBeforeFirst())
{
rs.first();

22
trunk/PlanosActuacao/src/java/phaselistener/ContextListener.java
Unescape View File

@ -5,6 +5,7 @@
package phaselistener;
import com.evolute.properties.EvoAbstractPropertiesLoader;
import com.evolute.utils.date.DateUtils;
import com.evolute.utils.error.ErrorLogger;
import com.evolute.utils.timer.TimedEvent;
@ -36,9 +37,20 @@ public class ContextListener implements ServletContextListener
startedTime = System.currentTimeMillis();
System.out.println( "\n\ncontextInitialized : " + startedTime );
try
{
System.out.println( "\nInitializing PA logger ..." );
PlanosActuacaoLogger.init();
}
catch ( Throwable e )
{
e.printStackTrace( System.err );
}
try
{
System.out.println( "\n\tReading app.properties ..." );
EvoAbstractPropertiesLoader.forceEncryptedPropertiesFile = false;
SIPRPPropertiesLoader props = SIPRPPropertiesLoader.getInstance();
props.load();
}
@ -58,16 +70,6 @@ public class ContextListener implements ServletContextListener
ErrorLogger.logException( e );
}
try
{
System.out.println( "\nInitializing PA logger ..." );
PlanosActuacaoLogger.init();
}
catch ( Throwable e )
{
e.printStackTrace( System.err );
}
System.out.println( "\nScheduling Import Event ... " );
importEvent = new TimedEvent()
{

5
trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java
Unescape View File

@ -1122,13 +1122,10 @@ public class EditarPlano extends AbstractPageBean
grd.getChildren().add( st );
if ( u.getTipo().intValue() == Global.RESPONSAVEL_SEGURANCA )
{
// HtmlCalendar cal = new HtmlCalendar();
dtInicio = new HtmlCalendar();
dtInicio.setId( "dtInicio" );
dtInicio.setDatePattern( "dd-MM-yyyy" );
// dtInicio.setDateFormatPattern( "dd-MM-yyyy" );
dtInicio.setValue( r.getData_inicio() );
java.util.GregorianCalendar gcalendar = new java.util.GregorianCalendar();
gcalendar.set( 2000, 1, 1 );
@ -1163,12 +1160,10 @@ public class EditarPlano extends AbstractPageBean
grd.getChildren().add( st );
if ( u.getTipo().intValue() == Global.RESPONSAVEL_SEGURANCA )
{
// dtFim = new Calendar();
dtFim = new HtmlCalendar();
dtFim.setId( "dtFim" );
dtFim.setDatePattern( "dd-MM-yyyy" );
// dtFim.setDateFormatPattern( "dd-MM-yyyy" );
java.util.GregorianCalendar gcalendar1 = new java.util.GregorianCalendar();
gcalendar1.set( 2099, 1, 1 );
// dtFim.setMaxDate( gcalendar1.getTime() );

181
trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java
Unescape View File

@ -21,13 +21,14 @@ import db.providers.PlanosDataProvider;
import global.Global;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import javax.faces.FacesException;
import javax.faces.component.html.HtmlPanelGrid;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletResponse;
import org.richfaces.component.html.HtmlCalendar;
import shst.higiene.planoactuacao.print.PlanoActuacaoPDFCreator;
import tabledataproviders.PlanosActualDataProvider;
import tabledataproviders.PlanosConcluidosDataProvider;
@ -765,18 +766,17 @@ public class ListaPlanos extends AbstractPageBean
System.out.println( "\tGETTING INITIAL VALUES FOR EACH TABLE." );
long startedTime = System.currentTimeMillis();
List listPlanosActivos = getPlanosActivos( u );
List< PlanoActuacao > listPlanosActivos = getPlanosActivos( u );
getSessionBean1().getPlanosActualDataProvider().setList( listPlanosActivos );
List listPlanosSeguimento = getPlanosSeguimento( u );
List< PlanoActuacao > listPlanosSeguimento = getPlanosSeguimento( u );
getSessionBean1().getPlanosSeguimentoDataProvider().setList( listPlanosSeguimento );
List listPlanosConcluidos = getPlanosConcluidos( u );
List< PlanoActuacao > listPlanosConcluidos = getPlanosConcluidos( u );
getSessionBean1().getPlanosConcluidosDataProvider().setList( listPlanosConcluidos );
long endedTime = System.currentTimeMillis();
System.out.println( "\nGot Planos List in : " + getTime( startedTime, endedTime ) );
//2010-11-12 : user scampos : 1 min (debug mode)
}
//checkPlanosDelayed();
}
@ -791,7 +791,7 @@ public class ListaPlanos extends AbstractPageBean
RowKey rk = tableRowGroup1.getRowKey();
int k = Integer.parseInt( rk.getRowId() );
PlanosActualDataProvider provider = ( PlanosActualDataProvider ) tableRowGroup1.getSourceData();
ArrayList list = ( ArrayList ) provider.getList();
List< PlanoActuacao > list = ( LinkedList< PlanoActuacao > ) provider.getList();
PlanoActuacao p = ( PlanoActuacao ) list.get( k );
return p;
}
@ -801,7 +801,7 @@ public class ListaPlanos extends AbstractPageBean
RowKey rk = tableRowGroup2.getRowKey();
int k = Integer.parseInt( rk.getRowId() );
PlanosSeguimentoDataProvider provider = ( PlanosSeguimentoDataProvider ) tableRowGroup2.getSourceData();
ArrayList list = ( ArrayList ) provider.getList();
List< PlanoActuacao > list = ( LinkedList< PlanoActuacao > ) provider.getList();
PlanoActuacao p = ( PlanoActuacao ) list.get( k );
return p;
@ -812,69 +812,15 @@ public class ListaPlanos extends AbstractPageBean
RowKey rk = tableRowGroup3.getRowKey();
int k = Integer.parseInt( rk.getRowId() );
PlanosConcluidosDataProvider provider = ( PlanosConcluidosDataProvider ) tableRowGroup3.getSourceData();
ArrayList list = ( ArrayList ) provider.getList();
List< PlanoActuacao > list = ( LinkedList< PlanoActuacao > ) provider.getList();
PlanoActuacao p = ( PlanoActuacao ) list.get( k );
return p;
}
private void checkPlanosDelayed()
{
}
// private void showPlano(PlanoActuacao p)
// {
// System.out.println("PLANO : " + p.getData_visita_str() + " | " + p.getFase_nome() + " | " + p.getNome_estabelecimento());
// System.out.println("=================================================================");
// showAreas(p.getAreas());
// System.out.println("=================================================================");
// }
//
// private void showAreas(List<Area> areas)
// {
// for(Area a : areas)
// {
// System.out.println(" " + a.getDescricao());
// showRiscos(a.getRiscos());
// }
// }
//
// private void showRiscos(List<Risco> riscos)
// {
// for(Risco r : riscos)
// {
// System.out.println(" " + r.getDescricao());
// showValores(r.getValores());
// }
// }
//
// private void showValores(List<Valor> valores)
// {
// for(Valor v : valores)
// {
// System.out.println(" " + v.getValor());
// showMedidas(v.getMedidas());
// }
// }
//
// private void showMedidas(List<Medida> medidas)
// {
// for(Medida m : medidas)
// {
// System.out.println(" " + m.getDescricao());
// showPostos(m.getPostos());
// }
// }
//
// private void showPostos(List<PostoTrabalho> postos)
// {
// for(PostoTrabalho p : postos)
// {
// System.out.println(" " + p.getDescricao());
// }
// }
public List<PlanoActuacao> searchPlanosActivos( Utilizador u, String nome, String estabelecimento, String dataVisita )
{
List<PlanoActuacao> list = new ArrayList<PlanoActuacao>();
private List< PlanoActuacao > searchPlanosActivos( Utilizador u, String nome, String estabelecimento, String dataVisita )
{
List< PlanoActuacao > list = null;
try
{
if ( u.getTipo().intValue() != Global.DIRECTOR_SIPRP && u.getTipo().intValue() != Global.GESTOR && u.getTipo().intValue() != Global.DIRECTOR_GERAL_RH )
@ -887,33 +833,17 @@ public class ListaPlanos extends AbstractPageBean
{
ErrorLogger.logException( e );
}
return list;
return list == null ? new LinkedList< PlanoActuacao >() : list;
}
public List<PlanoActuacao> getPlanosActivos( Utilizador u )
private List<PlanoActuacao> getPlanosActivos( Utilizador u )
{
return searchPlanosActivos( u, null, null, null );
// List< PlanoActuacao > list = new ArrayList();
// try
// {
// if ( u.getTipo().intValue() != Global.DIRECTOR_SIPRP
// && u.getTipo().intValue() != Global.GESTOR
// && u.getTipo().intValue() != Global.DIRECTOR_GERAL_RH )
// {
//// list = pdp.getPlanosActivos(u);
// list = pdp.searchPlanosActivos( u, null, null );
// }
// }
// catch(Exception ex)
// {
// ErrorLogger.logException( ex );
// }
// return list;
}
public List<PlanoActuacao> searchPlanosSeguimento( Utilizador u, String nome, String estabelecimento, String dataVisita )
{
List<PlanoActuacao> list = new ArrayList();
}
private List< PlanoActuacao > searchPlanosSeguimento( Utilizador u, String nome, String estabelecimento, String dataVisita )
{
List< PlanoActuacao > list = null;
try
{
PlanosDataProvider pdp = PlanosDataProvider.getInstance();
@ -923,28 +853,17 @@ public class ListaPlanos extends AbstractPageBean
{
ErrorLogger.logException( ex );
}
return list;
return list == null ? new LinkedList< PlanoActuacao >() : list;
}
public List<PlanoActuacao> getPlanosSeguimento( Utilizador u )
private List< PlanoActuacao > getPlanosSeguimento( Utilizador u )
{
return searchPlanosSeguimento( u, null, null, null );
// List< PlanoActuacao > list = new ArrayList();
// try
// {
//// list = pdp.getPlanosSeguimento(u);
// list = pdp.searchPlanosSeguimento( u, null, null );
// }
// catch(Exception ex)
// {
// ErrorLogger.logException( ex );
// }
// return list;
}
public List<PlanoActuacao> searchPlanosConcluidos( Utilizador u, String nome, String estabelecimento, String dataVisita )
{
List<PlanoActuacao> list = new ArrayList();
}
private List< PlanoActuacao > searchPlanosConcluidos( Utilizador u, String nome, String estabelecimento, String dataVisita )
{
List< PlanoActuacao > list = null;
try
{
PlanosDataProvider pdp = PlanosDataProvider.getInstance();
@ -954,23 +873,12 @@ public class ListaPlanos extends AbstractPageBean
{
ErrorLogger.logException( ex );
}
return list;
return list == null ? new LinkedList< PlanoActuacao >() : list;
}
public List<PlanoActuacao> getPlanosConcluidos( Utilizador u )
private List< PlanoActuacao > getPlanosConcluidos( Utilizador u )
{
return searchPlanosConcluidos( u, null, null, null );
// List< PlanoActuacao > list = new ArrayList();
// try
// {
//// list = pdp.getPlanosConcluidos(u);
// list = pdp.searchPlanosConcluidos( u, null, null );
// }
// catch(Exception ex)
// {
// ErrorLogger.logException( ex );
// }
// return list;
}
public String buttonFilterActual_action()
@ -995,16 +903,7 @@ public class ListaPlanos extends AbstractPageBean
}
}
// Date visitaDate = ( Date ) calFilterDateActual.getValue();
String visitaDateStr = null;
if ( calFilterDate != null )
{
visitaDateStr = D_F.format( calFilterDate );
}
// if ( visitaDate != null )
// {
// visitaDateStr = D_F.format( visitaDate );
// }
String visitaDateStr = calFilterDate == null ? null : D_F.format( calFilterDate );
getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE );
getSessionBean1().getPlanosActualDataProvider().setList(
@ -1035,16 +934,7 @@ public class ListaPlanos extends AbstractPageBean
}
}
// Date visitaDate = ( Date ) calFilterDateSeg.getValue();
String visitaDateStr = null;
if ( calFilterDateSeguimento != null )
{
visitaDateStr = D_F.format( calFilterDateSeguimento );
}
// if ( visitaDate != null )
// {
// visitaDateStr = D_F.format( visitaDate );
// }
String visitaDateStr = calFilterDateSeguimento == null ? null : D_F.format( calFilterDateSeguimento );
getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE );
getSessionBean1().getPlanosSeguimentoDataProvider().setList(
@ -1075,16 +965,7 @@ public class ListaPlanos extends AbstractPageBean
}
}
// Date visitaDate = ( Date ) calFilterDateConc.getValue();
String visitaDateStr = null;
if ( calFilterDateConcluidos != null )
{
visitaDateStr = D_F.format( calFilterDateConcluidos );
}
// if ( visitaDate != null )
// {
// visitaDateStr = D_F.format( visitaDate );
// }
String visitaDateStr = calFilterDateConcluidos == null ? null : D_F.format( calFilterDateConcluidos );
getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE );
getSessionBean1().getPlanosConcluidosDataProvider().setList(

12
trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java
Unescape View File

@ -16,9 +16,9 @@ import db.entidades.Valor;
import db.providers.CreatePlanosDataProvider;
import db.providers.UtilizadoresDataProvider;
import global.Global;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import mail.Mail;
@ -87,22 +87,22 @@ public class PlanosActuacao
}
}
private List<Date> getPlanosOnline(Integer estabelecimentoId)
private List< Date > getPlanosOnline( Integer estabelecimentoId )
{
List<Date> list = new ArrayList<Date>();
List< Date > list = null;
try
{
if( estabelecimentoId != null )
if ( estabelecimentoId != null )
{
CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance();
list = cpdp.getPlanosOnline( estabelecimentoId );
}
}
catch(Exception ex)
catch ( Exception ex )
{
ErrorLogger.logException( ex );
}
return list;
return list == null ? new LinkedList< Date >() : list;
}
private void initRelatorios( List< Date > list, Integer estabelecimentoId )

43
trunk/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java
Unescape View File

@ -6,11 +6,12 @@
package utils;
import com.evolute.utils.error.ErrorLogger;
import com.evolute.utils.error.Logger;
import com.evolute.utils.error.LoggerProperties;
import com.evolute.utils.error.ProjectsEnum;
import com.evolute.utils.error.ws.WSLogger;
import com.evolute.utils.network.proxy.EvoProxyObject;
import java.util.HashMap;
import java.util.Map;
/**
*
@ -19,29 +20,25 @@ import java.util.Map;
public class PlanosActuacaoLogger
{
private static String EVO_LOGGER_DB = "jdbc:postgresql://www.evolute.pt:5436/evo_logging?logUnclosedConnections=true&loginTimeout=5&socketTimeout=5&tcpKeepAlive=true";
private static String EVO_LOGGER_USER = "evo_logger";
private static String EVO_LOGGER_PASSWD = "2DD-rg2hLOG";
public static void init()
public static void init() throws Exception
{
Map< LoggerProperties, String > map = new HashMap< LoggerProperties, String >();
map.put( LoggerProperties.USERNAME, EVO_LOGGER_USER );
map.put( LoggerProperties.PASSWORD, EVO_LOGGER_PASSWD );
map.put( LoggerProperties.URL, EVO_LOGGER_DB );
map.put( LoggerProperties.PROJECT, ProjectsEnum.PLANOS_ACTUACAO.toString() );
map.put( LoggerProperties.PROJECT_NAME, ProjectsEnum.PLANOS_ACTUACAO.toString() );
map.put( LoggerProperties.SOFTWARE_VERSION, "1" );
map.put( LoggerProperties.PROJECT_VERSION, "1" );
map.put( LoggerProperties.SOFTWARE_NAME, "SIPRP - Planos Actuacao" );
try
{
ErrorLogger.initializeLogger( new WSLogger( map ) );
}
catch ( Exception e )
{
e.printStackTrace();
}
HashMap< LoggerProperties, String > properties = new HashMap< LoggerProperties, String >();
properties.put( LoggerProperties.SOFTWARE_NAME, "SIPRP - Planos Actuacao" );
properties.put( LoggerProperties.SOFTWARE_VERSION, "1" );
properties.put( LoggerProperties.PROJECT, ProjectsEnum.PLANOS_ACTUACAO.toString() );
properties.put( LoggerProperties.PROJECT_NAME, ProjectsEnum.PLANOS_ACTUACAO.toString() );
properties.put( LoggerProperties.PROJECT_VERSION, "1" );
String user = "";
String pass = "";
String host = "";
String port = "";
EvoProxyObject.configSystemProxySelector();
EvoProxyObject.getProxy( user, pass, host, port );
Logger logger = new WSLogger( properties );
ErrorLogger.initializeLogger( logger );
}
}

468
trunk/PlanosActuacao/web/ListaPlanos.jsp
Unescape View File

@ -11,7 +11,8 @@
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:webuijsf="http://www.sun.com/webui/webuijsf"
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich">
xmlns:rich="http://richfaces.org/rich"
xmlns:t="http://myfaces.apache.org/tomahawk">
<jsp:directive.page contentType="text/html;charset=ISO-8859-1" pageEncoding="ISO-8859-1"/>
<f:view>
@ -20,248 +21,245 @@
<webuijsf:head id="head1" title="Planos Actuacao">
<webuijsf:link id="link1" url="/resources/stylesheet.css"/>
<script type="text/javascript">
function checkEmptyTables()
{
var tableId1 = "_form1:table1:tableRowGroup1:_emptyDataColumn:_emptyDataText";
var tableId2 = "_form1:table2:tableRowGroup2:_emptyDataColumn:_emptyDataText";
var tableId3 = "_form1:table3:tableRowGroup3:_emptyDataColumn:_emptyDataText";
var t1 = document.getElementById(tableId1);
if(t1 != null)
{
//alert( t1.innerHTML );
t1.innerHTML = '';
}
}
function alertOnDeactivate()
{
return confirm( 'Tem a certeza que pretende desactivar o plano ?\nEsta acção é irreversível e passará o plano para o estado Concluído.' );
}
</script>
</webuijsf:head>
<webuijsf:body id="body1" onLoad="checkEmptyTables();">
<!-- form1 -->
<div style="height: 24px; left: 0px; top: 0px; width: 100%">
<jsp:directive.include file="Header.jspf"/>
</div>
<h:panelGrid columns="1" id="gridBaseLayout" lang="pt" style="height: 96px; width: 100%" styleClass="centerBlock" width="336">
<h:panelGrid columns="1" id="gridLayout" style="height: 24px; width: 80%" styleClass="centerBlock">
<webuijsf:staticText escape="false" id="staticText4" style="font-size: 36px" text="&amp;nbsp;"/>
<h:panelGrid columnClasses="gridColCenter" columns="1" id="gridMsg" style="height: 24px; width: 100%">
<webuijsf:staticText id="lblMsg" styleClass="labelMsg "/>
</h:panelGrid>
<h:panelGrid binding="#{ListaPlanos.gridActual}" columnClasses="gridColCenter" columns="1" id="gridActual"
style="height: 24px; width: 100%" styleClass="gridPlanosList">
<webuijsf:staticText id="staticText1" style="font-size: 18px" text="Actual"/>
<webuijsf:staticText escape="false" id="staticText2" style="font-size: 14px" text=" "/>
<webuijsf:staticText id="staticText3" styleClass="label" text="Processos com dados pendentes"/>
<webuijsf:form id="form1">
<h:panelGrid binding="#{ListaPlanos.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" style="" styleClass="centerBlock">
<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterActual}" id="groupPanelFilterActual" style="">
<webuijsf:staticText id="labelFilterNameActual" style="" text="Nome:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterNameActual}" id="textFilterNameActual" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterEstabelecimentoActual" style="" text="Estabelecimento:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoActual}" id="textFilterEstabelecimentoActual" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterDateActual" text="Data da Visita:" />
<rich:calendar datePattern="yyyy/MM/dd" value="#{ListaPlanos.calFilterDate}"></rich:calendar>
<!-- <webuijsf:calendar binding="#{ListaPlanos.calFilterDateActual}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateActual" /> -->
</webuijsf:panelGroup>
<webuijsf:button binding="#{ListaPlanos.buttonFilterActual}" id="buttonFilterActual" actionExpression="#{ListaPlanos.buttonFilterActual_action}" text="Pesquisar" />
</h:panelGrid>
<webuijsf:body id="body1">
<div style="height: 24px; left: 0px; top: 0px; width: 100%">
<jsp:directive.include file="Header.jspf"/>
</div>
<h:panelGrid columns="1" id="gridBaseLayout" lang="pt" style="height: 96px; width: 100%" styleClass="centerBlock" width="336">
<h:panelGrid columns="1" id="gridLayout" style="height: 24px; width: 80%" styleClass="centerBlock">
<webuijsf:staticText escape="false" id="staticText4" style="font-size: 36px" text="&amp;nbsp;"/>
<h:panelGrid columnClasses="gridColCenter" columns="1" id="gridMsg" style="height: 24px; width: 100%">
<webuijsf:staticText id="lblMsg" styleClass="labelMsg" />
</h:panelGrid>
<!-- grid actual -->
<h:panelGrid binding="#{ListaPlanos.gridActual}" columnClasses="gridColCenter" columns="1" id="gridActual"
style="height: 24px; width: 100%" styleClass="gridPlanosList">
<webuijsf:staticText id="staticText1" style="font-size: 18px" text="Actual"/>
<webuijsf:staticText escape="false" id="staticText2" style="font-size: 14px" text=" "/>
<webuijsf:staticText id="staticText3" styleClass="label" text="Processos com dados pendentes"/>
<webuijsf:form id="form1">
<h:panelGrid binding="#{ListaPlanos.gridPanelFilterActual}" columns="4" id="gridPanelFilterActual" style="" styleClass="centerBlock">
<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterActual}" id="groupPanelFilterActual" style="">
<webuijsf:staticText id="labelFilterNameActual" style="" text="Nome:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterNameActual}" id="textFilterNameActual" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterEstabelecimentoActual" style="" text="Estabelecimento:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoActual}" id="textFilterEstabelecimentoActual" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterDateActual" text="Data da Visita:" />
<t:inputDate id="calFilterDate" value="#{ListaPlanos.calFilterDate}" type="date" ampm="false" />
</webuijsf:panelGroup>
<webuijsf:button binding="#{ListaPlanos.buttonFilterActual}" id="buttonFilterActual" actionExpression="#{ListaPlanos.buttonFilterActual_action}" text="Pesquisar" />
</h:panelGrid>
</webuijsf:form>
<h:panelGrid columns="1" id="gridPanel1" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
<webuijsf:form id="form2">
<webuijsf:table augmentTitle="false" binding="#{ListaPlanos.table1}" id="table1" style="width: 100%"
styleClass="centerBlock" width="100%">
<webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup1}" id="tableRowGroup1" rows="10"
sourceData="#{SessionBean1.planosActualDataProvider}" sourceVar="currentRow">
<webuijsf:tableColumn headerText="Data da visita" id="tableColumn1" sort="data_visita">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkDataActivo" text="#{currentRow.value['data_visita_str']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Técnico de HST" id="tableColumn2" sort="tecnicos_nomes">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkTecnicoHsActivo" text="#{currentRow.value['tecnicos_nomes']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Fase" id="tableColumn3" sort="fase">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkFaseActivo" text="#{currentRow.value['fase_nome']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Plano" id="tableColumn10">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlano_action}" id="lnkPlanoActivo"
style="color: #008000;" text="imprimir"/>
<webuijsf:staticText id="staticTextActivosSeparator" text=" | " />
<webuijsf:staticText id="lnkPlanoImprimirPatrimoniais" text="imprimir (Patrimoniais)" />
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Loja" id="tableColumn13" sort="loja_nome">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkLojaActivo" text="#{currentRow.value['nome_estabelecimento']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="" id="tableColumn55" binding="#{ListaPlanos.tableColumn55}">
<webuijsf:button id="btnDesactivar" text="Desactivar Plano" onClick="return alertOnDeactivate();"
actionExpression="#{ListaPlanos.goDesactivarPlano_action}" binding="#{ListaPlanos.buttonDesactivar}" />
</webuijsf:tableColumn>
</webuijsf:tableRowGroup>
</webuijsf:table>
</webuijsf:form>
</h:panelGrid>
</h:panelGrid>
<!-- eof grid actual -->
<h:panelGrid columns="1" id="gridPanel1" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
<webuijsf:form id="form2">
<webuijsf:table augmentTitle="false" binding="#{ListaPlanos.table1}" id="table1" style="width: 100%"
styleClass="centerBlock" width="100%">
<webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup1}" id="tableRowGroup1" rows="10"
sourceData="#{SessionBean1.planosActualDataProvider}" sourceVar="currentRow">
<webuijsf:tableColumn headerText="Data da visita" id="tableColumn1" sort="data_visita">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkDataActivo" text="#{currentRow.value['data_visita_str']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Técnico de HST" id="tableColumn2" sort="tecnicos_nomes">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkTecnicoHsActivo" text="#{currentRow.value['tecnicos_nomes']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Fase" id="tableColumn3" sort="fase">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkFaseActivo" text="#{currentRow.value['fase_nome']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Plano" id="tableColumn10">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlano_action}" id="lnkPlanoActivo"
style="color: #008000;" text="imprimir"/>
<webuijsf:staticText id="staticTextActivosSeparator" text=" | " />
<webuijsf:staticText id="lnkPlanoImprimirPatrimoniais" text="imprimir (Patrimoniais)" />
<!--
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoPatrimoniais_action}" id="lnkPlanoImprimirPatrimoniais"
style="color: #008000;" text="imprimir (Patrimoniais)"/>
-->
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Loja" id="tableColumn13" sort="loja_nome">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkLojaActivo" text="#{currentRow.value['nome_estabelecimento']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="" id="tableColumn55" binding="#{ListaPlanos.tableColumn55}">
<webuijsf:button id="btnDesactivar" text="Desactivar Plano" onClick="return alertOnDeactivate();"
actionExpression="#{ListaPlanos.goDesactivarPlano_action}" binding="#{ListaPlanos.buttonDesactivar}"
/>
</webuijsf:tableColumn>
</webuijsf:tableRowGroup>
</webuijsf:table>
</webuijsf:form>
</h:panelGrid>
</h:panelGrid>
<h:panelGrid columnClasses="gridColCenter" columns="1" id="gridSeguimento1" style="height: 24px; width: 100%" styleClass="gridPlanosList">
<webuijsf:staticText id="staticText7" style="font-size: 18px" text="Em seguimento"/>
<webuijsf:staticText escape="false" id="staticText8" style="font-size: 14px" text=" "/>
<h:panelGrid columns="1" id="gridPanel2" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
<webuijsf:form id="form3">
<h:panelGrid binding="#{ListaPlanos.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" style="" styleClass="centerBlock">
<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterSeg}" id="groupPanelFilterSeg" style="">
<webuijsf:staticText id="labelFilterNameSeg" style="" text="Nome:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterNameSeg}" id="textFilterNameSeg" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterEstabelecimentoSeg" style="" text="Estabelecimento:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoSeg}" id="textFilterEstabelecimentoSeg" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterDateSeg" text="Data da Visita:" />
<rich:calendar datePattern="yyyy/MM/dd" value="#{ListaPlanos.calFilterDateSeguimento}"></rich:calendar>
<!-- <webuijsf:calendar binding="#{ListaPlanos.calFilterDateSeg}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateSeg" /> -->
</webuijsf:panelGroup>
<webuijsf:button binding="#{ListaPlanos.buttonFilterSeg}" id="buttonFilterSeg" actionExpression="#{ListaPlanos.buttonFilterSeg_action}" text="Pesquisar" />
</h:panelGrid>
</webuijsf:form>
<webuijsf:form id="form4">
<webuijsf:table augmentTitle="false" id="table2" style="width: 100%" styleClass="centerBlock" width="100%">
<webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup2}" id="tableRowGroup2" rows="10"
sourceData="#{SessionBean1.planosSeguimentoDataProvider}" sourceVar="currentRow">
<webuijsf:tableColumn headerText="Data da visita" id="tableColumn4" sort="data_visita_str">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink1" text="#{currentRow.value['data_visita_str']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Técnico de HST" id="tableColumn5" sort="tecnicos_nomes">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink2" text="#{currentRow.value['tecnicos_nomes']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Fase" id="tableColumn6" sort="fase_nome">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink3" text="#{currentRow.value['fase_nome']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Plano" id="tableColumn11">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoFromSeguimento_action}" id="hyperlink4"
style="color: #008000;" text="imprimir" />
<webuijsf:staticText id="staticTextSeguimentoSeparator" text=" | " />
<webuijsf:staticText id="lnkPlanoImprimirSeguimentoPatrimoniais" text="imprimir (Patrimoniais)" />
<!-- <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoSeguimentoPatrimoniais_action}" id="lnkPlanoImprimirSeguimentoPatrimoniais"
style="color: #008000;" text="imprimir (Patrimoniais)"/>
-->
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Loja" id="tableColumn14" sort="nome_estabelecimento">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink5" text="#{currentRow.value['nome_estabelecimento']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="" id="tableColumn56" binding="#{ListaPlanos.tableColumn56}">
<webuijsf:button id="btnDesactivarSeguimento" text="Desactivar Plano" onClick="return alertOnDeactivate();"
actionExpression="#{ListaPlanos.goDesactivarPlanoSeguimento_action}" binding="#{ListaPlanos.buttonDesactivarSeguimento}" />
</webuijsf:tableColumn>
</webuijsf:tableRowGroup>
</webuijsf:table>
</webuijsf:form>
</h:panelGrid>
</h:panelGrid>
<h:panelGrid columnClasses="gridColCenter" columns="1" id="gridConcluidos" style="height: 24px; width: 100%" styleClass="gridPlanosList">
<webuijsf:staticText escape="false" id="staticText14" style="font-size: 18px" text="Conclu&amp;iacute;dos"/>
<webuijsf:staticText escape="false" id="staticText15" style="font-size: 14px" text=" "/>
<h:panelGrid columns="1" id="gridPanel4" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
<webuijsf:form id="form5">
<h:panelGrid binding="#{ListaPlanos.gridPanelFilterConc}" columns="4" id="gridPanelFilterConc" style="" styleClass="centerBlock">
<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterConc}" id="groupPanelFilterConc" style="">
<webuijsf:staticText id="labelFilterNameConc" style="" text="Nome:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterNameConc}" id="textFilterNameConc" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterEstabelecimentoConc" style="" text="Estabelecimento:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoConc}" id="textFilterEstabelecimentoConc" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterDateConc" text="Data da Visita:" />
<rich:calendar datePattern="yyyy/MM/dd" value="#{ListaPlanos.calFilterDateConcluidos}"></rich:calendar>
<!-- <webuijsf:calendar binding="#{ListaPlanos.calFilterDateConc}" dateFormatPattern="yyyy/MM/dd" id="calFilterDateConc" /> -->
</webuijsf:panelGroup>
<webuijsf:button binding="#{ListaPlanos.buttonFilterConc}" id="buttonFilterConc" actionExpression="#{ListaPlanos.buttonFilterConc_action}" text="Pesquisar" />
</h:panelGrid>
</webuijsf:form>
<webuijsf:form id="form6">
<webuijsf:table augmentTitle="false" id="table3" style="width: 100%" styleClass="centerBlock" width="100%">
<webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup3}" id="tableRowGroup3" rows="10"
sourceData="#{SessionBean1.planosConcluidosDataProvider}" sourceVar="currentRow">
<webuijsf:tableColumn headerText="Data da visita" id="tableColumn7" sort="data_visita_str">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink6" text="#{currentRow.value['data_visita_str']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Técnico de HST" id="tableColumn8" sort="tecnicos_nomes">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink7" text="#{currentRow.value['tecnicos_nomes']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Fase" id="tableColumn9" sort="fase_nome">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink8" text="#{currentRow.value['fase_nome']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Plano" id="tableColumn12">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoFromConcluidos_action}" id="hyperlink9"
style="color: #008000;" text="imprimir"/>
<webuijsf:staticText id="staticTextConcluidoSeparator" text=" | " />
<webuijsf:staticText id="lnkPlanoImprimirConcluidoPatrimoniais" text="imprimir (Patrimoniais)" />
<!-- <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoConcluidoPatrimoniais_action}" id="lnkPlanoImprimirConcluidoPatrimoniais"
style="color: #008000;" text="imprimir (Patrimoniais)"/>
-->
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Loja" id="tableColumn15" sort="nome_estabelecimento">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink10" text="#{currentRow.value['nome_estabelecimento']}"/>
</webuijsf:tableColumn>
</webuijsf:tableRowGroup>
</webuijsf:table>
</webuijsf:form>
</h:panelGrid>
</h:panelGrid>
<h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel3" style="height: 24px; width: 50%" styleClass="centerBlock">
<webuijsf:panelGroup id="groupPanel1" style="border-bottom: solid white 2px; ">
<webuijsf:staticText escape="false" id="staticText5" text="Software desenvolvido por&amp;nbsp;"/>
<webuijsf:image id="image1" url="/resources/images/logo_evolute_small.png"/>
<webuijsf:staticText escape="false" id="staticText6" text="&amp;nbsp;&amp;copy; 2008"/>
</webuijsf:panelGroup>
</h:panelGrid>
</h:panelGrid>
</h:panelGrid>
<!-- EOF form1 -->
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
<script type="text/javascript">
try {
var pageTracker = _gat._getTracker("UA-6942416-1");
pageTracker._trackPageview();
} catch(err) {}</script>
<!-- grid seguimento -->
<h:panelGrid columnClasses="gridColCenter" columns="1" id="gridSeguimento1" style="height: 24px; width: 100%" styleClass="gridPlanosList">
<webuijsf:staticText id="staticText7" style="font-size: 18px" text="Em seguimento"/>
<webuijsf:staticText escape="false" id="staticText8" style="font-size: 14px" text=" "/>
<webuijsf:form id="form3">
<h:panelGrid binding="#{ListaPlanos.gridPanelFilterSeg}" columns="4" id="gridPanelFilterSeg" style="" styleClass="centerBlock">
<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterSeg}" id="groupPanelFilterSeg" style="">
<webuijsf:staticText id="labelFilterNameSeg" style="" text="Nome:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterNameSeg}" id="textFilterNameSeg" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterEstabelecimentoSeg" style="" text="Estabelecimento:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoSeg}" id="textFilterEstabelecimentoSeg" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterDateSeg" text="Data da Visita:" />
<t:inputDate id="calFilterDateSeguimento" value="#{ListaPlanos.calFilterDateSeguimento}" />
</webuijsf:panelGroup>
<webuijsf:button binding="#{ListaPlanos.buttonFilterSeg}" id="buttonFilterSeg" actionExpression="#{ListaPlanos.buttonFilterSeg_action}" text="Pesquisar" />
</h:panelGrid>
</webuijsf:form>
<h:panelGrid columns="1" id="gridPanel2" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
<webuijsf:form id="form4">
<webuijsf:table augmentTitle="false" id="table2" style="width: 100%" styleClass="centerBlock" width="100%">
<webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup2}" id="tableRowGroup2" rows="10"
sourceData="#{SessionBean1.planosSeguimentoDataProvider}" sourceVar="currentRow">
<webuijsf:tableColumn headerText="Data da visita" id="tableColumn4" sort="data_visita_str">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink1" text="#{currentRow.value['data_visita_str']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Técnico de HST" id="tableColumn5" sort="tecnicos_nomes">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink2" text="#{currentRow.value['tecnicos_nomes']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Fase" id="tableColumn6" sort="fase_nome">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink3" text="#{currentRow.value['fase_nome']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Plano" id="tableColumn11">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoFromSeguimento_action}" id="hyperlink4"
style="color: #008000;" text="imprimir" />
<webuijsf:staticText id="staticTextSeguimentoSeparator" text=" | " />
<webuijsf:staticText id="lnkPlanoImprimirSeguimentoPatrimoniais" text="imprimir (Patrimoniais)" />
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Loja" id="tableColumn14" sort="nome_estabelecimento">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink5" text="#{currentRow.value['nome_estabelecimento']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="" id="tableColumn56" binding="#{ListaPlanos.tableColumn56}">
<webuijsf:button id="btnDesactivarSeguimento" text="Desactivar Plano" onClick="return alertOnDeactivate();"
actionExpression="#{ListaPlanos.goDesactivarPlanoSeguimento_action}" binding="#{ListaPlanos.buttonDesactivarSeguimento}" />
</webuijsf:tableColumn>
</webuijsf:tableRowGroup>
</webuijsf:table>
</webuijsf:form>
</h:panelGrid>
</h:panelGrid>
<!-- eof grid seguimento -->
<!-- grid concluidos -->
<h:panelGrid columnClasses="gridColCenter" columns="1" id="gridConcluidos" style="height: 24px; width: 100%" styleClass="gridPlanosList">
<webuijsf:staticText escape="false" id="staticText14" style="font-size: 18px" text="Conclu&amp;iacute;dos"/>
<webuijsf:staticText escape="false" id="staticText15" style="font-size: 14px" text=" "/>
<webuijsf:form id="form5">
<h:panelGrid binding="#{ListaPlanos.gridPanelFilterConc}" columns="4" id="gridPanelFilterConc" style="" styleClass="centerBlock">
<webuijsf:panelGroup binding="#{ListaPlanos.groupPanelFilterConc}" id="groupPanelFilterConc" style="">
<webuijsf:staticText id="labelFilterNameConc" style="" text="Nome:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterNameConc}" id="textFilterNameConc" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterEstabelecimentoConc" style="" text="Estabelecimento:" />
<webuijsf:textField binding="#{ListaPlanos.textFilterEstabelecimentoConc}" id="textFilterEstabelecimentoConc" />
</webuijsf:panelGroup>
<webuijsf:panelGroup>
<webuijsf:staticText id="labelFilterDateConc" text="Data da Visita:" />
<t:inputDate id="calFilterDateConcluidos" value="#{ListaPlanos.calFilterDateConcluidos}" />
</webuijsf:panelGroup>
<webuijsf:button binding="#{ListaPlanos.buttonFilterConc}" id="buttonFilterConc" actionExpression="#{ListaPlanos.buttonFilterConc_action}" text="Pesquisar" />
</h:panelGrid>
</webuijsf:form>
<h:panelGrid columns="1" id="gridPanel4" style="height: 24px; width: 80%" styleClass="centerBlock" width="456">
<webuijsf:form id="form6">
<webuijsf:table augmentTitle="false" id="table3" style="width: 100%" styleClass="centerBlock" width="100%">
<webuijsf:tableRowGroup binding="#{ListaPlanos.tableRowGroup3}" id="tableRowGroup3" rows="10"
sourceData="#{SessionBean1.planosConcluidosDataProvider}" sourceVar="currentRow">
<webuijsf:tableColumn headerText="Data da visita" id="tableColumn7" sort="data_visita_str">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink6" text="#{currentRow.value['data_visita_str']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Técnico de HST" id="tableColumn8" sort="tecnicos_nomes">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink7" text="#{currentRow.value['tecnicos_nomes']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Fase" id="tableColumn9" sort="fase_nome">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink8" text="#{currentRow.value['fase_nome']}"/>
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Plano" id="tableColumn12">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoFromConcluidos_action}" id="hyperlink9"
style="color: #008000;" text="imprimir"/>
<webuijsf:staticText id="staticTextConcluidoSeparator" text=" | " />
<webuijsf:staticText id="lnkPlanoImprimirConcluidoPatrimoniais" text="imprimir (Patrimoniais)" />
</webuijsf:tableColumn>
<webuijsf:tableColumn headerText="Loja" id="tableColumn15" sort="nome_estabelecimento">
<webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink10" text="#{currentRow.value['nome_estabelecimento']}"/>
</webuijsf:tableColumn>
</webuijsf:tableRowGroup>
</webuijsf:table>
</webuijsf:form>
</h:panelGrid>
</h:panelGrid>
<!-- eof grid concluidos -->
<h:panelGrid columnClasses="gridColCenter" columns="1" id="gridPanel3" style="height: 24px; width: 50%" styleClass="centerBlock">
<webuijsf:panelGroup id="groupPanel1" style="border-bottom: solid white 2px; ">
<webuijsf:staticText escape="false" id="staticText5" text="Software desenvolvido por&amp;nbsp;"/>
<webuijsf:image id="image1" url="/resources/images/logo_evolute_small.png"/>
<webuijsf:staticText escape="false" id="staticText6" text="&amp;nbsp;&amp;copy; 2008"/>
</webuijsf:panelGroup>
</h:panelGrid>
</h:panelGrid>
</h:panelGrid>
<script type="text/javascript">
var gaJsHost = ( ( "https:" == document.location.protocol ) ? "https://ssl." : "http://www." );
document.write( unescape( "%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E" ) );
</script>
<script type="text/javascript">
try
{
var pageTracker = _gat._getTracker( "UA-6942416-1" );
pageTracker._trackPageview();
}
catch( err )
{
}
</script>
</webuijsf:body>
</webuijsf:html>
</webuijsf:page>

79
trunk/PlanosActuacao/web/WEB-INF/web.xml
Unescape View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<!-- Plugging the "Blue Sky" skin into the project -->
<context-param>
<param-name>org.richfaces.SKIN</param-name>
<param-value>blueSky</param-value>
</context-param>
<!-- Making the RichFaces skin spread to standard HTML controls -->
<!--
<context-param>
<param-name>org.richfaces.CONTROL_SKINNING</param-name>
<param-value>enable</param-value>
</context-param>
-->
<!-- Defining and mapping the RichFaces filter -->
<!-- richfaces -->
<filter>
<display-name>RichFaces Filter</display-name>
<filter-name>richfaces</filter-name>
@ -24,26 +10,32 @@
<filter-mapping>
<filter-name>richfaces</filter-name>
<servlet-name>Faces Servlet</servlet-name>
<!--
<dispatcher>REQUEST</dispatcher>
<dispatcher>FORWARD</dispatcher>
<dispatcher>INCLUDE</dispatcher>
-->
</filter-mapping>
<!-- richfaces -->
<!-- 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>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>client</param-value>
</context-param>
<context-param>
<param-name>com.sun.faces.validateXml</param-name>
<param-value>true</param-value>
</context-param>
<context-param>
<param-name>com.sun.faces.verifyObjects</param-name>
<param-value>false</param-value>
</context-param>
<filter>
@ -66,6 +58,28 @@
</filter-mapping>
<!-- richfaces -->
<context-param>
<param-name>org.richfaces.SKIN</param-name>
<param-value>blueSky</param-value>
</context-param>
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>client</param-value>
</context-param>
<context-param>
<param-name>com.sun.faces.validateXml</param-name>
<param-value>true</param-value>
</context-param>
<context-param>
<param-name>com.sun.faces.verifyObjects</param-name>
<param-value>false</param-value>
</context-param>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@ -157,4 +171,5 @@
<form-error-page>/AnaliseAcidentesTrabalho/Erro.jsp</form-error-page>
</form-login-config>
</login-config>-->
</web-app>

Write Preview
Loading…
Cancel
Save