CDPP / AMDA_IHM

Commit 098d15a9c2157e82f1e3f180d6b8a470c939d899

Authored by Benjamin Renard
1 parent fca728d7
Exists in master and in 107 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, 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-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

Give the possibility to put header in a separate file (#6497)

Showing 2 changed files with 10 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/models/Download.js
  Diff comments   View file @098d15a
@@ -20,6 +20,7 @@ Ext.define('amdaModel.Download', { @@ -20,6 +20,7 @@ Ext.define('amdaModel.Download', {
20 {name: 'timeformatTT', type: 'string'}, 20 {name: 'timeformatTT', type: 'string'},
21 {name: 'structure', type: 'string'}, 21 {name: 'structure', type: 'string'},
22 {name: 'refparamSampling', type: 'boolean', defaultValue: false}, 22 {name: 'refparamSampling', type: 'boolean', defaultValue: false},
  23 + {name: 'separateInfoFile', type: 'boolean', defaultValue: false},
23 {name: 'sampling', type: 'int', defaultValue: '600'}, 24 {name: 'sampling', type: 'int', defaultValue: '600'},
24 {name: 'fileprefix', type: 'string'}, 25 {name: 'fileprefix', type: 'string'},
25 {name: 'fileformat', type: 'string'}, 26 {name: 'fileformat', type: 'string'},
@@ -28,7 +29,7 @@ Ext.define('amdaModel.Download', { @@ -28,7 +29,7 @@ Ext.define('amdaModel.Download', {
28 {name: 'compressionTT', type: 'string'} 29 {name: 'compressionTT', type: 'string'}
29 ], 30 ],
30 31
31 - propertiesToCopy : 'id,name,downloadSrc,refparamSampling,sampling,list,timeformat,timeformatTT,structure,fileprefix,fileformat,fileformatTT,compression,compressionTT', 32 + propertiesToCopy : 'id,name,downloadSrc,refparamSampling,separateInfoFile,sampling,list,timeformat,timeformatTT,structure,fileprefix,fileformat,fileformatTT,compression,compressionTT',
32 33
33 getJsonValues : function(){ 34 getJsonValues : function(){
34 35
@@ -40,6 +41,7 @@ Ext.define('amdaModel.Download', { @@ -40,6 +41,7 @@ Ext.define('amdaModel.Download', {
40 if (myValues.downloadSrc === '0') { // Data download 41 if (myValues.downloadSrc === '0') { // Data download
41 myValues.structure = this.get('structure'); 42 myValues.structure = this.get('structure');
42 myValues.refparamSampling = this.get('refparamSampling'); 43 myValues.refparamSampling = this.get('refparamSampling');
  44 + myValues.separateInfoFile = this.get('separateInfoFile');
43 myValues.sampling = this.get('sampling'); 45 myValues.sampling = this.get('sampling');
44 myValues.fileprefix = this.get('fileprefix'); 46 myValues.fileprefix = this.get('fileprefix');
45 47
@@ -47,8 +49,7 @@ Ext.define('amdaModel.Download', { @@ -47,8 +49,7 @@ Ext.define('amdaModel.Download', {
47 // if there's at least one timeTable in case of Download data 49 // if there's at least one timeTable in case of Download data
48 if (this.get('timesrc') == amdaModel.AmdaTimeObject.inputTimeSrc[0] && this.get('timeTables') && this.get('timeTables').length){ 50 if (this.get('timesrc') == amdaModel.AmdaTimeObject.inputTimeSrc[0] && this.get('timeTables') && this.get('timeTables').length){
49 // get complete timeTables collection 51 // get complete timeTables collection
50 - var timeTables = this.get('timeTables');  
51 - // init an empty array for timeTables 52 + var timeTables = this.get('timeTables'); // init an empty array for timeTables
52 myValues.timeTables=[]; 53 myValues.timeTables=[];
53 // for each interval record 54 // for each interval record
54 Ext.Array.each(timeTables, function(item, index, all){ 55 Ext.Array.each(timeTables, function(item, index, all){
js/app/views/DownloadUI.js
  Diff comments   View file @098d15a
@@ -613,6 +613,12 @@ Ext.define('amdaUI.DownloadUI', { @@ -613,6 +613,12 @@ Ext.define('amdaUI.DownloadUI', {
613 scope: this 613 scope: this
614 } 614 }
615 }, 615 },
  616 + {
  617 + xtype: 'checkbox', boxLabel: 'Header in a separate file',
  618 + boxLabelAlign: 'before',
  619 + name: 'separateInfoFile', checked: false
  620 +
  621 + },
616 { 622 {
617 xtype: 'checkbox', boxLabel: 'Use first param. as reference for sampling', 623 xtype: 'checkbox', boxLabel: 'Use first param. as reference for sampling',
618 boxLabelAlign: 'before', 624 boxLabelAlign: 'before',