IDEMPIERE-582 Setup Wizard scrolling bars / And improvements to IDEMPIERE-393 Setup wizards

migration/i1.0a-release/oracle/201302190934_IDEMPIERE-393.sql

@@ -0,0 +1,29 @@
+-- Feb 13, 2013 7:08:02 PM COT
+--  
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Zoom Action',200144,'D','8ba56d3a-1fff-4e6c-b1a6-34cbe8a50071','ZoomLabel','Y',TO_DATE('2013-02-13 19:08:01','YYYY-MM-DD HH24:MI:SS'),0,0,0,0,TO_DATE('2013-02-13 19:08:01','YYYY-MM-DD HH24:MI:SS'))
+;
+
+-- Feb 13, 2013 7:08:02 PM COT
+--  
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200144 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
+;
+
+-- Feb 13, 2013 7:25:37 PM COT
+--  
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Setup Task:',200145,'D','ed196c88-09f4-40a7-8959-e6747b890420','Setup Task','Y',TO_DATE('2013-02-13 19:25:37','YYYY-MM-DD HH24:MI:SS'),0,0,0,0,TO_DATE('2013-02-13 19:25:37','YYYY-MM-DD HH24:MI:SS'))
+;
+
+-- Feb 13, 2013 7:25:37 PM COT
+--  
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200145 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
+;
+
+-- Feb 13, 2013 7:28:34 PM COT
+--  
+UPDATE AD_Message SET Value='SetupTask',Updated=TO_DATE('2013-02-13 19:28:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Message_ID=200145
+;
+
+SELECT register_migration_script('201302190934_IDEMPIERE-393.sql') FROM dual
+;
+
+

migration/i1.0a-release/postgresql/201302190934_IDEMPIERE-393.sql

@@ -0,0 +1,29 @@
+-- Feb 13, 2013 7:08:02 PM COT
+--  
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Zoom Action',200144,'D','8ba56d3a-1fff-4e6c-b1a6-34cbe8a50071','ZoomLabel','Y',TO_TIMESTAMP('2013-02-13 19:08:01','YYYY-MM-DD HH24:MI:SS'),0,0,0,0,TO_TIMESTAMP('2013-02-13 19:08:01','YYYY-MM-DD HH24:MI:SS'))
+;
+
+-- Feb 13, 2013 7:08:02 PM COT
+--  
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200144 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
+;
+
+-- Feb 13, 2013 7:25:37 PM COT
+--  
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Setup Task:',200145,'D','ed196c88-09f4-40a7-8959-e6747b890420','Setup Task','Y',TO_TIMESTAMP('2013-02-13 19:25:37','YYYY-MM-DD HH24:MI:SS'),0,0,0,0,TO_TIMESTAMP('2013-02-13 19:25:37','YYYY-MM-DD HH24:MI:SS'))
+;
+
+-- Feb 13, 2013 7:25:37 PM COT
+--  
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200145 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
+;
+
+-- Feb 13, 2013 7:28:34 PM COT
+--  
+UPDATE AD_Message SET Value='SetupTask',Updated=TO_TIMESTAMP('2013-02-13 19:28:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Message_ID=200145
+;
+
+SELECT register_migration_script('201302190934_IDEMPIERE-393.sql') FROM dual
+;
+
+

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

@@ -27,11 +27,8 @@ import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.component.Button;
 import org.adempiere.webui.component.Checkbox;
-import org.adempiere.webui.component.Grid;
 import org.adempiere.webui.component.Label;
 import org.adempiere.webui.component.Panel;
-import org.adempiere.webui.component.Row;
-import org.adempiere.webui.component.Rows;
 import org.adempiere.webui.component.Textbox;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.editor.WSearchEditor;
@@ -54,11 +51,13 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Borderlayout;
+import org.zkoss.zul.Center;
 import org.zkoss.zul.Div;
 import org.zkoss.zul.East;
 import org.zkoss.zul.Iframe;
 import org.zkoss.zul.North;
 import org.zkoss.zul.Progressmeter;
+import org.zkoss.zul.Separator;
 import org.zkoss.zul.Space;
 import org.zkoss.zul.Tree;
 import org.zkoss.zul.Treecell;
@@ -66,8 +65,6 @@ import org.zkoss.zul.Treechildren;
 import org.zkoss.zul.Treeitem;
 import org.zkoss.zul.Treerow;
 import org.zkoss.zul.Vbox;
-import org.zkoss.zul.West;
-
 /**
  * View for Setup Wizard
  *
@@ -86,6 +83,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 	private Tree			wfnodeTree;
 	private Treeitem 		prevti = null;
 
+	private Label			pretitleLabel	= new Label(Msg.getMsg(Env.getCtx(), "SetupTask"));
 	private Label			titleLabel	= new Label();
 	private Iframe			helpFrame	= new Iframe();
 	private Label			notesLabel  = new Label(Msg.getElement(Env.getCtx(), MWizardProcess.COLUMNNAME_Note));
@@ -97,6 +95,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 	private Label			statusLabel = new Label();
 	private WTableDirEditor statusField;
 	
+	private Label			bZoomLabel = new Label(Msg.getMsg(Env.getCtx(), "ZoomLabel"));
 	private Button 			bRefresh 	= new Button();
 	private Button 			bOK 		= new Button();
 	private Button 			bNext 		= new Button();
@@ -111,8 +110,9 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 	private static final String WIZARD_LABEL_STYLE = "font-weight: bold";
 	
 	private boolean expandTree = false;
-	private Vbox east = new Vbox();
+	private boolean allFinished = true;
-	private Vbox eastdown = new Vbox();
+	private Vbox centerBox = new Vbox();
+	private Vbox centerBoxdown = new Vbox();
 	private Vbox westdown = new Vbox();
 	private ArrayList<Integer> openNodes = new ArrayList<Integer>();
 
@@ -163,6 +163,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 
 	protected void addWfEntry(MWorkflow wfwizard) {
 		/* TODO: Color of workflow according to wizard status */
+		allFinished = true;
 		Treechildren treeChildren = wfnodeTree.getTreechildren();
 		Treeitem treeitemwf = new Treeitem();
 		treeChildren.appendChild(treeitemwf);
@@ -185,6 +186,10 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 			treeitemwf.setOpen(true);
 		addNodes(wfwizard, treeitemwf);
 
+		if(allFinished && showColors.isChecked()){
+			wizardLabel.setZclass("tree-wsetupwizard-finished-all");
+		}
+		
 		treeitemwf.setAttribute("AD_Workflow_ID", wfwizard.getAD_Workflow_ID());
 		if (prevti != null && prevti.getAttribute("AD_Workflow_ID") != null) {
 			if (prevti.getAttribute("AD_Workflow_ID").equals(treeitemwf.getAttribute("AD_Workflow_ID")))
@@ -206,12 +211,27 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		if (node != null && showColors.isChecked()) {
 			MWizardProcess wp = MWizardProcess.get(Env.getCtx(), node.getAD_WF_Node_ID(), Env.getAD_Client_ID(Env.getCtx()));
 			String status = wp.getWizardStatus();
-			if (   MWizardProcess.WIZARDSTATUS_Finished.equals(status)
+			if (MWizardProcess.WIZARDSTATUS_Finished.equals(status)){
-				|| MWizardProcess.WIZARDSTATUS_Skipped.equals(status)) {
+				nodeLabel.setZclass("tree-wsetupwizard-finished");
-				nodeLabel.setStyle("background-color: #90EE90;margin-left:20px;");
+				allFinished = allFinished && true;
+			}else if (MWizardProcess.WIZARDSTATUS_Skipped.equals(status)) {
+				nodeLabel.setZclass("tree-wsetupwizard-skipped");
+				allFinished = allFinished && true;
+			}else if (MWizardProcess.WIZARDSTATUS_Delayed.equals(status)) {
+				nodeLabel.setZclass("tree-wsetupwizard-delayed");
+				allFinished = allFinished && false;
+			}else if (MWizardProcess.WIZARDSTATUS_In_Progress.equals(status)) {
+				nodeLabel.setZclass("tree-wsetupwizard-in-progress");
+				allFinished = allFinished && false;
+			}else if (MWizardProcess.WIZARDSTATUS_Pending.equals(status)) {
+				nodeLabel.setZclass("tree-wsetupwizard-pending");
+				allFinished = allFinished && false;
 			}else {
-				nodeLabel.setStyle("background-color: #FFFF00;margin-left:20px;");
+				nodeLabel.setZclass("tree-setupwizard-nostatus");
+				allFinished = false;
 			}
+		}else{
+			nodeLabel.setStyle("margin-left:20px;");
 		}
 		
 		Div div = new Div();
@@ -245,6 +265,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 	 * 	Static init
 	 *	@throws Exception
 	 */
+	@SuppressWarnings("deprecation")
 	private void jbInit () throws Exception
 	{
 		form.setWidth("99%");
@@ -279,12 +300,10 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		justmine.setTooltiptext(Msg.getMsg(Env.getCtx(), "JustMine"));
 		justmine.addEventListener(Events.ON_CHECK,this);
 		
-		
 		showColors.setLabel("Show Colors");
 		showColors.setTooltiptext(Msg.getMsg(Env.getCtx(), "ShowColors"));
 		showColors.addEventListener(Events.ON_CHECK,this);
 			
-		
 		North north = new North();
 		mainLayout.appendChild(north);
 		north.appendChild(northPanel);
@@ -292,6 +311,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		//
 		northPanel.appendChild(progressbar);
 		progressbar.setWidth("100%");
+		progressbar.setZclass("progressmeter-setupwizard");
 		northPanel.appendChild(progressLabel);
 		progressLabel.setWidth("100%");
 		progressLabel.setStyle("margin:0; padding:0; position: absolute; align: center; valign: center; border:0; text-align: center; ");
@@ -304,62 +324,53 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		statusField = new WTableDirEditor("WizardStatus", true, false, true,wizardL);
 		statusField.setValue(MWizardProcess.WIZARDSTATUS_Pending);
 		
-		east.setVflex("1");
+		centerBox.setVflex("1");
-		east.setHflex("1");
+		centerBox.setHflex("1");
-		West west = new West();
+		Center center = new Center();
-		mainLayout.appendChild(west);	
+		mainLayout.appendChild(center);	
-		west.appendChild(east);
+		center.appendChild(centerBox);
-		east.appendChild(wfnodeTree);
+		centerBox.appendChild(wfnodeTree);
+		centerBox.setWidth("100%");
 		wfnodeTree.setVflex("1");
-		wfnodeTree.setHflex("1");
+		centerBox.appendChild(centerBoxdown);
-		east.appendChild(eastdown);
+		centerBoxdown.setOrient("horizontal");
-		eastdown.setOrient("horizontal");
+		centerBoxdown.appendChild(bExpand);
-		eastdown.appendChild(bExpand);
+		centerBoxdown.appendChild(justmine);
-		eastdown.appendChild(justmine);
+		centerBoxdown.appendChild(showColors);
-		eastdown.appendChild(showColors);
+		center.setAutoscroll(true);
-		west.setAutoscroll(true);
-		west.setWidth("30%");
 	
-		Grid gridView = new Grid();
+		Div div = new Div();
-		gridView.setStyle("margin:0; padding:0;");
+		div.setHeight("88%");
-		gridView.makeNoStrip();
+		div.setHflex("1");
-		gridView.setOddRowSclass("even");
 		
-		Rows rows = new Rows();
+		div.setStyle("text-align:center ");
-		gridView.appendChild(rows);
+		pretitleLabel.setStyle("font-weight: bold; font-size: 14px");
-
+		div.appendChild(titleLabel);
-		Row row = new Row();
-		rows.appendChild(row);
-		row.setAlign("center");
-		row.appendChild(titleLabel);
 		titleLabel.setStyle("font-weight: bold; font-size: 14px");
+		titleLabel.setLeft("50%");
 		
-		row = new Row();
+		div.appendChild(helpFrame);
-		rows.appendChild(row);
-		row.appendChild(helpFrame);
 		helpFrame.setWidth("99%");
 		helpFrame.setHeight("90%");
-		helpFrame.setStyle("min-height:300px; border: 1px solid lightgray; margin:auto");
+		helpFrame.setStyle("border: 1px solid lightgray; margin:auto");
 		
-		row = new Row();
+		Div divNote = new Div();
-		rows.appendChild(row);
+		divNote.setStyle("text-align:left");
-		row.appendChild(notesLabel);
+		Separator separator = new Separator();
-		notesLabel.setWidth("100%");
+		divNote.appendChild(separator);
+		divNote.appendChild(notesLabel);
 		
-		row = new Row();
+		divNote.appendChild(notesField);
-		rows.appendChild(row);
-		row.appendChild(notesField);
 		notesField.setRows(4);
-		notesField.setWidth("100%");
+		notesField.setWidth("99%");
 
 		MLookup lookup = MLookupFactory.get(Env.getCtx(), form.getWindowNo(),
                 0, 200913, DisplayType.Search);
 		userField = new WSearchEditor(lookup, Msg.translate(
                 Env.getCtx(), "AD_User_ID"), "", false, false, true);
 
-		row = new Row();
-		rows.appendChild(row);
 		westdown.setOrient("horizontal");
+		westdown.appendChild(bZoomLabel);
 		westdown.appendChild(bZoom);
 		westdown.appendChild(userLabel);
 		westdown.appendChild(userField.getComponent());
@@ -370,17 +381,26 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		westdown.appendChild(bRefresh);
 		westdown.appendChild(bOK);
 		westdown.appendChild(bNext);
-		row.appendChild(westdown);
+		Div divButton = new Div();
-		row.setAlign("right");
+		divButton.setAlign("right");
+		divButton.appendChild(westdown);
 
 		East east = new East();
 		mainLayout.appendChild(east);
-		east.appendChild(gridView);
+		div.appendChild(divNote);
-		east.setCollapsible(false);
+		div.appendChild(divButton);
+		east.appendChild(div);
+		east.setCollapsible(true);
 		east.setSplittable(true);
 		east.setWidth("70%");
+		east.setAutoscroll(true);
 
 		setNotesPanelVisible(false);
+		
+		MWorkflow wf = MWorkflow.get(Env.getCtx(), getWfWizards().get(0).get_ID());
+		showInRightPanel(wf.getAD_Workflow_ID(), 0);
+
+
 	}	//	jbInit
 
 	private void refreshProgress() {
@@ -396,7 +416,6 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		progressLabel.setText(msg);
 		progressbar.setValue(percent);
 		progressbar.setTooltiptext(msg);
-		progressbar.setStyle("background: #BBC2DB;");
 	}
 
 	/**
@@ -419,6 +438,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 			showInRightPanel(0, m_node.getAD_WF_Node_ID());
 		} else if (e.getTarget() == bOK) {
 			int userid = 0;
+			allFinished=true;
 			if (!userField.isNullOrEmpty())
 				userid = (Integer)userField.getValue();
 			if (save(notesField.getText(), (String) statusField.getValue(), userid))
@@ -438,14 +458,8 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 	}	//	actionPerformed
 
 	private void showColors() {
-		if (!showColors.isChecked()) {
+		if (showColors.isChecked())
-			for (Treeitem nextItem : nextItems){
+			allFinished = true;
-				Treeitem ti= nextItem;
-				if (ti.getLevel() != 0) {
-					ti.setStyle("background-color: #FFFFFF;");
-				}
-			}
-		}
 		repaintTree();
 	}
 
@@ -496,10 +510,6 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 	}
 
 	private void repaintTree() {
-		east.removeChild(wfnodeTree);
-		east.removeChild(eastdown);
-		east.setVflex("1");
-		east.setHflex("1");
 		openNodes.removeAll(openNodes);
 		for (Treeitem nextItem : nextItems) {
 			if (nextItem.isOpen() && nextItem.getAttribute("AD_Workflow_ID") != null) {
@@ -509,8 +519,6 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		prevti = wfnodeTree.getSelectedItem();
 		wfnodeTree.clear();
 		loadWizardNodes();
-		east.appendChild(wfnodeTree);
-		east.appendChild(eastdown);
 		refreshProgress();
 	}
 	
@@ -580,7 +588,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 			setNotesPanelVisible(false);
 			m_node = null;
 		}
-		titleLabel.setText(title);
+		titleLabel.setText(pretitleLabel.getValue() + title);
 		if (help != null) {
 	    	AMedia media = new AMedia("Help", "html", "text/html", help.getBytes());
 			helpFrame.setContent(media);
@@ -600,6 +608,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
 		statusField.setVisible(visible);
 		userLabel.setVisible(visible);
 		userField.setVisible(visible);
+		bZoomLabel.setVisible(visible);
 		bZoom.setVisible(visible);
 	}
 

org.adempiere.ui.zk/theme/default/css/theme.css.dsp

@@ -1220,6 +1220,57 @@ tbody.z-grid-empty-body td {
 	font-weight: normal;
 }
 
+<%-- Tree nodes configurable on Setup Wizard --%>
+.tree-wsetupwizard-finished {
+	background-color: #90EE90;
+	margin-left:20px
+}
+
+.tree-wsetupwizard-skipped {
+	background-color: #00FF00;
+	margin-left:20px
+}
+
+.tree-wsetupwizard-delayed {
+	background-color: #0080FF;
+	margin-left:20px;
+}
+
+.tree-wsetupwizard-in-progress {
+	background-color: #FFFF33;
+	margin-left:20px;
+}
+
+.tree-wsetupwizard-pending {
+	background-color: #FFFF00;
+	margin-left:20px;
+}
+
+.tree-setupwizard-nostatus{
+	margin-left:20px;
+}
+
+.tree-wsetupwizard-finished-all {
+	background-color: #90EE90;
+}
+
+.progressmeter-setupwizard {
+background: #FFFF00 repeat-x 0 0 ;
+background-image: none;
+border: 1px solid #CFCFCF;
+text-align: left;
+height: 20px;
+overflow: hidden;
+}
+.progressmeter-setupwizard-img {
+display: inline-block;
+background: #90EE90;
+background-image: none;
+height: 20px;
+line-height: 0;
+font-size: 0;
+}
+.
 .menu-search-toggle-box {
 	display: inline-block;
 	border: 1px solid #ababab;