CDPP / AMDA_IHM

Commit 3a5f60a11913fd6579f9485cf4694b7ee7cf8b6d

Authored by elena
1 parent 4a438b99
Exists in master and in 111 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, install-rework, livraison-akka, 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

proper use os statics

Showing 17 changed files with 121 additions and 178 deletions   Show diff stats
Inline Side-by-side
js/app/models/AliasNode.js
  Diff comments   View file @3a5f60a
... ... @@ -6,32 +6,25 @@
6 6 * @brief Basic Model of Node corresponding to an alias
7 7 * @author Myriam
8 8 * @version $Id: AliasNode.js 2615 2014-10-23 15:03:48Z myriam $
9   - * @todo
10   - *******************************************************************************
11   - * FT Id : Date : Name - Description
12   - *******************************************************************************
13   - * : :14/10/2011: Myriam - file creation
14 9 */
15 10  
16 11 Ext.define('amdaModel.AliasNode', {
17 12  
18   - extend: 'amdaModel.InteractiveNode',
19   -
20   - statics: {
21   - nodeType: 'alias',
22   - objectName: 'Alias',
23   - deletedAliases : null
24   - },
  13 + extend: 'amdaModel.InteractiveNode',
  14 +
  15 + statics: {
  16 + nodeType: 'alias',
  17 + objectName: 'Alias',
  18 + deletedAliases : null
  19 + },
25 20  
26 21 fields: [
27 22 {name: 'isScatter', type: 'boolean', defaultValue: true}
28 23 ],
29 24  
30   - constructor : function(config){
31   -
32   - this.callParent(arguments);
33   - this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
34   - this.set('nodeType',amdaModel.AliasNode.nodeType);
  25 + constructor : function(config)
  26 + {
  27 + this.callParent(arguments);
35 28 if (this.get('leaf')) this.set('iconCls', 'icon-scalar');
36 29 },
37 30  
... ...
js/app/models/BkgJobNode.js
  Diff comments   View file @3a5f60a
... ... @@ -31,7 +31,7 @@ Ext.define('amdaModel.BkgJobNode', {
31 31 RES_ROOT_NODE: {
32 32 PLOT: 'resPlot-treeRootNode',
33 33 CONDITION: 'resSearch-treeRootNode',
34   - DOWNLOAD: 'resDown-treeRootNode',
  34 + DOWNLOAD: 'resDown-treeRootNode',
35 35 STATISTICS: 'resStatistics-treeRootNode'
36 36 },
37 37 STATUS_LIST: {
... ... @@ -43,24 +43,22 @@ Ext.define('amdaModel.BkgJobNode', {
43 43 fields: [
44 44 // name, id, moduleId, object> from parent
45 45 { name : 'jobType', type : 'string' },
46   - { name : 'processId', type : 'string' },
47   - { name : 'status', type : 'string' },
  46 + { name : 'processId', type : 'string' },
  47 + { name : 'status', type : 'string' },
48 48 { name : 'percentDone', type : 'string', defaultValue : '0' },
49   - { name : 'start', type: 'date' },
50   - // { name : 'duration', type: 'int' , defaultValue: -1}
51   - { name : 'stop', type: 'date', defaultValue: null },
  49 + { name : 'start', type: 'date' },
  50 + // { name : 'duration', type: 'int' , defaultValue: -1}
  51 + { name : 'stop', type: 'date', defaultValue: null },
52 52 { name : 'rawname', type: 'string'},
53 53 { name : 'tabId', type: 'string'},
54 54 { name : 'info', type: 'string'}
55   -
56 55 ],
57 56  
58 57 constructor : function(config){
59 58  
60 59 this.callParent(arguments);
61 60 this.set('ownerTreeId', amdaUI.ExplorerUI.JOB_TAB.TREE_ID);
62   - this.set('nodeType', amdaModel.BkgJobNode.nodeType);
63   -
  61 +
64 62 if (this.isLeaf()) {
65 63 switch (this.get('status')) {
66 64 case amdaModel.BkgJobNode.STATUS_LIST.ERROR:
... ...
js/app/models/CatalogNode.js
  Diff comments   View file @3a5f60a
... ... @@ -9,21 +9,20 @@
9 9  
10 10 Ext.define('amdaModel.CatalogNode', {
11 11  
12   - extend: 'amdaModel.TimeTableNode',
  12 + extend: 'amdaModel.TimeTableNode',
13 13  
14   - statics: {
15   - nodeType: 'catalog',
16   - objectName: 'Catalog'
17   - },
  14 + statics: {
  15 + nodeType: 'catalog',
  16 + objectName: 'Catalog'
  17 + },
18 18  
19   - constructor : function(config){//
20   - this.callParent(arguments);
21   - this.set('nodeType',amdaModel.CatalogNode.nodeType);
22   - this.set('moduleId',myDesktopApp.dynamicModules.catalog.id);
23   - this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
24   - this.set('objectDataModel',amdaModel.Catalog.$className);
25   - if (this.get('leaf')) this.set('iconCls', 'icon-catalog');
26   - },
  19 + constructor : function(config)
  20 + {
  21 + this.callParent(arguments)
  22 + this.set('moduleId',myDesktopApp.dynamicModules.catalog.id);
  23 + this.set('objectDataModel',amdaModel.Catalog.$className);
  24 + if (this.get('leaf')) this.set('iconCls', 'icon-catalog');
  25 + },
27 26  
28 27 localMenuItems : function() {
29 28 var menuItems =
... ... @@ -62,6 +61,13 @@ Ext.define('amdaModel.CatalogNode', {
62 61 }*/];
63 62  
64 63 return menuItems;
  64 + },
  65 +
  66 + ttDownload : function() {
  67 + alert('NOT IMPLEMENTED YET');
  68 + },
  69 +
  70 + downloadMulti: function() {
  71 + alert('NOT IMPLEMENTED YET');
65 72 }
66   -
67 73 });
... ...
js/app/models/DerivedParamNode.js
  Diff comments   View file @3a5f60a
... ... @@ -6,12 +6,6 @@
6 6 * @brief Model of Node corresponding to a derived parameter
7 7 * @author CDA
8 8 * @version $Id: DerivedParamNode.js 2544 2014-10-03 10:21:56Z elena $
9   - * @todo
10   - *******************************************************************************
11   - * FT Id : Date : Name - Description
12   - *******************************************************************************
13   - * : :08/06/2011: CDA - Migration extjs4
14   - * : :09/06/2011: elena - all generic methods are now of InteractiveNode class
15 9 */
16 10  
17 11 Ext.define('amdaModel.DerivedParamNode', {
... ... @@ -28,13 +22,11 @@ Ext.define('amdaModel.DerivedParamNode', {
28 22 ],
29 23  
30 24 constructor : function(config){
31   - this.callParent(arguments);
32   -
33   - this.set('nodeType',amdaModel.DerivedParamNode.nodeType);
  25 + this.callParent(arguments);
34 26 this.set('moduleId',myDesktopApp.dynamicModules.param.id);
35 27 this.set('objectDataModel',amdaModel.Parameter.$className);
36 28 this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
37   - if (this.get('leaf')) this.set('iconCls', 'icon-scalar');
  29 + if (this.get('leaf')) this.set('iconCls', 'icon-scalar');
38 30 },
39 31  
40 32 localMenuItems : function() {
... ...
js/app/models/DownloadNode.js
  Diff comments   View file @3a5f60a
... ... @@ -14,14 +14,14 @@ Ext.define('amdaModel.DownloadNode', {
14 14  
15 15 singleton: true,
16 16  
17   - fields: [ {name : 'downloadType', type : 'string'},
18   - {name: 'object', type: 'object'},
19   - {name: 'realLinkedNode', type: 'amdaModel.AmdaNode'},
20   - {name: 'moduleId', type: 'string', defaultValue:'down-win'},
21   - {name: 'nodeType', type: 'string', defaultValue: 'download'},
22   - {name: 'objectDataModel', type: 'string', defaultValue:'amdaModel.Download'},
23   - {name: 'jobNode', type: 'string', defaultValue: 'amdaModel.BkgJobNode'}
24   - ],
  17 + fields:[{name : 'downloadType', type : 'string'},
  18 + {name: 'object', type: 'object'},
  19 + {name: 'realLinkedNode', type: 'amdaModel.AmdaNode'},
  20 + {name: 'moduleId', type: 'string', defaultValue:'down-win'},
  21 + {name: 'nodeType', type: 'string', defaultValue: 'download'},
  22 + {name: 'objectDataModel', type: 'string', defaultValue:'amdaModel.Download'},
  23 + {name: 'jobNode', type: 'string', defaultValue: 'amdaModel.BkgJobNode'}
  24 + ],
25 25  
26 26 isExecutable: function(){
27 27 return true;
... ...
js/app/models/ExecutableNode.js
  Diff comments   View file @3a5f60a
... ... @@ -24,7 +24,8 @@ Ext.define('amdaModel.ExecutableNode', {
24 24 statics: { jobTreeLoaded : false },
25 25  
26 26 constructor : function(config) {
27   - this.callParent(arguments);
  27 + this.callParent(arguments);
  28 + this.set('ownerTreeId',amdaUI.ExplorerUI.OPE_TAB.TREE_ID);
28 29 this.set('jobNode', amdaModel.BkgJobNode.$className);
29 30 },
30 31  
... ...
js/app/models/InteractiveNode.js
  Diff comments   View file @3a5f60a
... ... @@ -82,7 +82,9 @@ Ext.define('amdaModel.InteractiveNode', {
82 82  
83 83 constructor : function(config)
84 84 {
85   - this.callParent(arguments);
  85 + this.callParent(arguments);
  86 + this.set('nodeType',this.self.nodeType);
  87 + this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
86 88 // if id of this node have root category suffix
87 89 if (Ext.util.Format.substr(this.get('id'), -(amdaUI.ExplorerUI.CAT_SUFFIX.length), this.get('id').length) === amdaUI.ExplorerUI.CAT_SUFFIX)
88 90 {
... ...
js/app/models/LocalParamNode.js
  Diff comments   View file @3a5f60a
... ... @@ -39,9 +39,7 @@ Ext.define('amdaModel.LocalParamNode',
39 39 this.set('allowDrop', true);
40 40 this.set('moduleId',myDesktopApp.dynamicModules.param.id);
41 41 this.set('objectDataModel',amdaModel.Parameter.$className);
42   - this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
43   - this.set('nodeType',amdaModel.LocalParamNode.nodeType);
44   -
  42 +
45 43 // if future missions or 'depending on mission'
46 44 if (this.get('globalStart')) {
47 45 var now = Ext.Date.format(new Date(), 'Y/m/d');
... ...
js/app/models/MyDataNode.js
  Diff comments   View file @3a5f60a
... ... @@ -17,26 +17,24 @@ Ext.define('amdaModel.MyDataNode', {
17 17  
18 18 extend: 'amdaModel.InteractiveNode',
19 19  
  20 + statics:{
  21 + nodeType: 'myData'
  22 + },
  23 +
20 24 fields:
21 25 [
22 26 {name: 'globalStart', type: 'string', persist: false},
23 27 {name: 'globalStop', type: 'string', persist: false}
24 28 ],
25 29  
  30 + dependentRootNodeId : 'myDataParam-treeRootNode',
  31 +
26 32 constructor : function(config){
27 33 this.callParent(arguments);
28 34 this.set('moduleId',myDesktopApp.dynamicModules.my_data.id);
29 35 this.set('objectDataModel','amdaModel.FileObject');
30   - this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
31   - this.set('nodeType',amdaModel.MyDataNode.nodeType);
32   - },
33   -
34   - statics:{
35   - nodeType: 'myData'
36 36 },
37   -
38   - dependentRootNodeId : 'myDataParam-treeRootNode',
39   -
  37 +
40 38 localMenuItems : function() {
41 39 var menuItems =
42 40 [{
... ...
js/app/models/MyDataParamNode.js
  Diff comments   View file @3a5f60a
... ... @@ -13,33 +13,31 @@
13 13  
14 14 Ext.define('amdaModel.MyDataParamNode', {
15 15  
16   - extend: 'amdaModel.InteractiveNode',
17   -
18   - fields : [ // { name : 'linkedFile', persist: false},
19   - { name : 'linkedMask', persist: false},
20   - { name : 'fileObject', persist: false},
21   - { name : 'size', persist: false},
22   - { name : 'isSpectra', type: 'boolean', defaultValue: false, persist: false }
23   - ],
  16 + extend: 'amdaModel.InteractiveNode',
  17 +
  18 + fields : [ // { name : 'linkedFile', persist: false},
  19 + { name : 'linkedMask', persist: false},
  20 + { name : 'fileObject', persist: false},
  21 + { name : 'size', persist: false},
  22 + { name : 'isSpectra', type: 'boolean', defaultValue: false, persist: false }
  23 + ],
24 24  
25   - statics:{
26   - nodeType: 'myDataParam',
27   - objectName : 'Parameter'
28   - },
  25 + statics:{
  26 + nodeType: 'myDataParam',
  27 + objectName : 'Parameter'
  28 + },
29 29  
30   - constructor : function(config){
  30 + constructor : function(config)
  31 + {
31 32 this.callParent(arguments);
32 33 this.set('moduleId',myDesktopApp.dynamicModules.my_data.id);
33   - this.set('objectDataModel','amdaModel.FileParamObject');
34   - this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
35   - this.set('nodeType',amdaModel.MyDataParamNode.nodeType);
  34 + this.set('objectDataModel','amdaModel.FileParamObject');
36 35 if (this.get('isParameter')) {
37 36 if (this.get('size') == 1) this.set('iconCls', 'icon-scalar');
38 37 else this.set('iconCls', 'icon-unknowntype');
39 38 }
40 39 //TODO this.set('iconCls', 'icon-vector');
41   - if (this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
42   -
  40 + if (this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
43 41 },
44 42  
45 43 localMenuItems : function() {
... ...
js/app/models/PlotNode.js
  Diff comments   View file @3a5f60a
... ... @@ -6,11 +6,6 @@
6 6 * @brief Basic Model of Node corresponding to a plot request
7 7 * @author Caroline DARMON
8 8 * @version $Id: $
9   - * @todo
10   - *******************************************************************************
11   - * FT Id : Date : Name - Description
12   - *******************************************************************************
13   - * : :08/09/2011: CDA - file creation
14 9 */
15 10  
16 11 Ext.define('amdaModel.PlotNode', {
... ... @@ -19,16 +14,13 @@ Ext.define('amdaModel.PlotNode', {
19 14  
20 15 statics: {
21 16 nodeType: 'request'
22   - // objectName: 'Plot Request',
23 17 },
24 18  
25   - constructor : function(config){
26   -
  19 + constructor : function(config)
  20 + {
27 21 this.callParent(arguments);
28 22 this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
29 23 this.set('objectDataModel',amdaModel.Plot.$className);
30   - this.set('ownerTreeId',amdaUI.ExplorerUI.OPE_TAB.TREE_ID);
31   - this.set('nodeType',amdaModel.PlotNode.nodeType);
32 24 },
33 25  
34 26 allMenuItems : function() {
... ...
js/app/models/RemoteParamNode.js
  Diff comments   View file @3a5f60a
... ... @@ -12,14 +12,17 @@ Ext.define('amdaModel.RemoteParamNode', {
12 12  
13 13 extend: 'amdaModel.LocalParamNode',
14 14  
  15 + statics:{
  16 + nodeType: 'remoteParam'
  17 + },
  18 +
15 19 fields: [
16 20 {name: 'isRemoteDataSet', type:'boolean', persist: false, defaultValue: false},
17 21 {name: 'isSimulation', type:'boolean', defaultValue: false}
18 22 ],
19 23  
20 24 constructor : function(config){
21   - this.callParent(arguments);
22   - this.set('nodeType',amdaModel.RemoteParamNode.nodeType);
  25 + this.callParent(arguments);
23 26 //TODO only for INTEROPER TREE
24 27 if (!this.get('leaf')) this.set('allowDrag', false);
25 28 if (this.get('isParameter')) this.set('allowDrag',true);
... ... @@ -30,10 +33,7 @@ Ext.define('amdaModel.RemoteParamNode', {
30 33 }
31 34 },
32 35  
33   - statics:{
34   - nodeType: 'remoteParam'
35   - },
36   -
  36 +
37 37 allMenuItems : function() {
38 38 var menuItems =
39 39 [{
... ...
js/app/models/RemoteSimuParamNode.js
  Diff comments   View file @3a5f60a
... ... @@ -12,6 +12,10 @@ Ext.define('amdaModel.RemoteSimuParamNode', {
12 12  
13 13 extend: 'amdaModel.LocalParamNode',
14 14  
  15 + statics:{
  16 + nodeType: 'remoteSimuParam'
  17 + },
  18 +
15 19 requires: 'amdaUI.InteropImpexUI',
16 20  
17 21 fields: [
... ... @@ -23,10 +27,9 @@ Ext.define('amdaModel.RemoteSimuParamNode', {
23 27 ],
24 28  
25 29 constructor : function(config){
26   - this.callParent(arguments);
27   - this.set('nodeType',amdaModel.RemoteSimuParamNode.nodeType);
  30 + this.callParent(arguments);
28 31 if (this.get('isParameter')) this.set('needsArgs',this.get('needsArgs'));
29   - if (this.get('leaf') && this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
  32 + if (this.get('leaf') && this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
30 33 if (this.get('disable')) {
31 34 this.set('cls', 'icon-disabled');
32 35 this.set('allowDrag', false);
... ... @@ -48,10 +51,7 @@ Ext.define('amdaModel.RemoteSimuParamNode', {
48 51 }
49 52 },
50 53  
51   - statics:{
52   - nodeType: 'remoteSimuParam'
53   - },
54   -
  54 +
55 55 allMenuItems : function() {
56 56 var menuItems =
57 57 [ {
... ...
js/app/models/SearchNode.js
  Diff comments   View file @3a5f60a
... ... @@ -6,11 +6,6 @@
6 6 * @brief Basic Model of Node corresponding to a amda condition
7 7 * @author
8 8 * @version $Id: SearchNode.js 1739 2013-09-09 14:47:10Z myriam $
9   - * @todo
10   - *******************************************************************************
11   - * FT Id : Date : Name - Description
12   - *******************************************************************************
13   - * : :23/06/2011: myriam - Migration extjs4
14 9 */
15 10  
16 11 Ext.define('amdaModel.SearchNode', {
... ... @@ -21,15 +16,12 @@ Ext.define('amdaModel.SearchNode', {
21 16 nodeType: 'condition'
22 17 },
23 18  
24   - constructor : function(config){
25   -
  19 + constructor : function(config)
  20 + {
26 21 this.callParent(arguments);
27 22 this.set('moduleId',myDesktopApp.dynamicModules.search.id);
28   - this.set('objectDataModel',amdaModel.Search.$className);
29   - this.set('ownerTreeId',amdaUI.ExplorerUI.OPE_TAB.TREE_ID);
30   - this.set('nodeType',amdaModel.SearchNode.nodeType);
31   - this.set('resultModel',amdaModel.TimeTable.$className);
32   -
  23 + this.set('objectDataModel',amdaModel.Search.$className);
  24 + this.set('resultModel',amdaModel.TimeTable.$className);
33 25 },
34 26  
35 27 allMenuItems : function() {
... ...
js/app/models/StatisticsNode.js
  Diff comments   View file @3a5f60a
... ... @@ -2,39 +2,28 @@
2 2 * Project : AMDA-NG
3 3 * Name : StatisticsNode.js
4 4 * @class amdaModel.StatisticsNode
5   - * @extends amdaModel.TimeTableNode
  5 + * @extends amdaModel.ExecutableNode
6 6 * @brief Basic Model of Node corresponding to a amda statistics operation
7 7 * @author elena
8 8 */
9 9  
10 10 Ext.define('amdaModel.StatisticsNode', {
11 11  
12   - extend: 'amdaModel.ExecutableNode',
  12 + extend: 'amdaModel.ExecutableNode',
  13 +
  14 + singleton: true,
  15 +
  16 + fields: [
  17 + {name: 'downloadType', type : 'string'},
  18 + {name: 'object', type: 'object'},
  19 + {name: 'realLinkedNode', type: 'amdaModel.AmdaNode'},
  20 + {name: 'moduleId', type: 'string', defaultValue:'statistics-win'},
  21 + {name: 'nodeType', type: 'string', defaultValue: 'statistics'},
  22 + {name: 'objectDataModel', type: 'string', defaultValue:'amdaModel.Statistics'},
  23 + {name: 'jobNode', type: 'string', defaultValue: 'amdaModel.BkgJobNode'}
  24 + ],
13 25  
14   - singleton: true,
15   -
16   -
17   - fields: [ {name : 'downloadType', type : 'string'},
18   - {name: 'object', type: 'object'},
19   - {name: 'realLinkedNode', type: 'amdaModel.AmdaNode'},
20   - {name: 'moduleId', type: 'string', defaultValue:'statistics-win'},
21   - {name: 'nodeType', type: 'string', defaultValue: 'statistics'},
22   - {name: 'objectDataModel', type: 'string', defaultValue:'amdaModel.Statistics'},
23   - {name: 'jobNode', type: 'string', defaultValue: 'amdaModel.BkgJobNode'}
24   - ],
25   -
26   - isExecutable: function(){
27   - return true;
28   - }
29   - /*,
30   -
31   - constructor : function(config){//
32   - this.callParent(arguments);
33   - this.set('nodeType',amdaModel.StatisticsNode.nodeType);
34   - this.set('moduleId',myDesktopApp.dynamicModules.statistics.id);
35   - this.set('ownerTreeId',amdaUI.ExplorerUI.OPE_TAB.TREE_ID);
36   - this.set('objectDataModel',amdaModel.Statistics.$className);
37   -// if (this.get('leaf')) this.set('iconCls', 'icon-catalog');
38   - }
39   - */
  26 + isExecutable: function(){
  27 + return true;
  28 + }
40 29 });
... ...
js/app/models/TimeTableNode.js
  Diff comments   View file @3a5f60a
... ... @@ -6,12 +6,6 @@
6 6 * @brief Basic Model of Node corresponding to a amda Time Table
7 7 * @author
8 8 * @version $Id: TimeTableNode.js 1904 2013-11-25 12:42:02Z elena $
9   - * @todo
10   - *******************************************************************************
11   - * FT Id : Date : Name - Description
12   - *******************************************************************************
13   - * : :08/06/2011: CDA - Migration extjs4
14   - * : :09/06/2011: elena - all generic methods are now of InteractiveNode class
15 9 */
16 10  
17 11 Ext.define('amdaModel.TimeTableNode', {
... ... @@ -23,17 +17,16 @@ Ext.define('amdaModel.TimeTableNode', {
23 17 objectName: 'Time Table'
24 18 },
25 19  
26   - constructor : function(config){
  20 + constructor : function(config)
  21 + {
27 22 this.callParent(arguments);
28   -
29   - this.set('nodeType',amdaModel.TimeTableNode.nodeType);
30   - this.set('moduleId',myDesktopApp.dynamicModules.tt.id);//'timetab-win');
31   - this.set('objectDataModel','amdaModel.TimeTable');
32   - this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
  23 + this.set('moduleId',myDesktopApp.dynamicModules.tt.id);
  24 + this.set('objectDataModel','amdaModel.TimeTable');
33 25 if (this.get('leaf')) this.set('iconCls', 'icon-timetable');
34 26 },
35 27  
36   - localMenuItems : function() {
  28 + localMenuItems : function()
  29 + {
37 30 var menuItems =
38 31 [/*{
39 32 fnId : 'dire-shareNode',
... ...
js/app/models/sharedTimeTableNode.js
  Diff comments   View file @3a5f60a
... ... @@ -6,12 +6,6 @@
6 6 * @brief Basic Model of Node corresponding to a amda Time Table
7 7 * @author
8 8 * @version $Id: sharedTimeTableNode.js 1916 2013-11-26 10:58:49Z elena $
9   - * @todo
10   - *******************************************************************************
11   - * FT Id : Date : Name - Description
12   - *******************************************************************************
13   - * : :08/06/2011: CDA - Migration extjs4
14   - * : :09/06/2011: elena - all generic methods are now of InteractiveNode class
15 9 */
16 10  
17 11 Ext.define('amdaModel.sharedTimeTableNode', {
... ... @@ -19,17 +13,14 @@ Ext.define('amdaModel.sharedTimeTableNode', {
19 13 extend: 'amdaModel.InteractiveNode',
20 14  
21 15 statics: {
22   - nodeType: 'sharedtimeTable',
  16 + nodeType: 'sharedtimeTable',
23 17 objectName: 'Time Table'
24 18 },
25 19  
26 20 constructor : function(config){
27 21 this.callParent(arguments);
28   -
29   - this.set('nodeType',amdaModel.sharedTimeTableNode.nodeType);
30   - this.set('moduleId',myDesktopApp.dynamicModules.tt.id);//'timetab-win');
31   - this.set('objectDataModel','amdaModel.TimeTable');
32   - this.set('ownerTreeId',amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
  22 + this.set('moduleId',myDesktopApp.dynamicModules.tt.id);
  23 + this.set('objectDataModel','amdaModel.TimeTable');
33 24 if (this.get('leaf')) this.set('iconCls', 'icon-timetable');
34 25 },
35 26  
... ...