CDPP / AMDA_IHM

Commit 58fb3480da364ae4fff39fe77f4ed238788a690a

Authored by Benjamin Renard
2 parents 6769e00e 04e2fbb7
Exists in master and in 109 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 11 changed files with 294 additions and 273 deletions   Show diff stats
Inline Side-by-side
generic_data/rank.json
  Diff comments   View file @58fb348
1 1 {"Mercury": 1, "Venus": 2, "Heliosphere.NearEarth": 3, "Heliosphere.Remote1AU": 4,
2 2 "Earth.Magnetosheath": 5, "Earth.Magnetosphere": 5, "Earth": 5, "Earth.Surface": 6,
3   -"Mars": 7, "Jupiter": 8, "Ganymede" : 8, "Saturn": 9, "Uranus" : 91, "Neptune" : 92, "Comet" : 93,
  3 +"Mars": 7, "Jupiter": 8, "Ganymede" : 8, "Saturn": 9, "Uranus" : 10, "Neptune" : 11, "Comet" : 93,
4 4 "Heliosphere" : 99 }
5 5 \ No newline at end of file
... ...
js/app/models/LocalParamNode.js
  Diff comments   View file @58fb348
... ... @@ -63,14 +63,14 @@ Ext.define('amdaModel.LocalParamNode',
63 63 var rank = this.get('rank');
64 64 if (rank == 1) this.set('iconCls', 'icon-mercury');
65 65 if (rank == 2) this.set('iconCls', 'icon-venus');
66   - if (rank == 5) this.set('iconCls', 'icon-earth');
67   - if (rank == 6) this.set('iconCls', 'icon-earth');
  66 + if (rank == 5 || rank == 6) this.set('iconCls', 'icon-earth');
68 67 if (rank == 7) this.set('iconCls', 'icon-mars');
69 68 if (rank == 8) this.set('iconCls', 'icon-jupiter');
70 69 if (rank == 9) this.set('iconCls', 'icon-saturn');
  70 + if (rank == 10) this.set('iconCls', 'icon-uranus');
  71 + if (rank == 11) this.set('iconCls', 'icon-neptune');
71 72 if (rank == 93) this.set('iconCls', 'icon-comet');
72   - if (rank == 3) this.set('iconCls', 'icon-sw');
73   - if (rank == 4) this.set('iconCls', 'icon-sw');
  73 + if (rank == 3 || rank == 4) this.set('iconCls', 'icon-sw');
74 74 if (rank >= 99) this.set('iconCls', 'icon-solarsystem');
75 75 }
76 76  
... ...
js/app/models/MyDataParamNode.js
  Diff comments   View file @58fb348
... ... @@ -5,10 +5,7 @@
5 5 * @extends amdaModel.InteractiveNode
6 6 * @brief
7 7 * @author
8   - * @version $Id: MyDataParamNode.js 2683 2014-12-02 10:58:53Z elena $
9   - *******************************************************************************
10   - * FT Id : Date : Name - Description
11   - *******************************************************************************
  8 + * @version $Id: MyDataParamNode.js 2683 2014-12-02 10:58:53Z elena
