Merge branch 'amdadev' into SpeasyGet

Benjamin Renard
2 parents aa1e1e6d 82ec8dd0
Showing 2 changed files with 39 additions and 20 deletions Show diff stats
js/app/views/PlotComponents/intervalSelection/IntervalSelection.js
js/app/views/PlotComponents/intervalSelection/ZoomIntervalSelection.js
@@ -67,15 +67,22 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.IntervalSelection&#39;, {
                             if (newValue === null || newValue === undefined || newValue === '') return;
                             var field2 = self._getField2();
                             // Check if field2 is not empty
-                            const value2 = parseFloat(field2.getValue());
-                            if (value2 !== null && value2 !== undefined && value2 !== '') {
-                                if (parseFloat(newValue) > value2) {
-                                    // Update both field1 and field2 to the new values
-                                    field2.suspendEvents();
-                                    field2.setValue(newValue);
-                                    field.setValue(value2);
-                                    field2.resumeEvents();
-                                }
+                            const value2 = field2.getValue();
+                            if (value2 === null || value2 === undefined || value2 === '') return;
+
+                            var value2Parsed = value2;
+                            var newValueParsed = newValue;
+
+                            if (field.xtype == 'standardfloatfield') {
+                                newValueParsed = parseFloat(newValueParsed);
+                                value2Parsed = parseFloat(value2Parsed);
+                            }
+                            if (newValueParsed > value2Parsed) {
+                                // Update both field1 and field2 to the new values
+                                field2.suspendEvents();
+                                field2.setValue(newValue);
+                                field.setValue(value2);
+                                field2.resumeEvents();
                             }
                         }
                     }
@@ -90,15 +97,22 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.IntervalSelection&#39;, {
                             if (newValue === null || newValue === undefined || newValue === '') return;
                             var field1 = self._getField1();
                             // Check if field1 is not empty
-                            const value1 = parseFloat(field1.getValue());
-                            if (value1 !== null && value1 !== undefined && value1 !== '') {
-                                if (parseFloat(newValue) < value1) {
-                                    // Update both field1 and field2 to the new values
-                                    field1.suspendEvents();
-                                    field1.setValue(newValue);
-                                    field.setValue(value1);
-                                    field1.resumeEvents();
-                                }
+                            const value1 = field1.getValue();
+                            if (value1 === null || value1 === undefined || value1 === '') return;
+                                
+                            var value1Parsed = value1;
+                            var newValueParsed = newValue;
+
+                            if (field.xtype == 'standardfloatfield') {
+                                newValueParsed = parseFloat(newValue);
+                                value1Parsed = parseFloat(value1Parsed);
+                            }
+                            if (newValueParsed < value1Parsed) {
+                                // Update both field1 and field2 to the new values
+                                field1.suspendEvents();
+                                field1.setValue(newValue);
+                                field.setValue(value1);
+                                field1.resumeEvents();
                             }
                         }
                     }
@@ -30,9 +30,14 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.ZoomIntervalSelection&#39;, {
         if (this._notValidValues()) {
             myDesktopApp.warningMsg('The Input Values are not defined');
         } else {
+            var minVal = this.getField1Value();
+            var maxVal = this.getField2Value();
-            var minVal = Ext.Date.format(this.getField1Value(), 'Y-m-d\\TH:i:s.u');
-            var maxVal = Ext.Date.format(this.getField2Value(), 'Y-m-d\\TH:i:s.u');
+            
+            if (this.type == 'timeAxis') {
+                minVal = Ext.Date.format(minVal, 'Y-m-d\\TH:i:s.u');
+                maxVal = Ext.Date.format(maxVal, 'Y-m-d\\TH:i:s.u');
+            }
             this.hostCmp.callInteractivePlot({
                 'action': 'zoom',