X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2Fsource%2Fclass%2Forg%2Fargeo%2Fslc%2Fweb%2FTestList.js;h=8aaf5e14e215ff95de23e3c64e58445c0bd3af3d;hb=d87e2f0331afc9d26679f1d6ac69f752c80e0bf8;hp=231aad6f90b34cebd30fcd11ae068dc682ccc0b3;hpb=d0e9ed62482bd35d41869d0bbfbdec62698993c4;p=gpl%2Fargeo-slc.git

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 231aad6f9..8aaf5e14e 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",
@@ -78,7 +93,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
   				toolbar  	: "selection",
   				callback	: function(e){
   					var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();
-  					var classObj = org.argeo.slc.web.Applet;
+  					var classObj = org.argeo.slc.ria.Applet;
 					var iView = viewsManager.initIViewClass(classObj, "applet");
   					var xmlNodes = viewsManager.getViewPaneSelection("list").getNodes();
 					iView.load(xmlNodes[0]);
@@ -87,10 +102,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
   					if(viewId != "list") return;
   					this.setEnabled(false);
   					if(xmlNodes == null || !xmlNodes.length) return;
-  					var applet = org.argeo.ria.util.Element.selectSingleNode(xmlNodes[0],'report[@type="applet"]'); 
-  					if(applet != null && qx.dom.Node.getText(applet) != ""){
-  						this.setEnabled(true);  						
-  					}  					
+					this.setEnabled(true);
   				},
   				command 	: null
   			},
@@ -103,12 +115,14 @@ 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 viewsManager = org.argeo.ria.components.ViewsManager.getInstance();
-  					var xmlNodes = viewsManager.getViewPaneSelection("list").getNodes();
-  					// Single selection
-  					var uuid = qx.xml.Element.getSingleNodeText(xmlNodes[0], 'param[@name="uuid"]');
+  					var uuid = this.extractTestUuid();
   					var urls = {
   						xsl : "resultView.xslt",
   						xml : "resultViewXml.xslt",
@@ -124,44 +138,12 @@ qx.Class.define("org.argeo.slc.web.TestList",
   				},
   				selectionChange : function(viewId, xmlNodes){
   					if(viewId!="list")return;
-  					this.clearMenus();
+  					//this.clearMenus();
   					this.setEnabled(false);
-  					if(xmlNodes == null) return;
-  					
-  					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);
+  					if(xmlNodes == null || !xmlNodes.length) return;
   					this.setEnabled(true);
   				}
   			},
-  			"deletetest" : {
-  				label	 	: "Delete", 
-  				icon 		: "resource/slc/edit-delete.png",
-  				shortcut 	: "Control+d",
-  				enabled  	: false,
-  				menu	   	: "Selection",
-  				toolbar  	: "selection",
-  				callback	: function(e){
-  					// Call service to delete
-  				},
-	  			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",
@@ -192,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.ria.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
+  			}
   		}
 	}
   },
@@ -206,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();
@@ -215,8 +222,9 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	  }, this);
 	  var columnModel = this.table.getTableColumnModel(); 
 	  columnModel.getBehavior().setWidth(0, "60%");
