CDPP / AMDA_IHM

Commit 3604e40f1f4619f06194d7b0885377c34f1019ea

Authored by Benjamin Renard
1 parent 7892db24
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

"File Name" replaced by "File Prefix" in download interface. This option is now active and work

Showing 2 changed files with 8 additions and 8 deletions   Show diff stats
Inline Side-by-side
js/app/models/Download.js
  Diff comments   View file @3604e40
... ... @@ -26,14 +26,14 @@ Ext.define('amdaModel.Download', {
26 26 {name: 'structure', type: 'string'},
27 27 {name: 'refparamSampling', type: 'boolean', defaultValue: false},
28 28 {name: 'sampling', type: 'int', defaultValue: '600'},
29   - {name: 'output', type: 'string'},
  29 + {name: 'fileprefix', type: 'string'},
30 30 {name: 'fileformat', type: 'string'},
31 31 {name: 'fileformatTT', type: 'string'},
32 32 {name: 'compression', type: 'string'},
33 33 {name: 'compressionTT', type: 'string'}
34 34 ],
35 35  
36   - propertiesToCopy : 'id,name,downloadSrc,refparamSampling,sampling,list,timeformat,timeformatTT,structure,output,fileformat,fileformatTT,compression,compressionTT',
  36 + propertiesToCopy : 'id,name,downloadSrc,refparamSampling,sampling,list,timeformat,timeformatTT,structure,fileprefix,fileformat,fileformatTT,compression,compressionTT',
37 37  
38 38 getJsonValues : function(){
39 39  
... ... @@ -46,7 +46,7 @@ Ext.define('amdaModel.Download', {
46 46 myValues.structure = this.get('structure');
47 47 myValues.refparamSampling = this.get('refparamSampling');
48 48 myValues.sampling = this.get('sampling');
49   - myValues.output = this.get('output');
  49 + myValues.fileprefix = this.get('fileprefix');
50 50  
51 51 myValues.timesrc = this.get('timesrc');
52 52 // if there's at least one timeTable in case of Download data
... ...
js/app/views/DownloadUI.js
  Diff comments   View file @3604e40
... ... @@ -149,7 +149,7 @@ Ext.define('amdaUI.DownloadUI', {
149 149 var structure = values.filestructure;
150 150 var sampling = values.sampling ? values.sampling : 600;
151 151 var refparamSampling = values.refparamsampling == 'on';
152   - var output = values.output ? values.output : '';
  152 + var fileprefix = values.fileprefix ? values.fileprefix : '';
153 153 var fileformat = values.fileformat;
154 154 var compression = values.compression;
155 155  
... ... @@ -189,7 +189,7 @@ Ext.define('amdaUI.DownloadUI', {
189 189 this.object.set('structure', structure);
190 190 this.object.set('refparamSampling', refparamSampling);
191 191 this.object.set('sampling', sampling);
192   - this.object.set('output',output);
  192 + this.object.set('fileprefix',fileprefix);
193 193 this.object.set('timeformat',timeformat);
194 194 this.object.set('fileformat',fileformat);
195 195 this.object.set('compression',compression);
... ... @@ -512,9 +512,9 @@ Ext.define('amdaUI.DownloadUI', {
512 512 disabled: true
513 513 },
514 514 {
515   - xtype: 'textfield', name: 'output',
516   - fieldLabel: 'File Name',
517   - disabled: true, editable: true
  515 + xtype: 'textfield', name: 'fileprefix',
  516 + fieldLabel: 'File Prefix',
  517 + disabled: false, editable: true
518 518 },
519 519 {
520 520 fieldLabel: 'File Format',
... ...