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

IDEMPIERE-325 Complete AD based info window ( AD_InfoWindow ) implementation. Fixed IndexedOutOfBoundsException. Fixed paging and user ordering.

This commit is contained in:
Heng Sin Low 2013-02-15 15:52:52 +08:00
parent c649bc2652
commit 6f3d96910c
2 changed files with 78 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
package org.adempiere.webui.info;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
@ -385,7 +386,6 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
.append(" ?");
}
}
System.out.println(builder.toString());
return builder.toString();
}
@ -448,7 +448,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
if (infoWindow.isDistinct()) {
m_sqlMain = m_sqlMain.substring("SELECT ".length());
m_sqlMain = "SELECT DISTINCT " + m_sqlMain;
m_sqlMain = "SELECT DISTINCT " + m_sqlMain;
}
if (m_sqlOrder != null && m_sqlOrder.indexOf("@") >= 0) {
@ -504,6 +504,11 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
southBody.appendChild(statusBar);
}
protected void insertPagingComponent() {
southBody.insertBefore(paging, southBody.getFirstChild());
layout.invalidate();
}
protected void renderContentPane(Center center) {
Div div = new Div();
div.setStyle("width :100%; height: 100%");
@ -859,4 +864,59 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
}
}
}
/**
* Test Row Count
* @return true if display
*/
protected boolean testCount()
{
long start = System.currentTimeMillis();
String dynWhere = getSQLWhere();
StringBuilder sql = new StringBuilder (m_sqlMain);
if (dynWhere.length() > 0)
sql.append(dynWhere); // includes first AND
String countSql = Msg.parseTranslation(Env.getCtx(), sql.toString()); // Variables
if (countSql.trim().endsWith("WHERE")) {
countSql = countSql.trim();
countSql = countSql.substring(0, countSql.length() - 5);
}
countSql = MRole.getDefault().addAccessSQL (countSql, getTableName(),
MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO);
countSql = "SELECT COUNT(*) FROM ( " + countSql + " ) a";
if (log.isLoggable(Level.FINER))
log.finer(countSql);
m_count = -1;
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement(countSql, null);
setParameters (pstmt, true);
rs = pstmt.executeQuery();
if (rs.next())
m_count = rs.getInt(1);
}
catch (Exception e)
{
log.log(Level.SEVERE, countSql, e);
m_count = -2;
}
finally
{
DB.close(rs, pstmt);
}
if (log.isLoggable(Level.FINE))
log.fine("#" + m_count + " - " + (System.currentTimeMillis()-start) + "ms");
return true;
} // testCount
}

19
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
View File

@ -362,7 +362,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
/** Main SQL Statement */
protected String m_sqlMain;
/** Count SQL Statement */
private String m_sqlCount;
protected String m_sqlCount;
/** Order By Clause */
protected String m_sqlOrder;
protected String m_sqlUserOrder;
@ -432,7 +432,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
m_sqlCount = "SELECT COUNT(*) FROM " + from + " WHERE " + where;
//
m_sqlOrder = "";
m_sqlUserOrder = "";
// m_sqlUserOrder = "";
if (orderBy != null && orderBy.length() > 0)
m_sqlOrder = " ORDER BY " + orderBy;
} // prepareTable
@ -686,7 +686,19 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
{
end = cacheEnd-1;
}
return line.subList(start, end+1);
if (end == -1)
{
return line;
}
else
{
int fromIndex = start-getCacheStart()+1;
int toIndex = end-getCacheStart()+2;
if (toIndex > line.size())
toIndex = line.size();
return line.subList(fromIndex, toIndex);
}
}
protected String buildDataSQL(int start, int end) {
@ -1215,6 +1227,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
header.setSortDirection("natural");
}
}
m_sqlUserOrder="";
executeQuery();
renderItems();
}