Merge branch 'develop' into amdadev

Benjamin Renard
2 parents 9bdbfcc9 2b2bb263
Showing 2 changed files with 5 additions and 3 deletions Show diff stats
js/app/views/CatalogUI.js
js/app/views/DownloadUI.js
@@ -151,6 +151,8 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
     updateSurveyDates : function(ttObj){
         var starts = [];
         var stops= [];
+        if (this.TTGrid.getStore().getTotalCount() <= 0)
+            return;
           Ext.Array.each(this.TTGrid.getStore().data.first.value, function (item, index) {
              starts[index] = (item.raw.start);
              stops[index] = (item.raw.stop);
@@ -162,11 +164,11 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
          s = new Date(starts[0]);
          e = new Date(stops[stops.length - 1]);
          if(! ttObj.get('surveyStart') ){
-         	ttObj.set('surveyStart',  this.convertUTCDateToLocalDate(s));
+         	ttObj.set('surveyStart',  s);
                     this.status.isModified = true;
          }
          if(! ttObj.get('surveyStop') ){
-                   ttObj.set('surveyStop',  this.convertUTCDateToLocalDate(e));
+                   ttObj.set('surveyStop',  e);
                    this.status.isModified = true;
          }
     }
@@ -289,7 +289,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
         //TT download
         else
         {
-            var timeformat = values.timeformatTT ? alues.timeformatTT :amdaModel.DownloadConfig.defaultValues.timeformatTT;
+            var timeformat = values.timeformatTT ? values.timeformatTT :amdaModel.DownloadConfig.defaultValues.timeformatTT;
             var compression = values.compressionTT;
             var fileformat = values.fileformatTT;
             if (this.TTGrid.getStore().count() == 0) {