The UI of plotFunction feature is almost ready, the remaining is to send request to AMDA Integration

Menouar AZIB
1 parent 48e98e36
Showing 2 changed files with 6 additions and 10 deletions Show diff stats
js/app/views/PlotComponents/PlotZoomPlug.js
js/app/views/PlotComponents/plotFunction/ParamField.js
@@ -52,7 +52,6 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
  
   init: function (cmp) {
     this.hostCmp = cmp;
-    this.plotFunctionType = new amdaPlotComp.plotFunction.FunctionType({});
   },
  
   /**
@@ -62,6 +61,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
   setParameters: function (listParams_) {
     this.listParams = listParams_;
     this.plotFunctionParamField = new amdaPlotComp.plotFunction.ParamField({ params: this.listParams });
+    this.plotFunctionType = new amdaPlotComp.plotFunction.FunctionType({});
   },
  
  
@@ -85,12 +85,14 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
       var minValue = this.form.getForm().findField('zoom-min-time').getValue();
       if (minValue <= max) {
         this.form.getForm().findField('zoom-max-time').setValue(max);
-        this.plotFunctionParamField.setNbPoints(this.form.getForm(), minValue, max);
+        if (this.isPlotFunction)
+          this.plotFunctionParamField.setNbPoints(this.form.getForm(), minValue, max);
       }
       else {
         this.form.getForm().findField('zoom-min-time').setValue(max);
         this.form.getForm().findField('zoom-max-time').setValue(minValue);
-        this.plotFunctionParamField.setNbPoints(this.form.getForm(), max, minValue);
+        if (this.isPlotFunction)
+          this.plotFunctionParamField.setNbPoints(this.form.getForm(), max, minValue);
       }
  
     }
@@ -130,7 +132,6 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
    */
   show: function (interactiveId, zoomType, panelId, isPlotFunction_ = false) {
     this.isPlotFunction = isPlotFunction_;
-
     if (!this.win) {
       this.win = new Ext.Window({
         id: 'plot-zoom-win-' + this.hostCmp.ownerCt.getId(), // Plot window ID
@@ -164,7 +165,6 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
  
       Ext.PluginManager.register(this);
     }
-
     this.interactiveId = interactiveId;
     this.updateWinByType(zoomType, panelId);
     this.win.show();
@@ -216,8 +216,6 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
   },
  
   resetMinMaxValue: function () {
-    const ui_item = this.form.getForm().findField("NUMBERFIELDace_swe_all_VSW");
-    console.log(ui_item);
     if (this.zoomType == 'timeAxis') {
       this.form.getForm().findField('zoom-min-time').setValue('');
       this.form.getForm().findField('zoom-max-time').setValue('');
@@ -240,7 +238,6 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
    *        Main form
    */
   getFormConfig: function () {
-
     var intervalFieldSet = {
       xtype: 'fieldset',
       title: 'Interval Selection',
@@ -440,7 +437,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
       ],
       fbar: [
         {
-          text: 'Apply Zoom',
+          text: me.isPlotFunction ? "Apply" : 'Apply Zoom',
           width: 100,
           scope: this,
           handler: function () {
@@ -76,7 +76,6 @@ Ext.define(&#39;amdaPlotComp.plotFunction.ParamField&#39;, {
             const ui_item = parentForm.findField(this.label_number_field1 + param.id);
             if (ui_item !== undefined && ui_item !== null) {
                 param["nb_points"] = ui_item.getValue();
-                console.log(param);
             }
         }
     },