From 51d1c842e4e92cc65708b8bb88152d7344d43d04 Mon Sep 17 00:00:00 2001
From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Fri, 27 Feb 2009 15:21:36 +0000
Subject: [PATCH] Data model for batch entry, spec editor basis.

git-svn-id: https://svn.argeo.org/slc/trunk@2199 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org/argeo/slc/ria/NewLauncherApplet.js    | 71 +++++++++++----
 .../argeo/slc/ria/execution/BatchEntrySpec.js | 19 ++++
 .../class/org/argeo/slc/ria/execution/Flow.js |  4 +-
 .../org/argeo/slc/ria/execution/Module.js     |  4 +-
 .../class/org/argeo/slc/ria/execution/Spec.js |  4 +-
 .../org/argeo/slc/ria/execution/SpecEditor.js | 90 +++++++++++++++++++
 6 files changed, 174 insertions(+), 18 deletions(-)
 create mode 100644 org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js
 create mode 100644 org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/SpecEditor.js

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
index 929c2664d..600429197 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
@@ -59,10 +59,12 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
   				callback	: function(e){
   					var sel = this.list.getSortedSelection();
   					var item = sel[0];
-			  		alert('Edit Specs for : ' + item.getLabel());
+  					var execFlow = item.getUserData("batchEntrySpec").getFlow();
+  					var specEditor = new org.argeo.slc.ria.execution.SpecEditor(execFlow);
+  					specEditor.attachAndShow();
   				},
   				selectionChange : function(viewId, selection){
-  					if(viewId != "form") return;
+  					if(viewId != "form:list") return;
   					this.setEnabled(false);
   					if((selection && selection.length == 1)) this.setEnabled(true);
   				},
@@ -77,10 +79,17 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
   				toolbar  	: null,
   				callback	: function(e){
   					var sel = this.list.getSortedSelection();
-			  		alert('Remove '+ sel.length+ ' elements from batch');
+  					var modal = new org.argeo.ria.components.Modal("Confirm", null);
+  					modal.addConfirm("Are you sure you want to remove<br> the selected test" + (sel.length>1?"s":"") + " from the Batch?");
+  					modal.addListener("ok", function(){
+				  		for(var i=0;i<sel.length;i++){
+				  			this.list.remove(sel[i]);
+				  		}
+  					}, this);
+  					modal.attachAndShow();  					
   				},
   				selectionChange : function(viewId, selection){
-  					if(viewId != "form") return;
+  					if(viewId != "form:list") return;					
   					this.setEnabled(false);
   					if((selection && selection.length > 0)) this.setEnabled(true);
   				},  				
@@ -100,10 +109,10 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
   				command 	: null
   			},
   			"reloadtree" : {
-  				label	 	: "Reload Node", 
+  				label	 	: "Reload", 
   				icon 		: "resource/slc/view-refresh.png",
   				shortcut 	: "Control+m",
-  				enabled  	: true,
+  				enabled  	: false,
   				menu	   	: "Launcher",
   				toolbar  	: "launcher",
   				callback	: function(e){
@@ -111,7 +120,17 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
   					if(selected.classname == "org.argeo.ria.components.DynamicTreeFolder"){
 	  					selected.reload();
   					}
-  				},  				
+  				},  
+  				selectionChange : function(viewId, selection){
+  					if(viewId != "form:tree") return;
+  					if(!selection || selection.length != 1) return;
+  					var item = selection[0];
+  					if(!qx.Class.isSubClassOf(qx.Class.getByName(item.classname), qx.ui.tree.AbstractTreeItem)) return;
+  					this.setEnabled(false);
+  					if(qx.Class.isSubClassOf(qx.Class.getByName(item.classname), org.argeo.ria.components.DynamicTreeFolder)){
+  						this.setEnabled(true);
+  					}
+  				},
   				command 	: null
   			}
   		}
