From aaa0e57f8775ca7982721813e2eab34c2e159357 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 30 Apr 2020 10:42:15 +0200 Subject: [PATCH] values working --- FloatingSpace/ConditionEditor.js | 92 ++++++++++++++++---------------- FloatingSpace/Picker.js | 17 ++++-- 2 files changed, 60 insertions(+), 49 deletions(-) diff --git a/FloatingSpace/ConditionEditor.js b/FloatingSpace/ConditionEditor.js index 1d6498455..e4222013e 100644 --- a/FloatingSpace/ConditionEditor.js +++ b/FloatingSpace/ConditionEditor.js @@ -128,85 +128,87 @@ function newConditionEditor () { let codeArray = code.split(' > ') codeA = codeArray[0] codeB = codeArray[1] + operationPicker.setSelected(undefined, undefined, undefined, 0) } if (code.indexOf(' < ') > 0) { let codeArray = code.split(' < ') codeA = codeArray[0] codeB = codeArray[1] + operationPicker.setSelected(undefined, undefined, undefined, 1) } if (code.indexOf(' >= ') > 0) { let codeArray = code.split(' >= ') codeA = codeArray[0] codeB = codeArray[1] + operationPicker.setSelected(undefined, undefined, undefined, 2) } if (code.indexOf(' <= ') > 0) { let codeArray = code.split(' <= ') codeA = codeArray[0] codeB = codeArray[1] + operationPicker.setSelected(undefined, undefined, undefined, 3) } if (code.indexOf(' === ') > 0) { let codeArray = code.split(' === ') codeA = codeArray[0] codeB = codeArray[1] + operationPicker.setSelected(undefined, undefined, undefined, 4) } let codeAArray = codeA.split('.') let codeBArray = codeB.split('.') - if (code.indexOf(' === ') > 0) { - } else { - updatePickers(operatorA, codeAArray) - updatePickers(operatorB, codeBArray) + updatePickers(operatorA, codeAArray) + updatePickers(operatorB, codeBArray) - function updatePickers (operator, codeArray) { - let codeTimeFrame = codeArray[1].substring(2, 4) + '-' + codeArray[1].substring(4, 7) - let codeProduct = codeArray[2] - let codeProperty = codeArray[3] - let codeValue = '' + function updatePickers (operator, codeArray) { + let codeTimeFrame = codeArray[1].substring(2, 4) + '-' + codeArray[1].substring(4, 7) + let codeProduct = codeArray[2] + let codeProperty = codeArray[3] + let codeValue = codeBArray[0].replace('"', '').replace('"', '') - let dataMines = Object.keys(operator.selector) - for (let i = 0; i < dataMines.length; i++) { - let dataMine = dataMines[i] - let dataMineObject = operator.selector[dataMine] - let bots = Object.keys(dataMineObject) - for (let j = 0; j < bots.length; j++) { - let bot = bots[j] - let botObject = dataMineObject[bot] - let products = Object.keys(botObject) - for (let k = 0; k < products.length; k++) { - let product = products[k] - let productObject = botObject[product] - if (codeProduct === product) { - operator.dataMinePicker.setSelected(dataMines, operator.selector, undefined, i) - operator.botPicker.setSelected(bots, dataMineObject, operator.selector, j) - operator.productPicker.setSelected(products, botObject, dataMineObject, k) - let properties = Object.keys(productObject.properties) - for (let m = 0; m < properties.length; m++) { - let property = properties[m] - let propertyObject = productObject.properties[property] - if (codeProperty === property) { - operator.propertyPicker.setSelected(properties, productObject.properties, botObject, m) - let values = propertyObject.possibleValues - for (let n = 0; n < values.length; n++) { - let value = values[n] - let valueObject = propertyObject[value] - if (codeValue === value) { - operator.valuePicker.setSelected(propevaluesrties, propertyObject, productObject, n) - } + let dataMines = Object.keys(operator.selector) + for (let i = 0; i < dataMines.length; i++) { + let dataMine = dataMines[i] + let dataMineObject = operator.selector[dataMine] + let bots = Object.keys(dataMineObject) + for (let j = 0; j < bots.length; j++) { + let bot = bots[j] + let botObject = dataMineObject[bot] + let products = Object.keys(botObject) + for (let k = 0; k < products.length; k++) { + let product = products[k] + let productObject = botObject[product] + if (codeProduct === product) { + operator.dataMinePicker.setSelected(dataMines, operator.selector, undefined, i) + operator.botPicker.setSelected(bots, dataMineObject, operator.selector, j) + operator.productPicker.setSelected(products, botObject, dataMineObject, k) + let properties = Object.keys(productObject.properties) + for (let m = 0; m < properties.length; m++) { + let property = properties[m] + let propertyObject = productObject.properties[property] + if (codeProperty === property) { + operator.propertyPicker.setSelected(properties, productObject.properties, botObject, m) + let values = propertyObject.possibleValues + for (let n = 0; n < values.length; n++) { + let value = values[n] + let valueObject = propertyObject[value] + if (codeValue === value) { + operator.valuePicker.setSelected(values, propertyObject, productObject, n) } } } - 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) - } + } + 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) } } } diff --git a/FloatingSpace/Picker.js b/FloatingSpace/Picker.js index 47e3246b9..9cfc32b67 100644 --- a/FloatingSpace/Picker.js +++ b/FloatingSpace/Picker.js @@ -60,10 +60,19 @@ function newPicker () { } function setSelected (pOptionsList, pCurrent, pParent, pSelected) { - optionsList = pOptionsList - current = pCurrent - parent = pParent - selected = pSelected + if (pOptionsList !== undefined) { + optionsList = pOptionsList + } + if (pCurrent !== undefined) { + current = pCurrent + } + if (pParent !== undefined) { + parent = pParent + } + if (pSelected !== undefined) { + selected = pSelected + } + raiseEventParentChanged() } function onParentChanged (event) {