From 81b217ffa4fdd89f069fe954d3900686c2d8a5b1 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 30 Apr 2020 09:54:56 +0200
Subject: [PATCH] Update ConditionEditor.js

---
 FloatingSpace/ConditionEditor.js | 36 +++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/FloatingSpace/ConditionEditor.js b/FloatingSpace/ConditionEditor.js
index 677d1f20e..1d6498455 100644
--- a/FloatingSpace/ConditionEditor.js
+++ b/FloatingSpace/ConditionEditor.js
@@ -49,6 +49,20 @@ function newConditionEditor () {
 
   }
 
+  function activate (payload) {
+    thisObject.visible = true
+    thisObject.payload = payload
+    thisObject.payload.uiObject.setErrorMessage('', 0)
+
+    operatorA = {}
+    operatorB = {}
+    scanDataMines()
+    initializePickers()
+
+    loadFromCode()
+    EDITOR_ON_FOCUS = true
+  }
+
   function deactivate () {
     convertToCode()
     finalizePickers()
@@ -103,20 +117,6 @@ function newConditionEditor () {
     thisObject.payload.node.code = code
   }
 
-  function activate (payload) {
-    thisObject.visible = true
-    thisObject.payload = payload
-    thisObject.payload.uiObject.setErrorMessage('', 0)
-
-    operatorA = {}
-    operatorB = {}
-    scanDataMines()
-    initializePickers()
-
-    loadFromCode()
-    EDITOR_ON_FOCUS = true
-  }
-
   function loadFromCode () {
     if (thisObject.payload.node.code === undefined || thisObject.payload.node.code === '') { return }
 
@@ -200,6 +200,14 @@ function newConditionEditor () {
                     }
                   }
                 }
+                let timeFrames = productObject.validTimeFrames
+                for (let m = 0; m < timeFrames.length; m++) {
+                  let timeFrame = timeFrames[m]
+                  let timeFrameObject = productObject.validTimeFrames[timeFrame]
+                  if (codeTimeFrame === timeFrame) {
+                    operator.timeFramePicker.setSelected(timeFrames, productObject, botObject, m)
+                  }
+                }
               }
             }
           }