CDPP / AMDA_IHM

Commit c4ccaa4f4257f00b5de66e57c81c1eacf36b3201

Authored by Nathanael Jourdane
1 parent 04a55960
Exists in master and in 112 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, 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

BugFix window size when launching epntap module from tree

Showing 2 changed files with 20 additions and 4 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/EpnTapModule.js
  Diff comments   View file @c4ccaa4
... ... @@ -96,36 +96,46 @@ Ext.define('amdaDesktop.EpnTapModule', {
96 96  
97 97 createWindow: function (target) {
98 98 this.callParent();
  99 + this.launchedFromTree = true;
99 100 this.onWindowLoaded();
100 101 console.log("selected target:", target);
101 102  
102 103 switch(target) {
103 104 case 'icon-mercury':
104 105 this.targetClassCB.select('planet');
  106 + this.targetNameCB.select('mercury');
105 107 break;
106 108 case 'icon-venus':
107 109 this.targetClassCB.select('planet');
  110 + this.targetNameCB.select('venus');
108 111 break;
109 112 case 'icon-earth':
110 113 this.targetClassCB.select('planet');
  114 + this.targetNameCB.select('earth');
111 115 break;
112 116 case 'icon-mars':
113 117 this.targetClassCB.select('planet');
  118 + this.targetNameCB.select('mars');
114 119 break;
115 120 case 'icon-jupiter':
116 121 this.targetClassCB.select('planet');
  122 + this.targetNameCB.select('jupiter');
117 123 break;
118 124 case 'icon-saturn':
119 125 this.targetClassCB.select('planet');
  126 + this.targetNameCB.select('saturn');
120 127 break;
121 128 case 'icon-comet':
122 129 this.targetClassCB.select('comet');
  130 + this.targetNameCB.select('comet'); // À vérifier
123 131 break;
124 132 case 'icon-sw':
125 133 this.targetClassCB.select('sun'); // À vérifier
  134 + // this.targetNameCB.select(''); // ?
126 135 break;
127 136 case 'icon-solarsystem':
128 137 this.targetClassCB.select('sun'); // À vérifier
  138 + // this.targetNameCB.select(''); // ?
129 139 break;
130 140 default:
131 141 console.log("Unknown target: " + target);
... ... @@ -151,6 +161,11 @@ Ext.define('amdaDesktop.EpnTapModule', {
151 161 this.previousPageBtn = Ext.getCmp('epnTapPreviousPageBtn');
152 162 this.nextPageBtn = Ext.getCmp('epnTapNextPageBtn');
153 163 this.lastPageBtn = Ext.getCmp('epnTapLastPageBtn');
  164 + this.epnTapPanel = this.productTypeCB.findParentByType('panelEpnTap');
  165 +
  166 + if( this.launchedFromTree ) {
  167 + this.epnTapPanel.setSize(800, 600);
  168 + }
154 169  
155 170 this.productTypeCB.getStore().removeAll();
156 171 this.productTypeCB.getStore().add({'id': 'all', 'name': 'All data product types'});
... ...
js/app/views/EpnTapUI.js
  Diff comments   View file @c4ccaa4
... ... @@ -122,8 +122,8 @@ Ext.define('amdaUI.EpnTapUI', {
122 122 alias: 'widget.panelEpnTap',
123 123 requires: ['amdaUI.IntervalUI'],
124 124  
125   - width: 800,
126   - height: 600,
  125 + // width: 800,
  126 + // height: 600,
127 127  
128 128 /**
129 129 Method constructor, which basically call the `init()` method to create the EpnTap panel.
... ... @@ -582,10 +582,11 @@ Ext.define('amdaUI.EpnTapUI', {
582 582 // Ext.apply(this, Ext.apply(arguments, config));
583 583  
584 584 var myConf = {
  585 + id: 'epnTapWindow',
585 586 items: [
586 587 createServiceFilterPanel(),
587   - createGridsPanel()
588   - // createInfoPanel()
  588 + createGridsPanel(),
  589 + createInfoPanel()
589 590 ]
590 591 };
591 592 Ext.apply(this, Ext.apply(arguments, myConf));
... ...