Fix SAMP export from TabResult

Benjamin Renard
1 parent 2325998f
Showing 4 changed files with 33 additions and 9 deletions Show diff stats
js/app/views/DownloadUI.js
js/app/views/TabResultUI.js
php/classes/AmdaAction.php
php/config.php
@@ -375,6 +375,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
 	},
 	init : function (config){
+		var me = this;
 		this.timeSelector = new amdaUI.TimeSelectorUI({id: 'downloadTimeSelector',flex: 1});
@@ -711,7 +712,13 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
 				items: [
 					this.paramPanel,
 					this.ttPanel			      
-				]
+				],
+				listeners: {
+					'tabchange' : function (tabPanel, tab) {
+						var sampAvailable = (tab.title == me.paramPanel.title);
+						me.down('sendToSampButton').setDisabled(!sampAvailable);
+					}
+				}
 			}],
 			fbar: [
 			{
@@ -141,11 +141,21 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 	},
 	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.getRequestByProcessId(sendOpt, function(res,e) {
+			var request = res;
+			request.sendToSamp = true;
+			AmdaAction.execute({nodeType : 'download'}, request, function(res,e) {
+				loadMask.hide();
+				var files = res.result.split(",");
+				Ext.each(files, function(file) {
+					var href = 'data/'+sessionID+'/RES/'+ res.folder + '/' + file;
+					myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interop.id, true, function (module) {
+						module.sendVOTable(href, clientId ? clientId : 'hub');
+					});
+				});
+			});
+		});
 	},
 	constructor: function(config) {
@@ -155,7 +165,7 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 	initConfig: function(config){	
 		var jobtitle = config.title;
-			
+
 		switch (config.type) {			
 			case 'request' : 
 				var resultId = config.resultId;
@@ -302,7 +312,7 @@ Ext.define(&#39;amdaUI.ResultItem&#39;, {
 				xtype        : 'sendToSampButton',
 				type         : 'votable',
 				onSendToSamp : this.onSendVOTableToSamp,
-				sendOpt      : {'downId' : downId, 'downFolder'   : downFolder}
+				sendOpt      : {'processId' : config.processId}
 			}]
 		};
@@ -1425,5 +1425,11 @@ class AmdaAction
 		return array('success' => true, 'alreadyUsed' => $alreadyUsed);
 	}
+	public function getRequestByProcessId($obj)
+	{
+		require_once(INTEGRATION_SRC_DIR."RequestManager.php");
+
+		return $this->executeRequest($obj->processId, FunctionTypeEnumClass::PROCESSGETREQUEST);
+	}
 }
 ?>
@@ -213,7 +213,8 @@ $API = array(
 			'getParamInfo'=>array('len'=>1),
 			'getSharedObjectFolders' => array('len'=>1),
 			'shareObjects' => array('len'=>1),
-			'isSharedObjectNameAlreadyUsed' => array('len'=>1)
+			'isSharedObjectNameAlreadyUsed' => array('len'=>1),
+			'getRequestByProcessId' => array('len'=>1),
 		)
 	)
 );