Commit b0f72ee09ab382cf6a596e5cd28038af684c411b

Authored by Erdogan Furkan
1 parent 79dd62c6

#10557 For now

generic_data/SpecialParameters/SpecialParams.xml 0 → 100644
... ... @@ -0,0 +1,6 @@
  1 +<?xml version="1.0"?>
  2 + <special name="Special" desc="Special_parameter" xml:id="specialParam-treeRootNode">
  3 + <group xml:id="TimeStampAll" name="TimeStamp" desc="Time fonctions" >
  4 + <parameter name='Bonjour' xml:id="timestamp"/>
  5 + </group>
  6 + </special>
... ...
generic_data/resources.json
1 1 {"nodes": [
2 2 {"nodeType" : "", "text" : "Parameters", "id" : "parameters-treeBase",
3 3 "children" : [ {"nodeType" : "localParam", "text" : "AMDA DataBase","id" : "myLocalData-treeRootNode"},
4   - {"nodeType" : "remoteParam", "info" : "Access to other Data Bases : CDAWEB, ...", "text" : "Remote DataBases : Observations", "id" : "myRemoteData-treeRootNode"},
5   - {"nodeType" : "remoteSimuParam", "info" : "Access to Simulation Data Bases", "text" : "Remote DataBases : Simulations", "id" : "myRemoteSimuData-treeRootNode"},
6   - {"nodeType" : "myDataParam", "text" : "My DataBase", "id" : "myDataParam-treeRootNode"}
  4 + {"nodeType" : "remoteParam", "info" : "Access to other Data Bases : CDAWEB, ...", "text" : "Remote DataBases : Observations", "id" : "myRemoteData-treeRootNode"},
  5 + {"nodeType" : "remoteSimuParam", "info" : "Access to Simulation Data Bases", "text" : "Remote DataBases : Simulations", "id" : "myRemoteSimuData-treeRootNode"},
  6 + {"nodeType" : "specialParam", "text" : "Special Parameters", "id" : "specialParam-treeRootNode"},
  7 + {"nodeType" : "myDataParam", "text" : "My DataBase", "id" : "myDataParam-treeRootNode"}
  8 +
7 9 ]
8 10 },
9 11 {"nodeType" : "derivedParam","text" : "Derived Parameters","id" : "derivedParam-treeRootNode"},
... ...
js/app/controllers/ExplorerModule.js
... ... @@ -51,7 +51,8 @@ Ext.define(&#39;amdaDesktop.ExplorerModule&#39;,
51 51 'amdaModel.Statistic',
52 52 'amdaModel.FileObject',
53 53 'amdaModel.FileParamObject',
54   - 'amdaModel.FilterInfo'
  54 + 'amdaModel.FilterInfo',
  55 + 'amdaModel.SpecialParamNode'
55 56 ],
56 57  
57 58 contentId: 'explorerUI',
... ...
js/app/models/SpecialParamNode.js 0 → 100644
... ... @@ -0,0 +1,53 @@
  1 +/**
  2 + * Project : AMDA-NG4
  3 + * Name : SpecialParamNode.js
  4 + * @class amdaModel.SpecialParamNode
  5 + * @extends amdaModel.InteractiveNode
  6 + * @brief
  7 + * @author
  8 + * @version $Id: MyDataNode.js 2267 2014-04-03 10:13:16Z elena $
  9 + * @todo
  10 + *******************************************************************************
  11 + * FT Id : Date : Name - Description
  12 + *******************************************************************************
  13 + *
  14 + */
  15 +
  16 +Ext.define('amdaModel.SpecialParamNode', {
  17 +
  18 + extend: 'amdaModel.InteractiveNode',
  19 +
  20 + statics:{
  21 + nodeType: 'specialParam'
  22 + },
  23 +
  24 + fields:
  25 + [
  26 + ],
  27 +
  28 + dependentRootNodeId : 'specialParam-treeRootNode',
  29 +
  30 + constructor : function(config){
  31 + this.callParent(arguments);
  32 + },
  33 +
  34 + localMenuItems : function() {
  35 + var menuItems =
  36 + [];
  37 + return menuItems;
  38 + },
  39 +
  40 + getAllContextMenuItems: function(){
  41 +
  42 + // var menuItems = this.allMenuItems('File');
  43 + var locMenuItems = this.localMenuItems();
  44 +
  45 + // return Ext.Array.merge(menuItems,locMenuItems);
  46 + return locMenuItems;
  47 + },
  48 +
  49 + onMenuItemClick : function(menu,item,event) {
  50 +
  51 + },
  52 +
  53 +});
... ...
js/app/stores/ExplorerReader.js
... ... @@ -18,7 +18,7 @@ Ext.define(&#39;amdaReader.ExplorerReader&#39;, {
18 18 */
19 19  
20 20 getType: function(node){
21   -
  21 + console.log(node);
22 22 switch (node.nodeType) {
23 23  
24 24 case 'derivedParam':
... ... @@ -52,7 +52,10 @@ Ext.define(&#39;amdaReader.ExplorerReader&#39;, {
52 52 case 'statistic' :
53 53 return amdaModel.StatisticsNode;
54 54 case 'bkgWorks' :
55   - return amdaModel.BkgJobNode;
  55 + return amdaModel.BkgJobNode;
  56 + case 'specialParam':
  57 + console.log("Coucou");
  58 + return amdaModel.SpecialParamNode;
56 59 default:
57 60 return amdaModel.InteractiveNode;
58 61  
... ...
js/app/views/DownloadUI.js
... ... @@ -400,6 +400,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
400 400 (record.get('nodeType') == 'remoteParam') ||
401 401 (record.get('nodeType') == 'remoteSimuParam') ||
402 402 (record.get('nodeType') == 'derivedParam') ||
  403 + (record.get('nodeType') == 'specialParam') ||
403 404 (record.get('nodeType') == 'myDataParam') ||
404 405 (record.get('nodeType') == 'alias')) &&
405 406 (record.isLeaf() || record.get('isParameter')) &&
... ... @@ -476,6 +477,9 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
476 477 idToSent = "wsd_" + record.get('text');
477 478 }
478 479 break;
  480 + case 'specialParam':
  481 + idToSent=record.get('id');
  482 + break;
479 483 default:
480 484 return false;
481 485 }
... ...
js/app/views/PlotComponents/PlotTree.js
... ... @@ -554,19 +554,20 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
554 554 case 'amdaModel.TimeTableNode' :
555 555 case 'amdaModel.CatalogNode' :
556 556 return record.get('leaf');
557   - case 'amdaModel.LocalParamNode' :
558   - case 'amdaModel.RemoteParamNode' :
559   - case 'amdaModel.RemoteSimuParamNode' :
560   - return record.get('isParameter') && ! record.get('disable');
561   -
562   - case 'amdaModel.DerivedParamNode' :
563   - case 'amdaModel.DerivedParamComponentNode':
564   - return record.get('isParameter') ;
565   - case 'amdaModel.AliasNode' :
566   - case 'amdaModel.MyDataParamNode' :
567   - case 'amdaModel.MyDataParamComponentNode':
568   - return record.get('isParameter') ;
569   - case 'amdaPlotObj.PlotParamTreeNode' :
  557 + case 'amdaModel.LocalParamNode' :
  558 + case 'amdaModel.RemoteParamNode' :
  559 + case 'amdaModel.RemoteSimuParamNode' :
  560 + return record.get('isParameter') && ! record.get('disable');
  561 +
  562 + case 'amdaModel.DerivedParamNode' :
  563 + case 'amdaModel.DerivedParamComponentNode':
  564 + return record.get('isParameter') ;
  565 + case 'amdaModel.AliasNode' :
  566 + case 'amdaModel.SpecialParamNode':
  567 + case 'amdaModel.MyDataParamNode' :
  568 + case 'amdaModel.MyDataParamComponentNode':
  569 + return record.get('isParameter') ;
  570 + case 'amdaPlotObj.PlotParamTreeNode' :
570 571 var fromPanelObject = null;
571 572 if (this.tabObject.get('tree-full-view'))
572 573 {
... ... @@ -776,6 +777,11 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
776 777 return this.moveParam(record, targetNode, position);
777 778 case 'amdaPlotObj.PlotPanelTreeNode' :
778 779 return this.movePanel(record, targetNode, position);
  780 + case 'amdaModel.SpecialParamNode' :
  781 + if (!record.get('isParameter'))
  782 + return false;
  783 + this.dropParamToCreate(targetNode, position, record.get('id'));
  784 + return true;
779 785 default :
780 786 return false;
781 787 }
... ...
php/classes/AmdaAction.php
... ... @@ -61,7 +61,6 @@ class AmdaAction
61 61 $node = $obj->node;
62 62  
63 63 $nodeType = $obj->nodeType;
64   -
65 64 $remoteBase = false;
66 65 $isRemoteDataSet = false;
67 66  
... ... @@ -110,6 +109,9 @@ class AmdaAction
110 109 case 'destination':
111 110 $xmlName = USERWSDIR.'RemoteParams.xml';
112 111 break;
  112 + case 'specialParam':
  113 + $xmlName = DATAPATH.'SpecialParameters/SpecialParams.xml';
  114 + break;
113 115 default:
114 116 $xmlName = USERWSDIR.$this->xmlFiles[$nodeType];
115 117 }
... ... @@ -278,8 +280,8 @@ class AmdaAction
278 280 if ($child->hasAttribute('TemplatedParameter'))
279 281 $needsArgs = true;
280 282  
281   - if ($child->hasAttribute('PredefinedTemplatedParameter'))
282   - $predefinedArgs = true;
  283 + if ($child->hasAttribute('PredefinedTemplatedParameter'))
  284 + $predefinedArgs = true;
283 285  
284 286 if ($child->parentNode->hasAttribute('dataStart')) {
285 287 $globalStart = $child->parentNode->getAttribute('dataStart');
... ... @@ -584,6 +586,13 @@ class AmdaAction
584 586 'isParameter' => $isParameter, 'linkedMask' => $mask, 'isSpectra' => $isSpectra);
585 587  
586 588 break;
  589 +
  590 + case 'specialParam':
  591 + error_log('FER - HOLA');
  592 + $isParameter=true;
  593 + $childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType);
  594 + break;
  595 +
587 596 default:
588 597 }
589 598  
... ...