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

IDEMPIERE-5462 Implement Date Range Button for Info Window Query field (#1546)

This commit is contained in:
hengsin 2022-10-28 17:25:41 +08:00 committed by GitHub
parent dd77cc01cb
commit 56fe006d29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
View File

@ -66,6 +66,7 @@ import org.adempiere.webui.panel.InfoPanel;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.DateRangeButton;
import org.adempiere.webui.window.Dialog; import org.adempiere.webui.window.Dialog;
import org.compiere.minigrid.ColumnInfo; import org.compiere.minigrid.ColumnInfo;
import org.compiere.minigrid.EmbedWinInfo; import org.compiere.minigrid.EmbedWinInfo;
@ -1547,6 +1548,27 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
evalDisplayLogic(); evalDisplayLogic();
if (!update) if (!update)
initParameters(); initParameters();
for (WEditor editor : editors) {
if (editor.getGridField() != null && DisplayType.isDate(editor.getGridField().getDisplayType())) {
InfoColumnVO vo = findInfoColumnParameter(editor.getGridField());
if (vo == null) continue;
if (X_AD_InfoColumn.QUERYOPERATOR_LeEq.equals(vo.getQueryOperator())) {
for (WEditor editor1 : editors) {
if (editor1 == editor || editor1.getGridField() == null)
continue;
InfoColumnVO vo1 = findInfoColumnParameter(editor1.getGridField());
if (vo1 == null) continue;
if (X_AD_InfoColumn.QUERYOPERATOR_GtEq.equals(vo1.getQueryOperator()) && editor1.getGridField().getColumnName().equals(editor.getGridField().getColumnName())) {
DateRangeButton drb = new DateRangeButton(editor1, editor);
editor.getComponent().getParent().appendChild(drb);
break;
}
}
}
}
}
if (!isAutoComplete) if (!isAutoComplete)
dynamicDisplay(null); dynamicDisplay(null);
} }