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

FR [ 2877111 ] See identifiers columns when delete records 

https://sourceforge.net/tracker/?func=detail&atid=879335&aid=2877111&group_id=176962
* plus few cod rearranged
* please review
This commit is contained in:
redchris 2009-10-14 10:44:39 +00:00
parent 5afcf50f8a
commit ae93c8ca64
2 changed files with 57 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
client/src/org/compiere/apps/APanel.java
View File

@ -29,10 +29,8 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.InputEvent; import java.awt.event.InputEvent;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
import java.util.Vector; import java.util.Vector;
import java.util.logging.Level; import java.util.logging.Level;
@ -78,7 +76,7 @@ import org.compiere.model.GridTab;
import org.compiere.model.GridWindow; import org.compiere.model.GridWindow;
import org.compiere.model.GridWindowVO; import org.compiere.model.GridWindowVO;
import org.compiere.model.GridWorkbench; import org.compiere.model.GridWorkbench;
import org.compiere.model.Lookup; import org.compiere.model.MLookupFactory;
import org.compiere.model.MProcess; import org.compiere.model.MProcess;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MRole; import org.compiere.model.MRole;
@ -129,6 +127,8 @@ import org.compiere.util.Util;
* @see FR [ 1966328 ] New Window Info to MRP and CRP into View http://sourceforge.net/tracker/index.php?func=detail&aid=1966328&group_id=176962&atid=879335 * @see FR [ 1966328 ] New Window Info to MRP and CRP into View http://sourceforge.net/tracker/index.php?func=detail&aid=1966328&group_id=176962&atid=879335
* @autor tobi42, metas GmBH * @autor tobi42, metas GmBH
* <li>BF [ 2799362 ] You can press New button a lot of times * <li>BF [ 2799362 ] You can press New button a lot of times
* @author Cristina Ghita, www.arhipac.ro
* @see FR [ 2877111 ] See identifiers columns when delete records https://sourceforge.net/tracker/?func=detail&atid=879335&aid=2877111&group_id=176962
* *
*/ */
public final class APanel extends CPanel public final class APanel extends CPanel
@ -1734,50 +1734,36 @@ public final class APanel extends CPanel
private void cmd_deleteSelection(){ private void cmd_deleteSelection(){
if (m_curTab.isReadOnly()) if (m_curTab.isReadOnly())
return; return;
//show table with deletion rows -> value, name... //show table with deletion rows -> by identifiers columns
JPanel messagePanel = new JPanel(); JPanel messagePanel = new JPanel();
JList list = new JList(); JList list = new JList();
JScrollPane scrollPane = new JScrollPane(list); JScrollPane scrollPane = new JScrollPane(list);
Vector<String> data = new Vector<String>(); Vector<String> data = new Vector<String>();
// FR [ 2877111 ]
final String keyColumnName = m_curTab.getKeyColumnName();
final String sql = MLookupFactory.getLookup_TableDirEmbed(Env.getLanguage(m_ctx), keyColumnName, "[?","?]")
.replace("[?.?]", "?");
int noOfRows = m_curTab.getRowCount(); int noOfRows = m_curTab.getRowCount();
for(int i=0; i<noOfRows; i++){ for(int i = 0; i < noOfRows; i++)
{
final int id = m_curTab.getKeyID(i);
StringBuffer displayValue = new StringBuffer(); StringBuffer displayValue = new StringBuffer();
if("".equals(m_curTab.getKeyColumnName())){ String value = DB.getSQLValueStringEx(null, sql, id);
ArrayList<String> parentColumnNames = m_curTab.getParentColumnNames(); value = value.replace(" - ", " | ");
for (Iterator<String> iter = parentColumnNames.iterator(); iter.hasNext();) { displayValue.append(value);
String columnName = iter.next(); // Append ID
GridField field = m_curTab.getField(columnName); if (displayValue.length() == 0 || CLogMgt.isLevelFine())
if(field.isLookup()){ {
Lookup lookup = field.getLookup(); if (displayValue.length() > 0)
if (lookup != null){ displayValue.append(" | ");
displayValue = displayValue.append(lookup.getDisplay(m_curTab.getValue(i,columnName))).append(" | "); displayValue.append("<").append(id).append(">");
} else {
displayValue = displayValue.append(m_curTab.getValue(i,columnName)).append(" | ");
}
} else {
displayValue = displayValue.append(m_curTab.getValue(i,columnName)).append(" | ");
}
}
} else {
displayValue = displayValue.append(m_curTab.getValue(i,m_curTab.getKeyColumnName()));
}
if(m_curTab.getField("DocumentNo")!=null){
displayValue = displayValue.append(" | ").append(m_curTab.getValue(i, "DocumentNo"));
}
if(m_curTab.getField("Line")!=null){
displayValue = displayValue.append(" | ").append(m_curTab.getValue(i, "Line"));
}
if(m_curTab.getField("Value")!=null){
displayValue = displayValue.append(" | ").append(m_curTab.getValue(i, "Value"));
}
if(m_curTab.getField("Name")!=null){
displayValue = displayValue.append(" | ").append(m_curTab.getValue(i, "Name"));
} }
//
data.add(displayValue.toString()); data.add(displayValue.toString());
} }
// FR [ 2877111 ]
list.setListData(data); list.setListData(data);
list.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); list.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
messagePanel.add(scrollPane); messagePanel.add(scrollPane);
@ -1788,26 +1774,32 @@ public final class APanel extends CPanel
final JDialog deleteDialog = pane.createDialog(this.getParent(), Msg.getMsg(m_ctx, "DeleteSelection")); final JDialog deleteDialog = pane.createDialog(this.getParent(), Msg.getMsg(m_ctx, "DeleteSelection"));
deleteDialog.setVisible(true); deleteDialog.setVisible(true);
Integer okCancel = (Integer) pane.getValue(); Integer okCancel = (Integer) pane.getValue();
if(okCancel!=null && okCancel==JOptionPane.OK_OPTION){ if(okCancel != null && okCancel == JOptionPane.OK_OPTION)
{
log.fine("ok"); log.fine("ok");
Object[] selectedValues = list.getSelectedValues(); Object[] selectedValues = list.getSelectedValues();
for (int i = 0; i < selectedValues.length; i++) { for (int i = 0; i < selectedValues.length; i++)
{
log.fine(selectedValues[i].toString()); log.fine(selectedValues[i].toString());
} }
int[] indices = list.getSelectedIndices(); int[] indices = list.getSelectedIndices();
Arrays.sort(indices); Arrays.sort(indices);
int offset = 0; int offset = 0;
for (int i = 0; i < indices.length; i++) { for (int i = 0; i < indices.length; i++)
{
//m_curTab.setCurrentRow(indices[i]-offset); //m_curTab.setCurrentRow(indices[i]-offset);
m_curTab.navigate(indices[i]-offset); m_curTab.navigate(indices[i]-offset);
int keyID = m_curTab.getRecord_ID(); int keyID = m_curTab.getRecord_ID();
if (m_curTab.dataDelete()){ if (m_curTab.dataDelete())
m_curGC.rowChanged(false, keyID); {
offset++; m_curGC.rowChanged(false, keyID);
offset++;
} }
} }
m_curGC.dynamicDisplay(0); m_curGC.dynamicDisplay(0);
} else { }
else
{
log.fine("cancel"); log.fine("cancel");
} }
}//cmd_deleteSelection }//cmd_deleteSelection

