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

Ticket #1002158: Dashboard Columns - Bug

This commit is contained in:
Elaine Tan 2013-01-31 18:02:44 +08:00
parent cc8e738a77
commit e754412dc8
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
View File

@ -98,6 +98,8 @@ public class DashboardController implements EventListener<Event> {
private DashboardRunnable dashboardRunnable; private DashboardRunnable dashboardRunnable;
private ScheduledFuture<?> dashboardFuture; private ScheduledFuture<?> dashboardFuture;
private final static int DEFAULT_DASHBOARD_WIDTH = 95;
public DashboardController() { public DashboardController() {
dashboardLayout = new Anchorlayout(); dashboardLayout = new Anchorlayout();
dashboardLayout.setSclass("dashboard-layout"); dashboardLayout.setSclass("dashboard-layout");
@ -141,9 +143,9 @@ public class DashboardController implements EventListener<Event> {
dps = MDashboardPreference.getForSession(isShowInDashboard, AD_User_ID, AD_Role_ID); // based on user and role dps = MDashboardPreference.getForSession(isShowInDashboard, AD_User_ID, AD_Role_ID); // based on user and role
noOfCols = MDashboardPreference.getForSessionColumnCount(isShowInDashboard, AD_User_ID, AD_Role_ID); noOfCols = MDashboardPreference.getForSessionColumnCount(isShowInDashboard, AD_User_ID, AD_Role_ID);
int dashboardWidth = isShowInDashboard ? 95 : 100; int dashboardWidth = isShowInDashboard ? DEFAULT_DASHBOARD_WIDTH : 100;
width = noOfCols <= 0 ? dashboardWidth : dashboardWidth / noOfCols; width = noOfCols <= 0 ? dashboardWidth : dashboardWidth / noOfCols;
int useWidth = 0; int extraWidth = 100 - (noOfCols <= 0 ? dashboardWidth : width * noOfCols) - (100 - dashboardWidth - 1);
for (final MDashboardPreference dp : dps) for (final MDashboardPreference dp : dps)
{ {
MDashboardContent dc = new MDashboardContent(dp.getCtx(), dp.getPA_DashboardContent_ID(), dp.get_TrxName()); MDashboardContent dc = new MDashboardContent(dp.getCtx(), dp.getPA_DashboardContent_ID(), dp.get_TrxName());
@ -151,19 +153,12 @@ public class DashboardController implements EventListener<Event> {
int columnNo = dp.getColumnNo(); int columnNo = dp.getColumnNo();
if(dashboardColumnLayout == null || currentColumnNo != columnNo) if(dashboardColumnLayout == null || currentColumnNo != columnNo)
{ {
int anchorWidth = width;
if (columnNo == noOfCols) {
anchorWidth = 100 - useWidth;
} else {
useWidth = useWidth + width;
}
dashboardColumnLayout = new Vlayout(); dashboardColumnLayout = new Vlayout();
dashboardColumnLayout.setAttribute("ColumnNo", columnNo); dashboardColumnLayout.setAttribute("ColumnNo", columnNo);
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard); dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
dashboardColumnLayout.setAttribute("IsAdditionalColumn", false); dashboardColumnLayout.setAttribute("IsAdditionalColumn", false);
Anchorchildren dashboardColumn = new Anchorchildren(); Anchorchildren dashboardColumn = new Anchorchildren();
dashboardColumn.setAnchor(anchorWidth + "%" + " 100%"); dashboardColumn.setAnchor(width + "%" + " 100%");
dashboardColumn.setDroppable("true"); dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this); dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout); dashboardColumn.appendChild(dashboardColumnLayout);
@ -381,9 +376,9 @@ public class DashboardController implements EventListener<Event> {
dashboardColumnLayout = new Vlayout(); dashboardColumnLayout = new Vlayout();
dashboardColumnLayout.setAttribute("ColumnNo", "0"); dashboardColumnLayout.setAttribute("ColumnNo", "0");
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard); dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
dashboardColumnLayout.setAttribute("IsAdditionalColumn", false); dashboardColumnLayout.setAttribute("IsAdditionalColumn", true);
Anchorchildren dashboardColumn = new Anchorchildren(); Anchorchildren dashboardColumn = new Anchorchildren();
dashboardColumn.setAnchor((width-2) + "%" + " 100%"); dashboardColumn.setAnchor((width-5) + "%" + " 100%");
dashboardColumn.setDroppable("true"); dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this); dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout); dashboardColumn.appendChild(dashboardColumnLayout);
@ -400,7 +395,7 @@ public class DashboardController implements EventListener<Event> {
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard); dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
dashboardColumnLayout.setAttribute("IsAdditionalColumn", true); dashboardColumnLayout.setAttribute("IsAdditionalColumn", true);
Anchorchildren dashboardColumn = new Anchorchildren(); Anchorchildren dashboardColumn = new Anchorchildren();
dashboardColumn.setAnchor("1% 100%"); dashboardColumn.setAnchor(extraWidth + "% 100%");
dashboardColumn.setDroppable("true"); dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this); dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout); dashboardColumn.appendChild(dashboardColumnLayout);
@ -593,10 +588,12 @@ public class DashboardController implements EventListener<Event> {
layout.setAttribute("IsAdditionalColumn", false); layout.setAttribute("IsAdditionalColumn", false);
int noOfCols = columnList.size(); int noOfCols = columnList.size();
int width = noOfCols <= 0 ? 100 : (100-1) / noOfCols; int dashboardWidth = DEFAULT_DASHBOARD_WIDTH;
int width = noOfCols <= 0 ? dashboardWidth : dashboardWidth / noOfCols;
int extraWidth = 100 - (noOfCols <= 0 ? dashboardWidth : width * noOfCols) - (100 - dashboardWidth - 1);
for (Anchorchildren column : columnList) for (Anchorchildren column : columnList)
column.setAnchor((width-2) + "%" + " 100%"); column.setAnchor(width + "%" + " 100%");
// additional column // additional column
Vlayout dashboardColumnLayout = new Vlayout(); Vlayout dashboardColumnLayout = new Vlayout();
@ -604,7 +601,7 @@ public class DashboardController implements EventListener<Event> {
dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard); dashboardColumnLayout.setAttribute("IsShowInDashboard", isShowInDashboard);
dashboardColumnLayout.setAttribute("IsAdditionalColumn", true); dashboardColumnLayout.setAttribute("IsAdditionalColumn", true);
Anchorchildren dashboardColumn = new Anchorchildren(); Anchorchildren dashboardColumn = new Anchorchildren();
dashboardColumn.setAnchor("1% 100%"); dashboardColumn.setAnchor(extraWidth + "% 100%");
dashboardColumn.setDroppable("true"); dashboardColumn.setDroppable("true");
dashboardColumn.addEventListener(Events.ON_DROP, this); dashboardColumn.addEventListener(Events.ON_DROP, this);
dashboardColumn.appendChild(dashboardColumnLayout); dashboardColumn.appendChild(dashboardColumnLayout);