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

IDEMPIERE-1579 Range provision in general lookup window / thanks to Heng Sin

This commit is contained in:
Carlos Ruiz 2013-12-05 18:00:30 -05:00
parent 83bf6f7e36
commit c0bb3e76f3
1 changed files with 119 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
/** /**
* *
*/ */
private static final long serialVersionUID = 3901459797939709594L; private static final long serialVersionUID = -1264106685431608207L;
// values and label for history combo // values and label for history combo
private static final String HISTORY_DAY_ALL = "All"; private static final String HISTORY_DAY_ALL = "All";
@ -167,6 +167,8 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
// //
/** List of WEditors */ /** List of WEditors */
private ArrayList<WEditor> m_sEditors = new ArrayList<WEditor>(); private ArrayList<WEditor> m_sEditors = new ArrayList<WEditor>();
private ArrayList<ToolBarButton> m_sEditorsFlag = new ArrayList<ToolBarButton>();
private ArrayList<WEditor> m_sEditorsTo = new ArrayList<WEditor>();
/** For Grid Controller */ /** For Grid Controller */
public static final int TABNO = 99; public static final int TABNO = 99;
/** Length of Fields on first tab */ /** Length of Fields on first tab */
@ -1052,7 +1054,6 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
editor.setMandatory(false); editor.setMandatory(false);
editor.setReadWrite(true); editor.setReadWrite(true);
editor.dynamicDisplay(); editor.dynamicDisplay();
editor.fillHorizontal();
Label label = editor.getLabel(); Label label = editor.getLabel();
Component fieldEditor = editor.getComponent(); Component fieldEditor = editor.getComponent();
@ -1060,10 +1061,51 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
if (displayLength > 0) // set it back if (displayLength > 0) // set it back
mField.setDisplayLength(displayLength); mField.setDisplayLength(displayLength);
// //
WEditor editorTo = null;
Component fieldEditorTo = null;
if ( DisplayType.isDate(mField.getDisplayType())
|| DisplayType.isNumeric(mField.getDisplayType())) {
// Editor To
editorTo = WebEditorFactory.getEditor(mField, true);
editorTo.setMandatory(false);
editorTo.setReadWrite(true);
editorTo.dynamicDisplay();
//
if (displayLength > 0) // set it back
mField.setDisplayLength(displayLength);
fieldEditorTo = editorTo.getComponent();
fieldEditorTo.addEventListener(Events.ON_OK,this);
}
Row panel = new Row(); Row panel = new Row();
panel.appendChild(label); panel.appendChild(label);
panel.appendChild(fieldEditor); Div div = new Div();
panel.appendChild(div);
div.appendChild(fieldEditor);
if (editorTo != null) {
ToolBarButton editorFlag = new ToolBarButton();
editorFlag.setLabel(".. to ..");
editorFlag.setStyle("margin-left: 5px; margin-right: 5px;");
m_sEditorsFlag.add(editorFlag);
editorFlag.setMode("toggle");
div.appendChild(editorFlag);
div.appendChild(fieldEditorTo);
fieldEditorTo.setVisible(false);
final Component editorRef = fieldEditorTo;
editorFlag.addEventListener(Events.ON_CHECK, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
ToolBarButton btn = (ToolBarButton) event.getTarget();
editorRef.setVisible(btn.isChecked());
}
});
m_sEditorsTo.add(editorTo);
} else {
m_sEditorsFlag.add(null);
m_sEditorsTo.add(null);
editor.fillHorizontal();
}
panel.appendChild(new Space()); panel.appendChild(new Space());
if (group != null) if (group != null)
panel.setGroup(group); panel.setGroup(group);
@ -1222,13 +1264,20 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
dispose(); dispose();
} }
// Check simple panel fields // Check simple panel fields
for (WEditor editor : m_sEditors) for (int i = 0; i < m_sEditors.size(); i++)
{ {
WEditor editor = (WEditor)m_sEditors.get(i);
if (editor.getComponent() == event.getTarget()) if (editor.getComponent() == event.getTarget())
{ {
cmd_ok_Simple(); cmd_ok_Simple();
dispose(); dispose();
} }
WEditor editorTo = (WEditor)m_sEditorsTo.get(i);
if (editorTo != null && editor.getComponent() == event.getTarget())
{
cmd_ok_Simple();
dispose();
}
} }
} }
@ -1826,48 +1875,79 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
{ {
WEditor wed = (WEditor)m_sEditors.get(i); WEditor wed = (WEditor)m_sEditors.get(i);
Object value = wed.getValue(); Object value = wed.getValue();
String ColumnName = wed.getColumnName();
WEditor wedTo = (WEditor)m_sEditorsTo.get(i);
Object valueTo = null;
if (wedTo != null && wedTo.getComponent().isVisible())
valueTo = wedTo.getValue();
if (value != null && value.toString().length() > 0) if (value != null && value.toString().length() > 0)
{ {
String ColumnName = wed.getColumnName(); if (valueTo != null && valueTo.toString().length() > 0) {
StringBuilder msglog = new StringBuilder(ColumnName).append("=").append(value); // range
StringBuilder msglog = new StringBuilder(ColumnName).append(">=").append(value).append("<=").append(valueTo);
if (log.isLoggable(Level.FINE)) log.fine(msglog.toString());
GridField field = getTargetMField(ColumnName);
StringBuilder ColumnSQL = new StringBuilder(field.getColumnSQL(false));
m_query.addRangeRestriction(ColumnSQL.toString(), value, valueTo,
ColumnName, wed.getDisplay(), wedTo.getDisplay(), true, 0);
} else {
StringBuilder msglog = new StringBuilder(ColumnName).append("=").append(value);
if (log.isLoggable(Level.FINE)) log.fine(msglog.toString());
// globalqss - Carlos Ruiz - 20060711
// fix a bug with virtualColumn + isSelectionColumn not yielding results
GridField field = getTargetMField(ColumnName);
// add encryption here if the field is encrypted.
if (field.isEncryptedColumn()) {
value = SecureEngine.encrypt(value, Env.getAD_Client_ID(Env.getCtx()));
}
boolean isProductCategoryField = isProductCategoryField(field.getColumnName());
StringBuilder ColumnSQL = new StringBuilder(field.getColumnSQL(false));
//
// Be more permissive for String columns
if (isSearchLike(field))
{
StringBuilder valueStr = new StringBuilder(value.toString().toUpperCase());
if (!valueStr.toString().endsWith("%"))
valueStr.append("%");
//
ColumnSQL = new StringBuilder("UPPER(").append(ColumnSQL).append(")");
value = valueStr.toString();
}
//
if (value.toString().indexOf('%') != -1)
m_query.addRestriction(ColumnSQL.toString(), MQuery.LIKE, value, ColumnName, wed.getDisplay());
else if (isProductCategoryField && value instanceof Integer)
m_query.addRestriction(getSubCategoryWhereClause(((Integer) value).intValue()));
else {
String oper = MQuery.EQUAL;
if (wedTo != null) {
ToolBarButton wedFlag = m_sEditorsFlag.get(i);
if (wedFlag.isChecked())
oper = MQuery.GREATER_EQUAL;
}
m_query.addRestriction(ColumnSQL.toString(), oper, value, ColumnName, wed.getDisplay());
}
/*
if (value.toString().indexOf('%') != -1)
m_query.addRestriction(ColumnName, MQuery.LIKE, value, ColumnName, ved.getDisplay());
else
m_query.addRestriction(ColumnName, MQuery.EQUAL, value, ColumnName, ved.getDisplay());
*/
// end globalqss patch
}
} else if (valueTo != null && valueTo.toString().length() > 0) {
// filled upper limit without filling lower limit
StringBuilder msglog = new StringBuilder(ColumnName).append("<=").append(valueTo);
if (log.isLoggable(Level.FINE)) log.fine(msglog.toString()); if (log.isLoggable(Level.FINE)) log.fine(msglog.toString());
// globalqss - Carlos Ruiz - 20060711
// fix a bug with virtualColumn + isSelectionColumn not yielding results
GridField field = getTargetMField(ColumnName); GridField field = getTargetMField(ColumnName);
// add encryption here if the field is encrypted.
if (field.isEncryptedColumn()) {
value = SecureEngine.encrypt(value, Env.getAD_Client_ID(Env.getCtx()));
}
boolean isProductCategoryField = isProductCategoryField(field.getColumnName());
StringBuilder ColumnSQL = new StringBuilder(field.getColumnSQL(false)); StringBuilder ColumnSQL = new StringBuilder(field.getColumnSQL(false));
// //
// Be more permissive for String columns m_query.addRestriction(ColumnSQL.toString(), MQuery.LESS_EQUAL, valueTo, ColumnName, wed.getDisplay());
if (isSearchLike(field))
{
StringBuilder valueStr = new StringBuilder(value.toString().toUpperCase());
if (!valueStr.toString().endsWith("%"))
valueStr.append("%");
//
ColumnSQL = new StringBuilder("UPPER(").append(ColumnSQL).append(")");
value = valueStr.toString();
}
//
if (value.toString().indexOf('%') != -1)
m_query.addRestriction(ColumnSQL.toString(), MQuery.LIKE, value, ColumnName, wed.getDisplay());
else if (isProductCategoryField && value instanceof Integer)
m_query.addRestriction(getSubCategoryWhereClause(((Integer) value).intValue()));
else
m_query.addRestriction(ColumnSQL.toString(), MQuery.EQUAL, value, ColumnName, wed.getDisplay());
/*
if (value.toString().indexOf('%') != -1)
m_query.addRestriction(ColumnName, MQuery.LIKE, value, ColumnName, ved.getDisplay());
else
m_query.addRestriction(ColumnName, MQuery.EQUAL, value, ColumnName, ved.getDisplay());
*/
// end globalqss patch
} }
} // editors } // editors