diff --git a/trunk/AnaliseAcidentesTrabalho/lib/ashwood-2.0.jar b/trunk/AnaliseAcidentesTrabalho/lib/ashwood-2.0.jar new file mode 100644 index 00000000..55fcc9b1 Binary files /dev/null and b/trunk/AnaliseAcidentesTrabalho/lib/ashwood-2.0.jar differ diff --git a/trunk/AnaliseAcidentesTrabalho/lib/commons-fileupload-1.2.1.jar b/trunk/AnaliseAcidentesTrabalho/lib/commons-fileupload-1.2.1.jar deleted file mode 100644 index 7db423ed..00000000 Binary files a/trunk/AnaliseAcidentesTrabalho/lib/commons-fileupload-1.2.1.jar and /dev/null differ diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml index 19174df1..11dca693 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml @@ -524,13 +524,13 @@ exists or setup the property manually. For example like this: + - @@ -567,6 +567,9 @@ exists or setup the property manually. For example like this: + + + @@ -576,7 +579,7 @@ exists or setup the property manually. For example like this: - + @@ -588,13 +591,13 @@ exists or setup the property manually. For example like this: + - @@ -631,6 +634,9 @@ 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 3eb18000..d9c5df47 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/faces-config.NavData @@ -6,8 +6,8 @@ - + @@ -22,8 +22,8 @@ - + diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties index a5d1f2c8..9143cc1c 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=3ee292f1 +build.xml.data.CRC32=2d68f117 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=3ee292f1 -nbproject/build-impl.xml.script.CRC32=eeac4f78 +nbproject/build-impl.xml.data.CRC32=2d68f117 +nbproject/build-impl.xml.script.CRC32=0cb83ca1 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 3f6bc9d9..bf242b1d 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData @@ -10,13 +10,13 @@ - + - + diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/navigation.NavData index 142c9ed6..df9fdf13 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 5f4dac02..865a85fc 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties @@ -21,13 +21,14 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.war=${dist.dir}/${war.name} excludes= file.reference.activation.jar=lib/activation.jar +file.reference.ashwood-2.0.jar=lib/ashwood-2.0.jar file.reference.avalon-framework-4.2.0.jar=lib/avalon-framework-4.2.0.jar file.reference.batik-all-1.7.jar=lib/batik-all-1.7.jar file.reference.commons-beanutils-1.8.3.jar=lib/commons-beanutils-1.8.3.jar file.reference.commons-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 +file.reference.commons-el-1.0.jar=lib/myfaces/commons-el-1.0.jar file.reference.commons-httpclient-3.1.jar=lib/commons-httpclient-3.1.jar file.reference.commons-io-1.4.jar=lib/commons-io-1.4.jar file.reference.commons-lang-2.4.jar=lib/commons-lang-2.4.jar @@ -58,12 +59,14 @@ file.reference.spring-ws-core-1.5.9.jar=lib/spring-ws-core-1.5.9.jar file.reference.spring-ws-core-tiger-1.5.9.jar=lib/spring-ws-core-tiger-1.5.9.jar file.reference.spring-ws-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.tomahawk-1.1.10.jar=lib/myfaces/tomahawk-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.4 @@ -78,13 +81,13 @@ javac.classpath=\ ${libs.jstl11.classpath}:\ ${libs.rowset-ri.classpath}:\ ${file.reference.activation.jar}:\ + ${file.reference.ashwood-2.0.jar}:\ ${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}:\ @@ -120,7 +123,10 @@ javac.classpath=\ ${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.xmlgraphics-commons-1.3.1.jar}:\ + ${file.reference.commons-el-1.0.jar}:\ + ${file.reference.xmlParserAPIs-2.0.2.jar}:\ + ${file.reference.tomahawk-1.1.10.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml index f606c868..aa2dfee7 100644 --- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml +++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml @@ -39,6 +39,10 @@ ${file.reference.activation.jar} WEB-INF/lib + + ${file.reference.ashwood-2.0.jar} + WEB-INF/lib + ${file.reference.avalon-framework-4.2.0.jar} WEB-INF/lib @@ -63,10 +67,6 @@ ${file.reference.commons-digester-1.8.jar} WEB-INF/lib - - ${file.reference.commons-fileupload-1.2.1.jar} - WEB-INF/lib - ${file.reference.commons-httpclient-3.1.jar} WEB-INF/lib @@ -211,6 +211,18 @@ ${file.reference.xmlgraphics-commons-1.3.1.jar} WEB-INF/lib + + ${file.reference.commons-el-1.0.jar} + WEB-INF/lib + + + ${file.reference.xmlParserAPIs-2.0.2.jar} + WEB-INF/lib + + + ${file.reference.tomahawk-1.1.10.jar} + WEB-INF/lib + diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java index 939e10a1..650ff192 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java @@ -2993,50 +2993,78 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean { this.staticText112 = st; } - private com.sun.rave.web.ui.component.Calendar calAvaliacaoIncap = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalAvaliacaoIncap() + + + +// private org.apache.myfaces.custom.date.HtmlInputDate calAvaliacaoIncap = new org.apache.myfaces.custom.date.HtmlInputDate(); +// public org.apache.myfaces.custom.date.HtmlInputDate getCalAvaliacaoIncap() +// { +// return calAvaliacaoIncap; +// } +// public void setCalAvaliacaoIncap( org.apache.myfaces.custom.date.HtmlInputDate calAvaliacaoIncap ) +// { +// this.calAvaliacaoIncap = calAvaliacaoIncap; +// } + + private Date calAvaliacaoIncap = null; + public Date getCalAvaliacaoIncap() { return calAvaliacaoIncap; } - - public void setCalAvaliacaoIncap( com.sun.rave.web.ui.component.Calendar c ) + public void setCalAvaliacaoIncap( Date calAvaliacaoIncap ) { - this.calAvaliacaoIncap = c; + this.calAvaliacaoIncap = calAvaliacaoIncap; } - private StaticText staticText113 = new StaticText(); + + + + + private StaticText staticText113 = new StaticText(); public StaticText getStaticText113() { return staticText113; } - public void setStaticText113( StaticText st ) { this.staticText113 = st; } - private com.sun.rave.web.ui.component.Calendar calRevisaoIncap = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalRevisaoIncap() + +// private org.apache.myfaces.custom.date.HtmlInputDate calRevisaoIncap = new org.apache.myfaces.custom.date.HtmlInputDate(); +// public org.apache.myfaces.custom.date.HtmlInputDate getCalRevisaoIncap() +// { +// return calRevisaoIncap; +// } +// public void setCalRevisaoIncap( org.apache.myfaces.custom.date.HtmlInputDate calRevisaoIncap ) +// { +// this.calRevisaoIncap = calRevisaoIncap; +// } + private Date calRevisaoIncap = null; + public Date getCalRevisaoIncap() { return calRevisaoIncap; } - - public void setCalRevisaoIncap( com.sun.rave.web.ui.component.Calendar c ) + public void setCalRevisaoIncap( Date calRevisaoIncap ) { - this.calRevisaoIncap = c; + this.calRevisaoIncap = calRevisaoIncap; } - private HtmlPanelGrid gridPanel70 = new HtmlPanelGrid(); + + + + private HtmlPanelGrid gridPanel70 = new HtmlPanelGrid(); public HtmlPanelGrid getGridPanel70() { return gridPanel70; } - public void setGridPanel70( HtmlPanelGrid hpg ) { this.gridPanel70 = hpg; } + + private StaticText staticText114 = new StaticText(); public StaticText getStaticText114() @@ -3048,17 +3076,32 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean { this.staticText114 = st; } - private com.sun.rave.web.ui.component.Calendar calPeridoIncapDe = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalPeridoIncapDe() + + + +// private org.apache.myfaces.custom.date.HtmlInputDate calPeridoIncapDe = new org.apache.myfaces.custom.date.HtmlInputDate(); +// public org.apache.myfaces.custom.date.HtmlInputDate getCalPeridoIncapDe() +// { +// return calPeridoIncapDe; +// } +// public void setCalPeridoIncapDe( org.apache.myfaces.custom.date.HtmlInputDate calPeridoIncapDe ) +// { +// this.calPeridoIncapDe = calPeridoIncapDe; +// } + + private Date calPeriodoIncapDe = null; + public Date getCalPeriodoIncapDe() { - return calPeridoIncapDe; + return calPeriodoIncapDe; } - - public void setCalPeridoIncapDe( com.sun.rave.web.ui.component.Calendar c ) + public void setCalPeriodoIncapDe( Date calPeriodoIncapDe ) { - this.calPeridoIncapDe = c; + this.calPeriodoIncapDe = calPeriodoIncapDe; } + + + private StaticText staticText115 = new StaticText(); public StaticText getStaticText115() @@ -3070,17 +3113,33 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean { this.staticText115 = st; } - private com.sun.rave.web.ui.component.Calendar calPeriodoIncapA = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalPeriodoIncapA() + + + +// private org.apache.myfaces.custom.date.HtmlInputDate calPeriodoIncapA = new org.apache.myfaces.custom.date.HtmlInputDate(); +// public org.apache.myfaces.custom.date.HtmlInputDate getCalPeriodoIncapA() +// { +// return calPeriodoIncapA; +// } +// public void setCalPeriodoIncapA( org.apache.myfaces.custom.date.HtmlInputDate calPeriodoIncapA ) +// { +// this.calPeriodoIncapA = calPeriodoIncapA; +// } + + private Date calPeriodoIncapA = null; + public Date getCalPeriodoIncapA() { return calPeriodoIncapA; } - - public void setCalPeriodoIncapA( com.sun.rave.web.ui.component.Calendar c ) + public void setCalPeriodoIncapA( Date calPeriodoIncapA ) { - this.calPeriodoIncapA = c; + this.calPeriodoIncapA = calPeriodoIncapA; } + + + + private HtmlPanelGrid gridPanel71 = new HtmlPanelGrid(); public HtmlPanelGrid getGridPanel71() @@ -6887,17 +6946,31 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean { this.staticText15 = st; } - private com.sun.rave.web.ui.component.Calendar calDataOcorrencia = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalDataOcorrencia() + +// private org.apache.myfaces.custom.date.HtmlInputDate calDataOcorrencia = new org.apache.myfaces.custom.date.HtmlInputDate(); +// public org.apache.myfaces.custom.date.HtmlInputDate getCalDataOcorrencia() +// { +// return calDataOcorrencia; +// } +// public void setCalDataOcorrencia( org.apache.myfaces.custom.date.HtmlInputDate calDataOcorrencia ) +// { +// this.calDataOcorrencia = calDataOcorrencia; +// } + + private Date calDataOcorrencia = null; + public Date getCalDataOcorrencia() { return calDataOcorrencia; } - - public void setCalDataOcorrencia( com.sun.rave.web.ui.component.Calendar c ) + public void setCalDataOcorrencia( Date calDataOcorrencia ) { - this.calDataOcorrencia = c; + this.calDataOcorrencia = calDataOcorrencia; } + + + + private PanelGroup groupPanel9 = new PanelGroup(); public PanelGroup getGroupPanel9() @@ -7687,9 +7760,9 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean // SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd"); // stDataAcidente.setText(dateFormat.format(c.getTime())); txtAveriguador.setText( getSessionBean1().getCurrentUser().getNome() ); - java.util.Date today = - new java.util.Date(); - calDataOcorrencia.setValue( today ); + java.util.Date today = new java.util.Date(); +// calDataOcorrencia.setValue( today ); + setCalDataOcorrencia( today ); //drpMedicos.setSelected(new Integer(0)); // UtilizadoresDataProvider udp = new UtilizadoresDataProvider(); @@ -8426,7 +8499,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean if ( a.getData_acidente() != null ) { java.util.Date ddate = new java.util.Date( a.getData_acidente().getTime() ); - calDataOcorrencia.setValue( ddate ); +// calDataOcorrencia.setValue( ddate ); + setCalDataOcorrencia( ddate ); } Calendar cal = Calendar.getInstance(); @@ -9624,25 +9698,29 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean if ( a.getData_aval_incapacidade() != null ) { java.util.Date ddate = new java.util.Date( a.getData_aval_incapacidade().getTime() ); - calAvaliacaoIncap.setValue( ddate ); +// calAvaliacaoIncap.setValue( ddate ); + setCalAvaliacaoIncap( ddate ); } if ( a.getData_rev_incapacidade() != null ) { java.util.Date ddate = new java.util.Date( a.getData_rev_incapacidade().getTime() ); - calRevisaoIncap.setValue( ddate ); +// calRevisaoIncap.setValue( ddate ); + setCalRevisaoIncap( ddate ); } if ( a.getPeriodo_incapacidade_de() != null ) { java.util.Date ddate = new java.util.Date( a.getPeriodo_incapacidade_de().getTime() ); - calPeridoIncapDe.setValue( ddate ); +// calPeridoIncapDe.setValue( ddate ); + setCalPeriodoIncapDe( ddate ); } if ( a.getPeriodo_incapacidade_a() != null ) { java.util.Date ddate = new java.util.Date( a.getPeriodo_incapacidade_a().getTime() ); - calPeriodoIncapA.setValue( ddate ); +// calPeriodoIncapA.setValue( ddate ); + setCalPeriodoIncapA( ddate ); } if ( a.getImg_flexao().matches( "y" ) ) @@ -11682,7 +11760,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean //{ DateFormat formatador = new SimpleDateFormat( "yyyy-MM-dd" ); - java.util.Date ddate = ( java.util.Date ) calDataOcorrencia.getValue(); +// java.util.Date ddate = ( java.util.Date ) calDataOcorrencia.getValue(); + Date ddate = getCalDataOcorrencia(); try { String ddate_str = formatador.format( ddate ); @@ -12384,7 +12463,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean DateFormat formatador = new SimpleDateFormat( "yyyy-MM-dd" ); - java.util.Date ddate = ( java.util.Date ) calAvaliacaoIncap.getValue(); +// java.util.Date ddate = ( java.util.Date ) calAvaliacaoIncap.getValue(); + Date ddate = getCalAvaliacaoIncap(); try { String ddate_str = formatador.format( ddate ); @@ -12396,7 +12476,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean a.setData_aval_incapacidade( null ); } - ddate = ( java.util.Date ) calRevisaoIncap.getValue(); +// ddate = ( java.util.Date ) calRevisaoIncap.getValue(); + ddate = getCalRevisaoIncap(); try { @@ -12409,7 +12490,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean a.setData_rev_incapacidade( null ); } - ddate = ( java.util.Date ) calPeridoIncapDe.getValue(); +// ddate = ( java.util.Date ) calPeridoIncapDe.getValue(); + ddate = getCalPeriodoIncapDe(); try { String ddate_str = formatador.format( ddate ); @@ -12421,7 +12503,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean a.setPeriodo_incapacidade_de( null ); } - ddate = ( java.util.Date ) calPeriodoIncapA.getValue(); +// ddate = ( java.util.Date ) calPeriodoIncapA.getValue(); + ddate = getCalPeriodoIncapA(); try { String ddate_str = formatador.format( ddate ); @@ -14037,7 +14120,8 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean a.setAveriguador( txtAveriguador.getText() ); a.setData_nascimento( stDataNascimento.getText() ); a.setData_admissao( stDataAdmissao1.getText() ); - a.setData_acidente( calDataOcorrencia.getValue() ); +// a.setData_acidente( calDataOcorrencia.getValue() ); + a.setData_acidente( getCalDataOcorrencia() ); a.setBi( stBI.getText() ); a.setMorada( stMorada.getText() ); a.setContacto_telefonico( stContactoTelefonico.getText() ); @@ -14290,7 +14374,9 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean //////stDataAcidente.setText(a.getData_acidente()); txtAveriguador.setText( a.getAveriguador() ); java.util.Date dtAcidente = ( java.util.Date ) a.getData_acidente(); - calDataOcorrencia.setValue( dtAcidente ); +// calDataOcorrencia.setValue( dtAcidente ); + setCalDataOcorrencia( dtAcidente ); + try { txtHorasTurno.setText( a.getHoras_turno().toString() ); @@ -14609,24 +14695,25 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean private void initCalendars() { - java.util.GregorianCalendar gcalendar = new java.util.GregorianCalendar(); - gcalendar.set( 1900, 1, 1 ); - calAvaliacaoIncap.setMinDate( gcalendar.getTime() ); - java.util.GregorianCalendar gcalendar1 = new java.util.GregorianCalendar(); - gcalendar1.set( 2099, 1, 1 ); - calAvaliacaoIncap.setMaxDate( gcalendar1.getTime() ); - - calRevisaoIncap.setMinDate( gcalendar.getTime() ); - calRevisaoIncap.setMaxDate( gcalendar1.getTime() ); - - calPeridoIncapDe.setMinDate( gcalendar.getTime() ); - calPeridoIncapDe.setMaxDate( gcalendar1.getTime() ); - - calPeriodoIncapA.setMinDate( gcalendar.getTime() ); - calPeriodoIncapA.setMaxDate( gcalendar1.getTime() ); - - calDataOcorrencia.setMinDate( gcalendar.getTime() ); - calDataOcorrencia.setMaxDate( gcalendar1.getTime() ); +// java.util.GregorianCalendar gcalendar = new java.util.GregorianCalendar(); +// gcalendar.set( 1900, 1, 1 ); +// +// calAvaliacaoIncap.setMinDate( gcalendar.getTime() ); +// java.util.GregorianCalendar gcalendar1 = new java.util.GregorianCalendar(); +// gcalendar1.set( 2099, 1, 1 ); +// calAvaliacaoIncap.setMaxDate( gcalendar1.getTime() ); +// +// calRevisaoIncap.setMinDate( gcalendar.getTime() ); +// calRevisaoIncap.setMaxDate( gcalendar1.getTime() ); +// +// calPeridoIncapDe.setMinDate( gcalendar.getTime() ); +// calPeridoIncapDe.setMaxDate( gcalendar1.getTime() ); +// +// calPeriodoIncapA.setMinDate( gcalendar.getTime() ); +// calPeriodoIncapA.setMaxDate( gcalendar1.getTime() ); +// +// calDataOcorrencia.setMinDate( gcalendar.getTime() ); +// calDataOcorrencia.setMaxDate( gcalendar1.getTime() ); } public void chkMembroSupDir_processValueChange( ValueChangeEvent event ) diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java index 73778802..8f133189 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java @@ -118,16 +118,27 @@ public class EstatisticasProcesso extends AbstractPageBean this.textAnoOcorrencia = tf; } - private com.sun.rave.web.ui.component.Calendar calDataOcorrencia = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalDataOcorrencia() +// private com.sun.rave.web.ui.component.Calendar calDataOcorrencia = new com.sun.rave.web.ui.component.Calendar(); +// public com.sun.rave.web.ui.component.Calendar getCalDataOcorrencia() +// { +// return this.calDataOcorrencia; +// } +// public void setCalDataOcorrencia( com.sun.rave.web.ui.component.Calendar c ) +// { +// this.calDataOcorrencia = c; +// } + + private Date calDataOcorrencia = null; + public Date getCalDataOcorrencia() { - return this.calDataOcorrencia; + return calDataOcorrencia; } - public void setCalDataOcorrencia( com.sun.rave.web.ui.component.Calendar c ) + public void setCalDataOcorrencia( Date calDataOcorrencia ) { - this.calDataOcorrencia = c; + this.calDataOcorrencia = calDataOcorrencia; } + private TextField textHoraOcorrencia = new TextField(); public TextField getTextHoraOcorrencia() { @@ -501,10 +512,12 @@ public class EstatisticasProcesso extends AbstractPageBean anoOcorrencia = "".equals( anoOcorrencia ) ? null : anoOcorrencia; } Date dataOcorrencia = null; - if ( calDataOcorrencia.getValue() != null ) - { - dataOcorrencia = ( Date )calDataOcorrencia.getValue(); - } +// if ( calDataOcorrencia.getValue() != null ) +// { +// dataOcorrencia = ( Date )calDataOcorrencia.getValue(); +// } + dataOcorrencia = calDataOcorrencia; + String horaOcorrencia = null; if ( textHoraOcorrencia.getText() != null ) { diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java index 049b222c..62715eec 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirGerRh.java @@ -971,28 +971,32 @@ public class FormDirGerRh extends AbstractPageBean this.dropEstabelecimentosSeguimento = dropEstabelecimentos; } -// private TextField textFilterEstabelecimentoSeg = new TextField(); -// public TextField getTextFilterEstabelecimentoSeg() + +// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); +// +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() // { -// return textFilterEstabelecimentoSeg; +// return this.calFilterDateSeg; // } -// public void setTextFilterEstabelecimentoSeg( TextField textFilterEstabelecimentoSeg ) +// +// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) // { -// this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; +// this.calFilterDateSeg = c; // } - - - private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); - - public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() + + private Date calFilterDateSeguimento = null; + public Date getCalFilterDateSeguimento() { - return this.calFilterDateSeg; + return calFilterDateSeguimento; } - - public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateSeguimento( Date calFilterDateSeguimento ) { - this.calFilterDateSeg = c; + this.calFilterDateSeguimento = calFilterDateSeguimento; } + + + + private TextField textFilterPORSeg = new TextField(); public TextField getTextFilterPORSeg() @@ -1601,7 +1605,8 @@ public class FormDirGerRh extends AbstractPageBean public String buttonFilterSeg_action() { - Date visitaDate = ( Date ) calFilterDateSeg.getValue(); +// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); + Date visitaDate = calFilterDateSeguimento; String visitaDateStr = null; if ( visitaDate != null ) { diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java index 4b514d91..d7122e05 100755 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormDirSiprp.java @@ -1044,28 +1044,32 @@ public class FormDirSiprp extends AbstractPageBean this.dropEstabelecimentosSeguimento = dropEstabelecimentos; } -// private TextField textFilterEstabelecimentoSeg = new TextField(); -// public TextField getTextFilterEstabelecimentoSeg() + +// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); +// +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() // { -// return textFilterEstabelecimentoSeg; +// return this.calFilterDateSeg; // } -// public void setTextFilterEstabelecimentoSeg( TextField textFilterEstabelecimentoSeg ) +// +// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) // { -// this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; +// this.calFilterDateSeg = c; // } - - private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); - - public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() + private Date calFilterDateSeguimento = null; + public Date getCalFilterDateSeguimento() { - return this.calFilterDateSeg; + return calFilterDateSeguimento; } - - public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateSeguimento( Date calFilterDateSeguimento ) { - this.calFilterDateSeg = c; + this.calFilterDateSeguimento = calFilterDateSeguimento; } + + + + private TextField textFilterPORSeg = new TextField(); public TextField getTextFilterPORSeg() @@ -1645,7 +1649,8 @@ public class FormDirSiprp extends AbstractPageBean public String buttonFilterSeg_action() { - Date visitaDate = ( Date ) calFilterDateSeg.getValue(); +// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); + Date visitaDate = calFilterDateSeguimento; String visitaDateStr = null; if ( visitaDate != null ) { diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java index e1459377..accd9bad 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormGestor.java @@ -970,27 +970,30 @@ public class FormGestor extends AbstractPageBean this.dropEstabelecimentosSeguimento = dropEstabelecimentos; } -// private TextField textFilterEstabelecimentoSeg = new TextField(); -// public TextField getTextFilterEstabelecimentoSeg() + +// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() // { -// return textFilterEstabelecimentoSeg; +// return this.calFilterDateSeg; // } -// public void setTextFilterEstabelecimentoSeg( TextField textFilterEstabelecimentoSeg ) +// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) // { -// this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; +// this.calFilterDateSeg = c; // } - private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); - - public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() + private Date calFilterDateSeguimento = null; + public Date getCalFilterDateSeguimento() { - return this.calFilterDateSeg; + return calFilterDateSeguimento; } - - public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateSeguimento( Date calFilterDateSeguimento ) { - this.calFilterDateSeg = c; + this.calFilterDateSeguimento = calFilterDateSeguimento; } + + + + private TextField textFilterPORSeg = new TextField(); public TextField getTextFilterPORSeg() @@ -1656,7 +1659,8 @@ public class FormGestor extends AbstractPageBean public String buttonFilterSeg_action() { - Date visitaDate = ( Date ) calFilterDateSeg.getValue(); +// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); + Date visitaDate = calFilterDateSeguimento; String visitaDateStr = null; if ( visitaDate != null ) { diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java index 80dd6e3b..4dc7ae85 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormHS.java @@ -13,7 +13,6 @@ import com.sun.data.provider.RowKey; import com.sun.rave.web.ui.appbase.AbstractPageBean; import com.sun.rave.web.ui.component.Body; import com.sun.rave.web.ui.component.Button; -import com.sun.rave.web.ui.component.Calendar; import com.sun.rave.web.ui.component.DropDown; import com.sun.rave.web.ui.component.Form; import com.sun.rave.web.ui.component.Head; @@ -1152,30 +1151,30 @@ public class FormHS extends AbstractPageBean this.dropEstabelecimentosActuais = dropEstabelecimentos; } -// private TextField textFilterEstabelecimentoActual = new TextField(); -// -// public TextField getTextFilterEstabelecimentoActual() + +// private Calendar calFilterDateActual = new Calendar(); +// public Calendar getCalFilterDateActual() // { -// return textFilterEstabelecimentoActual; +// return this.calFilterDateActual; // } -// -// public void setTextFilterEstabelecimentoActual( TextField textFilterEstabelecimentoActual ) +// public void setCalFilterDateActual( Calendar c ) // { -// this.textFilterEstabelecimentoActual = textFilterEstabelecimentoActual; +// this.calFilterDateActual = c; // } - - private Calendar calFilterDateActual = new Calendar(); - - public Calendar getCalFilterDateActual() + private Date calFilterDateActual = null; + public Date getCalFilterDateActual() { - return this.calFilterDateActual; + return calFilterDateActual; } - - public void setCalFilterDateActual( Calendar c ) + public void setCalFilterDateActual( Date calFilterDateActual ) { - this.calFilterDateActual = c; + this.calFilterDateActual = calFilterDateActual; } + + + + private TextField textFilterPORActual = new TextField(); public TextField getTextFilterPORActual() @@ -1264,28 +1263,30 @@ public class FormHS extends AbstractPageBean { this.dropEstabelecimentosSeguimento = dropEstabelecimentos; } -// private TextField textFilterEstabelecimentoSeg = new TextField(); -// public TextField getTextFilterEstabelecimentoSeg() + + +// private Calendar calFilterDateSeg = new Calendar(); +// public Calendar getCalFilterDateSeg() // { -// return textFilterEstabelecimentoSeg; +// return this.calFilterDateSeg; // } -// public void setTextFilterEstabelecimentoSeg( TextField textFilterEstabelecimentoSeg ) +// public void setCalFilterDateSeg( Calendar c ) // { -// this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; +// this.calFilterDateSeg = c; // } - - - private Calendar calFilterDateSeg = new Calendar(); - - public Calendar getCalFilterDateSeg() + + private Date calFilterDateSeguimento = null; + public Date getCalFilterDateSeguimento() { - return this.calFilterDateSeg; + return calFilterDateSeguimento; } - - public void setCalFilterDateSeg( Calendar c ) + public void setCalFilterDateSeguimento( Date calFilterDateSeguimento ) { - this.calFilterDateSeg = c; + this.calFilterDateSeguimento = calFilterDateSeguimento; } + + + private TextField textFilterPORSeg = new TextField(); public TextField getTextFilterPORSeg() @@ -1894,7 +1895,8 @@ public class FormHS extends AbstractPageBean public String buttonFilterActual_action() { - Date visitaDate = ( Date ) calFilterDateActual.getValue(); +// Date visitaDate = ( Date ) calFilterDateActual.getValue(); + Date visitaDate = calFilterDateActual; String visitaDateStr = null; if ( visitaDate != null ) { @@ -1958,7 +1960,8 @@ public class FormHS extends AbstractPageBean public String buttonFilterSeg_action() { - Date visitaDate = ( Date ) calFilterDateSeg.getValue(); +// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); + Date visitaDate = calFilterDateSeguimento; String visitaDateStr = null; if ( visitaDate != null ) { diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java index 35524f6f..9b7cb88e 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormMedico.java @@ -1154,17 +1154,30 @@ public class FormMedico extends AbstractPageBean { this.textFilterNameActual = tf; } - private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual() + + +// private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar(); +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual() +// { +// return this.calFilterDateActual; +// } +// public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c ) +// { +// this.calFilterDateActual = c; +// } + + private Date calFilterDateActual = null; + public Date getCalFilterDateActual() { - return this.calFilterDateActual; + return calFilterDateActual; } - - public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateActual( Date calFilterDateActual ) { - this.calFilterDateActual = c; + this.calFilterDateActual = calFilterDateActual; } + + private TextField textFilterPORActual = new TextField(); public TextField getTextFilterPORActual() @@ -1231,17 +1244,32 @@ public class FormMedico extends AbstractPageBean { this.textFilterNameSeg = tf; } - private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() + + +// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() +// { +// return this.calFilterDateSeg; +// } +// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) +// { +// this.calFilterDateSeg = c; +// } + + private Date calFilterDateSeguimento = null; + public Date getCalFilterDateSeguimento() { - return this.calFilterDateSeg; + return calFilterDateSeguimento; } - - public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateSeguimento( Date calFilterDateSeguimento ) { - this.calFilterDateSeg = c; + this.calFilterDateSeguimento = calFilterDateSeguimento; } + + + + private TextField textFilterPORSeg = new TextField(); public TextField getTextFilterPORSeg() @@ -1818,7 +1846,8 @@ public class FormMedico extends AbstractPageBean public String buttonFilterActual_action() { - Date visitaDate = ( Date ) calFilterDateActual.getValue(); +// Date visitaDate = ( Date ) calFilterDateActual.getValue(); + Date visitaDate = calFilterDateActual; String visitaDateStr = null; if ( visitaDate != null ) { @@ -1867,7 +1896,8 @@ public class FormMedico extends AbstractPageBean public String buttonFilterSeg_action() { - Date visitaDate = ( Date ) calFilterDateSeg.getValue(); +// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); + Date visitaDate = calFilterDateSeguimento; String visitaDateStr = null; if ( visitaDate != null ) { diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java index 064f5d5b..c5e8e586 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormRH.java @@ -1201,17 +1201,31 @@ public class FormRH extends AbstractPageBean { this.textFilterNameActual = tf; } - private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual() + + +// private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar(); +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual() +// { +// return this.calFilterDateActual; +// } +// public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c ) +// { +// this.calFilterDateActual = c; +// } + + private Date calFilterDateActual = null; + public Date getCalFilterDateActual() { - return this.calFilterDateActual; + return calFilterDateActual; } - - public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateActual( Date calFilterDateActual ) { - this.calFilterDateActual = c; + this.calFilterDateActual = calFilterDateActual; } + + + private TextField textFilterPORActual = new TextField(); public TextField getTextFilterPORActual() @@ -1278,17 +1292,30 @@ public class FormRH extends AbstractPageBean { this.textFilterNameSeg = tf; } - private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() + +// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() +// { +// return this.calFilterDateSeg; +// } +// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) +// { +// this.calFilterDateSeg = c; +// } + + private Date calFilterDateSeguimento = null; + public Date getCalFilterDateSeguimento() { - return this.calFilterDateSeg; + return calFilterDateSeguimento; } - - public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateSeguimento( Date calFilterDateSeguimento ) { - this.calFilterDateSeg = c; + this.calFilterDateSeguimento = calFilterDateSeguimento; } + + + private TextField textFilterPORSeg = new TextField(); public TextField getTextFilterPORSeg() @@ -2009,7 +2036,8 @@ public class FormRH extends AbstractPageBean public String buttonFilterActual_action() { - Date visitaDate = ( Date ) calFilterDateActual.getValue(); +// Date visitaDate = ( Date ) calFilterDateActual.getValue(); + Date visitaDate = calFilterDateActual; String visitaDateStr = null; if ( visitaDate != null ) { @@ -2062,7 +2090,8 @@ public class FormRH extends AbstractPageBean public String buttonFilterSeg_action() { - Date visitaDate = ( Date ) calFilterDateSeg.getValue(); +// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); + Date visitaDate = calFilterDateSeguimento; String visitaDateStr = null; if ( visitaDate != null ) { diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java index 560886cf..226499d4 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/FormSeguranca.java @@ -1238,17 +1238,31 @@ public class FormSeguranca extends AbstractPageBean { this.textFilterNameSeg = tf; } - private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() + + +// private com.sun.rave.web.ui.component.Calendar calFilterDateSeg = new com.sun.rave.web.ui.component.Calendar(); +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateSeg() +// { +// return this.calFilterDateSeg; +// } +// public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) +// { +// this.calFilterDateSeg = c; +// } + + private Date calFilterDateSeguimento = null; + public Date getCalFilterDateSeguimento() { - return this.calFilterDateSeg; + return calFilterDateSeguimento; } - - public void setCalFilterDateSeg( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateSeguimento( Date calFilterDateSeguimento ) { - this.calFilterDateSeg = c; + this.calFilterDateSeguimento = calFilterDateSeguimento; } + + + private TextField textFilterPORSeg = new TextField(); public TextField getTextFilterPORSeg() @@ -1315,17 +1329,30 @@ public class FormSeguranca extends AbstractPageBean { this.textFilterNameActual = tf; } - private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar(); - public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual() + +// private com.sun.rave.web.ui.component.Calendar calFilterDateActual = new com.sun.rave.web.ui.component.Calendar(); +// public com.sun.rave.web.ui.component.Calendar getCalFilterDateActual() +// { +// return this.calFilterDateActual; +// } +// public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c ) +// { +// this.calFilterDateActual = c; +// } + + private Date calFilterDateActual = null; + public Date getCalFilterDateActual() { - return this.calFilterDateActual; + return calFilterDateActual; } - - public void setCalFilterDateActual( com.sun.rave.web.ui.component.Calendar c ) + public void setCalFilterDateActual( Date calFilterDateActual ) { - this.calFilterDateActual = c; + this.calFilterDateActual = calFilterDateActual; } + + + private TextField textFilterPORActual = new TextField(); public TextField getTextFilterPORActual() @@ -1735,7 +1762,8 @@ public class FormSeguranca extends AbstractPageBean public String buttonFilterActual_action() { - Date visitaDate = ( Date ) calFilterDateActual.getValue(); +// Date visitaDate = ( Date ) calFilterDateActual.getValue(); + Date visitaDate = calFilterDateActual; String visitaDateStr = null; if ( visitaDate != null ) { @@ -1789,7 +1817,8 @@ public class FormSeguranca extends AbstractPageBean public String buttonFilterSeg_action() { - Date visitaDate = ( Date ) calFilterDateSeg.getValue(); +// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); + Date visitaDate = calFilterDateSeguimento; String visitaDateStr = null; if ( visitaDate != null ) { diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/app.properties b/trunk/AnaliseAcidentesTrabalho/src/java/app.properties index 3fc72f86..c29c6ec8 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/app.properties +++ b/trunk/AnaliseAcidentesTrabalho/src/java/app.properties @@ -16,13 +16,13 @@ username.siprp_local = postgres # tests localhost #server.siprp = localhost #port.siprp = 5432 -#database.siprp = siprp_20110706 +#database.siprp = siprp #username.siprp = postgres #password.siprp = Typein # #server.siprp_local = localhost #port.siprp_local = 5432 -#database.siprp_local = siprp_local_3_20110706 +#database.siprp_local = siprp_local_3 #username.siprp_local = postgres #password.siprp_local = Typein diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/EvoBaseProvider.java b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/EvoBaseProvider.java index 6a404b6f..3851ab37 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/EvoBaseProvider.java +++ b/trunk/AnaliseAcidentesTrabalho/src/java/db/providers/EvoBaseProvider.java @@ -72,7 +72,7 @@ public class EvoBaseProvider String username = DBPropertiesLoader.getInstance().findProperty( DBConstants.USERNAME_SIPRP ); String password = DBPropertiesLoader.getInstance().findProperty( DBConstants.PASSWORD_SIPRP ); - System.out.println( "\t" + server + " : " + port + " : " + dbname + " : " + username + " : " + password ); +// System.out.println( "\t" + server + " : " + port + " : " + dbname + " : " + username + " : " + password ); String server_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.SERVER_SIPRP_LOCAL ); int port_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.PORT_SIPRP_LOCAL, -1 ); @@ -80,7 +80,7 @@ public class EvoBaseProvider String username_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.USERNAME_SIPRP_LOCAL ); String password_local = DBPropertiesLoader.getInstance().findProperty( DBConstants.PASSWORD_SIPRP_LOCAL ); - System.out.println( "\t" + server_local + " : " + port_local + " : " + dbname_local + " : " + username_local + " : " + password_local ); +// System.out.println( "\t" + server_local + " : " + port_local + " : " + dbname_local + " : " + username_local + " : " + password_local ); init( DBConstants.DB.SIPRP, server, port, dbname, username, password ); init( DBConstants.DB.SIPRP_LOCAL, server_local, port_local, dbname_local, username_local, password_local ); @@ -118,7 +118,7 @@ public class EvoBaseProvider UnicodeChecker.setUseDoubleSlash( true ); // Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); dbManager = manager; - System.out.println( "\nDBManager : " + dbManager ); +// System.out.println( "\nDBManager : " + dbManager ); } else if ( DBConstants.DB.SIPRP_LOCAL.equals( db ) ) { @@ -133,7 +133,7 @@ public class EvoBaseProvider // Insert.setDefaultKeyRetriever( PostgresqlAutoKeyRetriever.RETRIEVER ); localDBManager = manager; Singleton.setInstance( Singleton.DEFAULT_DBMANAGER, localDBManager ); - System.out.println( "\nLocalDBManager : " + localDBManager ); +// System.out.println( "\nLocalDBManager : " + localDBManager ); } } diff --git a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp index 63b58d41..4b944e6c 100644 --- a/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp +++ b/trunk/AnaliseAcidentesTrabalho/web/AnaliseAcidenteTrabalho.jsp @@ -1,24 +1,30 @@ - + + -