12 9 */
13 10  
14 11 Ext.define('amdaModel.MyDataParamNode', {
... ... @@ -27,225 +24,226 @@ Ext.define('amdaModel.MyDataParamNode', {
27 24 objectName : 'Parameter'
28 25 },
29 26  
30   - constructor : function(config)
31   - {
32   - this.callParent(arguments);
33   - this.set('moduleId',myDesktopApp.dynamicModules.my_data.id);
34   - this.set('objectDataModel','amdaModel.FileParamObject');
35   - if (this.get('isParameter')) {
36   - if (this.get('size') == 1) this.set('iconCls', 'icon-scalar');
37   - else this.set('iconCls', 'icon-unknowntype');
38   - }
39   - //TODO this.set('iconCls', 'icon-vector');
40   - if (this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
41   - },
  27 + constructor : function(config)
  28 + {
  29 + this.callParent(arguments);
  30 + this.set('moduleId',myDesktopApp.dynamicModules.my_data.id);
  31 + this.set('objectDataModel','amdaModel.FileParamObject');
  32 + if (this.get('isParameter')) {
  33 + if (this.get('size') == 1)
  34 + this.set('iconCls', 'icon-scalar');
  35 + else if (this.get('size') == 3)
  36 + this.set('iconCls', 'icon-vector');
  37 + else
  38 + this.set('iconCls', 'icon-unknowntype');
  39 + }
  40 + if (this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
  41 + },
42 42  
43   - localMenuItems : function()
44   - {
45   - var menuItems =
46   - [{
47   - fnId : 'root-upload',
48   - text : 'Upload File',
49   - hidden : true
50   - }, {
51   - fnId : 'dire-upload',
52   - text : 'Upload File',
53   - hidden : true
54   - }, {
55   - fnId : 'leaf-upload',
56   - text : 'Upload File',
57   - hidden : true
58   - },{
59   - fnId : 'leaf-plotParam',
60   - text : 'Plot Parameter',
61   - hidden : true
62   - }, {
63   - fnId : 'leaf-downParam',
64   - text : 'Download Parameter',
65   - hidden : true
66   - }, {
67   - fnId : 'para-plotParam',
68   - text : 'Plot Parameter',
69   - hidden : true
70   - }, {
71   - fnId : 'para-downParam',
72   - text : 'Download Parameter',
73   - hidden : true
74   - }];
75   - return menuItems;
76   - },
  43 + localMenuItems : function()
  44 + {
  45 + var menuItems =
  46 + [{
  47 + fnId : 'root-upload',
  48 + text : 'Upload File',
  49 + hidden : true
  50 + }, {
  51 + fnId : 'dire-upload',
  52 + text : 'Upload File',
  53 + hidden : true
  54 + }, {
  55 + fnId : 'leaf-upload',
  56 + text : 'Upload File',
  57 + hidden : true
  58 + },{
  59 + fnId : 'leaf-plotParam',
  60 + text : 'Plot Parameter',
  61 + hidden : true
  62 + }, {
  63 + fnId : 'leaf-downParam',
  64 + text : 'Download Parameter',
  65 + hidden : true
  66 + }, {
  67 + fnId : 'para-plotParam',
  68 + text : 'Plot Parameter',
  69 + hidden : true
  70 + }, {
  71 + fnId : 'para-downParam',
  72 + text : 'Download Parameter',
  73 + hidden : true
  74 + }];
  75 + return menuItems;
  76 + },
77 77  
78   - getAllContextMenuItems: function()
79   - {
80   - var menuItems = this.allMenuItems('Parameter');
81   - var locMenuItems = this.localMenuItems();
  78 + getAllContextMenuItems: function()
  79 + {
  80 + var menuItems = this.allMenuItems('Parameter');
  81 + var locMenuItems = this.localMenuItems();
82 82  
83   - return Ext.Array.merge(menuItems,locMenuItems);
84   - },
85   -
86   - onMenuItemClick : function(menu,item,event)
87   - {
88   - var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
  83 + return Ext.Array.merge(menuItems,locMenuItems);
  84 + },
89 85  
90   - switch (fnId) {
  86 + onMenuItemClick : function(menu,item,event)
  87 + {
  88 + var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
91 89  
92   - case 'deleteNode':
93   - this.deleteNode();
94   - break;
  90 + switch (fnId) {
  91 + case 'deleteNode':
  92 + this.deleteNode();
  93 + break;
95 94  
96   - case 'createDir':
97   - this.createDir();
98   - break;
  95 + case 'createDir':
  96 + this.createDir();
  97 + break;
99 98  
100   - case 'createLeaf':
101   - this.createLeaf(this);
102   - break;
  99 + case 'createLeaf':
  100 + this.createLeaf(this);
  101 + break;
103 102  
104   - case 'renameNode':
105   - this.renameNode();
106   - break;
  103 + case 'renameNode':
  104 + this.renameNode();
  105 + break;
107 106  
108   - case 'editLeaf':
109   - this.editLeaf();
110   - break;
  107 + case 'editLeaf':
  108 + this.editLeaf();
  109 + break;
111 110  
112   - case 'upload':
113   - this.uploadFile();
114   - break;
  111 + case 'upload':
  112 + this.uploadFile();
  113 + break;
115 114  
116   - case 'plotParam':
117   - this.createPlot(this);
118   - break;
  115 + case 'plotParam':
  116 + this.createPlot(this);
  117 + break;
  118 +
  119 + case 'downParam':
  120 + this.createDownload(this);
  121 + break;
119 122  
120   - case 'downParam':
121   - this.createDownload(this);
122   - break;
123   -
124   - default:
125   - break;
126   - } // switch end
  123 + default:
  124 + break;
  125 + } // switch end
127 126  
128 127 },
129 128  
130   - uploadFile: function() {
131   - myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.upload.id, true, function (module) {
132   - module.createWindow();
133   - });
134   - },
  129 + uploadFile: function() {
  130 + myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.upload.id, true, function (module) {
  131 + module.createWindow();
  132 + });
  133 + },
135 134  
136   - editLeaf: function() {
137   - // load the rootNode and recursively all its child nodes
138   - // to know all names of DerivedParameters
139   - var me = this;
140   - amdaModel.InteractiveNode.preloadNodes(this.getRootNode(),
141   - function()
142   - {
143   - if (me.get('object'))
144   - {
145   - if (me.get('fileObject'))
146   - // launch edition of parameter into parameter module
147   - me.editInModule();
148   - else
149   - AmdaAction.getObject(me.get('object').get('file'), amdaModel.MyDataNode.nodeType, me.getFileObjectCallback, me);
150   - }
151   - else
152   - {
153   - // call the ext method to get the details of parameter
154   - // the edition of real parameter is done into callback method getObjectCallback
155   - AmdaAction.getObject(me.get('id'), me.get('nodeType'), me.getObjectCallback, me);
156   - }
157   - });
158   - },
  135 + editLeaf: function() {
  136 + // load the rootNode and recursively all its child nodes
  137 + // to know all names of DerivedParameters
  138 + var me = this;
  139 + amdaModel.InteractiveNode.preloadNodes(this.getRootNode(),
  140 + function()
  141 + {
  142 + if (me.get('object'))
  143 + {
  144 + if (me.get('fileObject'))
  145 + // launch edition of parameter into parameter module
  146 + me.editInModule();
  147 + else
  148 + AmdaAction.getObject(me.get('object').get('file'), amdaModel.MyDataNode.nodeType, me.getFileObjectCallback, me);
  149 + }
  150 + else
  151 + {
  152 + // call the ext method to get the details of parameter
  153 + // the edition of real parameter is done into callback method getObjectCallback
  154 + AmdaAction.getObject(me.get('id'), me.get('nodeType'), me.getObjectCallback, me);
  155 + }
  156 + });
  157 + },
159 158  
160   - // special case file object should be also loaded
161   - getObjectCallback : function(result,remoteEvent){//result, e) {
162   - var t = remoteEvent.getTransaction();
163   - if (result) {
164   - if (result.id) {
165   - var paramObj = Ext.create(this.get('objectDataModel'), result);
166   - // set parameter into node
167   - this.set('object',paramObj);
168   -
169   - paramObj.set('tableDef', result['tableDef']);
170   -
171   - if (paramObj.get('mask')) var file = paramObj.get('mask');
172   - else var file = paramObj.get('file');
173   -
174   - AmdaAction.getObject(file, amdaModel.MyDataNode.nodeType,
175   - this.getFileObjectCallback, this);
176   - }
177   - else {
178   - myDesktopApp.errorMsg(result.error);
179   - }
180   - }
181   - else {
182   - // EXCEPTION : parameter not found !?
183   - myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"
184   - +this.get('name')+"' found!");
185   - //TODO: adding an error log
186   - }
187   - },
  159 + // special case file object should be also loaded
  160 + getObjectCallback : function(result,remoteEvent){//result, e) {
  161 + var t = remoteEvent.getTransaction();
  162 + if (result) {
  163 + if (result.id) {
  164 + var paramObj = Ext.create(this.get('objectDataModel'), result);
  165 + // set parameter into node
  166 + this.set('object',paramObj);
  167 +
  168 + paramObj.set('tableDef', result['tableDef']);
  169 +
  170 + if (paramObj.get('mask')) var file = paramObj.get('mask');
  171 + else var file = paramObj.get('file');
  172 +
  173 + AmdaAction.getObject(file, amdaModel.MyDataNode.nodeType,
  174 + this.getFileObjectCallback, this);
  175 + }
  176 + else {
  177 + myDesktopApp.errorMsg(result.error);
  178 + }
  179 + }
  180 + else {
  181 + // EXCEPTION : parameter not found !?
  182 + myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"
  183 + +this.get('name')+"' found!");
  184 + //TODO: adding an error log
  185 + }
  186 + },
188 187  
189   - getFileObjectCallback : function(result,remoteEvent){//result, e) {
190   - var t = remoteEvent.getTransaction();
191   - if (result) {
192   - if (result.success) {
193   - var paramObj = Ext.create('amdaModel.FileObject', result);
194   - this.set('fileObject', paramObj);
195   - // Edition of parameter into parameter Module
196   - this.editInModule();
197   - }
198   - else {
199   - myDesktopApp.errorMsg(result.error);
200   - }
201   - }
202   - else {
203   - // EXCEPTION : parameter not found !?
204   - myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"
205   - +this.get('name')+"' found!");
206   - }
207   - },
  188 + getFileObjectCallback : function(result,remoteEvent){//result, e) {
  189 + var t = remoteEvent.getTransaction();
  190 + if (result) {
  191 + if (result.success) {
  192 + var paramObj = Ext.create('amdaModel.FileObject', result);
  193 + this.set('fileObject', paramObj);
  194 + // Edition of parameter into parameter Module
  195 + this.editInModule();
  196 + }
  197 + else {
  198 + myDesktopApp.errorMsg(result.error);
  199 + }
  200 + }
  201 + else {
  202 + // EXCEPTION : parameter not found !?
  203 + myDesktopApp.errorMsg(t.action + "." + t.method + " : No parameter '"
  204 + +this.get('name')+"' found!");
  205 + }
  206 + },
208 207  
209   - /*
210   - * Mask was possibly changed update this info
211   - */
212   - updateMask : function(mask)
213   - {
214   - var myParamRootNode = this.getRootNode();
215   - if (myParamRootNode.isExpanded) {
216   - Ext.Array.each(myParamRootNode.childNodes, function(node) {
217   - if (node.get('linkedMask') && node.get('linkedMask').indexOf(mask) != -1 ) {
218   - node.set('linkedMask',mask);
219   - if (node.get('info')) {
220   - var info = node.get('info').split("<br/>");
221   - node.set('info',info[0] + "<br/>" + info[1] + "<br/> Mask: " + mask);
222   - }
223   - }
224   -
225   - });
226   - }
227   -
228   - },
  208 + /*
  209 + * Mask was possibly changed update this info
  210 + */
  211 + updateMask : function(mask)
  212 + {
  213 + var myParamRootNode = this.getRootNode();
  214 + if (myParamRootNode.isExpanded) {
  215 + Ext.Array.each(myParamRootNode.childNodes, function(node) {
  216 + if (node.get('linkedMask') && node.get('linkedMask').indexOf(mask) != -1 ) {
  217 + node.set('linkedMask',mask);
  218 + if (node.get('info')) {
  219 + var info = node.get('info').split("<br/>");
  220 + node.set('info',info[0] + "<br/>" + info[1] + "<br/> Mask: " + mask);
  221 + }
  222 + }
  223 +
  224 + });
  225 + }
  226 + },
229 227  
230   - updateMyData : function(){
231   - // reload myFiles Tree in explorer
232   - var explorerTree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
233   - if (explorerTree) {
234   - var explorerTreeStore = explorerTree.getStore();
235   - var explorerRoot = explorerTreeStore.getRootNode().findChild('text','My Files');
236   -
237   - var explorerPath = '/root/myData-treeRootNode/';
238   -
239   - explorerTreeStore.reload({node : explorerRoot,
240   - params : { nodeType: 'myData'},
241   - callback : function(){
242   - explorerTree.selectPath(explorerPath);
243   - }
244   - });
245   - }
246   - },
  228 + updateMyData : function(){
  229 + // reload myFiles Tree in explorer
  230 + var explorerTree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
  231 + if (explorerTree) {
  232 + var explorerTreeStore = explorerTree.getStore();
  233 + var explorerRoot = explorerTreeStore.getRootNode().findChild('text','My Files');
  234 +
  235 + var explorerPath = '/root/myData-treeRootNode/';
  236 +
  237 + explorerTreeStore.reload({node : explorerRoot,
  238 + params : { nodeType: 'myData'},
  239 + callback : function(){
  240 + explorerTree.selectPath(explorerPath);
  241 + }
  242 + });
  243 + }
  244 + },
247 245  
248   - isParameter : function(){
249   - return this.get('isParameter');
250   - }
  246 + isParameter : function(){
  247 + return this.get('isParameter');
  248 + }
251 249 });
... ...
js/app/views/ParamArgumentsUI.js
  Diff comments   View file @58fb348
