Test time selection validity before run plot request + Fix bug with source selector

Benjamin Renard
1 parent 02a4cc4d
Showing 4 changed files with 57 additions and 16 deletions Show diff stats
js/app/views/IntervalUI.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotUI.js
js/app/views/TimeSelectorUI.js
@@ -159,6 +159,21 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 		);
 	},
  
+        isValid: function() {
+            var form = this.findParentByType('form').getForm();
+            var startField = form.findField('startDate');
+            var stopField = form.findField('stopDate');
+            if (!startField.isValid() || !stopField.isValid())
+                return false;
+            var start = this.getStartTime();
+            var stop = this.getStopTime();
+            if ( stop <= start ) {
+                form.findField('stopDate').markInvalid('Stop Time  must be after Start Time');
+                return false;
+            }
+            return true;
+        },
+
 	updateStop: function() {
 		var form = this.findParentByType('form').getForm();
 		var start = form.findField('startDate').getValue();
@@ -146,11 +146,27 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
         }
     },
  
+    getDataProcess : function() {
+        var downObject = amdaModel.DownloadNode.decodeObject(this.plotNode.get('object'));
+        amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));
+        amdaModel.DownloadNode.editInModule();
+    },
+
+    isValidRequest : function(acceptEmptyTTList = true) {
+        this.updateTimeObject();
+        if (!this.timeSelector.isValid(acceptEmptyTTList)) {
+            myDesktopApp.errorMsg('Error in Time definition');
+            return false;
+        }
+        return true;
+    },
+
     updateUI : function() {
         this.plotOutput.setObject(this.plotNode.get('object'));
         this.timeSelector.intervalSel.setInterval(this.plotNode.get('object').get('startDate'), this.plotNode.get('object').get('stopDate'));
 	this.timeSelector.intervalSel.updateStop();
         this.timeSelector.setTTTab(this.plotNode.get('object').get('timeTables'));
+        this.timeSelector.timeSrc.setActiveTab(this.plotNode.get('object').get('timesrc'));
         this.treePlot.buildTree(this.plotNode.get('object'));
     },
  
@@ -53,9 +53,7 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
             var plotTab = this.plotTabs.getCurrentPlotTabContent();
             if (!plotTab || !plotTab.plotNode)
                 return;
-            var downObject = amdaModel.DownloadNode.decodeObject(plotTab.plotNode.get('object'));
-            amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));
-            amdaModel.DownloadNode.editInModule();
+            plotTab.getDataProcess();
         }
     },
  
@@ -83,7 +81,7 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
      * plot method called by 'Do Plot' button to launch the plot process
      */
     doPlot : function(){
-        if ( this.updateObject() ) {
+        if ( this.updateObject(false) ) {
             var plotTab = this.plotTabs.getCurrentPlotTabContent();
             if (plotTab)
                 plotTab.doPlot();
@@ -105,15 +103,11 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
     /**
      * update time selector of this.object from form
      */
-    updateObject : function(){
-        this.plotTabs.updateTimeObjects();
-        var basicForm = this.formPanel.getForm(); 
-        if (basicForm && ! basicForm.hasInvalidField()) {          
-            return true;
-        }
-        else {
-            return false; 
-        }
+    updateObject : function(acceptEmptyTTList = true){
+        var plotTab = this.plotTabs.getCurrentPlotTabContent();
+        if (plotTab)
+            return plotTab.isValidRequest(acceptEmptyTTList);
+        return false;
     },
  
     updateTabs : function() {
@@ -145,9 +139,11 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
     },
  
     savePlotRequest : function() {
-        var plotTab = this.plotTabs.getCurrentPlotTabContent();
-        if (plotTab)
-            plotTab.savePlot();
+        if (this.updateObject(true)) {
+            var plotTab = this.plotTabs.getCurrentPlotTabContent();
+            if (plotTab)
+                plotTab.savePlot();
+        }
     },
  
     init : function(config) {
@@ -61,6 +61,20 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;, {
 	getActiveTimeSource: function() {
 		return this.timeSrc.getActiveTab().getItemId(); 
 	},
+
+        isValid: function(acceptEmptyTTList = true) {
+            if (this.getActiveTimeSource() === amdaModel.AmdaTimeObject.inputTimeSrc[0]) {
+                //TimeTables
+                if (acceptEmptyTTList)
+                    return true;
+                return (this.TTGrid.getStore().count() > 0);
+            }
+            else {
+                //Interval
+                return this.intervalSel.isValid();
+            }
+            return true;
+        },
  
 	initComponent: function() {
 		this.activeField = null;