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

IDEMPIERE-4485 Info Window Columns has no Value preference (#501) 

* IDEMPIERE-4485 Info Window Columns has no Value preference

* IDEMPIERE-4485 Fix Query Parameter SQLWhere build.

* IDEMPIERE-4485 Info Window Columns - shorter code.
This commit is contained in:
igorpojzl 2021-01-05 14:15:26 +01:00 committed by GitHub
parent 47aee6fb02
commit 00f22bb30a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
protected WQuickEntry vqe; protected WQuickEntry vqe;
private List<GridField> gridFields; private List<GridField> gridFields;
private TreeMap<Integer, List<Object[]>> parameterTree;
private Checkbox checkAND; private Checkbox checkAND;
// F3P: Keep original values: when a row is unselected, restore original values // F3P: Keep original values: when a row is unselected, restore original values
@ -593,6 +594,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
infoColumns = InfoColumnVO.create(Env.getCtx(), p_infoColumns); infoColumns = InfoColumnVO.create(Env.getCtx(), p_infoColumns);
gridFields = new ArrayList<GridField>(); gridFields = new ArrayList<GridField>();
parameterTree = new TreeMap<Integer, List<Object[]>>();
for(InfoColumnVO infoColumn : infoColumns) { for(InfoColumnVO infoColumn : infoColumns) {
if (infoColumn.isKey()) if (infoColumn.isKey())
@ -624,6 +626,19 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
vo.IsReadOnly = infoColumn.isReadOnly(); vo.IsReadOnly = infoColumn.isReadOnly();
GridField gridField = new GridField(vo); GridField gridField = new GridField(vo);
gridFields.add(gridField); gridFields.add(gridField);
//IDEMPIERE-4485 Clone new Gridfields with IsReadOnly = false
if(infoColumn.isQueryCriteria()) {
vo = vo.clone(infoContext, p_WindowNo, 0, vo.AD_Window_ID, 0, false);
gridField = new GridField(vo);
List<Object[]> list = parameterTree.get(infoColumn.getSeqNoSelection());
if (list == null) {
list = new ArrayList<Object[]>();
parameterTree.put(infoColumn.getSeqNoSelection(), list);
}
list.add(new Object[]{infoColumn, gridField});
}
} }
// If we have a process and at least one process and an editable field, change to the info window rendered // If we have a process and at least one process and an editable field, change to the info window rendered
@ -945,7 +960,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
builder.append(whereClause); builder.append(whereClause);
} }
} else if (editor.getGridField() != null && editor.getValue() != null && editor.getValue().toString().trim().length() > 0) { } else if (editor.getGridField() != null && editor.getValue() != null && editor.getValue().toString().trim().length() > 0) {
InfoColumnVO InfoColumnVO = findInfoColumn(editor.getGridField()); InfoColumnVO InfoColumnVO = findInfoColumnParameter(editor.getGridField());
if (InfoColumnVO == null || InfoColumnVO.getSelectClause().equals("0")) { if (InfoColumnVO == null || InfoColumnVO.getSelectClause().equals("0")) {
continue; continue;
} }
@ -1049,6 +1064,18 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
return null; return null;
} }
protected InfoColumnVO findInfoColumnParameter(GridField gridField) {
for (Integer i : parameterTree.keySet()) {
List<Object[]> list = parameterTree.get(i);
for(Object[] value : list) {
if (gridField == value[1]) {
return (InfoColumnVO) value[0];
}
}
}
return null;
}
/** /**
* Check has new parameter is change or new input * Check has new parameter is change or new input
* in case first time search, return true * in case first time search, return true
@ -1074,7 +1101,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
continue; continue;
if (editor.getGridField() != null && editor.getValue() != null && editor.getValue().toString().trim().length() > 0) { if (editor.getGridField() != null && editor.getValue() != null && editor.getValue().toString().trim().length() > 0) {
InfoColumnVO InfoColumnVO = findInfoColumn(editor.getGridField()); InfoColumnVO InfoColumnVO = findInfoColumnParameter(editor.getGridField());
if (InfoColumnVO == null || InfoColumnVO.getSelectClause().equals("0")) { if (InfoColumnVO == null || InfoColumnVO.getSelectClause().equals("0")) {
continue; continue;
} }
@ -1116,7 +1143,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
continue; continue;
if (editor.getGridField() != null && editor.getValue() != null && editor.getValue().toString().trim().length() > 0) { if (editor.getGridField() != null && editor.getValue() != null && editor.getValue().toString().trim().length() > 0) {
InfoColumnVO InfoColumnVO = findInfoColumn(editor.getGridField()); InfoColumnVO InfoColumnVO = findInfoColumnParameter(editor.getGridField());
if (InfoColumnVO == null || InfoColumnVO.getSelectClause().equals("0")) { if (InfoColumnVO == null || InfoColumnVO.getSelectClause().equals("0")) {
continue; continue;
} }
@ -1421,21 +1448,9 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
editors = new ArrayList<WEditor>(); editors = new ArrayList<WEditor>();
identifiers = new ArrayList<WEditor>(); identifiers = new ArrayList<WEditor>();
} }
TreeMap<Integer, List<Object[]>> tree = new TreeMap<Integer, List<Object[]>>();
for (int i = 0; i < infoColumns.length; i++) for (Integer i : parameterTree.keySet()) {
{ List<Object[]> list = parameterTree.get(i);
if (infoColumns[i].isQueryCriteria()) {
List<Object[]> list = tree.get(infoColumns[i].getSeqNoSelection());
if (list == null) {
list = new ArrayList<Object[]>();
tree.put(infoColumns[i].getSeqNoSelection(), list);
}
list.add(new Object[]{infoColumns[i], gridFields.get(i)});
}
}
for (Integer i : tree.keySet()) {
List<Object[]> list = tree.get(i);
for(Object[] value : list) { for(Object[] value : list) {
if (update) { if (update) {
for (WEditor editor : editors) { for (WEditor editor : editors) {