Predefined templated params - First step

Benjamin Renard
1 parent b78325f1
Showing 6 changed files with 75 additions and 13 deletions Show diff stats
js/app/controllers/InteractiveModule.js
js/app/models/InteractiveNode.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/views/DownloadUI.js
js/app/views/PlotComponents/PlotTree.js
php/classes/AmdaAction.php
@@ -253,11 +253,29 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
 	 * @param {String} objectName The name of sent object
 	 * @param {String} isLeaf boolean true if it's a leaf parameter
 	 */
-	 addParam : function(objectName, isLeaf, needsArgs, components) {
+	 addParam : function(objectName, isLeaf, needsArgs, components, predefined_args) {
 	     var uiContent = this.getUiContent();
-	     uiContent.addParam(objectName, isLeaf, needsArgs, components);
+	     uiContent.addParam(objectName, isLeaf, needsArgs, components, predefined_args);
 	 },
-                  
+
+	parseTemplatedParam: function(templatedParamId, onParamParsed) {
+		AmdaAction.parseTemplatedParam(templatedParamId, function(res,e) {
+			if (!res || !res.success) {
+				if (!res || !res.message) {
+					myDesktopApp.errorMsg('Internal Error - Cannot parse the templated parameter');
+				}
+				else {
+					myDesktopApp.errorMsg('Internal Error - ' + res.message);
+				}
+			}
+			else {
+				if (onParamParsed) {
+					onParamParsed(res.info);
+				}
+			}
+		});
+	},
+
           saveState : Ext.emptyFn,
  
           getState :  function() {
@@ -18,6 +18,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 		{name: 'moduleId', type: 'string', persist: false},
 		{name: 'filtered', type: 'boolean', defaultValue: false, persist: false},
 		{name: 'needsArgs', type:'boolean', defaultValue: false},
+		{name: 'predefinedArgs', type:'boolean', defaultValue: false},
 		{name: 'disable', type: 'boolean', defaultValue: false, persist: false}
 	],
  
@@ -298,6 +298,7 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
 	var isTTCat = (typeof data !== "undefined") && (typeof data.isTTCat !== "undefined") && data.isTTCat;
 	var isVector = (typeof data !== "undefined") && (typeof data.isVector !== "undefined") && data.isVector;
 	var components = (typeof data !== "undefined") && (typeof data.components !== "undefined") && data.components ? data.components : null;
+	var template_args = (typeof data !== "undefined") && (typeof data.template_args !== "undefined") && data.template_args ? data.template_args : null;
  
     	this.set('last-param-id', this.get('last-param-id') + 1);
  
@@ -308,6 +309,9 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	var recs = this.params().add(obj);
     	recs[0].set('paramid', paramId);
 	recs[0].set('plotonly', isPlotOnly);
+	if (template_args) {
+		recs[0].set('template_args', template_args);
+	}
  
     	if (components != null) {
     		if (components['index1']) {
@@ -91,7 +91,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
         this.timeSelector.intervalSel.updateDuration();
     },
  
-    addParam: function (paramId, isLeaf, needArgs, components)
+    addParam: function (paramId, isLeaf, needArgs, components, predefined_args)
     {
         // adding the parameter to the  paramGrid	
         var paramObj = amdaModel.RequestParamObject.getEmptyObj();
@@ -109,6 +109,10 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
             }
         }
  
+	if (predefined_args) {
+		paramObj.template_args = predefined_args;
+	}
+
         var r = Ext.create('amdaModel.DownloadParam', paramObj);
         var pos = this.paramGrid.store.getCount();
         this.paramGrid.store.insert(pos, r);
@@ -504,8 +508,17 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
                                             return false;
                                     }
                                     var downModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.download.id);
-                                    if (downModule)
-                                        downModule.addParam(idToSent, data.records[0].get('leaf'), data.records[0].get('needsArgs'), components);
+                                    if (downModule) {
+					if (data.records[0].get('predefinedArgs')) {
+						downModule.parseTemplatedParam(idToSent, function(param_info) {
+							downModule.addParam(param_info.paramid, true, true, components, param_info.template_args);
+						});
+					}
+					else {
+                                        	downModule.addParam(idToSent, data.records[0].get('leaf'), data.records[0].get('needsArgs'), components);
+						return true;
+					}
+				    }
                                     return true;
                                 }
                             });
