From 449e1db242d1122287ae345d0215982304ea95bd Mon Sep 17 00:00:00 2001
From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Tue, 9 Dec 2008 11:43:37 +0000
Subject: [PATCH] Clean client, use an Api class

git-svn-id: https://svn.argeo.org/slc/trunk@1978 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../source/class/org/argeo/slc/web/Applet.js  |  39 ++++-
 .../source/class/org/argeo/slc/web/SlcApi.js  | 121 +++++++++++++
 .../class/org/argeo/slc/web/TestList.js       | 160 ++++++++----------
 .../class/org/argeo/slc/web/XmlRenderer.js    |  14 +-
 4 files changed, 231 insertions(+), 103 deletions(-)
 create mode 100644 org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/SlcApi.js

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Applet.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Applet.js
index 1ff9c71e3..b753a0b1a 100644
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Applet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Applet.js
@@ -69,11 +69,8 @@ qx.Class.define("org.argeo.slc.web.Applet",
   		var service;  		
 		var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
 		var testId = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(this.data, "slc:uuid"));		
-		this.info("Opening test "+testId);
 		this.getView().setViewTitle("Test "+testId);
-		service = "../resultViewXml.xslt?uuid="+testId;
-		var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
-  		var request = serviceManager.getRequest(service, "GET", "application/xml");
+  		var request = org.argeo.slc.web.SlcApi.getLoadResultService(testId);  		
   		request.addListener("completed", function(response){
 			this.createXmlGui(response.getContent());
 			this.getView().setOnLoad(false);
@@ -131,14 +128,34 @@ qx.Class.define("org.argeo.slc.web.Applet",
 				var simpleResults = org.argeo.ria.util.Element.selectNodes(node, "slc:part-sub-list/slc:parts/slc:simple-result-part", NSMap);
 
 				var newId;
-				newId = model.addBranch(currentParentId, label, false);
+				//newId = model.addBranch(currentParentId, label, false);
 				
 				// Test Leaf Node
 				if(!simpleResults || !simpleResults.length){
+					newId = model.addBranch(currentParentId, label, false);
 					addedPaths[crtPath] = newId;
 					currentParentId = newId;
 					continue;
 				}
+				if(simpleResults.length == 1){
+					//newId = model.addBranch(currentParentId, label, false);
+					var sResNode = simpleResults[0];
+					newId = model.addBranch(currentParentId, label);
+					model.setColumnData(newId, 3, org.argeo.ria.util.Element.getSingleNodeText(sResNode, "slc:test-run-uuid", NSMap));
+					model.setColumnData(newId, 2, org.argeo.ria.util.Element.getSingleNodeText(sResNode, "slc:message", NSMap));
+					var status = org.argeo.ria.util.Element.getSingleNodeText(sResNode, "slc:status", NSMap);
+					if(status != "PASSED"){
+						status = this.failedStatus ;
+						this._setParentBranchAsFailed(newId);
+					}else{
+						status = this.passedStatus;
+					}
+					model.setColumnData(newId, 1, status);											
+					addedPaths[crtPath] = newId;
+					currentParentId = newId;
+					continue;
+				}
+				newId = model.addBranch(currentParentId, label, false);
 				for(var k=0;k<simpleResults.length;k++){
 					var sResNode = simpleResults[k];
 					resId = model.addLeaf(currentParentId, label);
@@ -158,6 +175,7 @@ qx.Class.define("org.argeo.slc.web.Applet",
 				currentParentId = newId;
 			}
   		}
+  		this._refineLeaves(this.tree, 0);
   		this.add(this.tree, {flex:1});
   		model.setData();
   		var columnModel = this.tree.getTableColumnModel();
@@ -195,6 +213,17 @@ qx.Class.define("org.argeo.slc.web.Applet",
 		}  		
   	},
   	
+  	_refineLeaves : function(tree, nodeId){
+  		var node = tree.nodeGet(nodeId);  		
+  		if(node.children && node.children.length){
+  			for(var i=0;i<node.children.length;i++){
+  				this._refineLeaves(tree, node.children[i]);
+  			}
+  		}else{
+  			node.type = qx.ui.treevirtual.SimpleTreeDataModel.Type.LEAF;
+  		}
+  	},
+  	
   	createHtmlGui : function(responseText){
   		var htmlElement = new qx.ui.embed.Html(responseText);
   		htmlElement.setOverflowX("auto");
diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/SlcApi.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/SlcApi.js
new file mode 100644
index 000000000..14be9b56d
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/SlcApi.js
@@ -0,0 +1,121 @@
+qx.Class.define("org.argeo.slc.web.SlcApi",
+{
+  extend : qx.core.Object,
+  
+  statics : {
+  	DEFAULT_CONTEXT : "/org.argeo.slc.webapp",
+  	
+  	REMOVE_RESULT_FROM_COLL_SERVICE : "removeResultFromCollection.service",
+  	ADD_RESULT_TO_COLL_SERVICE : "addResultToCollection.service",
+  	LIST_COLLECTIONS_SERVICE : "listCollectionRefs.service",
+  	LIST_RESULTS_SERVICE : "listResultAttributes.service",
+  	GET_RESULT_SERVICE : "getResult.service",
+  	
+  	/**
+  	 * Standard Request getter
+  	 * @param serviceName {String} The name of the service to call (without base context)
+  	 * @param fireReloadEventType {String} Whether query should trigger a ReloadEvent
+  	 * @param iLoadStatusables {org.argeo.ria.components.ILoadStatusables[]} Gui parts to update
+  	 * @return {qx.io.remote.Request}
+  	 */
+  	getServiceRequest:function(serviceName, fireReloadEventType, iLoadStatusables){
+  		var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
+  		return serviceManager.getRequest(
+  			org.argeo.slc.web.SlcApi.DEFAULT_CONTEXT+"/"+serviceName,
+  			"GET",
+  			"application/xml",
+  			fireReloadEventType,
+  			iLoadStatusables
+  		);
+  	},
+  	
+  	/**
+  	 * Remove a result from a collection
+  	 * @param collectionId {String} Id of the destination collection
+  	 * @param resultId {String} Id of the test result to remove
+  	 * @param fireReloadEventType {String} Whether query should trigger a ReloadEvent
+  	 * @param iLoadStatusables {org.argeo.ria.components.ILoadStatusables[]} Gui parts to update
+  	 * @return {qx.io.remote.Request}
+  	 */
+  	getRemoveResultService : function(collectionId, resultId, fireReloadEventType, iLoadStatusables){
+  		var request = org.argeo.slc.web.SlcApi.getServiceRequest(
+	  		org.argeo.slc.web.SlcApi.REMOVE_RESULT_FROM_COLL_SERVICE, 
+	  		fireReloadEventType, 
+	  		iLoadStatusables
+  		);
+  		request.setParameter("collectionId", collectionId);
+  		request.setParameter("resultUuid", resultId);
+  		return request;
+  	},
+  	
+  	/**
+  	 * Add a result to a given collection
+  	 * @param collectionId {String} Id of the destination collection
+  	 * @param resultId {String} Id of the test result to add
+  	 * @param fireReloadEventType {String} Whether query should trigger a ReloadEvent
+  	 * @param iLoadStatusables {org.argeo.ria.components.ILoadStatusables[]} Gui parts to update
+  	 * @return {qx.io.remote.Request}
+  	 */
+  	getAddResultService : function(collectionId, resultId, fireReloadEventType, iLoadStatusables){
+  		var request = org.argeo.slc.web.SlcApi.getServiceRequest(
+	  		org.argeo.slc.web.SlcApi.ADD_RESULT_TO_COLL_SERVICE, 
+	  		fireReloadEventType, 
+	  		iLoadStatusables
+  		);
+  		request.setParameter("collectionId", collectionId);
+  		request.setParameter("resultUuid", resultId);
+  		return request;
+  	},
+  	
+  	/**
+  	 * List current collections
+  	 * @param fireReloadEventType {String} Whether query should trigger a ReloadEvent
+  	 * @param iLoadStatusables {org.argeo.ria.components.ILoadStatusables[]} Gui parts to update
+  	 * @return {qx.io.remote.Request}
+  	 */
+  	getListCollectionsService : function(fireReloadEventType, iLoadStatusables){
+  		return org.argeo.slc.web.SlcApi.getServiceRequest(
+	  		org.argeo.slc.web.SlcApi.LIST_COLLECTIONS_SERVICE, 
+	  		fireReloadEventType, 
+	  		iLoadStatusables
+  		);
+  	},
+  	
+  	/**
+  	 * List all results or results of a given collection 
+  	 * @param collectionId {String} Id of the collection to load
+  	 * @param fireReloadEventType {String} Whether query should trigger a ReloadEvent
+  	 * @param iLoadStatusables {org.argeo.ria.components.ILoadStatusables[]} Gui parts to update
+  	 * @return {qx.io.remote.Request}
+  	 */
+  	getListResultsService : function(collectionId, fireReloadEventType, iLoadStatusables){
+  		var request = org.argeo.slc.web.SlcApi.getServiceRequest(
+	  		org.argeo.slc.web.SlcApi.LIST_RESULTS_SERVICE, 
+	  		fireReloadEventType, 
+	  		iLoadStatusables
+  		);
+  		if(collectionId){
+  			request.setParameter("id", collectionId);
+  		}
+  		return request;
+  	},
+  	
+  	/**
+  	 * Load a result test
+  	 * @param resultId {String} Id of the test result to load
+  	 * @param fireReloadEventType {String} Whether query should trigger a ReloadEvent
+  	 * @param iLoadStatusables {org.argeo.ria.components.ILoadStatusables[]} Gui parts to update
+  	 * @return {qx.io.remote.Request}
+  	 */
+  	getLoadResultService : function(resultId, fireReloadEventType, iLoadStatusables){
+  		var request = org.argeo.slc.web.SlcApi.getServiceRequest(
+	  		org.argeo.slc.web.SlcApi.GET_RESULT_SERVICE, 
+	  		fireReloadEventType, 
+	  		iLoadStatusables
+  		);
+  		request.setParameter("uuid", resultId);
+  		return request;
+  	}
+  	
+  }
+});
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js
index 71d61322e..17ac3458f 100644
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js
@@ -44,6 +44,20 @@ qx.Class.define("org.argeo.slc.web.TestList",
   				}, 
   				command 	: null
   			},
+  			"polllistloading" : {
+  				label		: "Auto load", 
+  				icon 		: "resource/slc/document-open-recent.png",
+  				shortcut 	: "Control+l",
+  				enabled  	: true,
+  				toggle		: true,
+  				menu	   	: "Collection",
+  				toolbar  	: "collection",
+  				callback 	: function(event){
+  					this.pollListLoading(event.getTarget().getUserData("slc.command.toggleState"));
+  				}, 
+  				command 	: null
+  			},
+  			/*
   			"copyfullcollection" : {
   				label	 	: "Copy to...", 
   				icon 		: "resource/slc/edit-copy.png",
@@ -69,6 +83,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
   				},
   				command 	: null
   			},
+  			*/
   			"opentest" : {
   				label	 	: "Open", 
   				icon 		: "resource/slc/media-playback-start.png",
@@ -100,7 +115,12 @@ qx.Class.define("org.argeo.slc.web.TestList",
   				toolbar  	: "selection",
   				callback	: function(e){ },
   				command 	: null,
-  				submenu 	: {},
+  				submenu 	: [
+  						{'label':"Xsl", 'icon':'resource/slc/mime-xsl.png', 'commandId':'xsl'},
+  						{'label':"Xml", 'icon':'resource/slc/mime-xml.png', 'commandId':'xml'},
+  						{'label':"Excel", 'icon':'resource/slc/mime-xls.png', 'commandId':'xls'},
+  						{'label':"Pdf", 'icon':'resource/slc/mime-pdf.png', 'commandId':'pdf'}
+  					],
   				submenuCallback : function(commandId){
   					var uuid = this.extractTestUuid();
   					var urls = {
@@ -116,69 +136,14 @@ qx.Class.define("org.argeo.slc.web.TestList",
   						var win = window.open(url);
   					}
   				},
-  				init : function(command){
-  					this.setMenu([
-  						{'label':"Xsl", 'icon':'resource/slc/mime-xsl.png', 'commandId':'xsl'},
-  						{'label':"Xml", 'icon':'resource/slc/mime-xml.png', 'commandId':'xml'},
-  						{'label':"Excel", 'icon':'resource/slc/mime-xls.png', 'commandId':'xls'},
-  						{'label':"Pdf", 'icon':'resource/slc/mime-pdf.png', 'commandId':'pdf'}
-  					]);
-  				},
   				selectionChange : function(viewId, xmlNodes){
   					if(viewId!="list")return;
   					//this.clearMenus();
   					this.setEnabled(false);
   					if(xmlNodes == null || !xmlNodes.length) return;
   					this.setEnabled(true);
-  					/*
-  					var reports = qx.xml.Element.selectNodes(xmlNodes[0],'report[@type="download"]');
-  					if(reports == null || !reports.length)return;
-  					var submenus = [];
-  					for(var i=0; i<reports.length;i++){
-  						var report = reports[i];
-  						var commandId = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(report, "@commandid"));
-  						submenus.push({
-  							"label":qx.dom.Node.getText(report), 
-  							"icon":"resource/slc/mime-"+commandId+".png", 
-  							"commandId":commandId
-  						});
-  					}
-  					this.setMenu(submenus);
-  					this.setEnabled(true);
-  					*/
   				}
   			},
-  			"deletetest" : {
-  				label	 	: "Delete", 
-  				icon 		: "resource/slc/edit-delete.png",
-  				shortcut 	: "Control+d",
-  				enabled  	: false,
-  				menu	   	: "Selection",
-  				toolbar  	: "selection",
-  				callback	: function(e){
-  					var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
-  					var request = serviceManager.getRequest(
-  						"/org.argeo.slc.webapp/removeResultFromCollection.service",
-  						"GET",
-  						"application/xml"
-  					);
-  					request.setParameter("collectionId", this.getCollectionId());
-  					request.setParameter("resultUuid", this.extractTestUuid());
-					request.addListener("completed", function(response){
-						this.loadCollections();
-						this.loadList();
-						this.info("Test was successfully deleted");
-					}, this);
-					request.send();
-  				},
-	  			selectionChange : function(viewId, xmlNodes){
-					if(viewId != "list") return;
-					this.setEnabled(false);
-					if(xmlNodes == null || !xmlNodes.length) return;
-					this.setEnabled(true);  						
-	  			},
-  				command 	: null
-  			},
   			"copytocollection" : {
   				label	 	: "Copy to...", 
   				icon 		: "resource/slc/edit-copy.png",
@@ -209,7 +174,32 @@ qx.Class.define("org.argeo.slc.web.TestList",
 					this.setEnabled(true);  						
 	  			},
   				command 	: null
-  			}  			
+  			},
+  			"deletetest" : {
+  				label	 	: "Delete", 
+  				icon 		: "resource/slc/edit-delete.png",
+  				shortcut 	: "Control+d",
+  				enabled  	: false,
+  				menu	   	: "Selection",
+  				toolbar  	: "selection",
+  				callback	: function(e){
+  					
+  					var request = org.argeo.slc.web.SlcApi.getRemoveResultService(this.getCollectionId(), this.extractTestUuid());
+					request.addListener("completed", function(response){
+						this.loadCollections();
+						this.loadList();
+						this.info("Test was successfully deleted");
+					}, this);
+					request.send();
+  				},
+	  			selectionChange : function(viewId, xmlNodes){
+					if(viewId != "list") return;
+					this.setEnabled(false);
+					if(xmlNodes == null || !xmlNodes.length) return;
+					this.setEnabled(true);  						
+	  			},
+  				command 	: null
+  			}
   		}
 	}
   },
