diff --git a/trunk/AnaliseAcidentesTrabalho/lib/commons-digester-1.7.jar b/trunk/AnaliseAcidentesTrabalho/lib/commons-digester-1.7.jar new file mode 100644 index 00000000..1783dbea Binary files /dev/null and b/trunk/AnaliseAcidentesTrabalho/lib/commons-digester-1.7.jar differ diff --git a/trunk/AnaliseAcidentesTrabalho/lib/commons-httpclient-3.1.jar b/trunk/AnaliseAcidentesTrabalho/lib/commons-httpclient-3.1.jar new file mode 100755 index 00000000..7c59774a Binary files /dev/null and b/trunk/AnaliseAcidentesTrabalho/lib/commons-httpclient-3.1.jar differ diff --git a/trunk/AnaliseAcidentesTrabalho/lib/commons-vfs-1.0.jar b/trunk/AnaliseAcidentesTrabalho/lib/commons-vfs-1.0.jar new file mode 100644 index 00000000..7992d21b Binary files /dev/null and b/trunk/AnaliseAcidentesTrabalho/lib/commons-vfs-1.0.jar differ diff --git a/trunk/AnaliseAcidentesTrabalho/lib/httpclient-4.0.1.jar b/trunk/AnaliseAcidentesTrabalho/lib/httpclient-4.0.1.jar new file mode 100644 index 00000000..e9c961f1 Binary files /dev/null and b/trunk/AnaliseAcidentesTrabalho/lib/httpclient-4.0.1.jar differ diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml index 8d9722de..d3692cae 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml @@ -525,31 +525,35 @@ exists or setup the property manually. For example like this: - + + + + + + + + + + - + + + + - - - + + + - - - - - - - - - + @@ -559,7 +563,7 @@ exists or setup the property manually. For example like this: - + @@ -572,31 +576,35 @@ exists or setup the property manually. For example like this: - + + + + + + + + + + - + + + + - - - + + + - - - - - - - - - + diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData index 0c47e50b..3eb18000 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData @@ -2,12 +2,12 @@ - + - + @@ -22,8 +22,8 @@ - + diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties index c500c6cb..47152b26 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=8edae352 +build.xml.data.CRC32=328cf086 build.xml.script.CRC32=97b5d0ef 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=8edae352 -nbproject/build-impl.xml.script.CRC32=44c2e1c7 +nbproject/build-impl.xml.data.CRC32=328cf086 +nbproject/build-impl.xml.script.CRC32=8e640846 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1 diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData index 12aef59e..3f6bc9d9 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData @@ -6,12 +6,12 @@ - + - + diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData index df9fdf13..142c9ed6 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData @@ -6,8 +6,8 @@ - + diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties index 5f133633..65818c36 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties @@ -24,13 +24,17 @@ file.reference.activation.jar=lib/activation.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.commons-collections-3.1.jar=lib/commons-collections-3.1.jar +file.reference.commons-digester-1.7.jar=lib/commons-digester-1.7.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-lang-2.1.jar=lib/commons-lang-2.1.jar file.reference.commons-logging-1.1.jar=lib/commons-logging-1.1.jar file.reference.commons-validator-1.3.1.jar=lib/commons-validator-1.3.1.jar +file.reference.commons-vfs-1.0.jar=lib/commons-vfs-1.0.jar file.reference.evologger.jar=lib/evologger.jar file.reference.evolute.jar=lib/evolute.jar file.reference.fop.jar=lib/fop.jar +file.reference.httpclient-4.0.1.jar=lib/httpclient-4.0.1.jar file.reference.iText-2.0.8.jar=lib/iText-2.0.8.jar file.reference.jai_imageio.jar=lib/jai_imageio.jar file.reference.jakarta-oro-2.0.8.jar=lib/jakarta-oro-2.0.8.jar @@ -62,31 +66,35 @@ javac.classpath=\ ${libs.rowset-ri.classpath}:\ ${file.reference.activation.jar}:\ ${file.reference.avalon-framework-4.2.0.jar}:\ - ${file.reference.iText-2.0.8.jar}:\ ${file.reference.batik-all-1.7.jar}:\ + ${file.reference.commons-collections-3.1.jar}:\ + ${file.reference.commons-digester-1.7.jar}:\ + ${file.reference.commons-httpclient-3.1.jar}:\ + ${file.reference.commons-io-1.4.jar}:\ + ${file.reference.commons-lang-2.1.jar}:\ + ${file.reference.commons-logging-1.1.jar}:\ + ${file.reference.commons-validator-1.3.1.jar}:\ + ${file.reference.commons-vfs-1.0.jar}:\ + ${file.reference.evologger.jar}:\ + ${file.reference.evolute.jar}:\ ${file.reference.fop.jar}:\ - ${file.reference.xmlgraphics-commons-1.3.1.jar}:\ + ${file.reference.httpclient-4.0.1.jar}:\ + ${file.reference.iText-2.0.8.jar}:\ ${file.reference.jai_imageio.jar}:\ + ${file.reference.jakarta-oro-2.0.8.jar}:\ ${file.reference.jdom.jar}:\ + ${file.reference.log4j-1.2.15.jar}:\ ${file.reference.mail.jar}:\ - ${file.reference.evolute.jar}:\ - ${file.reference.postgresql-8.4-701.jdbc4.jar}:\ - ${file.reference.evologger.jar}:\ ${file.reference.poi-3.5-beta6-20090622.jar}:\ ${file.reference.poi-ooxml-3.5-beta6-20090622.jar}:\ + ${file.reference.postgresql-8.4-701.jdbc4.jar}:\ + ${file.reference.serializer-2.7.0.jar}:\ + ${file.reference.shst.jar}:\ ${file.reference.xalan-2.7.0.jar}:\ - ${file.reference.commons-io-1.4.jar}:\ - ${file.reference.commons-logging-1.1.jar}:\ - ${file.reference.log4j-1.2.15.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.serializer-2.7.0.jar}:\ - ${file.reference.commons-collections-3.1.jar}:\ - ${file.reference.commons-lang-2.1.jar}:\ - ${file.reference.commons-validator-1.3.1.jar}:\ - ${file.reference.jakarta-oro-2.0.8.jar}:\ - ${file.reference.shst.jar} + ${file.reference.xmlgraphics-commons-1.3.1.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml index b4396323..70c601f8 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml @@ -44,39 +44,39 @@ WEB-INF/lib - ${file.reference.iText-2.0.8.jar} + ${file.reference.batik-all-1.7.jar} WEB-INF/lib - ${file.reference.batik-all-1.7.jar} + ${file.reference.commons-collections-3.1.jar} WEB-INF/lib - ${file.reference.fop.jar} + ${file.reference.commons-digester-1.7.jar} WEB-INF/lib - ${file.reference.xmlgraphics-commons-1.3.1.jar} + ${file.reference.commons-httpclient-3.1.jar} WEB-INF/lib - ${file.reference.jai_imageio.jar} + ${file.reference.commons-io-1.4.jar} WEB-INF/lib - ${file.reference.jdom.jar} + ${file.reference.commons-lang-2.1.jar} WEB-INF/lib - ${file.reference.mail.jar} + ${file.reference.commons-logging-1.1.jar} WEB-INF/lib - ${file.reference.evolute.jar} + ${file.reference.commons-validator-1.3.1.jar} WEB-INF/lib - ${file.reference.postgresql-8.4-701.jdbc4.jar} + ${file.reference.commons-vfs-1.0.jar} WEB-INF/lib @@ -84,23 +84,31 @@ WEB-INF/lib - ${file.reference.poi-3.5-beta6-20090622.jar} + ${file.reference.evolute.jar} WEB-INF/lib - ${file.reference.poi-ooxml-3.5-beta6-20090622.jar} + ${file.reference.fop.jar} WEB-INF/lib - ${file.reference.xalan-2.7.0.jar} + ${file.reference.httpclient-4.0.1.jar} WEB-INF/lib - ${file.reference.commons-io-1.4.jar} + ${file.reference.iText-2.0.8.jar} WEB-INF/lib - ${file.reference.commons-logging-1.1.jar} + ${file.reference.jai_imageio.jar} + WEB-INF/lib + + + ${file.reference.jakarta-oro-2.0.8.jar} + WEB-INF/lib + + + ${file.reference.jdom.jar} WEB-INF/lib @@ -108,15 +116,19 @@ WEB-INF/lib - ${file.reference.xercesImpl-2.7.1.jar} + ${file.reference.mail.jar} WEB-INF/lib - ${file.reference.xml-apis-1.3.04.jar} + ${file.reference.poi-3.5-beta6-20090622.jar} WEB-INF/lib - ${file.reference.xml-apis-ext-1.3.04.jar} + ${file.reference.poi-ooxml-3.5-beta6-20090622.jar} + WEB-INF/lib + + + ${file.reference.postgresql-8.4-701.jdbc4.jar} WEB-INF/lib @@ -124,23 +136,27 @@ WEB-INF/lib - ${file.reference.commons-collections-3.1.jar} + ${file.reference.shst.jar} WEB-INF/lib - ${file.reference.commons-lang-2.1.jar} + ${file.reference.xalan-2.7.0.jar} WEB-INF/lib - ${file.reference.commons-validator-1.3.1.jar} + ${file.reference.xercesImpl-2.7.1.jar} WEB-INF/lib - ${file.reference.jakarta-oro-2.0.8.jar} + ${file.reference.xml-apis-1.3.04.jar} WEB-INF/lib - ${file.reference.shst.jar} + ${file.reference.xml-apis-ext-1.3.04.jar} + WEB-INF/lib + + + ${file.reference.xmlgraphics-commons-1.3.1.jar} WEB-INF/lib diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java index ccda294c..80dd6e3b 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java @@ -287,17 +287,7 @@ public class FormHS extends AbstractPageBean { this.tableRowGroup1 = trg; } - private TableColumn tableColumn1 = new TableColumn(); - public TableColumn getTableColumn1() - { - return tableColumn1; - } - - public void setTableColumn1( TableColumn tc ) - { - this.tableColumn1 = tc; - } private Hyperlink lnkDataAcidente = new Hyperlink(); public Hyperlink getLnkDataAcidente() @@ -309,17 +299,7 @@ public class FormHS extends AbstractPageBean { this.lnkDataAcidente = h; } - private TableColumn tableColumn2 = new TableColumn(); - public TableColumn getTableColumn2() - { - return tableColumn2; - } - - public void setTableColumn2( TableColumn tc ) - { - this.tableColumn2 = tc; - } private Hyperlink lnkNr = new Hyperlink(); public Hyperlink getLnkNr() @@ -331,17 +311,6 @@ public class FormHS extends AbstractPageBean { this.lnkNr = h; } - private TableColumn tableColumn3 = new TableColumn(); - - public TableColumn getTableColumn3() - { - return tableColumn3; - } - - public void setTableColumn3( TableColumn tc ) - { - this.tableColumn3 = tc; - } private Hyperlink lnkNomeAcidentado = new Hyperlink(); public Hyperlink getLnkNomeAcidentado() @@ -793,17 +762,7 @@ public class FormHS extends AbstractPageBean { this.txtSearchMsg = st; } - private TableColumn tableColumn10 = new TableColumn(); - public TableColumn getTableColumn10() - { - return tableColumn10; - } - - public void setTableColumn10( TableColumn tc ) - { - this.tableColumn10 = tc; - } private Hyperlink lnkFase = new Hyperlink(); public Hyperlink getLnkFase() @@ -837,17 +796,7 @@ public class FormHS extends AbstractPageBean { this.lnkFaseSeg = h; } - private TableColumn tableColumn12 = new TableColumn(); - public TableColumn getTableColumn12() - { - return tableColumn12; - } - - public void setTableColumn12( TableColumn tc ) - { - this.tableColumn12 = tc; - } private TableColumn tableColumn13 = new TableColumn(); public TableColumn getTableColumn13() @@ -1024,17 +973,7 @@ public class FormHS extends AbstractPageBean { this.txtMsg = st; } - private TableColumn tableColumn16 = new TableColumn(); - public TableColumn getTableColumn16() - { - return tableColumn16; - } - - public void setTableColumn16( TableColumn tc ) - { - this.tableColumn16 = tc; - } private Hyperlink lnkDataAbertura = new Hyperlink(); public Hyperlink getLnkDataAbertura() @@ -1090,17 +1029,7 @@ public class FormHS extends AbstractPageBean { this.lnkDataAberturaConcluida = h; } - private TableColumn tableColumn19 = new TableColumn(); - public TableColumn getTableColumn19() - { - return tableColumn19; - } - - public void setTableColumn19( TableColumn tc ) - { - this.tableColumn19 = tc; - } private Hyperlink lnkEstabelecimento = new Hyperlink(); public Hyperlink getLnkEstabelecimento() @@ -1481,8 +1410,8 @@ public class FormHS extends AbstractPageBean try { - AnalisesDataProvider adp = AnalisesDataProvider.getInstance(); - ArrayList actuaisList = adp.getAnalisesActuaisHsList( + getSessionBean1().getAnalisesActualDataProvider().setList( null ); + ArrayList actuaisList = AnalisesDataProvider.getInstance().getAnalisesActuaisHsList( getSessionBean1().getCurrentUser().getEstabelecimento_id(), fromYear ); getSessionBean1().getAnalisesActualDataProvider().setList( actuaisList ); table1.setRendered( true ); @@ -1495,8 +1424,8 @@ public class FormHS extends AbstractPageBean try { - AnalisesDataProvider adp = AnalisesDataProvider.getInstance(); - ArrayList seguimentoList = adp.getAnalisesSeguimentoHsList( + getSessionBean1().getAnalisesSeguimentoDataProvider().setList( null ); + ArrayList seguimentoList = AnalisesDataProvider.getInstance().getAnalisesSeguimentoHsList( getSessionBean1().getCurrentUser().getEstabelecimento_id(), fromYear ); getSessionBean1().getAnalisesSeguimentoDataProvider().setList( seguimentoList ); table2.setRendered( true ); @@ -1509,13 +1438,10 @@ public class FormHS extends AbstractPageBean try { - AnalisesDataProvider adp = AnalisesDataProvider.getInstance(); - - System.out.println( "CONCLUIDAS TABLE" ); getSessionBean1().getAnalisesConcluidasDataProvider().setList( null ); - table3.setRendered( true ); - ArrayList concluidasList = adp.getAnalisesConcluidasHsList( fromYear ); + ArrayList concluidasList = AnalisesDataProvider.getInstance().getAnalisesConcluidasHsList( fromYear ); getSessionBean1().getAnalisesConcluidasDataProvider().setList( concluidasList ); + table3.setRendered( true ); } catch ( Exception ex ) { @@ -1542,7 +1468,7 @@ public class FormHS extends AbstractPageBean String referer = request.getRequestURI(); String pageFrom = Utils.getPageFrom( referer ); System.out.println( "PAGE FROM : " + pageFrom ); - if ( !pageFrom.matches( "FormHS.jsp" ) || getSessionBean1().isFromAnaliseDeletion() ) + if ( ! pageFrom.matches( "FormHS.jsp" ) || getSessionBean1().isFromAnaliseDeletion() ) { fillCurrentYearDrop(); Utils.fillEstabelecimentos( dropEstabelecimentosActuais, dropEstabelecimentosSeguimento, dropEstabelecimentosConcluidos ); diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java index 0c653e57..e7e64270 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/SessionBean1.java @@ -105,7 +105,9 @@ public class SessionBean1 extends AbstractSessionBean * or resources that are required for the lifetime of a particular * user session.

*/ - public void init() { + @Override + public void init() + { // Perform initializations inherited from our superclass super.init(); // Perform application initialization that must complete @@ -115,11 +117,14 @@ public class SessionBean1 extends AbstractSessionBean // // Initialize automatically managed components // *Note* - this logic should NOT be modified - try { + try + { _init(); - } catch (Exception e) { - log("SessionBean1 Initialization Failure", e); - throw e instanceof FacesException ? (FacesException) e: new FacesException(e); + } + catch ( Exception e ) + { + log( "SessionBean1 Initialization Failure", e ); + throw e instanceof FacesException ? ( FacesException ) e : new FacesException( e ); } // @@ -138,7 +143,9 @@ public class SessionBean1 extends AbstractSessionBean *

You may customize this method to release references to session data * or resources that can not be serialized with the session itself.

*/ - public void passivate() { + @Override + public void passivate() + { } /** @@ -149,7 +156,9 @@ public class SessionBean1 extends AbstractSessionBean * data or resources that could not be serialized with the * session itself.

*/ - public void activate() { + @Override + public void activate() + { } /** @@ -161,33 +170,40 @@ public class SessionBean1 extends AbstractSessionBean * during the execution of the init() method, or * at any later time during the lifetime of the application.

*/ - public void destroy() { + @Override + public void destroy() + { } /** *

Return a reference to the scoped data bean.

*/ - protected ApplicationBean1 getApplicationBean1() { + protected ApplicationBean1 getApplicationBean1() + { return (ApplicationBean1)getBean("ApplicationBean1"); } private String msg; - public String getMsg() { + public String getMsg() + { return msg; } - public void setMsg(String msg) { + public void setMsg(String msg) + { this.msg = msg; } private Utilizador currentUser; - public Utilizador getCurrentUser() { + public Utilizador getCurrentUser() + { return currentUser; } - public void setCurrentUser(Utilizador currentUser) { + public void setCurrentUser(Utilizador currentUser) + { this.currentUser = currentUser; setCanAccessEstatisticas( getCanAccessEstatisticas() ); } @@ -776,6 +792,6 @@ public class SessionBean1 extends AbstractSessionBean public void setIsSearchingUtilizadores(Boolean isSearchingUtilizadores) { this.isSearchingUtilizadores = isSearchingUtilizadores; } - - + + } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java index a9555486..46d159f6 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java @@ -401,26 +401,14 @@ public class AnalisesDataProvider extends GenericDataProvider where = where.and( new Field( "EXTRACT( year FROM data_acidente )" ).isEqual( fromYear ) ); } Select2 query = new Select2( - new String[] - { - "analises_acidentes" - }, - new Integer[] - { - }, - new Expression[] - { - }, - new String[] - { - "*" - }, + new String[] { "analises_acidentes" }, + new Integer[] { }, + new Expression[] { }, + new String[] { "*" }, where, - new String[] - { - "analise_nr" - }, - null, null, null ); + new String[] { "analise_nr" }, + null, null, null + ); // String sql = "SELECT * " + // "FROM analises_acidentes " + @@ -550,26 +538,14 @@ public class AnalisesDataProvider extends GenericDataProvider new Field( "estado" ).isLess( Global.ESTADO_HS ).or( new Field( "estado" ).isGreater( Global.ESTADO_HS ).and( new Field( "estado" ).isLess( Global.ESTADO_CONSOLIDACAO ) ) ).or( new Field( "estado" ).isGreater( Global.ESTADO_CONSOLIDACAO ).and( new Field( "estado" ).isLess( Global.ESTADO_FECHAR ) ) ) ); Select2 query = new Select2( - new String[] - { - "analises_acidentes" - }, - new Integer[] - { - }, - new Expression[] - { - }, - new String[] - { - "*" - }, + new String[] { "analises_acidentes" }, + new Integer[] { }, + new Expression[] { }, + new String[] { "*" }, where, - new String[] - { - "analises_acidentes.analise_nr" - }, - null, null, null ); + new String[] { "analises_acidentes.analise_nr" }, + null, null, null + ); // String sql = null; // sql = "SELECT * FROM analises_acidentes WHERE (" + @@ -641,26 +617,14 @@ public class AnalisesDataProvider extends GenericDataProvider where = where.and( or ); Select2 query = new Select2( - new String[] - { - "analises_acidentes" - }, - new Integer[] - { - }, - new Expression[] - { - }, - new String[] - { - "*" - }, + new String[] { "analises_acidentes" }, + new Integer[] { }, + new Expression[] { }, + new String[] { "*" }, where, - new String[] - { - "analise_nr" - }, - null, null, null ); + new String[] { "analise_nr" }, + null, null, null + ); Statement st = createStatement(); ResultSet rs = st.executeQuery( query.toString() ); @@ -716,26 +680,14 @@ public class AnalisesDataProvider extends GenericDataProvider new Field( "analises_acidentes.estado" ).isGreater( 6 ).and( new Field( "analises_acidentes.estado" ).isLess( 9 ) ) ) ); Select2 query = new Select2( - new String[] - { - "analises_acidentes" - }, - new Integer[] - { - }, - new Expression[] - { - }, - new String[] - { - "*" - }, + new String[] { "analises_acidentes" }, + new Integer[] { }, + new Expression[] { }, + new String[] { "*" }, where, - new String[] - { - "analises_acidentes.analise_nr" - }, - null, null, null ); + new String[] { "analises_acidentes.analise_nr" }, + null, null, null + ); Statement st = createStatement(); ResultSet rs = st.executeQuery( query.toString() ); @@ -770,26 +722,14 @@ public class AnalisesDataProvider extends GenericDataProvider } Select2 query = new Select2( - new String[] - { - "analises_acidentes" - }, - new Integer[] - { - }, - new Expression[] - { - }, - new String[] - { - "*" - }, + new String[] { "analises_acidentes" }, + new Integer[] { }, + new Expression[] { }, + new String[] { "*" }, where, - new String[] - { - "analise_nr" - }, - null, null, null ); + new String[] { "analise_nr" }, + null, null, null + ); Statement st = createStatement(); ResultSet rs = st.executeQuery( query.toString() ); @@ -848,26 +788,14 @@ public class AnalisesDataProvider extends GenericDataProvider } Select2 query = new Select2( - new String[] - { - "analises_acidentes" - }, - new Integer[] - { - }, - new Expression[] - { - }, - new String[] - { - "*" - }, + new String[] { "analises_acidentes" }, + new Integer[] { }, + new Expression[] { }, + new String[] { "*" }, where, - new String[] - { - "analise_nr" - }, - null, null, null ); + new String[] { "analise_nr" }, + null, null, null + ); Statement st = createStatement(); ResultSet rs = st.executeQuery( query.toString() ); @@ -894,26 +822,14 @@ public class AnalisesDataProvider extends GenericDataProvider } Select2 query = new Select2( - new String[] - { - "analises_acidentes" - }, - new Integer[] - { - }, - new Expression[] - { - }, - new String[] - { - "*" - }, + new String[] { "analises_acidentes" }, + new Integer[] { }, + new Expression[] { }, + new String[] { "*" }, where, - new String[] - { - "analise_nr" - }, - null, null, null ); + new String[] { "analise_nr" }, + null, null, null + ); System.out.println( "\ngetAnalisesConcluidasList() : " + query.toString() + "\n" ); @@ -1497,6 +1413,7 @@ public class AnalisesDataProvider extends GenericDataProvider { a.setTipo_lesao( rs.getString( "tipo_lesao" ) ); } + a.setTipo_incapacidade( rs.getString( "tipo_incapacidade" ) ); //a.setCoef_incapacidade(new Integer(( rs.getInt("coef_incapacidade") ))); a.setCoef_incapacidade( ( Integer ) rs.getObject( "coef_incapacidade" ) ); diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/pagestate/AnaliseAcidenteTrabalhoState.java b/trunk/AnaliseAcidentesTrabalho/src/java/pagestate/AnaliseAcidenteTrabalhoState.java index 7be51517..05966ee1 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/pagestate/AnaliseAcidenteTrabalhoState.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/pagestate/AnaliseAcidenteTrabalhoState.java @@ -13,7 +13,8 @@ package pagestate; * * @author lluis */ -public class AnaliseAcidenteTrabalhoState { +public class AnaliseAcidenteTrabalhoState +{ private Object header_nr; private Object header_date; private int estado; @@ -458,7 +459,5 @@ public class AnaliseAcidenteTrabalhoState { public void setAveriguacao_obs(Object averiguacao_obs) { this.averiguacao_obs = averiguacao_obs; } - - - + } diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/MainPhaseListener.java b/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/MainPhaseListener.java index 9ef109f2..90d74e47 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/MainPhaseListener.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/MainPhaseListener.java @@ -13,7 +13,6 @@ import analiseacidentestrabalho.SessionBean1; import com.evolute.utils.error.ErrorLogger; import javax.faces.component.UIViewRoot; import javax.servlet.http.HttpServletRequest; -import utils.AnaliseAcidentesTrabalhoLogger; import utils.JSFUtils; import utils.Logos; @@ -23,7 +22,6 @@ import utils.Logos; */ public class MainPhaseListener implements PhaseListener { - private boolean firstEntry = true; @Override public void afterPhase(PhaseEvent pe) diff --git a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp index ca9561da..d960b0bf 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/FormDirGerRh.jsp @@ -6,20 +6,23 @@ - + + + - + @@ -100,8 +103,7 @@ - + - + - + + - + @@ -107,8 +109,7 @@ - + - + - + + - + @@ -100,8 +102,8 @@ - + - + - + + + - + @@ -60,23 +64,29 @@ + onChange="common_timeoutSubmitForm(this.form, 'dropCurrentYear');" valueChangeListener="#{FormHS.dropCurrentYear_valueChangeListener}" /> - - + + - + - - + + + + @@ -98,47 +108,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -170,8 +170,7 @@ - + - + + + - + @@ -75,8 +77,7 @@ - + - + - + - + + - + @@ -96,8 +98,7 @@ - + - + - + - + + - + @@ -103,8 +105,7 @@ - + - + - +