diff --git a/trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java b/trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java index 28aeac63..d3ca221f 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java +++ b/trunk/AnaliseAcidentesTrabalho/src/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java @@ -16,6 +16,7 @@ import beans.Trabalhador; import beans.Utilizador; import beans.Acidentado; import beans.AnaliseAcidente; +import com.evolute.utils.date.DateUtils; import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.strings.StringPlainer; import com.sun.data.provider.RowKey; @@ -62,10 +63,14 @@ import javax.activation.DataHandler; import javax.faces.FacesException; import javax.faces.FactoryFinder; import javax.faces.application.ApplicationFactory; +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; import javax.faces.component.html.HtmlPanelGrid; +import javax.faces.context.FacesContext; import javax.faces.el.MethodBinding; import javax.faces.event.ActionEvent; import javax.faces.event.ValueChangeEvent; +import javax.faces.validator.ValidatorException; import javax.mail.*; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeBodyPart; @@ -101,6 +106,19 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean private void _init() throws Exception { } + + private java.util.Date today = new java.util.Date(); + + public Date getToday() + { + return today; + } + + public void setToday( Date today ) + { + this.today = today; + } + private Page page1 = new Page(); public Page getPage1() @@ -12686,6 +12704,18 @@ public class AnaliseAcidenteTrabalho extends AbstractPageBean getSessionBean1().setMsg( "Falta data da ocorrência!" ); return false; } + + Calendar cal = Calendar.getInstance(); + cal.set( 2008, 1, 1 ); + + Date today = new Date(); + Date min = cal.getTime(); + if( !DateUtils.isBetween( d, min, today ) ) + { + getSessionBean1().setMsg("A data tem de ser superior a 2008 e inferior \u00e0 data actual."); + return false; + } + return true; } diff --git a/trunk/AnaliseAcidentesTrabalho/src/db/providers/AnalisesDataProvider.java b/trunk/AnaliseAcidentesTrabalho/src/db/providers/AnalisesDataProvider.java index f2217fa6..f280e556 100644 --- a/trunk/AnaliseAcidentesTrabalho/src/db/providers/AnalisesDataProvider.java +++ b/trunk/AnaliseAcidentesTrabalho/src/db/providers/AnalisesDataProvider.java @@ -2105,7 +2105,7 @@ public class AnalisesDataProvider extends GenericDataProvider for( DBColumn column : MODEL_PROVIDER.getTableByName( table ).getColumns() ) { - hash.put( (String) column.get( DBColumn.NAME ), Integer.parseInt( (String) column.get( DBColumn.LENGTH ) ) ); + hash.put( (String) column.get( DBColumn.NAME ), ( Integer ) column.get( DBColumn.LENGTH ) ); } return hash; }