diff --git a/trunk/PlanosActuacao/lib/commons-beanutils-1.8.3.jar b/trunk/PlanosActuacao/lib/commons-beanutils-1.8.3.jar new file mode 100644 index 00000000..218510bc Binary files /dev/null and b/trunk/PlanosActuacao/lib/commons-beanutils-1.8.3.jar differ diff --git a/trunk/PlanosActuacao/lib/commons-digester-1.8.jar b/trunk/PlanosActuacao/lib/commons-digester-1.8.jar new file mode 100644 index 00000000..1110f0aa Binary files /dev/null and b/trunk/PlanosActuacao/lib/commons-digester-1.8.jar differ diff --git a/trunk/PlanosActuacao/lib/commons-fileupload-1.2.1.jar b/trunk/PlanosActuacao/lib/commons-fileupload-1.2.1.jar new file mode 100644 index 00000000..7db423ed Binary files /dev/null and b/trunk/PlanosActuacao/lib/commons-fileupload-1.2.1.jar differ diff --git a/trunk/PlanosActuacao/lib/commons-lang-2.1.jar b/trunk/PlanosActuacao/lib/commons-lang-2.1.jar deleted file mode 100644 index 87b80ab5..00000000 Binary files a/trunk/PlanosActuacao/lib/commons-lang-2.1.jar and /dev/null differ diff --git a/trunk/PlanosActuacao/lib/commons-lang-2.4.jar b/trunk/PlanosActuacao/lib/commons-lang-2.4.jar new file mode 100644 index 00000000..532939ec Binary files /dev/null and b/trunk/PlanosActuacao/lib/commons-lang-2.4.jar differ diff --git a/trunk/PlanosActuacao/lib/commons-logging-1.1.1.jar b/trunk/PlanosActuacao/lib/commons-logging-1.1.1.jar new file mode 100644 index 00000000..1deef144 Binary files /dev/null and b/trunk/PlanosActuacao/lib/commons-logging-1.1.1.jar differ diff --git a/trunk/PlanosActuacao/lib/commons-logging-1.1.jar b/trunk/PlanosActuacao/lib/commons-logging-1.1.jar deleted file mode 100644 index 2ff9bbd9..00000000 Binary files a/trunk/PlanosActuacao/lib/commons-logging-1.1.jar and /dev/null differ diff --git a/trunk/PlanosActuacao/lib/commons-validator-1.3.1.jar b/trunk/PlanosActuacao/lib/commons-validator-1.3.1.jar new file mode 100644 index 00000000..55b12b1a Binary files /dev/null and b/trunk/PlanosActuacao/lib/commons-validator-1.3.1.jar differ diff --git a/trunk/PlanosActuacao/lib/richfaces-api-3.3.3.Final.jar b/trunk/PlanosActuacao/lib/richfaces-api-3.3.3.Final.jar new file mode 100644 index 00000000..0aeb97a6 Binary files /dev/null and b/trunk/PlanosActuacao/lib/richfaces-api-3.3.3.Final.jar differ diff --git a/trunk/PlanosActuacao/lib/richfaces-impl-3.3.3.Final.jar b/trunk/PlanosActuacao/lib/richfaces-impl-3.3.3.Final.jar new file mode 100644 index 00000000..6c61a7fd Binary files /dev/null and b/trunk/PlanosActuacao/lib/richfaces-impl-3.3.3.Final.jar differ diff --git a/trunk/PlanosActuacao/lib/richfaces-impl-jsf2-3.3.3.Final.jar b/trunk/PlanosActuacao/lib/richfaces-impl-jsf2-3.3.3.Final.jar new file mode 100644 index 00000000..0268975c Binary files /dev/null and b/trunk/PlanosActuacao/lib/richfaces-impl-jsf2-3.3.3.Final.jar differ diff --git a/trunk/PlanosActuacao/lib/richfaces-ui-3.3.3.Final.jar b/trunk/PlanosActuacao/lib/richfaces-ui-3.3.3.Final.jar new file mode 100644 index 00000000..6b02e055 Binary files /dev/null and b/trunk/PlanosActuacao/lib/richfaces-ui-3.3.3.Final.jar differ diff --git a/trunk/PlanosActuacao/nbproject/build-impl.xml b/trunk/PlanosActuacao/nbproject/build-impl.xml index b8b91f7b..929b682e 100644 --- a/trunk/PlanosActuacao/nbproject/build-impl.xml +++ b/trunk/PlanosActuacao/nbproject/build-impl.xml @@ -521,34 +521,43 @@ exists or setup the property manually. For example like this: - + - - - - - - - + - - + + + + + + + + - + + + + + + + + + + + + - - - + - + @@ -557,30 +566,39 @@ exists or setup the property manually. For example like this: - + - - - - - - - + - - + + + + + + + + - + + + + + + + + + + + + - - - + diff --git a/trunk/PlanosActuacao/nbproject/genfiles.properties b/trunk/PlanosActuacao/nbproject/genfiles.properties index 7946d2a1..d1c440cc 100644 --- a/trunk/PlanosActuacao/nbproject/genfiles.properties +++ b/trunk/PlanosActuacao/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=a4c2779c +build.xml.data.CRC32=68c8c433 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=a4c2779c -nbproject/build-impl.xml.script.CRC32=34b43bcc +nbproject/build-impl.xml.data.CRC32=68c8c433 +nbproject/build-impl.xml.script.CRC32=0f9e6147 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1 diff --git a/trunk/PlanosActuacao/nbproject/project.properties b/trunk/PlanosActuacao/nbproject/project.properties index 29b3a066..a3dbef95 100644 --- a/trunk/PlanosActuacao/nbproject/project.properties +++ b/trunk/PlanosActuacao/nbproject/project.properties @@ -26,19 +26,28 @@ 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.common-src=../common/src +file.reference.commons-beanutils-1.8.3.jar=lib/commons-beanutils-1.8.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-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-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.evologger.jar=lib/evologger.jar file.reference.evolute.jar=lib/evolute.jar file.reference.fop.jar=lib/fop.jar file.reference.jai_imageio.jar=lib/jai_imageio.jar +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.postgresql-8.4-701.jdbc4.jar=lib/postgresql-8.4-701.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.serializer-2.7.0.jar=lib/serializer-2.7.0.jar file.reference.shst.jar=lib/shst.jar file.reference.xalan-2.7.0.jar=lib/xalan-2.7.0.jar @@ -57,30 +66,39 @@ javac.classpath=\ ${libs.jsf12-support.classpath}:\ ${libs.woodstock-components.classpath}:\ ${libs.woodstock-theme-default.classpath}:\ - ${file.reference.jdom.jar}:\ + ${file.reference.activation.jar}:\ ${file.reference.ashwood-2.0.jar}:\ ${file.reference.avalon-framework-4.2.0.jar}:\ - ${file.reference.activation.jar}:\ - ${file.reference.fop.jar}:\ - ${file.reference.jai_imageio.jar}:\ - ${file.reference.postgresql-8.4-701.jdbc4.jar}:\ - ${file.reference.evologger.jar}:\ ${file.reference.batik-all-1.7.jar}:\ - ${file.reference.xmlgraphics-commons-1.3.1.jar}:\ - ${file.reference.commons-io-1.4.jar}:\ + ${file.reference.commons-beanutils-1.8.3.jar}:\ ${file.reference.commons-collections-3.1.jar}:\ - ${file.reference.commons-lang-2.1.jar}:\ - ${file.reference.commons-logging-1.1.jar}:\ + ${file.reference.commons-digester-1.8.jar}:\ + ${file.reference.commons-fileupload-1.2.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.evologger.jar}:\ ${file.reference.evolute.jar}:\ - ${file.reference.mail.jar-1}:\ + ${file.reference.fop.jar}:\ + ${file.reference.jai_imageio.jar}:\ + ${file.reference.jdbcappender.jar}:\ + ${file.reference.jdom.jar}:\ ${file.reference.log4j-1.2.15.jar}:\ + ${file.reference.mail.jar-1}:\ + ${file.reference.postgresql-8.4-701.jdbc4.jar}:\ + ${file.reference.richfaces-api-3.3.3.Final.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.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.serializer-2.7.0.jar}:\ - ${file.reference.cursos.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/PlanosActuacao/nbproject/project.xml b/trunk/PlanosActuacao/nbproject/project.xml index e7f09cca..df9778c0 100644 --- a/trunk/PlanosActuacao/nbproject/project.xml +++ b/trunk/PlanosActuacao/nbproject/project.xml @@ -28,7 +28,7 @@ WEB-INF/lib - ${file.reference.jdom.jar} + ${file.reference.activation.jar} WEB-INF/lib @@ -40,47 +40,47 @@ WEB-INF/lib - ${file.reference.activation.jar} + ${file.reference.batik-all-1.7.jar} WEB-INF/lib - ${file.reference.fop.jar} + ${file.reference.commons-beanutils-1.8.3.jar} WEB-INF/lib - ${file.reference.jai_imageio.jar} + ${file.reference.commons-collections-3.1.jar} WEB-INF/lib - ${file.reference.postgresql-8.4-701.jdbc4.jar} + ${file.reference.commons-digester-1.8.jar} WEB-INF/lib - ${file.reference.evologger.jar} + ${file.reference.commons-fileupload-1.2.1.jar} WEB-INF/lib - ${file.reference.batik-all-1.7.jar} + ${file.reference.commons-io-1.4.jar} WEB-INF/lib - ${file.reference.xmlgraphics-commons-1.3.1.jar} + ${file.reference.commons-lang-2.4.jar} WEB-INF/lib - ${file.reference.commons-io-1.4.jar} + ${file.reference.commons-logging-1.1.1.jar} WEB-INF/lib - ${file.reference.commons-collections-3.1.jar} + ${file.reference.commons-validator-1.3.1.jar} WEB-INF/lib - ${file.reference.commons-lang-2.1.jar} + ${file.reference.cursos.jar} WEB-INF/lib - ${file.reference.commons-logging-1.1.jar} + ${file.reference.evologger.jar} WEB-INF/lib @@ -88,7 +88,19 @@ WEB-INF/lib - ${file.reference.mail.jar-1} + ${file.reference.fop.jar} + WEB-INF/lib + + + ${file.reference.jai_imageio.jar} + WEB-INF/lib + + + ${file.reference.jdbcappender.jar} + WEB-INF/lib + + + ${file.reference.jdom.jar} WEB-INF/lib @@ -96,33 +108,57 @@ WEB-INF/lib - ${file.reference.xalan-2.7.0.jar} + ${file.reference.mail.jar-1} WEB-INF/lib - ${file.reference.xercesImpl-2.7.1.jar} + ${file.reference.postgresql-8.4-701.jdbc4.jar} WEB-INF/lib - ${file.reference.xml-apis-1.3.04.jar} + ${file.reference.richfaces-api-3.3.3.Final.jar} WEB-INF/lib - ${file.reference.xml-apis-ext-1.3.04.jar} + ${file.reference.richfaces-impl-3.3.3.Final.jar} WEB-INF/lib - ${file.reference.serializer-2.7.0.jar} + ${file.reference.richfaces-impl-jsf2-3.3.3.Final.jar} WEB-INF/lib - ${file.reference.cursos.jar} + ${file.reference.richfaces-ui-3.3.3.Final.jar} + WEB-INF/lib + + + ${file.reference.serializer-2.7.0.jar} WEB-INF/lib ${file.reference.shst.jar} WEB-INF/lib + + ${file.reference.xalan-2.7.0.jar} + WEB-INF/lib + + + ${file.reference.xercesImpl-2.7.1.jar} + WEB-INF/lib + + + ${file.reference.xml-apis-1.3.04.jar} + WEB-INF/lib + + + ${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/PlanosActuacao/src/java/pagination/Pagina.java b/trunk/PlanosActuacao/src/java/pagination/Pagina.java index 8957c4e2..2a319c55 100644 --- a/trunk/PlanosActuacao/src/java/pagination/Pagina.java +++ b/trunk/PlanosActuacao/src/java/pagination/Pagina.java @@ -6,6 +6,7 @@ package pagination; import com.sun.webui.jsf.component.Hyperlink; +import java.io.Serializable; import javax.faces.context.FacesContext; import planosactuacao.SessionBean1.PAGINATION_ENUM; @@ -13,7 +14,7 @@ import planosactuacao.SessionBean1.PAGINATION_ENUM; * * @author lluis */ -public class Pagina extends Hyperlink +public class Pagina extends Hyperlink implements Serializable { private PAGINATION_ENUM paginationType; diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java index 01a2d1d0..bbb57f11 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java @@ -9,7 +9,7 @@ import com.evolute.utils.error.ErrorLogger; import com.sun.rave.web.ui.appbase.AbstractPageBean; import com.sun.webui.jsf.component.Button; -import com.sun.webui.jsf.component.Calendar; + import com.sun.webui.jsf.component.Checkbox; import com.sun.webui.jsf.component.DropDown; import com.sun.webui.jsf.component.PanelGroup; @@ -36,7 +36,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import java.util.Vector; import javax.el.MethodExpression; import javax.faces.FacesException; import javax.faces.component.html.HtmlInputHidden; @@ -46,6 +45,7 @@ import javax.faces.event.ActionEvent; import javax.faces.event.MethodExpressionActionListener; import javax.faces.event.ValueChangeEvent; import mail.Mail; +import org.richfaces.component.html.HtmlCalendar; import pagination.Pagina; import pagination.Pagination; import pagination.PaginationNormais; @@ -97,8 +97,10 @@ public class EditarPlano extends AbstractPageBean TextField txtResponsavelExecucao; TextField txtPor; TextArea txtRecursos; - Calendar dtInicio; - Calendar dtFim; + + HtmlCalendar dtInicio; + HtmlCalendar dtFim; + TextArea txtParecerDns; TextArea txtParecerDl; TextArea txtVerificacaoSiprp; @@ -123,17 +125,19 @@ public class EditarPlano extends AbstractPageBean { this.butGravarPlano = b; } - private Button butGravarRisco = new Button(); - public Button getButGravarRisco() - { - return butGravarRisco; - } - public void setButGravarRisco( Button b ) - { - this.butGravarRisco = b; - } +// private Button butGravarRisco = new Button(); +// public Button getButGravarRisco() +// { +// return butGravarRisco; +// } +// public void setButGravarRisco( Button b ) +// { +// this.butGravarRisco = b; +// } + + private Button butEnviar = new Button(); public Button getButEnviar() @@ -1126,14 +1130,18 @@ public class EditarPlano extends AbstractPageBean grd.getChildren().add( st ); if ( u.getTipo().intValue() == Global.RESPONSAVEL_SEGURANCA ) { - dtInicio = new Calendar(); +// HtmlCalendar cal = new HtmlCalendar(); + + dtInicio = new HtmlCalendar(); dtInicio.setId( "dtInicio" ); - dtInicio.setDateFormatPattern( "dd-MM-yyyy" ); + 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 ); - dtInicio.setMinDate( gcalendar.getTime() ); + +// dtInicio.setMinDate( gcalendar.getTime() ); grd.getChildren().add( dtInicio ); } else @@ -1163,12 +1171,15 @@ public class EditarPlano extends AbstractPageBean grd.getChildren().add( st ); if ( u.getTipo().intValue() == Global.RESPONSAVEL_SEGURANCA ) { - dtFim = new Calendar(); +// dtFim = new Calendar(); + dtFim = new HtmlCalendar(); + dtFim.setId( "dtFim" ); - dtFim.setDateFormatPattern( "dd-MM-yyyy" ); + 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() ); +// dtFim.setMaxDate( gcalendar1.getTime() ); dtFim.setValue( r.getData_fim() ); grd.getChildren().add( dtFim ); } @@ -1743,16 +1754,24 @@ public class EditarPlano extends AbstractPageBean } } - Calendar dtInicio = ( Calendar ) gridResponsavel.findComponent( "form1:dtInicio:" ); + HtmlCalendar dtInicio = ( HtmlCalendar ) gridResponsavel.findComponent( "form1:dtInicio:" ); if ( dtInicio != null ) { - r.setData_inicio( dtInicio.getSelectedDate() ); + Object value = dtInicio.getValue(); + Date currentDate = value instanceof Date ? ( Date ) value : null; + + r.setData_inicio( currentDate ); +// r.setData_inicio( dtInicio.getSelectedDate() ); } - Calendar dtFim = ( Calendar ) gridResponsavel.findComponent( "form1:dtFim" ); + HtmlCalendar dtFim = ( HtmlCalendar ) gridResponsavel.findComponent( "form1:dtFim" ); if ( dtFim != null ) { - r.setData_fim( dtFim.getSelectedDate() ); + Object value = dtFim.getValue(); + Date currentDate = value instanceof Date ? ( Date ) value : null; + + r.setData_fim( currentDate ); +// r.setData_fim( dtFim.getSelectedDate() ); } TextArea txtParecerDl = ( TextArea ) gridResponsavel.findComponent( "form1:txtParecerDl" ); @@ -1872,11 +1891,13 @@ public class EditarPlano extends AbstractPageBean gridArea = ( HtmlPanelGrid ) gridPlano.findComponent( "form1:gridArea" ); gridResponsavel = ( HtmlPanelGrid ) gridArea.findComponent( "form1:gridResponsavel" ); HtmlPanelGrid gridDtInicio = ( HtmlPanelGrid ) gridResponsavel.findComponent( "form1:gridDtInicio" ); - Calendar calDtInicio = ( Calendar ) gridDtInicio.findComponent( "form1:dtInicio" ); + HtmlCalendar calDtInicio = ( HtmlCalendar ) gridDtInicio.findComponent( "form1:dtInicio" ); HtmlPanelGrid gridDtFim = ( HtmlPanelGrid ) gridResponsavel.findComponent( "form1:gridDtFim" ); - Calendar calDtFim = ( Calendar ) gridDtFim.findComponent( "form1:dtFim" ); - Date dtInicio = calDtInicio.getSelectedDate(); - Date dtFim = calDtFim.getSelectedDate(); + HtmlCalendar calDtFim = ( HtmlCalendar ) gridDtFim.findComponent( "form1:dtFim" ); +// Date dtInicio = calDtInicio.getSelectedDate(); + Date dtInicio = ( Date ) calDtInicio.getValue(); +// Date dtFim = calDtFim.getSelectedDate(); + Date dtFim = ( Date ) calDtFim.getValue(); if ( dtInicio != null && dtFim != null ) { if ( dtInicio.after( dtFim ) ) @@ -2360,8 +2381,8 @@ public class EditarPlano extends AbstractPageBean case Global.FASE_SEGURANCA_PREENCHIMENTO: TextField txtResponsavel = ( TextField ) gridResponsavel.findComponent( "form1:pgResponsavel:txtResponsavel" ); TextArea txtRecursos = ( TextArea ) gridResponsavel.findComponent( "form1:txtRecursos" ); - Calendar dtInicio = ( Calendar ) gridResponsavel.findComponent( "form1:dtInicio:" ); - Calendar dtFim = ( Calendar ) gridResponsavel.findComponent( "form1:dtFim" ); + HtmlCalendar dtInicio = ( HtmlCalendar ) gridResponsavel.findComponent( "form1:dtInicio:" ); + HtmlCalendar dtFim = ( HtmlCalendar ) gridResponsavel.findComponent( "form1:dtFim" ); txtResponsavel.setText( "" ); txtRecursos.setText( "" ); dtInicio.setValue( null ); diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java index 8f3d7655..26370620 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java @@ -198,17 +198,30 @@ public class ListaPlanos extends AbstractPageBean { this.textFilterEstabelecimentoActual = textFilterEstabelecimentoActual; } - private com.sun.webui.jsf.component.Calendar calFilterDateActual = new com.sun.webui.jsf.component.Calendar(); - public com.sun.webui.jsf.component.Calendar getCalFilterDateActual() + + private Date calFilterDate = null; + public Date getCalFilterDate() { - return calFilterDateActual; + return calFilterDate; } - - public void setCalFilterDateActual( com.sun.webui.jsf.component.Calendar calFilterDateActual ) + public void setCalFilterDate( Date calFilterDate ) { - this.calFilterDateActual = calFilterDateActual; + this.calFilterDate = calFilterDate; } + + +// private com.sun.webui.jsf.component.Calendar calFilterDateActual = new com.sun.webui.jsf.component.Calendar(); +// public com.sun.webui.jsf.component.Calendar getCalFilterDateActual() +// { +// return calFilterDateActual; +// } +// public void setCalFilterDateActual( com.sun.webui.jsf.component.Calendar calFilterDateActual ) +// { +// this.calFilterDateActual = calFilterDateActual; +// } + + private Button buttonFilterActual = new Button(); public Button getButtonFilterActual() @@ -264,17 +277,29 @@ public class ListaPlanos extends AbstractPageBean { this.textFilterEstabelecimentoSeg = textFilterEstabelecimentoSeg; } - private com.sun.webui.jsf.component.Calendar calFilterDateSeg = new com.sun.webui.jsf.component.Calendar(); - public com.sun.webui.jsf.component.Calendar getCalFilterDateSeg() + + private Date calFilterDateSeguimento = null; + public Date getCalFilterDateSeguimento() { - return calFilterDateSeg; + return calFilterDateSeguimento; } - - public void setCalFilterDateSeg( com.sun.webui.jsf.component.Calendar calFilterDateSeg ) + public void setCalFilterDateSeguimento( Date calFilterDateSeguimento ) { - this.calFilterDateSeg = calFilterDateSeg; + this.calFilterDateSeguimento = calFilterDateSeguimento; } + +// private com.sun.webui.jsf.component.Calendar calFilterDateSeg = new com.sun.webui.jsf.component.Calendar(); +// public com.sun.webui.jsf.component.Calendar getCalFilterDateSeg() +// { +// return calFilterDateSeg; +// } +// public void setCalFilterDateSeg( com.sun.webui.jsf.component.Calendar calFilterDateSeg ) +// { +// this.calFilterDateSeg = calFilterDateSeg; +// } + + private Button buttonFilterSeg = new Button(); public Button getButtonFilterSeg() @@ -330,17 +355,29 @@ public class ListaPlanos extends AbstractPageBean { this.textFilterEstabelecimentoConc = textFilterEstabelecimentoConc; } - private com.sun.webui.jsf.component.Calendar calFilterDateConc = new com.sun.webui.jsf.component.Calendar(); - public com.sun.webui.jsf.component.Calendar getCalFilterDateConc() + + private Date calFilterDateConcluidos = null; + public Date getCalFilterDateConcluidos() { - return calFilterDateConc; + return calFilterDateConcluidos; } - - public void setCalFilterDateConc( com.sun.webui.jsf.component.Calendar calFilterDateConc ) + public void setCalFilterDateConcluidos( Date calFilterDateConcluidos ) { - this.calFilterDateConc = calFilterDateConc; + this.calFilterDateConcluidos = calFilterDateConcluidos; } + +// private com.sun.webui.jsf.component.Calendar calFilterDateConc = new com.sun.webui.jsf.component.Calendar(); +// public com.sun.webui.jsf.component.Calendar getCalFilterDateConc() +// { +// return calFilterDateConc; +// } +// public void setCalFilterDateConc( com.sun.webui.jsf.component.Calendar calFilterDateConc ) +// { +// this.calFilterDateConc = calFilterDateConc; +// } + + private Button buttonFilterConc = new Button(); public Button getButtonFilterConc() @@ -953,12 +990,16 @@ public class ListaPlanos extends AbstractPageBean } } - Date visitaDate = ( Date ) calFilterDateActual.getValue(); +// Date visitaDate = ( Date ) calFilterDateActual.getValue(); String visitaDateStr = null; - if ( visitaDate != null ) + if ( calFilterDate != null ) { - visitaDateStr = D_F.format( visitaDate ); + visitaDateStr = D_F.format( calFilterDate ); } +// if ( visitaDate != null ) +// { +// visitaDateStr = D_F.format( visitaDate ); +// } getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE ); getSessionBean1().getPlanosActualDataProvider().setList( @@ -989,12 +1030,16 @@ public class ListaPlanos extends AbstractPageBean } } - Date visitaDate = ( Date ) calFilterDateSeg.getValue(); +// Date visitaDate = ( Date ) calFilterDateSeg.getValue(); String visitaDateStr = null; - if ( visitaDate != null ) + if ( calFilterDateSeguimento != null ) { - visitaDateStr = D_F.format( visitaDate ); + visitaDateStr = D_F.format( calFilterDateSeguimento ); } +// if ( visitaDate != null ) +// { +// visitaDateStr = D_F.format( visitaDate ); +// } getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE ); getSessionBean1().getPlanosSeguimentoDataProvider().setList( @@ -1025,12 +1070,16 @@ public class ListaPlanos extends AbstractPageBean } } - Date visitaDate = ( Date ) calFilterDateConc.getValue(); +// Date visitaDate = ( Date ) calFilterDateConc.getValue(); String visitaDateStr = null; - if ( visitaDate != null ) + if ( calFilterDateConcluidos != null ) { - visitaDateStr = D_F.format( visitaDate ); + visitaDateStr = D_F.format( calFilterDateConcluidos ); } +// if ( visitaDate != null ) +// { +// visitaDateStr = D_F.format( visitaDate ); +// } getSessionBean1().setIsSearchingPlanosActuacao( Boolean.TRUE ); getSessionBean1().getPlanosConcluidosDataProvider().setList( diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java index da10169d..87d642c3 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java @@ -24,7 +24,6 @@ import java.util.Comparator; import java.util.List; import javax.faces.FacesException; import javax.faces.component.html.HtmlPanelGrid; -import javax.sound.midi.SysexMessage; /** *

Page bean that corresponds to a similarly named JSP page. This diff --git a/trunk/PlanosActuacao/web/EditarPlano.jsp b/trunk/PlanosActuacao/web/EditarPlano.jsp index 37b9015b..bcca4ab5 100644 --- a/trunk/PlanosActuacao/web/EditarPlano.jsp +++ b/trunk/PlanosActuacao/web/EditarPlano.jsp @@ -4,33 +4,35 @@ Created on : Aug 26, 2008, 3:10:59 PM Author : lluis --> - + + - - -

- -
- - +
+ +
+ @@ -220,7 +220,8 @@ - @@ -251,8 +252,7 @@ - - + + } + - -
- -
- +
+ +
+ + diff --git a/trunk/PlanosActuacao/web/WEB-INF/faces-config.xml b/trunk/PlanosActuacao/web/WEB-INF/faces-config.xml index 68d2f2bc..f3d8a731 100644 --- a/trunk/PlanosActuacao/web/WEB-INF/faces-config.xml +++ b/trunk/PlanosActuacao/web/WEB-INF/faces-config.xml @@ -8,13 +8,9 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> viewhandler.CustomViewHandler - - - phaselistener.MainPhaseListener diff --git a/trunk/PlanosActuacao/web/WEB-INF/web.xml b/trunk/PlanosActuacao/web/WEB-INF/web.xml index ebfe1b02..a2ee0cbf 100644 --- a/trunk/PlanosActuacao/web/WEB-INF/web.xml +++ b/trunk/PlanosActuacao/web/WEB-INF/web.xml @@ -1,5 +1,37 @@ + + + + org.richfaces.SKIN + blueSky + + + + + + + + RichFaces Filter + richfaces + org.ajax4jsf.Filter + + + richfaces + Faces Servlet + + + + javax.faces.STATE_SAVING_METHOD client @@ -12,6 +44,7 @@ com.sun.faces.verifyObjects false + UploadFilter @@ -31,6 +64,7 @@ UploadFilter Faces Servlet + Faces Servlet