icon Cls for alias

Elena.Budnik
1 parent 5bc01d75
Showing 5 changed files with 20 additions and 11 deletions Show diff stats
js/app/models/AliasNode.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/views/AliasUI.js
js/app/views/PlotComponents/PlotTree.js
php/classes/AliasMgr.php
@@ -20,7 +20,10 @@ Ext.define(&#39;amdaModel.AliasNode&#39;, {
  
 	constructor : function(config) {
 		this.callParent(arguments);     
-		if (this.get('leaf')) this.set('iconCls', 'icon-scalar');
+// 		if (this.get('leaf')) 
+// 			this.set('iconCls', 'icon-scalar');
+		if (this.get('leaf') && (!this.get('iconCls') || this.get('iconCls') == ""))
+			this.set('iconCls', 'icon-scalar');
 	},
  
 	allMenuItems : function() {
@@ -41,9 +44,9 @@ Ext.define(&#39;amdaModel.AliasNode&#39;, {
 		return menuItems;
 	}, 
  
-	create: function(alias, param, component_info) {
+	create: function(alias, param, component_info, iconCls) {
 		//if (!Ext.Object.isEmpty(component_info))) 
-		AmdaAction.createObject({ name: alias, param: param, component_info : component_info,
+		AmdaAction.createObject({ name: alias, param: param, component_info : component_info, iconCls : iconCls,
 			nodeType:amdaModel.AliasNode.nodeType, leaf:true }, null, 
 			function(result, e){	  
 				var t = e.getTransaction();
@@ -61,6 +64,7 @@ Ext.define(&#39;amdaModel.AliasNode&#39;, {
 							// set the tooltip
 							this.set('info', param);
 							this.set('component_info',component_info);
+							this.set('iconCls',iconCls);
 						}
 					} else {
 						// EXCEPTION : 
@@ -75,7 +79,7 @@ Ext.define(&#39;amdaModel.AliasNode&#39;, {
 		},this); 
 	},
  
-	renameNode: function(old_alias,alias, param) {
+	renameNode: function(old_alias, alias, param) {
 		AmdaAction.renameObject({id : param, old_name: old_alias, name: alias,  
 			parent : this.parentNode.get('id'), leaf: this.isLeaf(), nodeType: this.get('nodeType')},
 			function(result, e){	  
@@ -298,7 +298,8 @@ 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 realparamid = (typeof data !== "undefined") && (typeof data.realparamid !== "undefined") ? data.realparamid : null;
+	
     	this.set('last-param-id', this.get('last-param-id') + 1);
  
     	var emptyPanel = (this.params().getCount() == 0);
@@ -323,7 +324,10 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
 				recs[0].set('real-type', 1);
     		}
     	}
-
+	if (realparamid) {
+		recs[0].set('real-paramid',realparamid); // aliases
+	}
+						
 	recs[0].set('param-type', isTTCat ? 'ttcat' : 'param');
 	if (isTTCat) {
 		recs[0].set('param-ttcat-name', data.name);
@@ -122,6 +122,7 @@ Ext.define(&#39;amdaUI.AliasUI&#39;,{
 		var alias = this.aliasField.value;
 		var param = this.parameterField.value;
 		var component_info = this.paramNode.get('component_info');
+		var iconClass = this.paramNode.get('iconCls');
 		// now validation							    
 		if (this.validate(alias,param)) {	
 			if (isNew) {
@@ -131,7 +132,7 @@ Ext.define(&#39;amdaUI.AliasUI&#39;,{
 				}
 				else {
 					// create alias 
-					this.linkedNode.create(alias, param, component_info);
+					this.linkedNode.create(alias, param, component_info, iconClass);
 					this.updateConstruct(param,"#"+alias);
 				}
 			}   
@@ -711,15 +711,15 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
                                           //It's a component 
                                           components = [];
                                           components['paramId'] = component_info.parentId; 
-														
+ 
                                           if (component_info.index1)
                                              components['index1'] = component_info.index1;
  
                                           if (component_info.index2)
                                              components['index2'] = component_info.index2;
                                           }
-                                          
-                                        this.dropParamToCreate(targetNode, position, "#" + record.get('text'), { 'components': components });
+                                      
+                                        this.dropParamToCreate(targetNode, position, "#" + record.get('text'), { 'components': components, 'realparamid' :  record.get('info') });
                                         return true;
                                     case 'amdaModel.DerivedParamNode' :
                                             if (!record.get('isParameter'))
@@ -10,7 +10,7 @@ class AliasMgr extends AmdaObjectMgr {
 		parent::__construct('Alias.xml');
 		$this->contentRootId = 'alias-treeRootNode';
 		$this->contentRootTag = 'aliasList';
-		$this->attributes = array('name' => '', 'param' => '');
+		$this->attributes = array('name' => '', 'param' => '', 'iconCls' => '');
 		$this->objTagName = 'alias';
 		if (!file_exists($this->xmlName)) {
 			$this->createDom();