@@ -128,15 +147,22 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
 
   statics : {
 	flowLoader : function(folder){
-		var moduleData = folder.getUserData("executionModule");
-  		var req = org.argeo.ria.remote.RequestManager.getInstance().getRequest("stub.xml", "GET", "application/xml");
+		var moduleData = folder.getUserData("moduleData");
+  		var req = org.argeo.ria.remote.RequestManager.getInstance().getRequest("../argeo-ria-src/stub.xml", "GET", "application/xml");
   		req.addListener("completed", function(response){
   			var executionModule = new org.argeo.slc.ria.execution.Module();			  			
   			executionModule.setXmlNode(response.getContent());
+  			//
+  			// ARTIFIALLY REPLACE MODULE NAME / VERSION, FOR TESTS PURPOSES
+  			//
+  			executionModule.setName(moduleData.name);
+  			executionModule.setVersion(moduleData.version);
+  			// END
   			var execFlows = executionModule.getExecutionFlows();
   			for(var key in execFlows){
   				var file = new qx.ui.tree.TreeFile(key);
-  				file.setUserData("executionFlow", execFlows);
+  				file.setUserData("executionModule", executionModule);
+  				file.setUserData("executionFlow", execFlows[key]);
   				folder.add(file);
   			}
   			folder.setLoaded(true);
@@ -163,7 +189,7 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
 					folder.getDragData()
 				);
 				moduleFolder.add(versionFolder);
-				//versionFolder.setUserData("executionModule", "object");
+				versionFolder.setUserData("moduleData", {name:key, version:mods[key][i]});
 			}
 			folder.setLoaded(true);
 		}
@@ -264,6 +290,16 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
 		this.tree.setRoot(root);
 		root.setOpen(true);
 		
+		this.tree.addListener("changeSelection", function(e){
+			var viewSelection = this.getViewSelection();
+			viewSelection.setViewId("form:tree");
+			viewSelection.clear();
+			var sel = this.tree.getSortedSelection();
+			for(var i=0;i<sel.length;i++){
+				viewSelection.addNode(sel[i]);
+			}			
+		}, this);
+		
 		this.listPane = new qx.ui.container.Composite(new qx.ui.layout.Dock());
 		var listToolBar = new qx.ui.toolbar.ToolBar();		
 		var toolGroup = new qx.ui.toolbar.Part();		
@@ -288,10 +324,14 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
 		this.list.setSelectionMode("multi");
 		this.list.setDroppable(true);
 		this.list.addListener("drop", function(e){
-		  var label = e.getRelatedTarget().getLabel();
-		  var li = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
-		  li.add(new qx.ui.basic.Label(label));
-		  var item = new qx.ui.form.ListItem(label, e.getRelatedTarget().getIcon());
+			var target = e.getRelatedTarget();
+			var executionModule = target.getUserData("executionModule");
+			var executionFlow = target.getUserData("executionFlow");
+			var label = executionModule.getName()+"/"+executionModule.getVersion()+"/"+executionFlow.getName();
+		  	var icon = target.getIcon();
+		  	
+		  var item = new qx.ui.form.ListItem(label, icon);
+		  item.setUserData("batchEntrySpec", new org.argeo.slc.ria.execution.BatchEntrySpec(executionModule, executionFlow));
 		  item.setPaddingTop(1);
 		  item.setPaddingBottom(2);
 		  this.list.add(item);
@@ -302,6 +342,7 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
 		
 		this.list.addListener("changeSelection", function(e){
 			var viewSelection = this.getViewSelection();
+			viewSelection.setViewId("form:list");
 			viewSelection.clear();
 			var listSel = this.list.getSortedSelection();
 			for(var i=0;i<listSel.length;i++){
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js
new file mode 100644
index 000000000..3bb37fcdc
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/BatchEntrySpec.js
@@ -0,0 +1,19 @@
+/**
+ * Data model for an entry of the Batch list : original Spec, flow and module, and currently computed value.
+ */
+qx.Class.define("org.argeo.slc.ria.execution.BatchEntrySpec", {
+	extend : org.argeo.slc.ria.execution.Spec,
+	
+	properties : {
+		module :{},
+		flow : {},
+		originalSpec : {}		
+	},
+	
+	construct : function(module, flow){
+		this.base(arguments);
+		this.setModule(module);
+		this.setFlow(flow);
+		this.setOriginalSpec(flow.getExecutionSpec());
+	}
+});
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Flow.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Flow.js
index ed23ff04a..75da046ca 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Flow.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Flow.js
@@ -39,7 +39,9 @@ qx.Class.define("org.argeo.slc.ria.execution.Flow", {
 		XPATH_VALUES : "slc:values"
 	},
 	
-	construct : function(){},
+	construct : function(){
+		this.base(arguments);
+	},
 	
 	members : {		
 		/**
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Module.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Module.js
index 8e69c92b2..b3e303496 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Module.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Module.js
@@ -49,7 +49,9 @@ qx.Class.define("org.argeo.slc.ria.execution.Module", {
 		XPATH_EXECUTION_SPECS : "slc:execution-module-descriptor/slc:executionSpecs/slc:simple-execution-spec"
 	},
 	
-	construct : function(){},
+	construct : function(){
+		this.base(arguments);
+	},
 	
 	members : {
 		/**
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Spec.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Spec.js
index 0dc1eb0a8..85a8d4a51 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Spec.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/Spec.js
@@ -33,7 +33,9 @@ qx.Class.define("org.argeo.slc.ria.execution.Spec", {
 		XPATH_VALUES : "slc:values"
 	},
 	
-	construct : function(){},
+	construct : function(){
+		this.base(arguments);
+	},
 	
 	members : {
 		/**
diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/SpecEditor.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/SpecEditor.js
new file mode 100644
index 000000000..f302c3da5
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/execution/SpecEditor.js
@@ -0,0 +1,90 @@
+/**
+ * Generic modal popup window.
+ * It is layed out with a dock layout. When adding components to it, they are added as "center".
+ * @author Charles du Jeu
+ */
+qx.Class.define("org.argeo.slc.ria.execution.SpecEditor",
+{
+	extend : qx.ui.window.Window,
+  
+	events : {
+		/**
+		 * Triggered when the user clicks the "ok" button. 
+		 */
+		"ok" : "qx.event.type.Event"
+	},
+	/**
+	 * 
+	 * @param caption {String} Title of the window
+	 * @param icon {String} Icon of the window
+	 * @param text {String} Default content of the window.
+	 */
+	construct : function(executionFlow){
+	  	this.base(arguments, "Spec Editor");
+		this.set({
+			showMaximize : false,
+			showMinimize : false,
+			width: parseInt(qx.bom.Viewport.getWidth()*80/100),
+			height: parseInt(qx.bom.Viewport.getHeight()*80/100)
+		});
+		this.setLayout(new qx.ui.layout.Dock());
+		this.setModal(true);
+		this.center();
+		if(executionFlow){
+			this.addContent(new qx.ui.basic.Label("Editing specs for flow : "+executionFlow.getName()));
+		}else{
+			this.addCloseButton();
+		}
+	},
+	
+	members : {
+		/**
+		 * Display a component (panel) in the center of the popup
+		 * @param panel {qx.ui.core.Widget} A gui component (will be set at width 100%).
+		 */
+		addContent: function(panel){
+			this.add(panel, {edge:'center', width:'100%'});
+			this.addCloseButton();
+		},
+		/**
+		 * Automatically attach to the application root, then show.
+		 */
+		attachAndShow:function(){
+			org.argeo.ria.components.ViewsManager.getInstance().getApplicationRoot().add(this);			
+			this.show();
+		},
+		/**
+		 * Adds a close button bottom-center aligned to the popup
+		 */
+		addCloseButton : function(){
+			this.closeButton = new qx.ui.form.Button("Close");
+			this.closeButton.addListener("execute", this._closeAndDestroy, this);
+			this.add(this.closeButton, {edge:'south'});			
+		},
+		/**
+		 * Adds two buttons bottom-center aligned (Ok and Cancel). 
+		 * Ok button has no listener by default, Cancel will close and destroy the popup.
+		 */
+		addOkCancel : function(){
+			var buttonPane = new qx.ui.container.Composite(new qx.ui.layout.HBox(5, 'right'));
+			buttonPane.setAlignX("center");
+			this.add(buttonPane, {edge:"south"});
+			this.okButton = new qx.ui.form.Button("Ok");
+			this.okButton.addListener("execute", function(e){
+				this.fireEvent("ok");
+				this._closeAndDestroy();
+			}, this);
+			this.cancelButton = new qx.ui.form.Button("Cancel");
+			this.cancelButton.addListener("execute", this._closeAndDestroy, this);
+			buttonPane.add(this.okButton);
+			buttonPane.add(this.cancelButton);
+		},
+		/**
+		 * Close this modal window and destroy it.
+		 */
+		_closeAndDestroy : function(){
+			this.hide();
+			this.destroy();			
+		}
+	}
+});
\ No newline at end of file
-- 
2.39.2