CDPP / AMDA_IHM

Commit 9b50abc6336c910f2ff17c4b2fe6526adc677abb

Authored by Elena.Budnik
1 parent 3af5d16c
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, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, 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

nettoyage

Showing 1 changed file with 15 additions and 32 deletions   Show diff stats
Inline Side-by-side
js/app/models/LocalParamNode.js
  Diff comments   View file @9b50abc
... ... @@ -12,13 +12,11 @@ Ext.define('amdaModel.LocalParamNode',
12 12 {
13 13 extend: 'amdaModel.InteractiveNode',
14 14  
15   - statics:
16   - {
  15 + statics: {
17 16 nodeType: 'localParam'
18 17 },
19 18  
20   - fields:
21   - [
  19 + fields: [
22 20 {name: 'alias', type:'string', persist: false},
23 21 {name: 'isParameter', type: 'boolean', persist: false},
24 22 {name: 'notyet', type: 'boolean', defaultValue: false, persist: false},
... ... @@ -29,7 +27,12 @@ Ext.define('amdaModel.LocalParamNode',
29 27 {name: 'timeRestriction', type: 'boolean', persist: false},
30 28 {name: 'rank', type: 'integer', persist: false, defaultValue: null}
31 29 ],
32   -
  30 +
  31 + icons : {'1' : 'icon-mercury','2' : 'icon-venus','3' : 'icon-sw','4' : 'icon-sw','5' : 'icon-earth','6' : 'icon-earth',
  32 + '7' : 'icon-mars','8' : 'icon-jupiter','9' : 'icon-saturn','10' : 'icon-uranus','11' : 'icon-neptune',
  33 + '93' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem'
  34 + },
  35 +
33 36 constructor : function(config)
34 37 {
35 38 this.callParent(arguments);
... ... @@ -40,41 +43,21 @@ Ext.define('amdaModel.LocalParamNode',
40 43  
41 44 // if future missions or 'depending on mission'
42 45 if (this.get('globalStart')) {
43   - var now = Ext.Date.format(new Date(), 'Y/m/d');
44   - if ( this.get('globalStart') > now )
45   - this.set('cls','predicted');
  46 + var now = Ext.Date.format(new Date(), 'Y/m/d');
  47 + if ( this.get('globalStart') > now )
  48 + this.set('cls','predicted');
46 49 }
47 50 // // time restriction on parameters
48 51 // if (this.get('timeRestriction')) {
49   -// // this.set('cls','predicted');
50   -// var id = this.get('id');
51   -// var bracketPos = id.indexOf("(");
52   -// if (bracketPos > 0) {
53   -// id = Ext.String.insert(id, '_restr', bracketPos);
54   -// }
55   -// else {
56   -// id += '_restr';
57   -// }
58   -// this.set('id', id);
  52 +// TBD
59 53 // }
60   -
  54 +
61 55 if (this.get('rank')) {
62 56 var rank = this.get('rank');
63   - if (rank == 1) this.set('iconCls', 'icon-mercury');
64   - if (rank == 2) this.set('iconCls', 'icon-venus');
65   - if (rank == 5 || rank == 6) this.set('iconCls', 'icon-earth');
66   - if (rank == 7) this.set('iconCls', 'icon-mars');
67   - if (rank == 8) this.set('iconCls', 'icon-jupiter');
68   - if (rank == 9) this.set('iconCls', 'icon-saturn');
69   - if (rank == 10) this.set('iconCls', 'icon-uranus');
70   - if (rank == 11) this.set('iconCls', 'icon-neptune');
71   - if (rank == 93) this.set('iconCls', 'icon-comet');
72   - if (rank == 3 || rank == 4) this.set('iconCls', 'icon-sw');
73   - if (rank >= 99) this.set('iconCls', 'icon-solarsystem');
  57 + this.set('iconCls', this.icons[rank]);
74 58 }
75 59  
76   - if (this.get('isParameter'))
77   - {
  60 + if (this.get('isParameter')) {
78 61 if (this.get('leaf'))
79 62 this.set('iconCls', 'icon-scalar');
80 63 else
... ...