@@ -223,7 +213,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	  	statusBarVisible: false,
 		showCellFocusIndicator:false,
 		columnVisibilityButtonVisible:false,
-		contextMenu : org.argeo.ria.event.CommandsManager.getInstance().createMenuFromIds(["opentest", "deletetest", "copytocollection"]),
+		contextMenu : org.argeo.ria.event.CommandsManager.getInstance().createMenuFromIds(["opentest", "download", "copytocollection", "deletetest"]),
 		decorator : new qx.ui.decoration.Background("#fff")
 	  });
 	  var viewPane = this.getView();
@@ -274,13 +264,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	},
 	
 	loadCollections : function(){
-		var url = "/org.argeo.slc.webapp/listCollectionRefs.service";
-		var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
-		var request = serviceManager.getRequest(
-			url,
-			"GET",
-			"application/xml"
-		);
+		var request = org.argeo.slc.web.SlcApi.getListCollectionsService();
 		var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
 		request.addListener("completed", function(response){
 			var xml = response.getContent();
@@ -298,23 +282,14 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	},
 	
 	loadList : function(){
-		var url = "/org.argeo.slc.webapp/listResultAttributes.service";
 	  	var model = this.table.getTableModel();
 	  	model.removeRows(0, model.getRowCount());
-	  	var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
 	  	var commandManager = org.argeo.ria.event.CommandsManager.getInstance();
-	  	var request = serviceManager.getRequest(
-	  		url, 
-	  		"GET", 
-	  		"application/xml",	
-	  		null,
-	  		[commandManager.getCommandById("loadtestlist"), this.getView()]
-	  	);	 
-	  	request.setParameter("id", this.getCollectionId());
+	  	var request = org.argeo.slc.web.SlcApi.getListResultsService(this.getCollectionId(), null, [commandManager.getCommandById("loadtestlist"), this.getView()]);
 	  	var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
 	  	request.addListener("completed", function(response){
   			var xml = response.getContent();
-	  		this.info("Successfully loaded XML");
+	  		this.debug("Successfully loaded XML");
 	  		var nodes = org.argeo.ria.util.Element.selectNodes(xml, "//slc:result-attributes", NSMap);
 	  		for(var i=0; i<nodes.length;i++){
 	  			var rowData = nodes[i];
@@ -324,6 +299,19 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	  	request.send();		
 	},
 	
+	pollListLoading : function(state){
+		if(!this.timer){
+			this.timer = new qx.event.Timer(5000);
+			this.timer.addListener("interval", this.loadList, this);
+		}
+		if(state){
+			this.loadList();
+			this.timer.start();
+		}else{
+			this.timer.stop();
+		}
+	},
+	
 	collectionListToMenu : function(command, checkSelection){
 		command.setEnabled(false);
 		command.clearMenus();
@@ -338,6 +326,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
 				"commandId":key
 			});
 		}		
+		submenus.push({'separator':true});
 		submenus.push({"label":"New...", "icon":"resource/slc/folder-new.png", "commandId":"slc.client.create"});
 		command.setMenu(submenus);
 		if(checkSelection){
@@ -366,24 +355,17 @@ qx.Class.define("org.argeo.slc.web.TestList",
 			return;
 		}
 
-		var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
-		var request = serviceManager.getRequest(
-			"/org.argeo.slc.webapp/addResultToCollection.service", 
-			"GET", 
-			"application/xml"
-		);
-
 		if(selectionType == "current_collection"){
 			this.error("Not implemented yet!");			
 		}else if(selectionType == "current_selection"){
 			// get selection ID
-			request.setParameter("collectionId", collectionId);
-			request.setParameter("resultUuid", this.extractTestUuid());
+			var request = org.argeo.slc.web.SlcApi.getAddResultService(collectionId,this.extractTestUuid());
+			request.addListener("completed", function(response){
+				this.info("Result successfully copied to collection!");
+				this.loadCollections();
+			}, this);
+			request.send();		
 		}
-		request.addListener("completed", function(response){
-			this.loadCollections();
-		}, this);
-		request.send();		
 	},
 	
 	extractTestUuid: function(){
diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/XmlRenderer.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/XmlRenderer.js
index 00be48f42..c369bb347 100644
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/XmlRenderer.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/XmlRenderer.js
@@ -34,22 +34,18 @@ qx.Class.define("org.argeo.slc.web.XmlRenderer",
 		    	var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || "Not Found");
     			break;
     		case 1 : 
-    			return "-";
-    			xPath = 'param[@name="date"]';
+    			xPath = "slc:close-date";
 		    	var nameParam = org.argeo.ria.util.Element.selectSingleNode(xmlNode, xPath, NSMap);
-		    	//qx.log.Logger.info(nameParam);
-		    	var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || 0);
+		    	var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || "NOT CLOSED");
 		    	if(value == "NOT CLOSED") return value;
 		    	var splits = value.split(".");
-				//qx.log.Logger.info(value);
+		    	value = splits[0].replace("T", " ");				
 		    	var dateFormat = new qx.util.format.DateFormat("yyyy-MM-dd HH:mm:ss");
 		    	try {
-			    	var date = dateFormat.parse(splits[0]);
+			    	var date = dateFormat.parse(value);
 			    	var dateFormat2 = new qx.util.format.DateFormat("MMM d, yy HH:mm:ss");
 			    	return dateFormat2.format(date);
-		    	}catch(e){
-		    		qx.log.Logger.info(e);
-		    	}
+		    	}catch(e){}
     			break;
     		default :
     			return "";
-- 
2.39.2