resolu

Hacene SI HADJ MOHAND
1 parent d8ee9cbb
Showing 3 changed files with 54 additions and 2 deletions Show diff stats
js/app/controllers/ExplorerModule.js
php/classes/AmdaAction.php
php/config.php
@@ -292,8 +292,9 @@ Ext.define(&#39;amdaDesktop.ExplorerModule&#39;,
         }
         return this.paramInfoRegistry[paramId]
       }
-     var pattParam = new RegExp("ws_");
-     if(pattParam .test(paramId)){
+     var pattParamWs = new RegExp("ws_");
+     var pattParamWsd = new RegExp("wsd_");
+     if(pattParamWs.test(paramId)){
          var regExp = /\(([\d]+)\)/;
          var matches = regExp.exec(paramId);
          if(matches)
@@ -323,6 +324,36 @@ Ext.define(&#39;amdaDesktop.ExplorerModule&#39;,
           onReady(paramInfo)
         }
       })
+     }else if(pattParamWsd.test(paramId)){
+         var regExp = /\(([\d]+)\)/;
+         var matches = regExp.exec(paramId);
+         if(matches)
+         {
+             paramId=paramId.substr(0,paramId.length-3);
+         }
+    /* case of derived parameter */
+       AmdaAction.getMyDataParamInfo({paramId: paramId}, function (result, e) {
+        var paramInfo = null
+        if (e.status === true) {
+          // No available info for this parameter, do not display an error message if no success
+          if (result.success) {
+            // Store parameter info in registry
+            me.paramInfoRegistry[paramId] = result;
+            paramInfo = result
+          }
+        } else {
+          Ext.Msg.show({
+            title: 'Error System',
+            msg: e.message,
+            icon: Ext.MessageBox.ERROR,
+            buttons: Ext.Msg.OK
+          })
+        }
+
+        if (onReady) {
+          onReady(paramInfo)
+        }
+      })
      }else{
       AmdaAction.getParamInfo({paramId: paramId}, function (result, e) {
         var paramInfo = null
@@ -1466,6 +1466,26 @@ class AmdaAction
 		return array('success'=>false, 'message'=>'unkown parameter (derived parameter arguments are not handled)');
 	}
  
+       public function getMyDataParamInfo($obj)
+        {
+                 $dom = new DomDocument("1.0");
+                 $xmlName=USERWSDIR.$this->xmlFiles['derivedParam'];
+                 @$dom->load($xmlName);
+                 $params=$dom->getElementsByTagName("mydata");
+                 foreach($params as $param)
+                 {
+                        if($param->hasAttribute("name") && ("wsd_" . ($param->getAttribute("name")))==$obj->paramId)
+                        {
+                         $dim_1=$param->getAttribute("size");
+                         $dim_2=1;
+                         return $this->createDerivedParamInfo($dim_1,$dim_2,$obj->paramId);
+                        }
+
+                }
+                return array('success'=>false, 'message'=>'unkown parameter (derived parameter arguments are not handled)');
+        }
+
+
 	public function createDerivedParamInfo($dim_1,$dim_2,$paramId)
 	{
 		/* case of constant */
@@ -193,6 +193,7 @@ $API = array(
 			'getParamPlotInit'=>array('len'=>1),
 			'getParamInfo'=>array('len'=>1),
 			'getDerivedParamInfo'=>array('len'=>1),
+			'getMyDataParamInfo'=>array('len'=>1),
 			'getSharedObjectFolders' => array('len'=>1),
 			'shareObjects' => array('len'=>1),
 			'isSharedObjectNameAlreadyUsed' => array('len'=>1),