CDPP / AMDA_IHM

Commit 62dc10f64e997427d869813b0bfafaba6236feb4

Authored by Benjamin Renard
2 parents 1f3ee1cd 666c2dcb
Exists in master and in 100 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, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 3 changed files with 3 additions and 15 deletions   Show diff stats
Inline Side-by-side
help/parameters/RO-IRFU-LAP-EAICD-2_0_1_PDF_A.PDF deleted
View file @1f3ee1c
No preview for this file type
help/parameters/RO-IRFU-LAP-EAICD.PDF 0 → 100644
View file @62dc10f
No preview for this file type
js/app/views/StatisticsUI.js
  Diff comments   View file @62dc10f
... ... @@ -117,9 +117,8 @@ Ext.define('amdaUI.StatisticsUI',
117 117 updateObject : function()
118 118 {
119 119 // get the basic form of the left
120   - var basicForm = this.formPanel.items.items[0].getForm();
121   - var updateStatus = true;
122   -
  120 + var basicForm = this.formPanel.items.items[1].getForm();
  121 + var updateStatus = true;
123 122 var formValues = basicForm.getValues();
124 123 this.object.set('name',this.fieldName.getValue());
125 124 this.object.set('description',formValues.description);
... ... @@ -151,9 +150,8 @@ Ext.define('amdaUI.StatisticsUI',
151 150 +'<br>You must add one or choose Time Selection `by Interval`');
152 151 return false;
153 152 }
154   -
  153 +
155 154 basicForm.updateRecord(this.object);
156   -
157 155 this.object.set('timesrc', timeSource);
158 156 // set valid intervals into TimeTable object
159 157 if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
... ... @@ -180,15 +178,6 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
180 178 */
181 179 init : function (config)
182 180 {
183   -// var functions = Ext.create('Ext.data.Store', {
184   -// fields: ['id', 'name'],
185   -// data : [
186   -// {"id":"min", "name":"MIN"},
187   -// {"id":"max", "name":"MAX"},
188   -// {"id":"mean","name":"MEAN"}
189   -// ]
190   -// });
191   -
192 181 this.fieldName = new Ext.form.field.Text({
193 182 fieldLabel: 'Catalog Name',
194 183 allowBlank : false,
... ... @@ -385,7 +374,6 @@ Ext.define(&#39;amdaUI.StatisticsUI&#39;,
385 374 pack: 'start',
386 375 align: 'stretch'
387 376 },
388   - //bodyStyle: {background : '#dfe8f6'},
389 377 defaults: { bodyStyle: {background : '#dfe8f6'}, padding : '3'},
390 378 fieldDefaults: { labelWidth: 80, labelAlign : 'top' },
391 379 items: [ {
... ...