CDPP / AMDA_IHM

Commit 339fb3802b1b4d7dc9fe04dfd1c2a3ae3e9c8fe9

Authored by Benjamin Renard
2 parents 648201bc 6f8612b5
Exists in master and in 72 other branches 10098, 10178, 5390, 6629, 7616, 8459, 8528, 9014, 9016Bis, 9084, 9326, 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, amdadev, amdadev_test, anr_tempete, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, test-merge

Merge branch 'amdadev'

Showing 2 changed files with 5 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/views/CatalogUI.js
  Diff comments   View file @339fb38
... ... @@ -151,6 +151,8 @@ Ext.define('amdaUI.CatalogUI', {
151 151 updateSurveyDates : function(ttObj){
152 152 var starts = [];
153 153 var stops= [];
  154 + if (this.TTGrid.getStore().getTotalCount() <= 0)
  155 + return;
154 156 Ext.Array.each(this.TTGrid.getStore().data.first.value, function (item, index) {
155 157 starts[index] = (item.raw.start);
156 158 stops[index] = (item.raw.stop);
... ... @@ -162,11 +164,11 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
162 164 s = new Date(starts[0]);
163 165 e = new Date(stops[stops.length - 1]);
164 166 if(! ttObj.get('surveyStart') ){
165   - ttObj.set('surveyStart', this.convertUTCDateToLocalDate(s));
  167 + ttObj.set('surveyStart', s);
166 168 this.status.isModified = true;
167 169 }
168 170 if(! ttObj.get('surveyStop') ){
169   - ttObj.set('surveyStop', this.convertUTCDateToLocalDate(e));
  171 + ttObj.set('surveyStop', e);
170 172 this.status.isModified = true;
171 173 }
172 174 }
... ...
js/app/views/DownloadUI.js
  Diff comments   View file @339fb38
... ... @@ -289,7 +289,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
289 289 //TT download
290 290 else
291 291 {
292   - var timeformat = values.timeformatTT ? alues.timeformatTT :amdaModel.DownloadConfig.defaultValues.timeformatTT;
  292 + var timeformat = values.timeformatTT ? values.timeformatTT :amdaModel.DownloadConfig.defaultValues.timeformatTT;
293 293 var compression = values.compressionTT;
294 294 var fileformat = values.fileformatTT;
295 295 if (this.TTGrid.getStore().count() == 0) {
... ...