82
zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
View File

@ -17,7 +17,6 @@
package org.adempiere.webui.panel; package org.adempiere.webui.panel;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@ -57,7 +56,7 @@ import org.compiere.model.GridField;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.GridWindow; import org.compiere.model.GridWindow;
import org.compiere.model.GridWindowVO; import org.compiere.model.GridWindowVO;
import org.compiere.model.Lookup; import org.compiere.model.MLookupFactory;
import org.compiere.model.MProcess; import org.compiere.model.MProcess;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MRole; import org.compiere.model.MRole;
@ -65,9 +64,9 @@ import org.compiere.process.DocAction;
import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil; import org.compiere.process.ProcessInfoUtil;
import org.compiere.util.ASyncProcess; import org.compiere.util.ASyncProcess;
import org.compiere.util.CLogMgt;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.WebDoc; import org.compiere.util.WebDoc;
@ -95,6 +94,8 @@ import org.zkoss.zul.Menupopup;
* @author <a href="mailto:hengsin@gmail.com">Low Heng Sin</a> * @author <a href="mailto:hengsin@gmail.com">Low Heng Sin</a>
* @date Feb 25, 2007 * @date Feb 25, 2007
* @version $Revision: 0.10 $ * @version $Revision: 0.10 $
* @author Cristina Ghita, www.arhipac.ro
* @see FR [ 2877111 ] See identifiers columns when delete records https://sourceforge.net/tracker/?func=detail&atid=879335&aid=2877111&group_id=176962
*/ */
public abstract class AbstractADWindowPanel extends AbstractUIPart implements ToolbarListener, public abstract class AbstractADWindowPanel extends AbstractUIPart implements ToolbarListener,
EventListener, DataStatusListener, ActionListener, ASyncProcess EventListener, DataStatusListener, ActionListener, ASyncProcess
@ -1319,75 +1320,30 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
final Listbox listbox = new Listbox(); final Listbox listbox = new Listbox();
listbox.setHeight("400px"); listbox.setHeight("400px");
// Display the first 5 fields data exclude Organization, Client and YesNo field data
Vector<String> columnNames = new Vector<String>();
GridField[] fields = curTab.getFields();
if(curTab.getField("DocumentNo")!=null){
columnNames.add(curTab.getField("DocumentNo").getColumnName());
}
if(curTab.getField("Line")!=null){
columnNames.add(curTab.getField("Line").getColumnName());
}
if(curTab.getField("Value")!=null){
columnNames.add(curTab.getField("Value").getColumnName());
}
if(curTab.getField("Name")!=null){
columnNames.add(curTab.getField("Name").getColumnName());
}
for(int i = 0, count = columnNames.size(); i < fields.length && count < 5; i++)
{
GridField field = fields[i];
if(field.getColumnName().equalsIgnoreCase("AD_Org_ID")
|| field.getColumnName().equalsIgnoreCase("AD_Client_ID")
|| field.getDisplayType() == DisplayType.YesNo)
continue;
if (!columnNames.contains(field.getColumnName()))
{
columnNames.add(field.getColumnName());
count++;
}
}
Vector<String> data = new Vector<String>(); Vector<String> data = new Vector<String>();
// FR [ 2877111 ]
final String keyColumnName = curTab.getKeyColumnName();
final String sql = MLookupFactory.getLookup_TableDirEmbed(Env.getLanguage(ctx), keyColumnName, "[?","?]")
.replace("[?.?]", "?");
int noOfRows = curTab.getRowCount(); int noOfRows = curTab.getRowCount();
for(int i=0; i<noOfRows; i++) for(int i=0; i<noOfRows; i++)
{ {
final int id = curTab.getKeyID(i);
StringBuffer displayValue = new StringBuffer(); StringBuffer displayValue = new StringBuffer();
if("".equals(curTab.getKeyColumnName())) String value = DB.getSQLValueStringEx(null, sql, id);
value = value.replace(" - ", " | ");
displayValue.append(value);
// Append ID
if (displayValue.length() == 0 || CLogMgt.isLevelFine())
{ {
ArrayList<String> parentColumnNames = curTab.getParentColumnNames(); if (displayValue.length() > 0)
for (Iterator<String> iter = parentColumnNames.iterator(); iter.hasNext();) displayValue.append(" | ");
{ displayValue.append("<").append(id).append(">");
String columnName = iter.next();
GridField field = curTab.getField(columnName);
if(field.isLookup()){
Lookup lookup = field.getLookup();
if (lookup != null){
displayValue = displayValue.append(lookup.getDisplay(curTab.getValue(i,columnName))).append(" | ");
} else {
displayValue = displayValue.append(curTab.getValue(i,columnName)).append(" | ");
}
} else {
displayValue = displayValue.append(curTab.getValue(i,columnName)).append(" | ");
}
}
} else {
displayValue = displayValue.append(curTab.getValue(i,curTab.getKeyColumnName()));
} }
//
for(int j=0; j < columnNames.size(); j++)
{
Object value = curTab.getValue(i, columnNames.get(j));
if(value == null) continue; // skip when value is null
String text = value.toString().trim();
if(text.length() == 0) continue; // skip when value is empty
if(text.length() > 30)
text = text.substring(0, 30); // display the first 30 characters
displayValue = displayValue.append(" | ").append(text);
}
data.add(displayValue.toString()); data.add(displayValue.toString());
} }
// FR [ 2877111 ]
for(int i = 0; i < data.size(); i++) for(int i = 0; i < data.size(); i++)
{ {