... ... @@ -276,57 +276,71 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
276 276 }
277 277 ];
278 278  
279   - var sumRangeFieldSet = Ext.create('Ext.form.FieldSet', {
280   - title: relatedTable.variable ? title + " - Sum. in range" : "Sum. in range",
  279 + var sumRangeFieldSet = Ext.create('Ext.form.FieldSet', {
  280 + title: relatedTable.variable ? title + " - Sum. in range" : "Sum. in range",
281 281 collapsed: true,
282   - checkboxName: 'range_checkbox_'+relatedDim,
283   - checkboxToggle: true,
284   - name: 'range_fieldset_'+relatedDim,
285   - layout: {
286   - type: 'vbox',
287   - pack: 'start',
288   - align: 'stretch'
  282 + checkboxName: 'range_checkbox_'+relatedDim,
  283 + checkboxToggle: true,
  284 + name: 'range_fieldset_'+relatedDim,
  285 + layout: {
  286 + type: 'vbox',
  287 + pack: 'start',
  288 + align: 'stretch'
289 289 },
290 290 items: rangeItems,
291 291 listeners: {
292 292 expand: function(fieldset, eOpts) {
293   -
294   - if (indexesCombo.getValue() == "*") {
295   - Ext.Object.each(relatedTable.channels, function (index, channel) {
296   - //ToDo
297   - });
298   - }
299   - else
300   - {
301   - //ToDo
302   - }
303   - indexesCombo.setDisabled(true);
304   -
305   - this.paramRequestObject.set(relatedDim+'-is-range', true);
306   - if (this.onChange != null)
307   - this.onChange(uiScope, relatedDim, true, false, false);
308   - if (this.onModifyHeight)
309   - this.onModifyHeight(this.pluginOwner);
310   -
  293 + if (relatedTable.variable) {
  294 + if (Ext.Object.isEmpty(relatedTable.minmax)) {
  295 + myDesktopApp.warningMsg('Min/Max '+title+' values are undefined<br/>Arbitrary values are taken');
  296 + var minValue = 10;
  297 + var maxValue = 10000;
  298 + }
  299 + else {
  300 + var minValue = relatedTable.minmax.min;
  301 + var maxValue = relatedTable.minmax.max;
  302 + }
  303 + }
  304 + else {
  305 + var minValue = parseInt(relatedTable.channels[0].min);
  306 + var maxValue = parseInt(relatedTable.channels[relatedTable.channels.length - 1].max);
  307 + }
  308 + fieldset.items.items[ + (minValue > maxValue)].setValue(minValue);
  309 + fieldset.items.items[ + (minValue < maxValue)].setValue(maxValue);
  310 + // if (indexesCombo.getValue() == "*") {
  311 + // Ext.Object.each(relatedTable.channels, function (index, channel) {
  312 + // //ToDo
  313 + // });
  314 + // }
  315 + // else
  316 + // {
  317 + //
  318 + // //ToDo
  319 + // }
  320 + indexesCombo.setDisabled(true);
  321 +
  322 + this.paramRequestObject.set(relatedDim+'-is-range', true);
  323 + if (this.onChange != null)
  324 + this.onChange(uiScope, relatedDim, true, false, false);
  325 + if (this.onModifyHeight)
  326 + this.onModifyHeight(this.pluginOwner);
311 327 },
312 328 collapse: function(fieldset, eOpts) {
313   - indexesCombo.setDisabled(false);
314   -
315   - this.paramRequestObject.set(relatedDim+'-is-range', false);
316   - if (this.onChange != null)
317   - this.onChange(uiScope, relatedDim, false, true, false);
318   - if (this.onModifyHeight)
319   - this.onModifyHeight(this.pluginOwner);
320   - },
321   - scope: this
  329 + indexesCombo.setDisabled(false);
  330 +
  331 + this.paramRequestObject.set(relatedDim+'-is-range', false);
  332 + if (this.onChange != null)
  333 + this.onChange(uiScope, relatedDim, false, true, false);
  334 + if (this.onModifyHeight)
  335 + this.onModifyHeight(this.pluginOwner);
  336 + },
  337 + scope: this
322 338 }
323   - });
324   -
  339 + });
