From 3651c615faa1687e0eb56f3db66111a3b65584bb Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 8 Jun 2019 15:20:10 +0200 Subject: [PATCH] errorMessage --- Conditions.js | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Conditions.js b/Conditions.js index 3e09c92ec..c9f83be94 100644 --- a/Conditions.js +++ b/Conditions.js @@ -521,6 +521,16 @@ canvas.strategySpace.workspace.tradingSystem.payload.uiObject.setErrorMessage(tradingSystem.error) + if (tradingSystem.parameters !== undefined) { + canvas.strategySpace.workspace.tradingSystem.parameters.payload.uiObject.setErrorMessage(tradingSystem.parameters.error) + if (tradingSystem.parameters.baseAsset !== undefined) { + canvas.strategySpace.workspace.tradingSystem.parameters.baseAsset.payload.uiObject.setErrorMessage(tradingSystem.parameters.baseAsset.error) + if (tradingSystem.parameters.baseAsset.formula !== undefined) { + canvas.strategySpace.workspace.tradingSystem.parameters.baseAsset.formula.payload.uiObject.setErrorMessage(tradingSystem.parameters.baseAsset.formula.error) + } + } + } + for (let j = 0; j < tradingSystem.strategies.length; j++) { let strategy = tradingSystem.strategies[j]; @@ -593,6 +603,9 @@ let phase = initialDefinition.stopLoss.phases[p]; canvas.strategySpace.workspace.tradingSystem.strategies[j].openStage.initialDefinition.stopLoss.phases[p].payload.uiObject.setErrorMessage(openStage.initialDefinition.stopLoss.phases[p].error) + if (phase.formula !== undefined) { + canvas.strategySpace.workspace.tradingSystem.strategies[j].openStage.initialDefinition.stopLoss.phases[p].formula.payload.uiObject.setErrorMessage(openStage.initialDefinition.stopLoss.phases[p].formula.error) + } let nextPhaseEvent = phase.nextPhaseEvent; if (nextPhaseEvent !== undefined) { @@ -622,6 +635,10 @@ let phase = initialDefinition.takeProfit.phases[p]; canvas.strategySpace.workspace.tradingSystem.strategies[j].openStage.initialDefinition.takeProfit.phases[p].payload.uiObject.setErrorMessage(openStage.initialDefinition.takeProfit.phases[p].error) + if (phase.formula !== undefined) { + canvas.strategySpace.workspace.tradingSystem.strategies[j].openStage.initialDefinition.takeProfit.phases[p].formula.payload.uiObject.setErrorMessage(openStage.initialDefinition.takeProfit.phases[p].formula.error) + } + let nextPhaseEvent = phase.nextPhaseEvent; if (nextPhaseEvent !== undefined) { canvas.strategySpace.workspace.tradingSystem.strategies[j].openStage.initialDefinition.takeProfit.phases[p].nextPhaseEvent.payload.uiObject.setErrorMessage(openStage.initialDefinition.takeProfit.phases[p].nextPhaseEvent.error) @@ -657,6 +674,9 @@ let phase = manageStage.stopLoss.phases[p]; canvas.strategySpace.workspace.tradingSystem.strategies[j].manageStage.stopLoss.phases[p].payload.uiObject.setErrorMessage(manageStage.stopLoss.phases[p].error) + if (phase.formula !== undefined) { + canvas.strategySpace.workspace.tradingSystem.strategies[j].manageStage.stopLoss.phases[p].formula.payload.uiObject.setErrorMessage(manageStage.stopLoss.phases[p].formula.error) + } let nextPhaseEvent = phase.nextPhaseEvent; if (nextPhaseEvent !== undefined) { @@ -686,6 +706,10 @@ let phase = manageStage.takeProfit.phases[p]; canvas.strategySpace.workspace.tradingSystem.strategies[j].manageStage.takeProfit.phases[p].payload.uiObject.setErrorMessage(manageStage.takeProfit.phases[p].error) + if (phase.formula !== undefined) { + canvas.strategySpace.workspace.tradingSystem.strategies[j].manageStage.takeProfit.phases[p].formula.payload.uiObject.setErrorMessage(manageStage.takeProfit.phases[p].formula.error) + } + let nextPhaseEvent = phase.nextPhaseEvent; if (nextPhaseEvent !== undefined) { canvas.strategySpace.workspace.tradingSystem.strategies[j].manageStage.takeProfit.phases[p].nextPhaseEvent.payload.uiObject.setErrorMessage(manageStage.takeProfit.phases[p].nextPhaseEvent.error) @@ -712,6 +736,10 @@ node.conditions[m].payload.uiObject.setErrorMessage(situation.conditions[m].error) + if (situation.conditions[m].code !== undefined) { + node.conditions[m].code.payload.uiObject.setErrorMessage(situation.conditions[m].code.error) + } + if (currentRecord.conditionsValues[conditionIndex] === 1) { node.conditions[m].payload.uiObject.highlight() } else {