-	  columnModel.setDataCellRenderer(0, new org.argeo.slc.web.XmlRenderer());
-	  columnModel.setDataCellRenderer(1, new org.argeo.slc.web.XmlRenderer());
+	  var renderer = new org.argeo.slc.web.XmlRenderer();
+	  columnModel.setDataCellRenderer(0, renderer);
+	  columnModel.setDataCellRenderer(1, renderer);
 	  
 	  this.table.getSelectionManager().getSelectionModel().addListener("changeSelection", function(e){
 	  	var viewSelection = viewPane.getViewSelection();
@@ -236,14 +244,11 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	  this.getView().setViewTitle("");
 	  this.add(this.table, {flex:1});
 
-  	  select.addListener("changeValue", function(dataEvent){
-  	  	this.debug(dataEvent.getData());
-	  	this.setCollectionId(dataEvent.getData());
-	  	this.loadList();
-	  }, this);
+  	  select.addListener("changeValue", this.collectionSelectorListener, this);
 
 	  org.argeo.ria.remote.RequestManager.getInstance().addListener("reload", function(event){
 	  	 if(event.getDataType()!="collection") return;
+	  	 select.removeListener("changeValue", this.collectionSelectorListener, this);
 	  	 var collectionList = event.getContent();
 	  	 select.removeAll();
 	  	 for(key in collectionList){
@@ -253,41 +258,62 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	  	 		select.setSelected(item);
 	  	 	}
 	  	 }
+	  	 this.setCollectionId(select.getSelected().getValue());
+	  	 select.addListener("changeValue", this.collectionSelectorListener, this);
 	  }, this);
 	  	  
 	},
 	
 	loadCollections : function(){
-		this.setCollectionList({"Charles":"Collection 'Charles'","My Collection":"Collection 'My Collection'"});
-		org.argeo.ria.remote.RequestManager.getInstance().fireReloadEvent("collection", this.getCollectionList());
+		var request = org.argeo.slc.ria.SlcApi.getListCollectionsService();
+		var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
+		request.addListener("completed", function(response){
+			var xml = response.getContent();
+			var collections = {};
+			var nodes = org.argeo.ria.util.Element.selectNodes(xml, "//slc:ref", NSMap);
+			for(var i=0;i<nodes.length;i++){
+				var collId = qx.xml.Element.getSingleNodeText(nodes[i], ".");
+				collections[collId] = collId;
+			}
+			this.setCollectionList(collections);
+			org.argeo.ria.remote.RequestManager.getInstance().fireReloadEvent("collection", this.getCollectionList());
+		}, this);
+		request.setAsynchronous(false);
+		request.send();
 	},
 	
 	loadList : function(){
-		var url = "/org.argeo.slc.webapp/resultList.ui";
 	  	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",
-	  		"test_cases",
-	  		[commandManager.getCommandById("loadtestlist"), this.getView()]
-	  	);	 
-	  	request.setParameter("collectionId", this.getCollectionId());
+	  	var request = org.argeo.slc.ria.SlcApi.getListResultsService(this.getCollectionId(), null, [commandManager.getCommandById("loadtestlist"), this.getView()]);
+	  	var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
 	  	request.addListener("completed", function(response){
-  			xml = response.getContent();
-	  		qx.log.Logger.info("Successfully loaded XML");
-	  		var nodes = qx.xml.Element.selectNodes(xml, "//data");
-	  		for(var i=0; i<nodes.length;i++){
-	  			var rowData = nodes[i];
-	  			model.addRows([rowData]);
-	  		}
+  			var xml = response.getContent();
+	  		this.debug("Successfully loaded XML");
+	  		var nodes = org.argeo.ria.util.Element.selectNodes(xml, "//slc:result-attributes", NSMap);
+	  		//model.addRows(nodes);
+	  		
+	  		for(var i=0; i<nodes.length;i++){	  			
+	  			model.addRows([nodes[i]]);
+	  		}	  		
 	  	}, request);
 	  	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();
@@ -302,6 +328,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){
@@ -327,9 +354,32 @@ qx.Class.define("org.argeo.slc.web.TestList",
 				}
 			}, this);
 			modal.attachAndShow();
-		}else{			
-			this.debug("Copying "+selectionType+" to collection " + collectionId);
+			return;
 		}
+
+		if(selectionType == "current_collection"){
+			this.error("Not implemented yet!");			
+		}else if(selectionType == "current_selection"){
+			// get selection ID
+			var request = org.argeo.slc.ria.SlcApi.getAddResultService(collectionId,this.extractTestUuid());
+			request.addListener("completed", function(response){
+				this.info("Result successfully copied to collection!");
+				this.loadCollections();
+			}, this);
+			request.send();		
+		}
+	},
+	
+	extractTestUuid: function(){
+		var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
+		var xmlNodes = this.getView().getViewSelection().getNodes();
+		var uuid = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(xmlNodes[0], "slc:uuid"));
+		return uuid;
+	},
+	
+	collectionSelectorListener : function(event){
+	  	this.setCollectionId(event.getData());
+	  	this.loadList();		
 	},
 	
 	addScroll : function(){