CDPP / AMDA_IHM

Commit d5cbbeebd9262e3f59a37e090fcaea5210a9a0fc

Authored by Benjamin Renard
2 parents 275c15b1 915febd3
Exists in master and in 82 other branches 10098, 10178, 5390, 6629, 7494, 7616, 8459, 8528, 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, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, rm_6912_bis, save-other-requests, special-params, test-merge, ws_get_catalog

Merge branch 'develop' into amdadev

Showing 1 changed file with 16 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/views/DownloadUI.js
  Diff comments   View file @d5cbbee
@@ -271,7 +271,7 @@ Ext.define('amdaUI.DownloadUI', { @@ -271,7 +271,7 @@ Ext.define('amdaUI.DownloadUI', {
271 this.object.set('timeformat', this.timeformatData[0][0]); 271 this.object.set('timeformat', this.timeformatData[0][0]);
272 272
273 if (!this.object.get('timeformatTT')) 273 if (!this.object.get('timeformatTT'))
274 - this.object.set('timeformatTT', this.timeformatTTData[0][0]); 274 + this.object.set('timeformatTT', this.timeformatData[0][0]);
275 275
276 if (!this.object.get('fileformat')) 276 if (!this.object.get('fileformat'))
277 this.object.set('fileformat', this.fileformatData[0][0]); 277 this.object.set('fileformat', this.fileformatData[0][0]);
@@ -585,7 +585,7 @@ Ext.define('amdaUI.DownloadUI', { @@ -585,7 +585,7 @@ Ext.define('amdaUI.DownloadUI', {
585 585
586 this.TTGrid.on('cellclick', this.actionItem, this); 586 this.TTGrid.on('cellclick', this.actionItem, this);
587 587
588 - var store = new Ext.data.ArrayStore({ 588 + var storeTimeFormat = new Ext.data.ArrayStore({
589 fields: ['id', 'name', 'qtip'], 589 fields: ['id', 'name', 'qtip'],
590 data: this.timeformatData 590 data: this.timeformatData
591 }); 591 });
@@ -640,7 +640,7 @@ Ext.define('amdaUI.DownloadUI', { @@ -640,7 +640,7 @@ Ext.define('amdaUI.DownloadUI', {
640 valueField: 'id', 640 valueField: 'id',
641 displayField: 'name', 641 displayField: 'name',
642 queryMode: 'local', 642 queryMode: 'local',
643 - store: store, 643 + store: storeTimeFormat,
644 listConfig: { 644 listConfig: {
645 tpl: [ 645 tpl: [
646 '<tpl for=".">', 646 '<tpl for=".">',
@@ -648,7 +648,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, { @@ -648,7 +648,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
648 '</tpl>' 648 '</tpl>'
649 ] 649 ]
650 }, 650 },
651 - value: store.first() 651 + value: storeTimeFormat.first()
652 }, 652 },
653 { 653 {
654 fieldLabel: 'File Structure', 654 fieldLabel: 'File Structure',
@@ -735,8 +735,18 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, { @@ -735,8 +735,18 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
735 items: [{ 735 items: [{
736 fieldLabel: 'Time Format', 736 fieldLabel: 'Time Format',
737 name: 'timeformatTT', 737 name: 'timeformatTT',
738 - store: this.timeformatTTData,  
739 - value: this.timeformatTTData[0] 738 + valueField: 'id',
  739 + store: storeTimeFormat,
  740 + displayField: 'name',
  741 + queryMode: 'local',
  742 + listConfig: {
  743 + tpl: [
  744 + '<tpl for=".">',
  745 + '<li class="x-boundlist-item" data-qtip="{qtip}">{name}</li>',
  746 + '</tpl>'
  747 + ]
  748 + },
  749 + value: storeTimeFormat.first()
740 }, 750 },
741 { 751 {
742 fieldLabel: 'File Format ', 752 fieldLabel: 'File Format ',