format + redmine #4824

Elena.Budnik
1 parent a087d0b3
Showing 4 changed files with 470 additions and 536 deletions Show diff stats
js/app/controllers/ResultModule.js
js/app/models/BkgJobNode.js
js/app/views/ResultUI.js
js/app/views/TabResultUI.js
@@ -6,27 +6,22 @@
  * @extends  amdaDesktop.InteractiveModule
  * @brief    Result Module controller definition 
  * @author   
- * @version $Id: ResultModule.js 1052 2012-07-20 14:21:37Z elena $
- *****************************************************************************
- *    FT Id     :   Date   : Name - Description
- *******************************************************************************
- *  			 
+ * @version $Id: ResultModule.js 1052 2012-07-20 14:21:37Z elena $ 
  */
  
 Ext.define('amdaDesktop.ResultModule', {
 	extend: 'amdaDesktop.InteractiveModule',
  
-	requires: [
-        'amdaUI.ResultUI'
-	],
+	requires: ['amdaUI.ResultUI'],
  
 	contentId : 'resultUI',
 	width :  500, 
 	height : 250,
-    /**
-     * @cfg {String} data models
-     * @required
-     */
+	
+	/**
+	* @cfg {String} data models
+	* @required
+	*/
 	nodeDataModel :  'amdaModel.BkgJobNode',
 	uiType : 'panelResult',
 	nodeType : null,
@@ -37,15 +32,15 @@ Ext.define(&#39;amdaDesktop.ResultModule&#39;, {
 		this.launcher = null;
 	},
  
-    /**
-      * Window Creation method of the Module
-      */
+	/**
+	* Window Creation method of the Module
+	*/
 	createWindow : function () {
-	    // init Result Win 	 
-	    var desktop = this.app.getDesktop();
-	    var win = desktop.getWindow(this.id);
-	    if (!win) {
-	        win = desktop.createWindow({
+		// init Result Win 	 
+		var desktop = this.app.getDesktop();
+		var win = desktop.getWindow(this.id);
+		if (!win) {
+			win = desktop.createWindow({
 				id : this.id,
 				title : this.title,
 				width : this.width,
@@ -58,86 +53,79 @@ Ext.define(&#39;amdaDesktop.ResultModule&#39;, {
 				stateId  : this.id,
 				stateEvents: ['move','show','resize'],
 //				closable : false,
-				tools: [
-			         {
-			        	type:'help',
-			        	qtip: this.helpTitle,
-			        	handler: function(event, toolEl, panel){
-			        		//TODO: help logic
-			        	}
-			         }
-				],
-				items : [ 
-				 {
-				 	    xtype :  this.uiType,					    
-					    id : this.contentId
-				  }	
-				],
+				tools : [{
+					type:'help',
+					qtip: this.helpTitle,
+					handler: function(event, toolEl, panel){
+						//TODO: help logic
+					}
+				}],
+				items : [ {
+					xtype :  this.uiType,					    
+					id : this.contentId
+				}],
 				listeners: {
-				  scope: this,
-				  beforeclose : function() {
-				     if (this.linkedNodes) this.linkedNodes.clear();
-				  }
+					scope: this,
+					beforeclose : function() {
+						if (this.linkedNodes) this.linkedNodes.clear();
+					}
 				}
 			});
-	    }	 
-	    win.show();
-	    
-	    var linkedNode = this.getLinkedNode();
+		}	 
+		win.show();
  
-	    if (win && linkedNode.get('jobType')) {      
-	     if (!this.linkedNodes ||
-	 	  !this.linkedNodes.getByKey(linkedNode.get('processId'))){	 
-	    	this.getUiContent().setResult(linkedNode);	
-		    this.addLinkedNode(linkedNode);
-	     }
-	    }	
+		var linkedNode = this.getLinkedNode();
+		
+		if (win && linkedNode.get('jobType')) {      
+			if (!this.linkedNodes ||
+			!this.linkedNodes.getByKey(linkedNode.get('processId'))){	 
+				this.getUiContent().setResult(linkedNode);	
+				this.addLinkedNode(linkedNode);
+			}
+		}	
 	},	
  
-//TODO override interactive module method : is it needed???	
+	//TODO override interactive module method : is it needed???	
 	setLinkedNode : function (myLinkedNode){
 		this.linkedNode = myLinkedNode;
 	},
  
-    /**
-     * add the current node in this module
-     * @param {amdaModel.InteractiveNode} myLinkedNode
-     */
+	/**
+	* add the current node into this module
+	* @param {amdaModel.InteractiveNode} myLinkedNode
+	*/
 	addLinkedNode : function (myLinkedNode){
-	    if (!this.linkedNodes){
-	        this.linkedNodes = new Ext.util.MixedCollection();
-	    }
-	    
-	    if (myLinkedNode.get('processId')){	
-	    	
-	        // add new linkedNode to this module
-	        this.linkedNodes.add(myLinkedNode.get('processId'),myLinkedNode);	
-	    }	  
+		if (!this.linkedNodes){
+			this.linkedNodes = new Ext.util.MixedCollection();
+		}
+		
+		if (myLinkedNode.get('processId')){
+			// add new linkedNode to this module
+			this.linkedNodes.add(myLinkedNode.get('processId'),myLinkedNode);	
+		}	  
 	},
  
-   /**
-     * remove deleted node from this module; delete corresponding FieldSet
-     * @param {amdaModel.InteractiveNode} linkedNode 
-     * @param int index
-     */
-   
-       removeLinkedNode : function(linkedNode, index) {	 
-    	   
-    this.linkedNodes.remove(index);
-	  
-	 var type = linkedNode.get('jobType');
-	 var processId = linkedNode.get('processId');	 
-	 var tabPanel = this.getUiContent().items.items[0];
-	 var thePanel;
-	 tabPanel.items.each(function(item){
-	    if (item.id == 'tab-'+type) {
-	       thePanel = item;
-	       thePanel.items.each(function(item) {
-		 if (processId == item.intId){
-		        thePanel.remove(item);
-		 }
-	       });
-	     }
-	  });
-       }
-});
 \ No newline at end of file
+	/**
+	* remove deleted node from this module; delete corresponding FieldSet
+	* @param {amdaModel.InteractiveNode} linkedNode 
+	* @param int index
+	*/
+	removeLinkedNode : function(linkedNode, index) {	     	   
+		this.linkedNodes.remove(index);
+		
+		var type = linkedNode.get('jobType');
+		var processId = linkedNode.get('processId');	 
+		var tabPanel = this.getUiContent().items.items[0];
+		var thePanel;
+		tabPanel.items.each(function(item){
+			if (item.id == 'tab-'+type) {
+				thePanel = item;
+				thePanel.items.each(function(item) {
+					if (processId == item.intId){
+							thePanel.remove(item);
+					}
+				});
+			}
+		});
+	}
+});
@@ -122,9 +122,8 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 		onMenuItemClick : function(menu, item, event) 
 		{
 			var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
-            
-			switch (fnId) 
-			{				
+         
+			switch (fnId) {
 				case 'deleteNode':      
 					this.deleteJob();
 					this.deleteNode();  
@@ -138,17 +137,15 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 					alert('NOT IMPLEMENTED YET');
 					// this.renameNode(); 
 					break; 						
-				case 'editNode': 
-				//create object if it doesn't exist (tree load)	  
-				//TODO use data model ?  
-                if (!this.get('object')) 
-					 {
+				case 'editNode':   
+					// create object if it doesn't exist (tree load)	  
+					// TODO use data model ?  	
+					if (!this.get('object')) {
 						AmdaAction.getObject(this.get('id'), this.get('nodeType'), this.getObjectCallback, this);		  
-                }
-                else 
-					 {
+					}
+					else {
 						var isInteractive = false;
-						var isNewTab = true;	  
+						var isNewTab = true;
 						this.editNode(isNewTab, isInteractive);
 					}
 					break; 	        
@@ -209,26 +206,22 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 			} 
 		},	
  
-		getObjectCallback : function(result,remoteEvent)
-		{//result, e) {
-			var t = remoteEvent.getTransaction();
-        
+		getObjectCallback : function(result,remoteEvent){
+			var t = remoteEvent.getTransaction();        
 			//AKKA - Rework of the result treatment for the integration with the new kernel
-			if (!remoteEvent.status)
-			{
+			if (!remoteEvent.status) {
 				myDesktopApp.errorMsg('Internal error during download request');
 				return;
 			}
  
-			if (!result.success)
-			{
+			if (!result.success) {
 				myDesktopApp.errorMsg(result.message);
 				return;
 			}
  
 			var obj = null;
-			switch (this.get('jobType'))
-			{
+			
+			switch (this.get('jobType')) {
 				case 'condition' : 
 					obj = Ext.create('amdaModel.Search',
 							{name: result.name,
@@ -242,7 +235,7 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 							folderId : result.folder});
 					break;
 				case 'request' : 
-					obj = Ext.create('amdaPlotObj.PlotRequestObject.',
+					obj = Ext.create('amdaPlotObj.PlotRequestObject',
 							{name: result.name, format: result.format,
 							resultId : result.result,
 							folderId : result.folder}); 
@@ -256,26 +249,25 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 					break;
 			}
  
-			if (!obj)
-			{
+			if (!obj){
 				myDesktopApp.errorMsg("Unknown job type");
 				return;
-			}	
+			}
  
 			// set parameter into node
 			this.set('object',obj);
  
 			var isInteractive = false;
-			var isNewTab = true;	 
+			var isNewTab = true;
+			
 			this.editNode(isNewTab, isInteractive);	   
 		},
  
 		// Show Result 
-		editNode : function(isNewTab, isInteractive) 
-		{
+		editNode : function(isNewTab, isInteractive) {
 			var me = this;
-			if (isInteractive) 
-			{
+
+			if (isInteractive) {
 				myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interactive_plot.id, true, function(module) {
 					if (isNewTab) {	 
 						module.setLinkedNode(me); 
@@ -286,9 +278,9 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
 			else 
 			{
 				myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id, true, function(module) {
-					if (isNewTab) {	 
-						module.setLinkedNode(me); 
-					}	
+					if (isNewTab) {	
+						module.setLinkedNode(me);
+					}
 					module.createWindow();
 				});
 			}
@@ -5,78 +5,63 @@
  * @extends  Ext. 
  * @brief	 Result  Module UI definition (View)
  * @author 	  
- * @version  $Id: ResultUI.js 1052 2012-07-20 14:21:37Z elena $
- ********************************************************************************
- *    FT Id     :   Date   : Name - Description
- *******************************************************************************
- *              
+ * @version  $Id: ResultUI.js 1052 2012-07-20 14:21:37Z elena $            
  */
  
 Ext.define('amdaUI.ResultUI', {
-    extend: 'Ext.container.Container',
-    alias: 'widget.panelResult',
-    
-    requires: [
-        'amdaUI.TabResultUI'
-    ],
-
-    constructor: function(config) {
-        this.init(config);
-        this.callParent(arguments);   
+	extend: 'Ext.container.Container',
+	alias: 'widget.panelResult',
  
-    },
+	requires: ['amdaUI.TabResultUI'],
+
+	constructor: function(config) {
+		this.init(config);
+		this.callParent(arguments);	
+	},
  
-    getTabResult: function(nodeType) {
-      var tabId = 'tab-'+nodeType;      
-      return this.tabPanel.getComponent(tabId);
-    },
+	getTabResult: function(nodeType) {
+		var tabId = 'tab-'+nodeType;      
+		return this.tabPanel.getComponent(tabId);
+	},
  
-    setObject: function(obj){},
+	setObject: function(obj){},
  
-    setResult: function(linkedNode){
-        var configResult = {nodeType: linkedNode.get('jobType')}; 
-        var panelResult = this.getTabResult(linkedNode.get('jobType'));
+	setResult: function(linkedNode){
+		var configResult = {nodeType: linkedNode.get('jobType')}; 
+		var panelResult = this.getTabResult(linkedNode.get('jobType'));
  
-	if (!panelResult) {
-	    // create the plot Tab Result Panel	    
-	     panelResult = Ext.create('widget.tabResult',configResult);
-	    	     
-	    // add it
-	    this.tabPanel.add(panelResult);	  	      
-	} 
-	   // focus on it
-	    this.tabPanel.setActiveTab(panelResult);
-	    var format = linkedNode.get('object').get('format');
-	    if (!format) format = 'unknown';	  
-	    var compression = linkedNode.get('object').get('compression');	     
-	    if (!compression) compression = 'unknown';	
-	  
-//TODO args as object ???	
-	    panelResult.addResult(
-	    		linkedNode.get('text'),
-	    		linkedNode.get('object').get('resultId'),
-	    		linkedNode.get('object').get('folderId'),
-	    		compression.toLowerCase(),
-	    		format.toLowerCase(),
-	    		linkedNode.get('id'));
-    },
-    
-    init : function(config)	{
+		if (!panelResult) {
+			// create the plot Tab Result Panel	    
+			panelResult = Ext.create('widget.tabResult',configResult);
+			// add it
+			this.tabPanel.add(panelResult);	  	      
+		} 
+		// focus on it
+		this.tabPanel.setActiveTab(panelResult);
+		var format = linkedNode.get('object').get('format');
+		if (!format) format = 'unknown';	  
+		var compression = linkedNode.get('object').get('compression');	     
+		if (!compression) compression = 'unknown';	  
  
-        this.tabPanel = Ext.create('Ext.tab.Panel',{	   
-	    layout: { type :'vbox' },        
-            activeTab: 0
-        });
-	 
-	
-        var myConf = {
-            layout: 'fit',   
-            items: [                 
-                     this.tabPanel                        
-            ]
-        };
-
-        Ext.apply (this , Ext.apply (arguments, myConf));	    	    
-    }
+		panelResult.addResult(
+			linkedNode.get('text'),
+			linkedNode.get('object').get('resultId'),
+			linkedNode.get('object').get('folderId'),
+			compression.toLowerCase(),
+			format.toLowerCase(),
+			linkedNode.get('id'));
+	},
  
+	init : function(config)	{
+		this.tabPanel = Ext.create('Ext.tab.Panel',{	   
+			layout: { type :'vbox' },        
+				activeTab: 0
+		});
+	
+		var myConf = {
+			layout: 'fit',   
+			items: [ this.tabPanel ]
+		};
+		Ext.apply(this, Ext.apply(arguments, myConf));	    	    
+	}    
 });
@@ -5,371 +5,340 @@
  * @extends  Ext.panel.Panel 
  * @brief   Tab Result UI definition (View)
  * @author    
- * @version  $Id: TabResultUI.js 2618 2014-10-24 12:27:42Z elena $
- ********************************************************************************
- *    FT Id     :   Date   : Name - Description
- *******************************************************************************
- *              
+ * @version  $Id: TabResultUI.js 2618 2014-10-24 12:27:42Z elena $  
  */
  
 Ext.define('amdaUI.TabResultUI', {
-    extend: 'Ext.panel.Panel',
-   
-    alias: 'widget.tabResult',
-    
-    requires: [
-               'amdaUI.SendToSampButtonUI'
-           ],
-    
-    constructor: function(config) {	 
-	this.initConfig(config);
-	this.callParent();	
-    },  
+	extend: 'Ext.panel.Panel',
+
+	alias: 'widget.tabResult',
+	
+	requires: [ 'amdaUI.SendToSampButtonUI'],
+	
+	constructor: function(config) {	 
+		this.initConfig(config);
+		this.callParent();	
+	},  
  
-    initConfig: function(config){
-	this.type = config.nodeType;
-  	this.id = 'tab-' + config.nodeType;	 
-	//var title = config.nodeType +' Result';	
-	switch (config.nodeType) {
-	  case 'condition': var title = 'Data Mining Results';
-			    break;
-	  case 'request' : var title = 'Plot Results';
-			    break;	   
-	  case 'download': var title = 'Download Results';
-			    break;
-	  case 'statistics': var title = 'Statistics Results';
-			    break;
-	  default:
-	}
-        var newConfig = {
-	    id: this.id,          	    
-            title: title,
-            autoScroll: true,
-	    height: 250,
-            closable: true,
-	    layout: {
-		type: 'vbox',
-	        align : 'stretch',
-		autoSize : true
-	    },
-	    listeners: {
-	      scope : this,
-	      beforeclose : function() {
-		//delete linked nodes connected to ResultModule and corresponding to this Tab
-		       var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id);
-		       if (module.linkedNodes) {
-			  var indices = new Array();
-			  var i =0;
-			  module.linkedNodes.each(function(item,index){
-			    if(this.type == item.get('jobType')) {
-			      indices[i] = index;
-			      i++;
-			    }
-			  }, this);
-			  if (indices.length > 0) {
-			    Ext.Array.each(indices, function(item) {
-			       module.linkedNodes.removeAt(item);
-			    });			    
-			  }
-		       }
-		    }
-	    }
-	    }
-	Ext.apply(this, newConfig);	 
-    },
+	initConfig: function(config){
+		this.type = config.nodeType;
+		this.id = 'tab-' + config.nodeType;	 
+		//var title = config.nodeType +' Result';	
+		switch (config.nodeType) {
+			case 'condition': var title = 'Data Mining Results';
+						break;
+			case 'request' : var title = 'Plot Results';
+						break;	   
+			case 'download': var title = 'Download Results';
+						break;
+			case 'statistics': var title = 'Statistics Results';
+						break;
+			default:
+		}
+		
+		var newConfig = {
+			id: this.id,          	    
+			title: title,
+			autoScroll: true,
+			height: 250,
+			closable: true,
+			layout: {
+				type: 'vbox',
+				align : 'stretch',
+				autoSize : true
+			},
+			listeners: {
+				scope : this,
+				beforeclose : function() {
+				//delete linked nodes connected to ResultModule and corresponding to this Tab
+					var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id);
+					if (module.linkedNodes) {
+						var indices = new Array();
+						var i = 0;
+						module.linkedNodes.each(function(item,index){
+							if(this.type == item.get('jobType')) {
+								indices[i] = index;
+								i++;
+							}
+						}, this);
+						if (indices.length > 0) {
+							Ext.Array.each(indices, function(item) {
+								module.linkedNodes.removeAt(item);
+							});			    
+						}
+					}
+				}
+			}
+		}
+		Ext.apply(this, newConfig);	 
+	},
  
-    addResult: function(resultName, resultId, folderId, compression, format, processId) { 
-      this.insert(0,[ {xtype : 'resultItem', type : this.type, title: resultName, folderId: folderId, resultId: resultId, compress : compression, format: format, processId: processId}]); 
-   }
+	addResult: function(resultName, resultId, folderId, compression, format, processId) { 
+		this.insert(0,[ {xtype : 'resultItem', type : this.type, title: resultName, folderId: folderId, resultId: resultId, compress : compression, format: format, processId: processId}]); 
+	}
 });
  
 Ext.define('amdaUI.ResultItem', {
-    extend: 'Ext.form.FieldSet',
-   
-    alias: 'widget.resultItem',
-    
-    linkedNode : null,
-    
-    delete: function(processId) {
-      var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id);
-      var jobLinkedNode = module.linkedNodes.getByKey(processId);
-      jobLinkedNode.deleteNode();
-      module.linkedNodes.remove(jobLinkedNode);    
-    },
-    
-    saveTable: function(folderId,ttName) {
-      this.linkedNode = Ext.create('amdaModel.TimeTableNode',{leaf : true});
-      AmdaAction.getTmpObject(
-    		  folderId,
-    		  ttName,
-    		  this.linkedNode.get('nodeType'),
-    		  this.getResultCallback,
-    		  this);       
-    },
+	extend: 'Ext.form.FieldSet',
+
+	alias: 'widget.resultItem',
+	
+	linkedNode : null,
+	
+	delete: function(processId) {
+		var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id);
+		alert(processId);
+		var jobLinkedNode = module.linkedNodes.getByKey(processId);
+		jobLinkedNode.deleteNode();
+		module.linkedNodes.remove(jobLinkedNode);    
+	},
+		
+	saveTable: function(folderId,ttName) {
+		this.linkedNode = Ext.create('amdaModel.TimeTableNode',{leaf : true});
+		AmdaAction.getTmpObject(
+				folderId,
+				ttName,
+				this.linkedNode.get('nodeType'),
+				this.getResultCallback,
+				this);       
+	},
  
-    saveCatalog: function(folderId,ttName) {    
-      this.linkedNode = Ext.create('amdaModel.CatalogNode',{leaf : true});
-      AmdaAction.getTmpObject(
-    		  folderId,
-    		  ttName,
-    		  this.linkedNode.get('nodeType'),
-    		  this.getResultCallback,
-    		  this);       
-    },
+	saveCatalog: function(folderId,ttName) {    
+		this.linkedNode = Ext.create('amdaModel.CatalogNode',{leaf : true});
+		AmdaAction.getTmpObject(
+				folderId,
+				ttName,
+				this.linkedNode.get('nodeType'),
+				this.getResultCallback,
+				this);       
+	},
  
-    getResultCallback : function(result,remoteEvent){//result, e) {
-        var t = remoteEvent.getTransaction();
-        //AKKA - catch error
-        if (!remoteEvent.status)
-        {
-        	myDesktopApp.errorMsg('Internal error');
-        	return;
-        }
-        
-        if (result.error)
-        {
-        	myDesktopApp.errorMsg(result.error);
-        	return;
-        }
-        
-        var paramObj = Ext.create(this.linkedNode.get('objectDataModel'), result);
-         paramObj.set('fromPlugin',true);
-         paramObj.set('intervals',result.intervals);
-        // set parameter into node
-        this.linkedNode.set('object',paramObj);
-           
-	var me = this;
-	myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id, true, function (module) {
-		module.setLinkedNode(me.linkedNode);
-		// Edition of parameter into parameter Module	    
-		   me.linkedNode.editInModule();
-	});
-    },
+	getResultCallback : function(result,remoteEvent){ //result, e) {
+		var t = remoteEvent.getTransaction();
+		//AKKA - catch error
+		if (!remoteEvent.status){
+			myDesktopApp.errorMsg('Internal error');
+			return;
+		}
+		
+		if (result.error){
+			myDesktopApp.errorMsg(result.error);
+			return;
+		}
+		
+		var paramObj = Ext.create(this.linkedNode.get('objectDataModel'), result);
+		paramObj.set('fromPlugin',true);
+		paramObj.set('intervals',result.intervals);
+		// set parameter into node
+		this.linkedNode.set('object',paramObj);
+			
+		var me = this;
+		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.result.id, true, function (module) {
+			module.setLinkedNode(me.linkedNode);
+			// Edition of parameter into parameter Module	    
+			me.linkedNode.editInModule();
+		});
+	},
  
-    onSendVOTableToSamp : function (clientId, sendOpt)
-    {
-    	var o = {folderId : sendOpt.downFolder, downId : sendOpt.downId};
+	onSendVOTableToSamp : function (clientId, sendOpt){
+		var o = {folderId : sendOpt.downFolder, downId : sendOpt.downId};
  
-    	var me = this;
-        myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interop.id, true, function (module) {
-        	loadMask.show();
-        	
-            AmdaAction.sendToSAMP(o,function (result, e)
-            		{
-            	        loadMask.hide();
-            			if (!result.success)
-        				{
-        					Ext.Msg.show( {
-        						title : 'SAMP - Cannot send VOTable',
-        						msg : result.message,
-        						modal : true,
-        						icon : Ext.Msg.ERROR,
-        						buttons : Ext.Msg.OK
-        				});
-        				return;
-        			}
-        			
-        			Ext.each(result.files,function (file)
-        					{
-        						module.sendVOTable(file,clientId);
-        					}, me);
-        		},
-        		me);
-        });
-        	
-        
-    },
+		var me = this;
+		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interop.id, true, function (module) {
+			loadMask.show();
+		
+			AmdaAction.sendToSAMP(o,function (result, e){
+				loadMask.hide();
+				if (!result.success) {
+					Ext.Msg.show( {
+						title : 'SAMP - Cannot send VOTable',
+						msg : result.message,
+						modal : true,
+						icon : Ext.Msg.ERROR,
+						buttons : Ext.Msg.OK
+					});
+					return;
+				}
+				
+				Ext.each(result.files,function (file) {
+					module.sendVOTable(file,clientId);
+				}, me);
+			}, me);
+		});   
+	},
  
-    constructor: function(config) {
-    	this.initConfig(config);
-    	this.callParent();	
-    },  
+	constructor: function(config) {
+		this.initConfig(config);
+		this.callParent();	
+	},  
  
-      initConfig: function(config){	
-    	var jobtitle = config.title;
-    	
-       switch (config.type) {	
-	  
-	    case 'request' : 
-            var resultId = config.resultId;
-            var folderId = config.folderId;
-            var href = 'data/'+sessionID+'/RES/'+ folderId  + '/' + resultId;
+	initConfig: function(config){	
+		var jobtitle = config.title;
+			
+		switch (config.type) {			
+			case 'request' : 
+				var resultId = config.resultId;
+				var folderId = config.folderId;
+				var href = 'data/'+sessionID+'/RES/'+ folderId  + '/' + resultId;
 			break; 
-	    case 'download' :
-	      //TODO suffix parsing		     
-			      var suffix = '.tar.gz';			     
-			      if (config.compress == 'zip') var suffix = '.zip';
-			      var downId = config.resultId;
-			      var downFolder = config.folderId;			      
-			      var href = 'data/'+sessionID+'/RES/'+ downFolder + '/' + downId + suffix;			      
-			    break;
-	    default:
-	  }
-	  
+			case 'download' :
+				//TODO suffix parsing		     
+				var suffix = '.tar.gz';			     
+				if (config.compress == 'zip') var suffix = '.zip';
+				var downId = config.resultId;
+				var downFolder = config.folderId;			      
+				var href = 'data/'+sessionID+'/RES/'+ downFolder + '/' + downId + suffix;			      
+				break;
+			default:
+		}	  
  
-	var height = 60;  
+		var height = 60;  
  
-        var configTT = {
-	    intId : config.title, 
-	    height : height,	
-	    title: jobtitle,
-	    collapsible: true,
-	    defaultType: 'button',
-	    items :[
-	         {
-		   xtype: 'label',
-		   text: 'Time Table '
-		 }, 
-		{
-		text: 'Edit/Save',
-		scope : this,
-		handler: function() {
-			  this.saveTable(config.folderId,config.resultId);
-		  }
-		},  {
-		   xtype: 'label',
-		   text: '  || Gaps Time Table '
-		 }, 
-		{
-		text: 'Edit/Save',
-		scope : this,
-		handler: function() {
-		     this.saveTable(config.folderId,'Gaps_'+config.resultId); 
-		  }
-		}, {
-		   xtype: 'label',
-		   text: ' || ',
-		   width: 50
-		 }, 
-	        {
-		text: 'Delete Both',
-		scope : this,
-		handler: function() {
-		      this.delete(config.processId);
-		      this.ownerCt.remove(this);
-		  }
-		}
-	     ]
-	  };
-	  var configCat = {
-	    intId : config.title, 
-	    height : height,	
-	    title: jobtitle,
-	    collapsible: true,
-	    defaultType: 'button',
-	    items :[
-	         {
-		   xtype: 'label',
-		   text: 'Catalog '
-		 }, 
-		{
-		text: 'Edit/Save',
-		scope : this,
-		handler: function() {
-			  this.saveCatalog(config.folderId,config.resultId);
-		  }
-		}, 
-	        {
-		text: 'Delete',
-		scope : this,
-		handler: function() {
-		      this.delete(config.processId);
-		      this.ownerCt.remove(this);
-		  }
-		}
-	     ]
-	  };
+		var configTT = {
+			intId : config.title, 
+			height : height,	
+			title: jobtitle,
+			collapsible: true,
+			defaultType: 'button',
+			items :[
+			{
+				xtype: 'label',
+				text: 'Time Table '
+			},{
+				text: 'Edit/Save',
+				scope : this,
+				handler: function() {
+					this.saveTable(config.folderId,config.resultId);
+				}
+			},  {
+				xtype: 'label',
+				text: '  || Gaps Time Table '
+			}, {
+				text: 'Edit/Save',
+				scope : this,
+				handler: function() {
+					this.saveTable(config.folderId,'Gaps_'+config.resultId); 
+				}
+			}, {
+				xtype: 'label',
+				text: ' || ',
+				width: 50
+			}, {
+				text: 'Delete Both',
+				scope : this,
+				handler: function() {
+					this.delete(config.processId);
+					this.ownerCt.remove(this);
+				}
+			}]
+		};
  
-//TODO make this properly
-	  	  
-	  var configPlot = {
-	    intId : config.processId,
-	    height :  height,	
-	    title : jobtitle,
-	    collapsible: true,
-	    defaultType: 'button',
-	    items :[
-	         {
-		   xtype: 'label',
-		   text: 'Plot '
-		 }, 
-		{
-		text: 'Download',
-	        href: href,
-                target: '_blank', // removed in 4.1    , hrefTarget: '_blank' // used in 4.1	
-                hrefTarget: '_blank'
-		},  {
-		   xtype: 'label',
-		   text: '  ||  '
-		 }, 
-	        {
-		text: 'Delete',
-		scope : this,
-		handler: function() {
-		      this.delete(config.processId);
-		      this.ownerCt.remove(this);
-		  }
-		}
-	     ]
-	  };
-	  
-	  var configDown = {
-	    intId : config.processId,
-	    height :  height,	
-	    title: jobtitle,
-	    collapsible: true,
-	    defaultType: 'button',
-	    items :[
-	         {
-		   xtype: 'label',
-		   text: 'File '
-		 }, 
-		{
-		text: 'Download',
-	        href: href,
-                target: '_self', // removed in 4.1    , hrefTarget: '_blank' // used in 4.1	
-                hrefTarget: '_self'
-		},  {
-		   xtype: 'label',
-		   text: '  ||  '
-		 }, 
-	        {
-		text: 'Delete',
-		scope : this,
-		handler: function() {
-		      this.delete(config.processId);
-		      this.ownerCt.remove(this);
-		  }
-		},
-		{
-			   xtype: 'label',
-			   text: '  ||  '
-		},
-		{
-			xtype        : 'sendToSampButton',
-			type         : 'votable',
-			onSendToSamp : this.onSendVOTableToSamp,
-			sendOpt      : {'downId' : downId, 'downFolder'   : downFolder}
+		var configCat = {
+			intId : config.title, 
+			height : height,	
+			title: jobtitle,
+			collapsible: true,
+			defaultType: 'button',
+			items :[
+			{
+				xtype: 'label',
+				text: 'Catalog '
+			}, {
+				text: 'Edit/Save',
+				scope : this,
+				handler: function() {
+					this.saveCatalog(config.folderId,config.resultId);
+				}
+			}, {
+				text: 'Delete',
+				scope : this,
+				handler: function() {
+					this.delete(config.processId);
+					this.ownerCt.remove(this);
+				}
+			}]
+		};
+		
+		//TODO make this properly	  	  
+		var configPlot = {
+			intId : config.processId,
+			height :  height,	
+			title : jobtitle,
+			collapsible: true,
+			defaultType: 'button',
+			items :[
+			{
+				xtype: 'label',
+				text: 'Plot '
+			}, {
+				text: 'Download',
+				href: href,
+				target: '_blank', // removed in 4.1    , hrefTarget: '_blank' // used in 4.1	
+				hrefTarget: '_blank'
+			},  {
+				xtype: 'label',
+				text: '  ||  '
+			}, {
+				text: 'Delete',
+				scope : this,
+				handler: function() {
+					this.delete(config.processId);
+					this.ownerCt.remove(this);
+				}
+			}]
+		};
+		
+		var configDown = {
+			intId : config.processId,
+			height :  height,	
+			title: jobtitle,
+			collapsible: true,
+			defaultType: 'button',
+			items :[
+			{
+				xtype: 'label',
+				text: 'File '
+			}, {
+				text: 'Download',
+				href: href,
+				target: '_self', // removed in 4.1    , hrefTarget: '_blank' // used in 4.1	
+				hrefTarget: '_self'
+			}, {
+				xtype: 'label',
+				text: '  ||  '
+			}, 
+			{
+				text: 'Delete',
+				scope : this,
+				handler: function() {
+					this.delete(config.processId);
+					this.ownerCt.remove(this);
+				}
+			},{
+				xtype: 'label',
+				text: '  ||  '
+			},{
+				xtype        : 'sendToSampButton',
+				type         : 'votable',
+				onSendToSamp : this.onSendVOTableToSamp,
+				sendOpt      : {'downId' : downId, 'downFolder'   : downFolder}
+			}]
+		};
+	
+		switch (config.type) {
+			case 'condition' : 
+				Ext.apply(this, configTT);	
+				break;
+			case 'statistics' : 
+				Ext.apply(this, configCat);	
+				break;
+			case 'request' : 		      
+				Ext.apply(this, configPlot);
+				break; 
+			case 'download' :			     
+				Ext.apply(this, configDown);
+				break;
+			default:
 		}
-	     ]
-	  };
- 
-	  switch (config.type) {
-	    case 'condition' : 
-			      Ext.apply(this, configTT);	
-			    break;
-	    case 'statistics' : 
-			      Ext.apply(this, configCat);	
-			    break;
-	    case 'request' : 		      
-			      Ext.apply(this, configPlot);
-			    break; 
-	    case 'download' :			     
-			      Ext.apply(this, configDown);
-			    break;
-	    default:
-	  }
- 
-    }
-    
+	}    
 });