From d19261e5deb54c470ee9396500228557a868c664 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 19 Sep 2019 14:46:29 +0200 Subject: [PATCH] Multiple Task Managers --- FloatingSpace/StrategyPart.js | 79 ++-- .../FunctionLibraries/AttachDetach.js | 18 +- .../FunctionLibraries/NodeChildren.js | 11 +- .../FunctionLibraries/NodeDeleter.js | 368 ++++++++++-------- .../FunctionLibraries/PartsFromNodes.js | 21 +- .../FunctionLibraries/ProtocolNode.js | 6 +- .../FunctionLibraries/StringifyNode.js | 17 +- 7 files changed, 293 insertions(+), 227 deletions(-) diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 1bbd10c08..1552fdf4c 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -170,7 +170,7 @@ function newStrategyPart () { thisObject.codeEditor.physics() } - if (thisObject.payload.chainParent === undefined) { + if (thisObject.payload.chainParent === undefined || thisObject.payload.chainParent.payload === undefined) { thisObject.payload.targetPosition.x = thisObject.payload.position.x, thisObject.payload.targetPosition.y = thisObject.payload.position.y } else { @@ -203,151 +203,151 @@ function newStrategyPart () { let compatibleSubType switch (thisObject.payload.node.type) { case 'Trading System': - compatibleType = '->' + 'Definition' + compatibleType = '->' + 'Definition' + '->' compatibleSubType = undefined break case 'Personal Data': - compatibleType = '->' + 'Definition' + compatibleType = '->' + 'Definition' + '->' compatibleSubType = undefined break case 'Exchange Account': - compatibleType = '->' + 'Personal Data' + compatibleType = '->' + 'Personal Data' + '->' compatibleSubType = undefined break case 'Exchange Account Asset': - compatibleType = '->' + 'Exchange Account' + compatibleType = '->' + 'Exchange Account' + '->' compatibleSubType = undefined break case 'Exchange Account Key': - compatibleType = '->' + 'Exchange Account' + compatibleType = '->' + 'Exchange Account' + '->' compatibleSubType = undefined break case 'Parameters': - compatibleType = '->' + 'Trading System' + compatibleType = '->' + 'Trading System' + '->' compatibleSubType = undefined break case 'Base Asset': - compatibleType = '->' + 'Parameters' + compatibleType = '->' + 'Parameters' + '->' compatibleSubType = undefined break case 'Time Range': - compatibleType = '->' + 'Parameters' + compatibleType = '->' + 'Parameters' + '->' compatibleSubType = undefined break case 'Slippage': - compatibleType = '->' + 'Parameters' + compatibleType = '->' + 'Parameters' + '->' compatibleSubType = undefined break case 'Fee Structure': - compatibleType = '->' + 'Parameters' + compatibleType = '->' + 'Parameters' + '->' compatibleSubType = undefined break case 'Task Manager': - compatibleType = '->' + 'Definition' + compatibleType = '->' + 'Definition' + '->' compatibleSubType = undefined break case 'Task': - compatibleType = '->' + 'Task Manager' + compatibleType = '->' + 'Task Manager' + '->' compatibleSubType = undefined break case 'Sensor': - compatibleType = '->' + 'Task' + compatibleType = '->' + 'Task' + '->' compatibleSubType = undefined break case 'Indicator': - compatibleType = '->' + 'Task' + compatibleType = '->' + 'Task' + '->' compatibleSubType = undefined break case 'Trading Engine': - compatibleType = '->' + 'Task' + compatibleType = '->' + 'Task' + '->' compatibleSubType = undefined break case 'Process': - compatibleType = '->' + 'Sensor' + '->' + 'Indicator' + '->' + 'Trading Engine' + compatibleType = '->' + 'Sensor' + '->' + 'Indicator' + '->' + 'Trading Engine' + '->' compatibleSubType = undefined break case 'Strategy': - compatibleType = '->' + 'Trading System' + compatibleType = '->' + 'Trading System' + '->' compatibleSubType = undefined break case 'Trigger Stage': - compatibleType = '->' + 'Strategy' + compatibleType = '->' + 'Strategy' + '->' compatibleSubType = undefined break case 'Open Stage': - compatibleType = '->' + 'Strategy' + compatibleType = '->' + 'Strategy' + '->' compatibleSubType = undefined break case 'Manage Stage': - compatibleType = '->' + 'Strategy' + compatibleType = '->' + 'Strategy' + '->' compatibleSubType = undefined break case 'Close Stage': - compatibleType = '->' + 'Strategy' + compatibleType = '->' + 'Strategy' + '->' compatibleSubType = undefined break case 'Position Size': - compatibleType = '->' + 'Initial Definition' + compatibleType = '->' + 'Initial Definition' + '->' compatibleSubType = undefined break case 'Position Rate': - compatibleType = '->' + 'Initial Definition' + compatibleType = '->' + 'Initial Definition' + '->' compatibleSubType = undefined break case 'Take Position Event': - compatibleType = '->' + 'Trigger Stage' + compatibleType = '->' + 'Trigger Stage' + '->' compatibleSubType = undefined break case 'Trigger Off Event': - compatibleType = '->' + 'Trigger Stage' + compatibleType = '->' + 'Trigger Stage' + '->' compatibleSubType = undefined break case 'Trigger On Event': - compatibleType = '->' + 'Trigger Stage' + compatibleType = '->' + 'Trigger Stage' + '->' compatibleSubType = undefined break case 'Initial Definition': - compatibleType = '->' + 'Open Stage' + compatibleType = '->' + 'Open Stage' + '->' compatibleSubType = undefined break case 'Open Execution': - compatibleType = '->' + 'Open Stage' + compatibleType = '->' + 'Open Stage' + '->' compatibleSubType = undefined break case 'Close Execution': - compatibleType = '->' + 'Close Stage' + compatibleType = '->' + 'Close Stage' + '->' compatibleSubType = undefined break case 'Stop': - compatibleType = '->' + 'Manage Stage' + '->' + 'Initial Definition' + compatibleType = '->' + 'Manage Stage' + '->' + 'Initial Definition' + '->' compatibleSubType = undefined break case 'Take Profit': - compatibleType = '->' + 'Manage Stage' + '->' + 'Initial Definition' + compatibleType = '->' + 'Manage Stage' + '->' + 'Initial Definition' + '->' compatibleSubType = undefined break case 'Phase': - compatibleType = '->' + 'Stop' + '->' + 'Take Profit' + '->' + 'Phase' + compatibleType = '->' + 'Stop' + '->' + 'Take Profit' + '->' + 'Phase' + '->' compatibleSubType = undefined break case 'Formula': - compatibleType = '->' + 'Position Size' + '->' + 'Position Rate' + '->' + 'Phase' + compatibleType = '->' + 'Position Size' + '->' + 'Position Rate' + '->' + 'Phase' + '->' compatibleSubType = undefined break case 'Next Phase Event': - compatibleType = '->' + 'Phase' + compatibleType = '->' + 'Phase' + '->' compatibleSubType = undefined break case 'Situation': - compatibleType = '->' + 'Take Position Event' + '->' + 'Trigger On Event' + '->' + 'Trigger Off Event' + '->' + 'Next Phase Event' + compatibleType = '->' + 'Take Position Event' + '->' + 'Trigger On Event' + '->' + 'Trigger Off Event' + '->' + 'Next Phase Event' + '->' compatibleSubType = undefined break case 'Condition': - compatibleType = '->' + 'Situation' + compatibleType = '->' + 'Situation' + '->' compatibleSubType = undefined break case 'Code': - compatibleType = '->' + 'Condition' + compatibleType = '->' + 'Condition' + '->' compatibleSubType = undefined break default: @@ -362,9 +362,8 @@ function newStrategyPart () { let distance = nearby[0] let floatingObject = nearby[1] let nearbyNode = floatingObject.payload.node - if (compatibleType.indexOf('->' + nearbyNode.type) >= 0) { + if (compatibleType.indexOf('->' + nearbyNode.type + '->') >= 0) { /* Discard objects with busy coonection ports */ - if (thisObject.payload.node.type === 'Task Manager' && nearbyNode.taskManager !== undefined) { continue } if (thisObject.payload.node.type === 'Task' && nearbyNode.task !== undefined) { continue } if (thisObject.payload.node.type === 'Sensor' && nearbyNode.bot !== undefined) { continue } if (thisObject.payload.node.type === 'Indicator' && nearbyNode.bot !== undefined) { continue } diff --git a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js index 86e4d13f1..01e71cdba 100644 --- a/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js +++ b/StrategySpace/Workspace/FunctionLibraries/AttachDetach.js @@ -50,12 +50,24 @@ function newAttachDetach () { return } case 'Task Manager': { - node.payload.parentNode.taskManager = undefined + let payload = node.payload + for (let i = 0; i < payload.parentNode.taskManagers.length; i++) { + let taskManager = payload.parentNode.taskManagers[i] + if (taskManager.id === node.id) { + payload.parentNode.taskManagers.splice(i, 1) + } + } completeDetachment(node, rootNodes) return } case 'Task': { - node.payload.parentNode.task = undefined + let payload = node.payload + for (let i = 0; i < payload.parentNode.tasks.length; i++) { + let task = payload.parentNode.tasks[i] + if (task.id === node.id) { + payload.parentNode.tasks.splice(i, 1) + } + } completeDetachment(node, rootNodes) return } @@ -251,7 +263,7 @@ function newAttachDetach () { case 'Task Manager': { node.payload.parentNode = attachToNode node.payload.chainParent = attachToNode - node.payload.parentNode.taskManager = node + node.payload.parentNode.taskManagers.push(node) completeAttachment(node, rootNodes) } break diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js index df0a8b531..5c6c2b311 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js @@ -145,10 +145,13 @@ function newNodeChildren () { response.childIndex = response.childrenCount } } - if (parentNode.taskManager !== undefined) { - response.childrenCount++ - if (parentNode.taskManager.id === childNode.id) { - response.childIndex = response.childrenCount + if (parentNode.taskManagers !== undefined) { + for (let i = 0; i < parentNode.taskManagers.length; i++) { + let child = parentNode.taskManagers[i] + response.childrenCount++ + if (child.id === childNode.id) { + response.childIndex = response.childrenCount + } } } return response diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index 517f705bb..352515e85 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -44,149 +44,151 @@ function newNodeDeleter () { } function deleteWorkspace (node, rootNodes) { - while (node.rootNodes.length > 0) { - let rootNode = node.rootNodes[0] - switch (rootNode.type) { + if (node.rootNodes !== undefined) { + while (node.rootNodes.length > 0) { + let rootNode = node.rootNodes[0] + switch (rootNode.type) { - case 'Definition': { - deleteDefinition(rootNode, rootNodes, true) - break - } - case 'Task Manager': { - deleteTaskManager(rootNode, rootNodes) - break - } - case 'Task': { - deleteTask(rootNode, rootNodes) - break - } - case 'Sensor': { - deleteBot(rootNode, rootNodes) - break - } - case 'Indicator': { - deleteBot(rootNode, rootNodes) - break - } - case 'Trading Engine': { - deleteBot(rootNode, rootNodes) - break - } - case 'Process': { - deleteProcess(rootNode, rootNodes) - break - } - case 'Personal Data': { - deletePersonalData(rootNode, rootNodes) - break - } - case 'Exchange Account': { - deleteExchangeAccount(rootNode, rootNodes) - break - } - case 'Exchange Account Asset': { - deleteExchangeAccountAsset(rootNode, rootNodes) - break - } - case 'Exchange Account Key': { - deleteExchangeAccountKey(rootNode, rootNodes) - break - } - case 'Trading System': { - deleteTradingSystem(rootNode, rootNodes) - break - } - case 'Parameters': { - deleteParameters(rootNode, rootNodes) - break - } - case 'Base Asset': { - deleteBaseAsset(rootNode, rootNodes) - break - } - case 'Time Range': { - deleteTimeRange(rootNode, rootNodes) - break - } - case 'Slippage': { - deleteSlippage(rootNode, rootNodes) - break - } - case 'Fee Structure': { - deleteFeeStructure(rootNode, rootNodes) - break - } - case 'Strategy': { - deleteStrategy(rootNode, rootNodes) - break - } - case 'Trigger Stage': { - deleteTriggerStage(rootNode, rootNodes) - break - } - case 'Open Stage': { - deleteOpenStage(rootNode, rootNodes) - break - } - case 'Manage Stage': { - deleteManageStage(rootNode, rootNodes) - break - } - case 'Close Stage': { - deleteCloseStage(rootNode, rootNodes) - break - } - case 'Position Size': { - deletePositionSize(rootNode, rootNodes) - break - } - case 'Position Rate': { - deletePositionRate(rootNode, rootNodes) - break - } - case 'Initial Definition': { - deleteInitialDefinition(rootNode, rootNodes) - break - } - case 'Open Execution': { - deleteOpenExecution(rootNode, rootNodes) - break - } - case 'Close Execution': { - deleteCloseExecution(rootNode, rootNodes) - break - } - case 'Event': { - deleteEvent(rootNode, rootNodes) - break - } - case 'Managed Item': { - deleteManagedItem(rootNode, rootNodes) - break - } - case 'Phase': { - deletePhase(rootNode, rootNodes) - break - } - case 'Formula': { - deleteFormula(rootNode, rootNodes) - break - } - case 'Situation': { - deleteSituation(rootNode, rootNodes) - break - } - case 'Condition': { - deleteCondition(rootNode, rootNodes) - break - } - case 'Code': { - deleteCode(rootNode, rootNodes) - break - } + case 'Definition': { + deleteDefinition(rootNode, rootNodes, true) + break + } + case 'Task Manager': { + deleteTaskManager(rootNode, rootNodes) + break + } + case 'Task': { + deleteTask(rootNode, rootNodes) + break + } + case 'Sensor': { + deleteBot(rootNode, rootNodes) + break + } + case 'Indicator': { + deleteBot(rootNode, rootNodes) + break + } + case 'Trading Engine': { + deleteBot(rootNode, rootNodes) + break + } + case 'Process': { + deleteProcess(rootNode, rootNodes) + break + } + case 'Personal Data': { + deletePersonalData(rootNode, rootNodes) + break + } + case 'Exchange Account': { + deleteExchangeAccount(rootNode, rootNodes) + break + } + case 'Exchange Account Asset': { + deleteExchangeAccountAsset(rootNode, rootNodes) + break + } + case 'Exchange Account Key': { + deleteExchangeAccountKey(rootNode, rootNodes) + break + } + case 'Trading System': { + deleteTradingSystem(rootNode, rootNodes) + break + } + case 'Parameters': { + deleteParameters(rootNode, rootNodes) + break + } + case 'Base Asset': { + deleteBaseAsset(rootNode, rootNodes) + break + } + case 'Time Range': { + deleteTimeRange(rootNode, rootNodes) + break + } + case 'Slippage': { + deleteSlippage(rootNode, rootNodes) + break + } + case 'Fee Structure': { + deleteFeeStructure(rootNode, rootNodes) + break + } + case 'Strategy': { + deleteStrategy(rootNode, rootNodes) + break + } + case 'Trigger Stage': { + deleteTriggerStage(rootNode, rootNodes) + break + } + case 'Open Stage': { + deleteOpenStage(rootNode, rootNodes) + break + } + case 'Manage Stage': { + deleteManageStage(rootNode, rootNodes) + break + } + case 'Close Stage': { + deleteCloseStage(rootNode, rootNodes) + break + } + case 'Position Size': { + deletePositionSize(rootNode, rootNodes) + break + } + case 'Position Rate': { + deletePositionRate(rootNode, rootNodes) + break + } + case 'Initial Definition': { + deleteInitialDefinition(rootNode, rootNodes) + break + } + case 'Open Execution': { + deleteOpenExecution(rootNode, rootNodes) + break + } + case 'Close Execution': { + deleteCloseExecution(rootNode, rootNodes) + break + } + case 'Event': { + deleteEvent(rootNode, rootNodes) + break + } + case 'Managed Item': { + deleteManagedItem(rootNode, rootNodes) + break + } + case 'Phase': { + deletePhase(rootNode, rootNodes) + break + } + case 'Formula': { + deleteFormula(rootNode, rootNodes) + break + } + case 'Situation': { + deleteSituation(rootNode, rootNodes) + break + } + case 'Condition': { + deleteCondition(rootNode, rootNodes) + break + } + case 'Code': { + deleteCode(rootNode, rootNodes) + break + } - default: { - console.log('WARNING this node type is not listed at NodeDeleter: ' + node.type) + default: { + console.log('WARNING this node type is not listed at NodeDeleter: ' + node.type) + } } } } @@ -221,9 +223,12 @@ function newNodeDeleter () { if (node.personalData !== undefined) { deletePersonalData(node.personalData, rootNodes) } - if (node.taskManager !== undefined) { - deleteTaskManager(node.taskManager, rootNodes) + if (node.taskManagers !== undefined) { + while (node.taskManagers.length > 0) { + deleteTaskManager(node.taskManagers[0], rootNodes) + } } + completeDeletion(node, rootNodes) destroyPart(node) cleanNode(node) @@ -232,10 +237,17 @@ function newNodeDeleter () { function deleteTaskManager (node, rootNodes) { let payload = node.payload if (payload.parentNode !== undefined) { - payload.parentNode.taskManager = undefined + for (let j = 0; j < payload.parentNode.taskManagers.length; j++) { + let taskManager = payload.parentNode.taskManagers[j] + if (taskManager.id === node.id) { + payload.parentNode.taskManagers.splice(j, 1) + } + } } - while (node.tasks.length > 0) { - deleteTask(node.tasks[0], rootNodes) + if (node.tasks !== undefined) { + while (node.tasks.length > 0) { + deleteTask(node.tasks[0], rootNodes) + } } completeDeletion(node, rootNodes) destroyPart(node) @@ -265,9 +277,12 @@ function newNodeDeleter () { if (payload.parentNode !== undefined) { payload.parentNode.bot = undefined } - while (node.processes.length > 0) { - deleteProcess(node.processes[0], rootNodes) + if (node.processes !== undefined) { + while (node.processes.length > 0) { + deleteProcess(node.processes[0], rootNodes) + } } + completeDeletion(node, rootNodes) destroyPart(node) cleanNode(node) @@ -295,8 +310,10 @@ function newNodeDeleter () { payload.parentNode.personalData = undefined } - while (node.exchangeAccounts.length > 0) { - deleteExchangeAccount(node.exchangeAccounts[0], rootNodes) + if (node.exchangeAccounts !== undefined) { + while (node.exchangeAccounts.length > 0) { + deleteExchangeAccount(node.exchangeAccounts[0], rootNodes) + } } completeDeletion(node, rootNodes) @@ -314,12 +331,17 @@ function newNodeDeleter () { } } } - while (node.assets.length > 0) { - deleteExchangeAccountAsset(node.assets[0], rootNodes) + if (node.assets !== undefined) { + while (node.assets.length > 0) { + deleteExchangeAccountAsset(node.assets[0], rootNodes) + } } - while (node.keys.length > 0) { - deleteExchangeAccountKey(node.keys[0], rootNodes) + if (node.keys !== undefined) { + while (node.keys.length > 0) { + deleteExchangeAccountKey(node.keys[0], rootNodes) + } } + completeDeletion(node, rootNodes) destroyPart(node) cleanNode(node) @@ -364,8 +386,10 @@ function newNodeDeleter () { payload.parentNode.tradingSystem = undefined } - while (node.strategies.length > 0) { - deleteStrategy(node.strategies[0], rootNodes) + if (node.strategies !== undefined) { + while (node.strategies.length > 0) { + deleteStrategy(node.strategies[0], rootNodes) + } } if (node.parameters !== undefined) { @@ -640,9 +664,12 @@ function newNodeDeleter () { completeDeletion(node, rootNodes) } - while (node.situations.length > 0) { - deleteSituation(node.situations[0], rootNodes) + if (node.situations !== undefined) { + while (node.situations.length > 0) { + deleteSituation(node.situations[0], rootNodes) + } } + destroyPart(node) cleanNode(node) } @@ -664,9 +691,12 @@ function newNodeDeleter () { completeDeletion(node, rootNodes) } - while (node.phases.length > 0) { - deletePhase(node.phases[0]) + if (node.phases !== undefined) { + while (node.phases.length > 0) { + deletePhase(node.phases[0]) + } } + destroyPart(node) cleanNode(node) } @@ -718,10 +748,13 @@ function newNodeDeleter () { for (let j = 0; j < payload.parentNode.situations.length; j++) { let situation = payload.parentNode.situations[j] if (situation.id === node.id) { - while (situation.conditions.length > 0) { - let condition = situation.conditions[0] - deleteCondition(condition, rootNodes) + if (situation.conditions !== undefined) { + while (situation.conditions.length > 0) { + let condition = situation.conditions[0] + deleteCondition(condition, rootNodes) + } } + situation.conditions = [] payload.parentNode.situations.splice(j, 1) destroyPart(situation) @@ -730,10 +763,13 @@ function newNodeDeleter () { } } } else { - while (node.conditions.length > 0) { - let condition = node.conditions[0] - deleteCondition(condition) + if (node.conditions !== undefined) { + while (node.conditions.length > 0) { + let condition = node.conditions[0] + deleteCondition(condition) + } } + node.conditions = [] completeDeletion(node, rootNodes) destroyPart(node) diff --git a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js index 412d6160e..183843041 100644 --- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js +++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js @@ -333,8 +333,11 @@ function newPartsFromNodes () { if (node.personalData !== undefined) { createPartFromNode(node.personalData, node, node) } - if (node.taskManager !== undefined) { - createPartFromNode(node.taskManager, node, node) + if (node.taskManagers !== undefined) { + for (let m = 0; m < node.taskManagers.length; m++) { + let taskManager = node.taskManagers[m] + createPartFromNode(taskManager, node, node) + } } return } @@ -385,14 +388,16 @@ function newPartsFromNodes () { } function addTaskManager (node) { - if (node.taskManager === undefined) { - node.taskManager = { - tasks: [] - } - createPart('Task Manager', '', node.taskManager, node, node) + let taskManager = { + name: 'New Task Manager' } + if (node.taskManagers === undefined) { + node.taskManagers = [] + } + node.taskManagers.push(taskManager) + createPart('Task Manager', taskManager.name, taskManager, node, node, 'Task Manager') - return node.taskManager + return taskManager } function addTask (node) { diff --git a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js index b9a9f95f4..9ee0774ed 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -450,7 +450,11 @@ function newProtocolNode () { name: node.name, tradingSystem: getProtocolNode(node.tradingSystem, removePersonalData, parseJSONStrings, includeIds), personalData: getProtocolNode(node.personalData, removePersonalData, parseJSONStrings, includeIds), - taskManager: getProtocolNode(node.taskManager, removePersonalData, parseJSONStrings, includeIds) + taskManagers: [] + } + for (let m = 0; m < node.taskManagers.length; m++) { + let taskManager = getProtocolNode(node.taskManagers[m], removePersonalData, parseJSONStrings, includeIds) + object.taskManagers.push(taskManager) } return object } diff --git a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js index 79a4ed6de..7320a0050 100644 --- a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js @@ -435,11 +435,12 @@ function newStringifyNode () { savedPayload: getSavedPayload(node) } - for (let m = 0; m < node.tasks.length; m++) { - let task = prepareForStringify(node.tasks[m], removePersonalData) - taskManager.tasks.push(task) + if (node.tasks !== undefined) { + for (let m = 0; m < node.tasks.length; m++) { + let task = prepareForStringify(node.tasks[m], removePersonalData) + taskManager.tasks.push(task) + } } - return taskManager } case 'Task': { @@ -523,9 +524,15 @@ function newStringifyNode () { name: node.name, tradingSystem: prepareForStringify(node.tradingSystem, removePersonalData), personalData: prepareForStringify(node.personalData, removePersonalData), - taskManager: prepareForStringify(node.taskManager, removePersonalData), + taskManagers: [], savedPayload: getSavedPayload(node) } + if (node.taskManagers !== undefined) { + for (let m = 0; m < node.taskManagers.length; m++) { + let taskManager = prepareForStringify(node.taskManagers[m], removePersonalData) + object.taskManagers.push(taskManager) + } + } return object } }