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

IDEMPIERE-2404 Position in first pending node in Setup Wizard

This commit is contained in:
Carlos Ruiz 2015-01-16 16:57:40 -05:00
parent 0422d05487
commit 2e8fce6fde
1 changed files with 52 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java
View File

@ -80,12 +80,14 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
private Borderlayout mainLayout = new Borderlayout(); private Borderlayout mainLayout = new Borderlayout();
private Panel northPanel = new Panel(); private Panel northPanel = new Panel();
private Progressmeter progressbar = new Progressmeter(); private Progressmeter progressbar = new Progressmeter();
private Label progressLabel = new Label(); private Label progressLabel = new Label();
// //
private Tree wfnodeTree; private Tree wfnodeTree;
private Treeitem prevti = null; private Treeitem prevti = null;
private Treeitem firstti = null; private Treeitem firstOpenNode = null;
private Treeitem firstOpenWF = null;
private Treeitem firstWF = null;
private Label pretitleLabel = new Label(Msg.getMsg(Env.getCtx(), "SetupTask")); private Label pretitleLabel = new Label(Msg.getMsg(Env.getCtx(), "SetupTask"));
private Label titleLabel = new Label(); private Label titleLabel = new Label();
@ -201,8 +203,8 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
Treechildren treeChildren = wfnodeTree.getTreechildren(); Treechildren treeChildren = wfnodeTree.getTreechildren();
Treeitem treeitemwf = new Treeitem(); Treeitem treeitemwf = new Treeitem();
treeChildren.appendChild(treeitemwf); treeChildren.appendChild(treeitemwf);
if (firstti == null) if (firstWF == null)
firstti = treeitemwf; firstWF = treeitemwf;
Label wizardLabel = new Label(wfwizard.getName(true)); Label wizardLabel = new Label(wfwizard.getName(true));
wizardLabel.setStyle(WIZARD_LABEL_STYLE); wizardLabel.setStyle(WIZARD_LABEL_STYLE);
@ -221,9 +223,17 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
if (openNodes.contains(wfwizard.getAD_Workflow_ID())) if (openNodes.contains(wfwizard.getAD_Workflow_ID()))
treeitemwf.setOpen(true); treeitemwf.setOpen(true);
addNodes(wfwizard, treeitemwf); addNodes(wfwizard, treeitemwf);
if (firstOpenWF == treeitemwf && allPending) {
firstOpenNode = firstOpenWF;
}
if (showColors.isChecked() && (allFinished || !allPending)) if (showColors.isChecked()) {
wizardLabel.setZclass(allFinished ? "tree-wsetupwizard-finished-all" : "tree-wsetupwizard-open-tasks"); if (allFinished) {
wizardLabel.setZclass("tree-wsetupwizard-finished-all");
} else if (!allPending) {
wizardLabel.setZclass("tree-wsetupwizard-open-tasks");
}
}
treeitemwf.setAttribute("AD_Workflow_ID", wfwizard.getAD_Workflow_ID()); treeitemwf.setAttribute("AD_Workflow_ID", wfwizard.getAD_Workflow_ID());
if (prevti != null && prevti.getAttribute("AD_Workflow_ID") != null) { if (prevti != null && prevti.getAttribute("AD_Workflow_ID") != null) {
@ -241,40 +251,32 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
} }
private void addWfNode(MWFNode node, Treeitem treeitemwf) { private void addWfNode(MWFNode node, Treeitem treeitemwf) {
/* TODO: Color of node according to wizard status */ /* Color of node according to wizard status */
Label nodeLabel = new Label(node.getName(true)); Label nodeLabel = new Label(node.getName(true));
if (node != null && showColors.isChecked()) { MWizardProcess wp = MWizardProcess.get(Env.getCtx(), node.getAD_WF_Node_ID(), Env.getAD_Client_ID(Env.getCtx()));
MWizardProcess wp = MWizardProcess.get(Env.getCtx(), node.getAD_WF_Node_ID(), Env.getAD_Client_ID(Env.getCtx())); String status = wp.getWizardStatus();
String status = wp.getWizardStatus(); if (showColors.isChecked()) {
if (MWizardProcess.WIZARDSTATUS_Finished.equals(status)){ if (MWizardProcess.WIZARDSTATUS_Finished.equals(status)) {
nodeLabel.setZclass("tree-wsetupwizard-finished"); nodeLabel.setZclass("tree-wsetupwizard-finished");
allFinished = allFinished && true; } else if (MWizardProcess.WIZARDSTATUS_Skipped.equals(status)) {
allPending = allPending && false;
}else if (MWizardProcess.WIZARDSTATUS_Skipped.equals(status)) {
nodeLabel.setZclass("tree-wsetupwizard-skipped"); nodeLabel.setZclass("tree-wsetupwizard-skipped");
allFinished = allFinished && true; } else if (MWizardProcess.WIZARDSTATUS_Delayed.equals(status)) {
allPending = allPending && false;
}else if (MWizardProcess.WIZARDSTATUS_Delayed.equals(status)) {
nodeLabel.setZclass("tree-wsetupwizard-delayed"); nodeLabel.setZclass("tree-wsetupwizard-delayed");
allFinished = allFinished && false; } else if (MWizardProcess.WIZARDSTATUS_In_Progress.equals(status)) {
allPending = allPending && false;
}else if (MWizardProcess.WIZARDSTATUS_In_Progress.equals(status)) {
nodeLabel.setZclass("tree-wsetupwizard-in-progress"); nodeLabel.setZclass("tree-wsetupwizard-in-progress");
allFinished = allFinished && false; } else if (MWizardProcess.WIZARDSTATUS_Pending.equals(status)) {
allPending = allPending && false;
}else if (MWizardProcess.WIZARDSTATUS_Pending.equals(status)) {
nodeLabel.setZclass("tree-wsetupwizard-pending"); nodeLabel.setZclass("tree-wsetupwizard-pending");
allFinished = allFinished && false; } else {
allPending = allPending && true;
}else {
nodeLabel.setZclass("tree-setupwizard-nostatus"); nodeLabel.setZclass("tree-setupwizard-nostatus");
allFinished = false;
allPending = allPending && true;
} }
}else{
nodeLabel.setStyle("margin-left:20px;");
} }
if ( MWizardProcess.WIZARDSTATUS_Finished.equals(status)
|| MWizardProcess.WIZARDSTATUS_Skipped.equals(status)) {
allPending = false;
} else {
allFinished = false;
}
Div div = new Div(); Div div = new Div();
div.setStyle("display:inline;"); div.setStyle("display:inline;");
div.appendChild(nodeLabel); div.appendChild(nodeLabel);
@ -300,13 +302,20 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
wfnodeTree.setSelectedItem(childItem); wfnodeTree.setSelectedItem(childItem);
} }
nextItems.add(childItem); nextItems.add(childItem);
if (firstOpenNode == null) {
if (! ( MWizardProcess.WIZARDSTATUS_Finished.equals(status)
|| MWizardProcess.WIZARDSTATUS_Skipped.equals(status))) {
firstOpenWF = treeitemwf;
firstOpenNode = childItem;
}
}
} }
/** /**
* Static init * Static init
* @throws Exception * @throws Exception
*/ */
@SuppressWarnings("deprecation")
private void jbInit () throws Exception private void jbInit () throws Exception
{ {
form.setWidth("99%"); form.setWidth("99%");
@ -428,7 +437,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
westdown.appendChild(bOK); westdown.appendChild(bOK);
westdown.appendChild(bNext); westdown.appendChild(bNext);
Div divButton = new Div(); Div divButton = new Div();
divButton.setAlign("right"); divButton.setStyle("display: inline-block; float: right;");
divButton.appendChild(westdown); divButton.appendChild(westdown);
East east = new East(); East east = new East();
@ -443,8 +452,16 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
setNotesPanelVisible(false); setNotesPanelVisible(false);
wfnodeTree.setSelectedItem(firstti); if (firstOpenNode == null) {
showItem(firstti); firstOpenWF = firstWF;
firstOpenNode = firstWF;
}
if (firstOpenWF != null)
firstOpenWF.setOpen(true);
if (firstOpenNode != null) {
wfnodeTree.setSelectedItem(firstOpenNode);
showItem(firstOpenNode);
}
} // jbInit } // jbInit
private void refreshProgress() { private void refreshProgress() {