ok pour download

Hacene SI HADJ MOHAND
1 parent f981cd96
Showing 2 changed files with 32 additions and 3 deletions Show diff stats
js/app/models/InteractiveNode.js
js/app/views/DownloadUI.js
@@ -478,6 +478,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 						paramName = "#"+node.get('text');
 						break;
                                                                                                     case 'amdaModel.DerivedParamComponentNode' :
+                                                                                                                                                            
                                                                                                     paramId = node.get('text');
                                                                                                     var parentId = paramId.substr(0, paramId.length - 3);
                                                                                                     paramName= "ws_" + parentId;
@@ -489,6 +490,18 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
                                                                                                         components['index1'] = component_index[1];
                                                                                                         }
                                                                                                     break;
+                                                                                                    case 'amdaModel.MyDataParamComponentNode' : 
+                                                                                                      paramId = node.get('text');
+                                                                                                    var parentId = paramId.substr(0, paramId.length - 3);
+                                                                                                    paramName= "wsd_" + parentId;
+                                                                                                    var regExp = /\(([\d]+)\)/;
+                                                                                                     var component_index = regExp.exec(paramId);
+                                                                                                      if (component_index)
+                                                                                                      {
+                                                                                                        components = [];
+                                                                                                        components['index1'] = component_index[1];
+                                                                                                        }
+                                                                                                    break;
 					case 'amdaModel.DerivedParamNode' :
 						paramName = "ws_"+node.get('text');
 						break;
@@ -128,8 +128,9 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
             Ext.Array.each(arrayParams, function (item) {
                 if (Ext.isObject(item)) {
              // handel case of derived parameters 
-                   var patt = new RegExp("ws_");
-                    if (typeof paramId !== 'undefined' && ! patt.test(item.paramid))
+                   var patt_ws = new RegExp("ws_");
+                   var patt_wsd = new RegExp("wsd_");
+                    if (typeof paramId !== 'undefined' && ! patt_ws.test(item.paramid) && ! patt_wsd.test(item.paramid))
                     {
                         // for Parameter Name in Download Module
                         var paramObj = amdaModel.RequestParamObject.getEmptyObj();
@@ -459,7 +460,6 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
                                             }
                                             break;
                                         case 'alias' :
-                                            // console.log(data.records[0].data);
                                             idToSent = "#" + data.records[0].get('text');
                                             break;
                                         case 'derivedParam' :
@@ -482,7 +482,23 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
                                             }
                                             break;
                                         case 'myDataParam' :
+                                             if (data.records[0].modelName == 'amdaModel.MyDataParamComponentNode')
+                                            {
+                                                paramId = data.records[0].get('text');
+                                                var parentId = paramId.substr(0, paramId.length - 3);
+                                                idToSent = "wsd_" + parentId;
+                                                var regExp = /\(([\d]+)\)/;
+                                                var component_index = regExp.exec(paramId);
+                                                if (component_index)
+                                                {
+                                                    components = [];
+                                                    components['index1'] = component_index[1];
+                                                }
+                                                break;
+                                            } 
+                                            else{
                                             idToSent = "wsd_" + data.records[0].get('text');
+                                        }
                                             break;
                                         default :
                                             return false;