CDPP / AMDA_IHM

Commit 94a05aa20c19c76d1dcd5ca1c9700b7312edb6f8

Authored by Elena.Budnik
1 parent 2e8be1ae
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

update object in stat

Showing 1 changed file with 11 additions and 7 deletions   Show diff stats
Inline Side-by-side
js/app/views/StatisticsUI.js
  Diff comments   View file @94a05aa
@@ -57,19 +57,22 @@ Ext.define('amdaUI.StatisticsUI', { @@ -57,19 +57,22 @@ Ext.define('amdaUI.StatisticsUI', {
57 var formValues = basicForm.getValues(); 57 var formValues = basicForm.getValues();
58 // this.object.set('name',formValues.name); 58 // this.object.set('name',formValues.name);
59 // this.object.set('description',formValues.description); 59 // this.object.set('description',formValues.description);
60 - 60 +
61 var recs = this.paramGrid.getStore().getNewRecords(); 61 var recs = this.paramGrid.getStore().getNewRecords();
62 var paramArr = new Array(); 62 var paramArr = new Array();
63 - Ext.Array.each(recs, function(rec, index,allItems){ 63 +
  64 + Ext.Array.each(recs, function(rec, index,allItems)
  65 + {
64 var obj = new Object(); 66 var obj = new Object();
65 obj.param = rec.get('name'); 67 obj.param = rec.get('name');
66 obj.function = rec.get('function'); 68 obj.function = rec.get('function');
67 - paramArr.push(obj); 69 + paramArr.push(obj);
68 }); 70 });
  71 +
69 this.object.set('parameter', paramArr); 72 this.object.set('parameter', paramArr);
70 73
71 var timeSource = this.timeSelector.getActiveTimeSource(); 74 var timeSource = this.timeSelector.getActiveTimeSource();
72 - 75 +
73 if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0] // timeSource 'TimeTable' 76 if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0] // timeSource 'TimeTable'
74 && this.timeSelector.TTGrid.getStore().count() == 0) { 77 && this.timeSelector.TTGrid.getStore().count() == 0) {
75 myDesktopApp.warningMsg('You\'ve chosen Time Selection `by TimeTable` but no timeTable was added!' 78 myDesktopApp.warningMsg('You\'ve chosen Time Selection `by TimeTable` but no timeTable was added!'
@@ -77,7 +80,8 @@ Ext.define('amdaUI.StatisticsUI', { @@ -77,7 +80,8 @@ Ext.define('amdaUI.StatisticsUI', {
77 return false; 80 return false;
78 } 81 }
79 82
80 - // basicForm.updateRecord(this.object); 83 + basicForm.updateRecord(this.object);
  84 +
81 this.object.set('timesrc', timeSource); 85 this.object.set('timesrc', timeSource);
82 // set valid intervals into TimeTable object 86 // set valid intervals into TimeTable object
83 if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0]) 87 if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
@@ -297,8 +301,8 @@ Ext.define('amdaUI.StatisticsUI', { @@ -297,8 +301,8 @@ Ext.define('amdaUI.StatisticsUI', {
297 // update object with user's values 301 // update object with user's values
298 // if the return is true (object had been updated) 302 // if the return is true (object had been updated)
299 // if(this.updateObject()){ 303 // if(this.updateObject()){
300 - this.updateObject();  
301 - this.generateCatalog(); 304 + this.updateObject();
  305 + this.generateCatalog();
302 // } 306 // }
303 } 307 }
304 }, 308 },