From de2713a775d755e62c05a87f46d24d484769fae8 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 23 Nov 2020 17:41:54 +0100 Subject: [PATCH] Add Missing Projects Implemented --- .../Function-Libraries/ActionSwitch.js | 40 +++++++++++++ .../DataStorageFunctions.js | 59 +++++++++++++++++-- .../Function-Libraries/TaskFunctions.js | 45 +++++++++++++- Projects/Superalgos/Schemas/AppSchema.json | 2 +- 4 files changed, 139 insertions(+), 7 deletions(-) diff --git a/Projects/Superalgos/Function-Libraries/ActionSwitch.js b/Projects/Superalgos/Function-Libraries/ActionSwitch.js index 0838a05cc..0a6d4d7f3 100644 --- a/Projects/Superalgos/Function-Libraries/ActionSwitch.js +++ b/Projects/Superalgos/Function-Libraries/ActionSwitch.js @@ -287,6 +287,11 @@ function newSuperalgosActionSwitch() { UI.projects.superalgos.functionLibraries.taskFunctions.stopAllLearningMineTasks(action.node) } break + case 'Add Missing Project Data Tasks': + { + UI.projects.superalgos.functionLibraries.taskFunctions.addMissingProjectDataTasks(action.node, action.rootNodes) + } + break case 'Add Missing Exchange Data Tasks': { UI.projects.superalgos.functionLibraries.taskFunctions.addMissingExchangeDataTasks(action.node, action.rootNodes) @@ -302,6 +307,11 @@ function newSuperalgosActionSwitch() { UI.projects.superalgos.functionLibraries.taskFunctions.addMissingDataMineTasks(action.node, action.rootNodes) } break + case 'Add Missing Project Trading Tasks': + { + UI.projects.superalgos.functionLibraries.taskFunctions.addMissingProjectTradingTasks(action.node, action.rootNodes) + } + break case 'Add Missing Exchange Trading Tasks': { UI.projects.superalgos.functionLibraries.taskFunctions.addMissingExchangeTradingTasks(action.node, action.rootNodes) @@ -317,6 +327,11 @@ function newSuperalgosActionSwitch() { UI.projects.superalgos.functionLibraries.taskFunctions.addMissingTradingMineTasks(action.node, action.rootNodes) } break + case 'Add Missing Project Learning Tasks': + { + UI.projects.superalgos.functionLibraries.taskFunctions.addMissingProjectLearningTasks(action.node, action.rootNodes) + } + break case 'Add Missing Exchange Learning Tasks': { UI.projects.superalgos.functionLibraries.taskFunctions.addMissingExchangeLearningTasks(action.node, action.rootNodes) @@ -407,6 +422,16 @@ function newSuperalgosActionSwitch() { UI.projects.superalgos.functionLibraries.dataStorageFunctions.addMissingMarketTradingProducts(action.node, action.rootNodes) } break + case 'Add Missing Market Learning Products': + { + UI.projects.superalgos.functionLibraries.dataStorageFunctions.addMissingMarketLearningProducts(action.node, action.rootNodes) + } + break + case 'Add Missing Exchange Learning Products': + { + UI.projects.superalgos.functionLibraries.dataStorageFunctions.addMissingExchangeLearningProducts(action.node, action.rootNodes) + } + break case 'Add Missing Exchange Trading Products': { UI.projects.superalgos.functionLibraries.dataStorageFunctions.addMissingExchangeTradingProducts(action.node, action.rootNodes) @@ -417,6 +442,21 @@ function newSuperalgosActionSwitch() { UI.projects.superalgos.functionLibraries.dataStorageFunctions.addMissingExchangeDataProducts(action.node, action.rootNodes) } break + case 'Add Missing Project Learning Products': + { + UI.projects.superalgos.functionLibraries.dataStorageFunctions.addMissingProjectLearningProducts(action.node, action.rootNodes) + } + break + case 'Add Missing Project Trading Products': + { + UI.projects.superalgos.functionLibraries.dataStorageFunctions.addMissingProjectTradingProducts(action.node, action.rootNodes) + } + break + case 'Add Missing Project Data Products': + { + UI.projects.superalgos.functionLibraries.dataStorageFunctions.addMissingProjectDataProducts(action.node, action.rootNodes) + } + break case 'Add All Data Dependencies': { UI.projects.superalgos.functionLibraries.mineFunctions.addAllDataDependencies(action.node) diff --git a/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js b/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js index e81e3bec0..876fcb6bd 100644 --- a/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js +++ b/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js @@ -5,11 +5,16 @@ function newSuperalgosFunctionLibraryDataStorageFunctions() { addAllTradingMineProducts: addAllTradingMineProducts, addAllLearningMineProducts: addAllLearningMineProducts, addMissingTradingSessionReferences: addMissingTradingSessionReferences, - addMissingLearningSessionReferences: addMissingLearningSessionReferences, + addMissingLearningSessionReferences: addMissingLearningSessionReferences, addMissingMarketDataProducts: addMissingMarketDataProducts, addMissingMarketTradingProducts: addMissingMarketTradingProducts, + addMissingMarketLearningProducts: addMissingMarketLearningProducts, + addMissingExchangeDataProducts: addMissingExchangeDataProducts, addMissingExchangeTradingProducts: addMissingExchangeTradingProducts, - addMissingExchangeDataProducts: addMissingExchangeDataProducts, + addMissingExchangeLearningProducts: addMissingExchangeLearningProducts, + addMissingProjectDataProducts: addMissingProjectDataProducts, + addMissingProjectTradingProducts: addMissingProjectTradingProducts, + addMissingProjectLearningProducts: addMissingProjectLearningProducts, createSessionReference: createSessionReference } @@ -158,6 +163,10 @@ function newSuperalgosFunctionLibraryDataStorageFunctions() { addMissingMarketProducts(node, rootNodes, 'Market Trading Products') } + function addMissingMarketLearningProducts(node, rootNodes) { + addMissingMarketProducts(node, rootNodes, 'Market Learning Products') + } + function addMissingMarketProducts(node, rootNodes, newNodeType) { if (node.payload.referenceParent === undefined) { return } if (node.payload.referenceParent.exchangeMarkets === undefined) { return } @@ -172,12 +181,16 @@ function newSuperalgosFunctionLibraryDataStorageFunctions() { } } + function addMissingExchangeDataProducts(node, rootNodes) { + addMissingExchange(node, rootNodes, 'Exchange Data Products') + } + function addMissingExchangeTradingProducts(node, rootNodes) { addMissingExchange(node, rootNodes, 'Exchange Trading Products') } - function addMissingExchangeDataProducts(node, rootNodes) { - addMissingExchange(node, rootNodes, 'Exchange Data Products') + function addMissingExchangeLearningProducts(node, rootNodes) { + addMissingExchange(node, rootNodes, 'Exchange Learning Products') } function addMissingExchange(node, rootNodes, newNodeType) { @@ -198,4 +211,42 @@ function newSuperalgosFunctionLibraryDataStorageFunctions() { } } } + + + function addMissingProjectDataProducts(node, rootNodes) { + addMissingProject(node, rootNodes, 'Project Data Products') + } + + function addMissingProjectTradingProducts(node, rootNodes) { + addMissingProject(node, rootNodes, 'Project Trading Products') + } + + function addMissingProjectLearningProducts(node, rootNodes) { + addMissingProject(node, rootNodes, 'Project Learning Products') + } + + function addMissingProject(node, rootNodes, newNodeType) { + let url = 'ProjectNames' + httpRequest(undefined, url, onResponse) + + function onResponse(err, pProjects) { + let projects = JSON.parse(pProjects) + for (let i = 0; i < projects.length; i++) { + let project = projects[i] + + for (let j = 0; j < rootNodes.length; j++) { + let rootNode = rootNodes[j] + if (rootNode.type === project + ' Project') { + let projectDefinition = rootNode.projectDefinition + if (projectDefinition !== undefined) { + if (UI.projects.superalgos.utilities.children.isMissingChildren(node, projectDefinition, true) === true) { + let projectTasks = UI.projects.superalgos.functionLibraries.uiObjectsFromNodes.addUIObject(node, newNodeType) + projectTasks.payload.referenceParent = projectDefinition + } + } + } + } + } + } + } } diff --git a/Projects/Superalgos/Function-Libraries/TaskFunctions.js b/Projects/Superalgos/Function-Libraries/TaskFunctions.js index 029231c0f..09bc365c9 100644 --- a/Projects/Superalgos/Function-Libraries/TaskFunctions.js +++ b/Projects/Superalgos/Function-Libraries/TaskFunctions.js @@ -30,12 +30,15 @@ function newSuperalgosFunctionLibraryTaskFunctions() { runAllLearningMineTasks: runAllLearningMineTasks, stopAllLearningMineTasks: stopAllLearningMineTasks, + addMissingProjectDataTasks: addMissingProjectDataTasks, addMissingExchangeDataTasks: addMissingExchangeDataTasks, addMissingMarketDataTasks: addMissingMarketDataTasks, addMissingDataMineTasks: addMissingDataMineTasks, + addMissingProjectTradingTasks: addMissingProjectTradingTasks, addMissingExchangeTradingTasks: addMissingExchangeTradingTasks, addMissingMarketTradingTasks: addMissingMarketTradingTasks, addMissingTradingMineTasks: addMissingTradingMineTasks, + addMissingProjectLearningTasks: addMissingProjectLearningTasks, addMissingExchangeLearningTasks: addMissingExchangeLearningTasks, addMissingMarketLearningTasks: addMissingMarketLearningTasks, addMissingLearningMineTasks: addMissingLearningMineTasks, @@ -65,7 +68,7 @@ function newSuperalgosFunctionLibraryTaskFunctions() { function onStatus(message) { eventsServerClient.stopListening(key, eventSubscriptionIdOnStatus, node.id) - if (message.event.status === 'Task Process Running' ) { + if (message.event.status === 'Task Process Running') { node.payload.uiObject.menu.internalClick('Run Task') } } @@ -487,6 +490,44 @@ function newSuperalgosFunctionLibraryTaskFunctions() { } } + function addMissingProjectDataTasks(node, rootNodes) { + addMissingProjectTasks(node, rootNodes, 'Project Data Tasks') + } + + function addMissingProjectTradingTasks(node, rootNodes) { + addMissingProjectTasks(node, rootNodes, 'Project Trading Tasks') + } + + function addMissingProjectLearningTasks(node, rootNodes) { + addMissingProjectTasks(node, rootNodes, 'Project Learning Tasks') + } + + function addMissingProjectTasks(node, rootNodes, newNodeType) { + + let url = 'ProjectNames' + httpRequest(undefined, url, onResponse) + + function onResponse(err, pProjects) { + let projects = JSON.parse(pProjects) + for (let i = 0; i < projects.length; i++) { + let project = projects[i] + + for (let j = 0; j < rootNodes.length; j++) { + let rootNode = rootNodes[j] + if (rootNode.type === project + ' Project') { + let projectDefinition = rootNode.projectDefinition + if (projectDefinition !== undefined) { + if (UI.projects.superalgos.utilities.children.isMissingChildren(node, projectDefinition, true) === true) { + let projectTasks = UI.projects.superalgos.functionLibraries.uiObjectsFromNodes.addUIObject(node, newNodeType) + projectTasks.payload.referenceParent = projectDefinition + } + } + } + } + } + } + } + function addMissingExchangeDataTasks(node, rootNodes) { addMissingExchangeTasks(node, rootNodes, 'Exchange Data Tasks') } @@ -530,7 +571,7 @@ function newSuperalgosFunctionLibraryTaskFunctions() { addMissingMarketTasks(node, 'Market Learning Tasks') } - function addMissingMarketTasks(node, newNodeType) { + function addMissingMarketTasks(node, newNodeType) { if (node.payload === undefined) { return } if (node.payload.referenceParent === undefined) { return } if (node.payload.referenceParent.exchangeMarkets === undefined) { return } diff --git a/Projects/Superalgos/Schemas/AppSchema.json b/Projects/Superalgos/Schemas/AppSchema.json index 1832c519f..2ec739a1b 100644 --- a/Projects/Superalgos/Schemas/AppSchema.json +++ b/Projects/Superalgos/Schemas/AppSchema.json @@ -16294,7 +16294,7 @@ }, { "action": "Add Missing Project Learning Tasks", - "label": "Add Missing Project", + "label": "Add Missing Projects", "askConfirmation": true, "confirmationLabel": "Confirm to Proceed", "workDoneLabel": "Done",