@@ -643,11 +643,24 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
  
                                 //Create param object
                                 var me = this;
-                                panelObject.createNewParam(paramId, data, function (newParamObject) {
-                                    //Rebuild params node
-                                    me.buildPanelsNode(newParamObject.getId());
-                                    //BRE newParamObject
-                                });
+				if ((typeof data !== "undefined") && (typeof data.predefinedArgs !== "undefined") && data.predefinedArgs) {
+					var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+					plotModule.parseTemplatedParam(paramId, function(param_info) {
+						data.template_args = param_info.template_args;
+						panelObject.createNewParam(param_info.paramid, data, function (newParamObject) {
+							//Rebuild params node
+							me.buildPanelsNode(newParamObject.getId());
+						}); 
+						//downModule.addParam(param_info.paramid, true, true, components, param_info.template_args);
+					});
+				}
+				else {
+                                	panelObject.createNewParam(paramId, data, function (newParamObject) {
+                                    		//Rebuild params node
+                                    		me.buildPanelsNode(newParamObject.getId());
+                                    		//BRE newParamObject
+                                	});
+				}
                             },
  
                             dropRecord: function (record, targetNode, position)
@@ -693,7 +706,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                                 if (component_info.index2)
                                                     components['index2'] = component_info.index2;
                                             }
-                                            this.dropParamToCreate(targetNode, position, param_id, {'components': components, 'isVector': isVector, 'plotOnly': plot_only});
+                                            this.dropParamToCreate(targetNode, position, param_id, {'components': components, 'isVector': isVector, 'plotOnly': plot_only, 'predefinedArgs': record.get('predefinedArgs')});
                                         }
                                         return true;
                                     case 'amdaModel.AliasNode'        :
@@ -268,6 +268,9 @@ class AmdaAction
 								$isParameter = true;
                                 if ($child->hasAttribute('TemplatedParameter'))
                                     $needsArgs = true;
+
+				if ($child->hasAttribute('PredefinedTemplatedParameter'))
+					$predefinedArgs = true;
  
 								if ($child->parentNode->hasAttribute('dataStart')) {
 									$globalStart = $child->parentNode->getAttribute('dataStart');
@@ -332,7 +335,7 @@ class AmdaAction
 									'id' => $id,'nodeType' => $nodeType, 'info' => $info, "component_info" => $component_info,
 									'globalStart' => $globalStart, 'globalStop' => $globalStop, 'timeRestriction' => $timeRestriction,
 									'leaf' => $isLeaf, 'isParameter' => $isParameter,'isSpectra' => $isSpectra,
-									'is2dSpectra' => $is2dSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'help' => $help, 'notyet' => $not_yet);
+									'is2dSpectra' => $is2dSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'predefinedArgs' => $predefinedArgs, 'help' => $help, 'notyet' => $not_yet);
 							}
 							else {
 								if ($child->hasAttribute('rank')) {
@@ -1443,6 +1446,7 @@ class AmdaAction
  
 		$inputobj = (Object)array(
 				'paramId' => $obj->paramId,
+				'predefinedArgs' => !empty($obj->predefinedArgs),
 				'type' => $type
 		);
 		return $this->executeRequest($inputobj, FunctionTypeEnumClass::PARAMINFO);
@@ -1603,5 +1607,14 @@ class AmdaAction
 	{
 		return $this->executeRequest($obj->processId, FunctionTypeEnumClass::PROCESSGETREQUEST);
 	}
+
+	public function parseTemplatedParam($paramTemplateId)
+	{
+		$args = (Object)array(
+			'paramId' => $paramTemplateId,
+			'type' => 'param_parse_template'
+		);
+		return $this->executeRequest($args, FunctionTypeEnumClass::PARAMINFO);
+	}
 }
 ?>