X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2Fargeo-ria-lib%2Fslc-web%2Fclass%2Forg%2Fargeo%2Fslc%2Fweb%2FTestList.js;h=88da2ccdc38ae2e150da40fbe41eb3b75834f034;hb=e3071ef5a1e3a51e8a040534d2b24ac0e9c9fbb4;hp=cd7f6d913167943dc1997a75207636fa2782b650;hpb=5879174d30c095e1422011f88577943181abb5e0;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/TestList.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/TestList.js
index cd7f6d913..88da2ccdc 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/TestList.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc-web/class/org/argeo/slc/web/TestList.js
@@ -29,6 +29,12 @@ qx.Class.define("org.argeo.slc.web.TestList",
   	view : {
   		init : null
   	},
+  	viewSelection : {
+  		nullable:false, 
+  		check:"org.argeo.ria.components.ViewSelection"
+  	},  
+  	instanceId : {init:""},
+  	instanceLabel : {init:""},
   	/**
   	 * The load list of available collection (Map of ids => labels)
   	 */
@@ -110,8 +116,8 @@ qx.Class.define("org.argeo.slc.web.TestList",
   				callback	: function(e){
   					var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();
   					var classObj = org.argeo.slc.ria.Applet;
-					var iView = viewsManager.initIViewClass(classObj, "applet");
   					var xmlNodes = viewsManager.getViewPaneSelection("list").getNodes();
+					var iView = viewsManager.initIViewClass(classObj, "applet", xmlNodes[0]);
 					iView.load(xmlNodes[0]);
   				},
   				selectionChange : function(viewId, xmlNodes){
@@ -199,14 +205,18 @@ qx.Class.define("org.argeo.slc.web.TestList",
   				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();
+  					var modal = new org.argeo.ria.components.Modal("Confirm", null);
+  					modal.addConfirm("Are you sure you want to delete<br> test " + this.extractTestUuid() + "?");
+  					modal.addListener("ok", function(){
+	  					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();  					
+  					}, this);
+  					modal.attachAndShow();
   				},
 	  			selectionChange : function(viewId, xmlNodes){
 					if(viewId != "list") return;
@@ -221,10 +231,11 @@ qx.Class.define("org.argeo.slc.web.TestList",
   },
   
   members : {
-	init : function(viewPane){
-	  this.setView(viewPane);
+	init : function(viewPane, data){
+		this.setView(viewPane);
+		this.setViewSelection(new org.argeo.ria.components.ViewSelection(viewPane.getViewId()));	  
 	},
-	load : function(data){
+	load : function(){
 	  this.table.set({	  	
 	  	statusBarVisible: false,
 		showCellFocusIndicator:false,
@@ -243,7 +254,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	  columnModel.setDataCellRenderer(1, renderer);
 	  
 	  this.table.getSelectionManager().getSelectionModel().addListener("changeSelection", function(e){
-	  	var viewSelection = viewPane.getViewSelection();
+	  	var viewSelection = this.getViewSelection();
 	  	viewSelection.clear();
 	  	var selectionModel = this.table.getSelectionManager().getSelectionModel();
 	  	if(!selectionModel.getSelectedCount()){
@@ -252,7 +263,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	  	var ranges = this.table.getSelectionManager().getSelectionModel().getSelectedRanges();
 	  	var xmlNode = this.table.getTableModel().getRowData(ranges[0].minIndex);
 	  	viewSelection.addNode(xmlNode);
-	  	viewPane.setViewSelection(viewSelection);
+	  	//viewPane.setViewSelection(viewSelection);
 	  }, this);		
 	  
 	  var select = new qx.ui.form.SelectBox();
@@ -428,6 +439,13 @@ qx.Class.define("org.argeo.slc.web.TestList",
 	
 	addScroll : function(){
 		return false;
-	}  	
+	},
+	
+	close : function(){
+		if(this.timer){
+			this.pollListLoading(false);
+		}
+	}
+	
   }
 });
\ No newline at end of file