325 340 this.add(sumRangeFieldSet);
326 341 }
327   -
328 342 return indexesCombo;
329   - },
  343 + },
330 344  
331 345 buildTemplateArguments: function(arguments, uiScope) {
332 346 var me = this;
... ...
js/resources/css/amda.css
  Diff comments   View file @58fb348
... ... @@ -369,6 +369,18 @@ background-image: url(../images/16x16/error.png) !important;
369 369 background-repeat: no-repeat;
370 370 }
371 371  
  372 +.icon-neptune {
  373 + background-image:url(../images/icons/neptune.png) !important;
  374 + background-position: center;
  375 + background-repeat: no-repeat;
  376 +}
  377 +
  378 +.icon-uranus {
  379 + background-image:url(../images/icons/uranus.png) !important;
  380 + background-position: center;
  381 + background-repeat: no-repeat;
  382 +}
  383 +
372 384 .icon-sun {
373 385 background-image:url(../images/icons/sun.png) !important;
374 386 background-position: center;
... ...
php/WebServices/Tests/testWebServer.php
  Diff comments   View file @58fb348
... ... @@ -20,7 +20,7 @@ function runSuiteTests($client)
20 20 // echo "[OK] - getTimeTablesList - Test 1 - ".$res->TimeTablesList.PHP_EOL;
21 21  
22 22 //Test getTimeTablesList function with userID & password
23   - $res = $client->getTimeTablesList("budnik", "Sacre-Cour");
  23 + $res = $client->getTimeTablesList(dduser, ddpass);
24 24 if (!isset($res) || !$res->success)
25 25 echo "[ERROR] - Error during call of getTimeTablesList function - Test 2".PHP_EOL;
26 26 else
... ... @@ -34,7 +34,7 @@ function runSuiteTests($client)
34 34 // echo "[OK] - getTimeTable - Test 1 - ".$res->ttFileURL.PHP_EOL;
35 35  
36 36 //Test getTimeTable function with userID & password
37   - $res = $client->getTimeTable("tt_0", "budnik", "Sacre-Cour");
  37 + $res = $client->getTimeTable("tt_0", dduser, ddpass);
38 38 if (!isset($res) || !$res->success)
39 39 echo "[ERROR] - Error during call of getTimeTable function - Test 2".PHP_EOL;
40 40 else
... ... @@ -48,7 +48,7 @@ function runSuiteTests($client)
48 48 // echo "[OK] - getParameterList - Test 1 - ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL;
49 49  
50 50 //Test getParameterList function with userID & password
51   - $res = $client->getParameterList("budnik", "Sacre-Cour");
  51 + $res = $client->getParameterList(dduser, ddpass);
52 52 if (!isset($res) || !$res->success)
53 53 echo "[ERROR] - Error during call of getParameterList function - Test 2".PHP_EOL;
54 54 else
... ... @@ -152,6 +152,13 @@ function runSuiteTests($client)
152 152  
153 153 $clientSOAP = new WSClientSOAP("http://apus.irap.omp.eu/NEWAMDA/public/wsdl/Methods_AMDA.wsdl");
154 154  
  155 +if ( getenv('DDUSER') && getenv('DDPASS')) {
  156 + define('dduser', getenv('DDUSER'));
  157 + define('ddpass', getenv('DDPASS'));
  158 +}
  159 +else {
  160 + die("Export env vars : DDUSER and DDPASS");
  161 +}
155 162 echo "==> Suite tests for SOAP client".PHP_EOL;
156 163 runSuiteTests($clientSOAP);
157 164  
... ...
php/classes/AmdaAction.php
  Diff comments   View file @58fb348
... ... @@ -247,7 +247,6 @@ class AmdaAction
247 247 if ($child->tagName == 'parameter')
248 248 {
249 249 $isParameter = true;
250   - $isScatter = true;
251 250  
252 251 if ($child->parentNode->hasAttribute('dataStart'))
253 252 {
... ... @@ -270,7 +269,6 @@ class AmdaAction
270 269 if ($child->tagName == 'component')
271 270 {
272 271 $isParameter = true;
273   - $isScatter = true;
274 272  
275 273 if ($child->parentNode->parentNode->hasAttribute('dataStart'))
276 274 {
... ... @@ -291,7 +289,6 @@ class AmdaAction
291 289 $component_info["parentId"] = $child->parentNode->getAttribute('xml:id');
292 290 }
293 291  
294   - if ($child->tagName == 'parameter' && $child->hasChildNodes()) $isScatter = false;
295 292  
296 293 if ($child->tagName == 'parameter' && $child->hasAttribute('display_type'))
297 294 {
... ... @@ -299,12 +296,10 @@ class AmdaAction
299 296 {
300 297 $needsArgs = true;
301 298 $isSpectra = true;
302   - $isScatter = false;
303 299 }
304 300 elseif ($child->getAttribute('display_type') == 'stackplot')
305 301 {
306 302 $isStack = true;
307   - $isScatter = false;
308 303 }
309 304 }
310 305  
... ... @@ -316,7 +311,7 @@ class AmdaAction
316 311 $childrenToReturn[] = array('text' => $name,'alias' => $alias,
317 312 'id' => $id,'nodeType' => $nodeType, 'info' => $info, "component_info" => $component_info,
318 313 'globalStart' => $globalStart, 'globalStop' => $globalStop, 'timeRestriction' => $timeRestriction,
319   - 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'isScatter' => $isScatter,
  314 + 'leaf' => $isLeaf, 'isParameter' => $isParameter,
320 315 'isSpectra' => $isSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'help' => $help, 'notyet' => $not_yet);
321 316 }
322 317 else
... ... @@ -431,13 +426,10 @@ class AmdaAction
431 426 if (($child->tagName == 'parameter') || ($child->tagName == 'component'))
432 427 {
433 428 $isParameter = true;
434   - $isScatter = true;
435 429 }
436 430  
437 431 $needsArgs = $child->getAttribute('needsArgs');
438 432  
439   - if (($child->tagName == 'parameter' && $child->hasChildNodes()) || $needsArgs) $isScatter = false;
440   -
441 433 if ($remoteBase)
442 434 {
443 435 if ($child->tagName == 'dataset') $isRemoteDataSet = true;
... ... @@ -466,19 +458,18 @@ class AmdaAction
466 458 if ($child->hasAttribute('display_type') && $child->getAttribute('display_type') == 'spectrogram')
467 459 {
468 460 $needsArgs = true;
469   - $isScatter = false;
470 461 $isSpectra = true;
471 462 }
472 463 if ($globalStart)
473 464 $childrenToReturn[] = array('text' => $name,'alias' => $alias,
474 465 'id' => $id,'nodeType' => $nodeType, 'info' => $info, 'help' => $help, 'globalStart' => $globalStart,
475 466 'globalStop' => $globalStop, 'leaf' => $isLeaf, 'disable' => $disable, 'isParameter' => $isParameter,
476   - 'isScatter' => $isScatter, 'isSpectra' => $isSpectra, 'needsArgs' => $needsArgs, "component_info" => isset($component_info) ? $component_info : NULL);
  467 + 'isSpectra' => $isSpectra, 'needsArgs' => $needsArgs, "component_info" => isset($component_info) ? $component_info : NULL);
477 468 else
478 469 $childrenToReturn[] = array('text' => $name,'alias' => $alias,
479 470 'id' => $id,'nodeType' => $nodeType, 'info' => $info, 'help' => $help,
480 471 'leaf' => $isLeaf, 'disable' => $disable, 'isParameter' => $isParameter,
481   - 'isScatter' => $isScatter, 'isSpectra' => $isSpectra, 'needsArgs' => $needsArgs, "component_info" => $component_info);
  472 + 'isSpectra' => $isSpectra, 'needsArgs' => $needsArgs, "component_info" => $component_info);
482 473 }
483 474 else
484 475 {
... ... @@ -525,7 +516,6 @@ class AmdaAction
525 516 $globalStop = null;
526 517 $specialNode = true;
527 518 $size = $child->getAttribute('size');
528   - $isScatter = $size == 1;
529 519 $mask = $child->getAttribute('mask');
530 520 $isSpectra = false;
531 521  
... ... @@ -544,7 +534,7 @@ class AmdaAction
544 534  
545 535 $childrenToReturn[] = array('text' => $name, 'size' => $size, 'id' => $id,
546 536 'globalStart' => $globalStart, 'globalStop' => $globalStop,
547   - 'nodeType' => $nodeType, 'info' => $info, 'isScatter' => $isScatter, 'leaf' => $isLeaf,
  537 + 'nodeType' => $nodeType, 'info' => $info, 'leaf' => $isLeaf,
548 538 'isParameter' => $isParameter, 'linkedMask' => $mask, 'isSpectra' => $isSpectra);
549 539  
550 540 break;
... ...
php/old_amda/simple_html_dom.php renamed to php/classes/simple_html_dom.php
  Diff comments   View file @58fb348
php/config.php
  Diff comments   View file @58fb348
... ... @@ -85,7 +85,6 @@ define(&#39;InstrumentInfo&#39;, LocalData.&#39;/InstrumentInfo&#39;);
85 85 define('DataSetInfo', LocalData.'/DataSetInfo/');
86 86 define('RemoteData', DATAPATH.'/RemoteData/');
87 87 define('Functions', DATAPATH.'/Functions/');
88   -define('HelpAuto', DATAPATH.'/help/auto/');
89 88 define('Hst', DATAPATH.'/Hst/');
90 89 define('SpecialSettingsDir',DATAPATH.'/SpecialSettings/');
91 90  
... ... @@ -98,6 +97,7 @@ define(&#39;specialSettingsXml&#39;,SpecialSettingsDir.&#39;/Settings.xml&#39;);
98 97  
99 98 //Help info dirs
100 99 define('HELPPATH', IHM_SRC_DIR."/help/");
  100 +define('HelpAuto', HELPPATH.'auto/');
101 101  
102 102 // IMPEX section
103 103 define('SimuTargetsXml', DATAPATH.'/SimuTemplate/TargetsSimu.xml');
... ...
public/wsdl/Methods_AMDA.wsdl
  Diff comments   View file @58fb348
... ... @@ -740,6 +740,7 @@ of a set of typically orthogonal axes.
740 740 </xs:annotation>
741 741 <xs:simpleType>
742 742 <xs:restriction base="xs:string">
  743 + <xs:enumeration value="done"/>
743 744 <xs:enumeration value="in progress"/>
744 745 <xs:enumeration value="error"/>
745 746 </xs:restriction>
... ...
update_amda/makeTree.php
  Diff comments   View file @58fb348
... ... @@ -5,15 +5,14 @@
5 5 */
6 6  
7 7 error_reporting(E_ERROR);
8   - define("AMDA_SPASE_INTERFACE", getenv("AMDA_SPASE_INTERFACE"));
9 8  
10   - if ( AMDA_SPASE_INTERFACE == "" )
  9 + if (getenv("AMDA_SPASE_INTERFACE") === false)
11 10 require_once("./config.php");
12 11 else
13   - require_once(AMDA_SPASE_INTERFACE."/config.php");
14   -
15   - if (defined("DATAPATH") && file_exists(DATAPATH.'rank.json'))
16   - $cmpArr = json_decode(file_get_contents(DATAPATH.'rank.json'), true);
  12 + require_once(getenv("AMDA_SPASE_INTERFACE")."/config.php");
  13 +
  14 + if (getenv("DATAPATH") !== false && file_exists(getenv("DATAPATH")."rank.json"))
  15 + $cmpArr = json_decode(file_get_contents(getenv("DATAPATH")."rank.json"), true);
17 16 else
18 17 $cmpArr = null;
19 18  
... ...