midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-925 Date field shows error for incorrect format but allow user to proceed on ok button

This commit is contained in:
Deepak Pansheriya 2013-05-16 18:53:38 +05:30
parent 6d7fb18ed2
commit 1a54f69c34
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -43,6 +44,7 @@ import org.adempiere.webui.component.Column;
import org.adempiere.webui.component.Columns; import org.adempiere.webui.component.Columns;
import org.adempiere.webui.component.Combobox; import org.adempiere.webui.component.Combobox;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.DatetimeBox;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.ListCell; import org.adempiere.webui.component.ListCell;
@ -96,6 +98,7 @@ import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Hbox; import org.zkoss.zul.Hbox;
import org.zkoss.zul.South; import org.zkoss.zul.South;
@ -1331,7 +1334,24 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
// Value ****** // Value ******
ListCell cellQueryFrom = (ListCell)row.getFellow("cellQueryFrom"+row.getId()); ListCell cellQueryFrom = (ListCell)row.getFellow("cellQueryFrom"+row.getId());
Object value = cellQueryFrom.getAttribute("value"); Object value = null;
//Allowing Date validation before save
List<Component> compoList = cellQueryFrom.getChildren();
if(compoList.get(0) instanceof Datebox) {
Datebox dbox = (Datebox)compoList.get(0);
if(dbox.getValue() != null)
value = new Timestamp(((Date)dbox.getValue()).getTime());
}
else if(compoList.get(0) instanceof DatetimeBox) {
DatetimeBox dtbox = (DatetimeBox)compoList.get(0);
if(dtbox.getValue() != null)
value = new Timestamp(((Date)dtbox.getValue()).getTime());
}
else {
value = cellQueryFrom.getAttribute("value");
}
if (value == null) if (value == null)
{ {
if(Operator.equals(MQuery.NULL) || Operator.equals(MQuery.NOT_NULL)) if(Operator.equals(MQuery.NULL) || Operator.equals(MQuery.NOT_NULL))
@ -1369,6 +1389,24 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
if (MQuery.OPERATORS[MQuery.BETWEEN_INDEX].getValue().equals(Operator)) if (MQuery.OPERATORS[MQuery.BETWEEN_INDEX].getValue().equals(Operator))
{ {
ListCell cellQueryTo = (ListCell)row.getFellow("cellQueryTo"+row.getId()); ListCell cellQueryTo = (ListCell)row.getFellow("cellQueryTo"+row.getId());
//Allowing Date validation before save
compoList = cellQueryTo.getChildren();
if(compoList.get(0) instanceof Datebox) {
Datebox dbox = (Datebox)compoList.get(0);
if(dbox.getValue() != null)
value2 = new Timestamp(((Date)dbox.getValue()).getTime());
}
else if(compoList.get(0) instanceof DatetimeBox) {
DatetimeBox dtbox = (DatetimeBox)compoList.get(0);
if(dtbox.getValue() != null)
value2 = new Timestamp(((Date)dtbox.getValue()).getTime());
}
else {
value2 = cellQueryFrom.getAttribute("value");
}
value2 = cellQueryTo.getAttribute("value"); value2 = cellQueryTo.getAttribute("value");
if (value2 == null) if (value2 == null)
continue; continue;