From 15cd349c05f634448ee352026f92264c5156a885 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 30 Dec 2020 10:58:42 +0100 Subject: [PATCH] Concepts and Topics with Images at the definition --- Client/WebServer/index.html | 8 +-- ...-code-style.png => docs-js-code-style.png} | Bin ...ucess-style.png => docs-success-style.png} | Bin ...style.png => docs-web-page-link-style.png} | Bin ...style.png => docs-youtube-video-style.png} | Bin .../BollingerBandsMultiPeriodDaily.js | 2 +- .../CandlesVolumesMultiPeriodDaily.js | 2 +- .../CandlesVolumesMultiPeriodMarket.js | 2 +- .../Indicator-Bot/MultiPeriodDaily.js | 2 +- .../Low-Frequency-Trading/TradingProcess.js | 2 +- .../UI/Spaces/Design-Space/DesignSpace.js | 31 ++++++---- .../UI/Spaces/Docs-Space/DocsSpace.js | 58 +++++++++--------- TaskServer/ProcessInstance.js | 2 +- 13 files changed, 58 insertions(+), 51 deletions(-) rename Projects/Superalgos/Icons/{docs-javascript-code-style.png => docs-js-code-style.png} (100%) rename Projects/Superalgos/Icons/{docs-sucess-style.png => docs-success-style.png} (100%) rename Projects/Superalgos/Icons/{docs-link-style.png => docs-web-page-link-style.png} (100%) rename Projects/Superalgos/Icons/{docs-youtube-style.png => docs-youtube-video-style.png} (100%) diff --git a/Client/WebServer/index.html b/Client/WebServer/index.html index 4b26ba5b7..2d9aea595 100644 --- a/Client/WebServer/index.html +++ b/Client/WebServer/index.html @@ -122,10 +122,10 @@
- +
- +
@@ -142,7 +142,7 @@
- +
@@ -182,7 +182,7 @@
- +
diff --git a/Projects/Superalgos/Icons/docs-javascript-code-style.png b/Projects/Superalgos/Icons/docs-js-code-style.png similarity index 100% rename from Projects/Superalgos/Icons/docs-javascript-code-style.png rename to Projects/Superalgos/Icons/docs-js-code-style.png diff --git a/Projects/Superalgos/Icons/docs-sucess-style.png b/Projects/Superalgos/Icons/docs-success-style.png similarity index 100% rename from Projects/Superalgos/Icons/docs-sucess-style.png rename to Projects/Superalgos/Icons/docs-success-style.png diff --git a/Projects/Superalgos/Icons/docs-link-style.png b/Projects/Superalgos/Icons/docs-web-page-link-style.png similarity index 100% rename from Projects/Superalgos/Icons/docs-link-style.png rename to Projects/Superalgos/Icons/docs-web-page-link-style.png diff --git a/Projects/Superalgos/Icons/docs-youtube-style.png b/Projects/Superalgos/Icons/docs-youtube-video-style.png similarity index 100% rename from Projects/Superalgos/Icons/docs-youtube-style.png rename to Projects/Superalgos/Icons/docs-youtube-video-style.png diff --git a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Bollinger-Bands/BollingerBandsMultiPeriodDaily.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Bollinger-Bands/BollingerBandsMultiPeriodDaily.js index 52e4bfdf6..8243a35de 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Bollinger-Bands/BollingerBandsMultiPeriodDaily.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Bollinger-Bands/BollingerBandsMultiPeriodDaily.js @@ -38,7 +38,7 @@ try { /* Context Variables */ let contextVariables = { - lastBandFile: undefined, // Datetime of the last file files sucessfully produced by this process. + lastBandFile: undefined, // Datetime of the last file files successfully produced by this process. firstTradeFile: undefined, // Datetime of the first trade file in the whole market history. maxBandFile: undefined // Datetime of the last file available to be used as an input of this process. }; diff --git a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Candles-Volumes/CandlesVolumesMultiPeriodDaily.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Candles-Volumes/CandlesVolumesMultiPeriodDaily.js index fcd18f058..c8b774f03 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Candles-Volumes/CandlesVolumesMultiPeriodDaily.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Candles-Volumes/CandlesVolumesMultiPeriodDaily.js @@ -36,7 +36,7 @@ try { /* Context Variables */ let contextVariables = { - lastCandleFile: undefined, // Datetime of the last file files sucessfully produced by this process. + lastCandleFile: undefined, // Datetime of the last file files successfully produced by this process. firstTradeFile: undefined, // Datetime of the first trade file in the whole market history. maxCandleFile: undefined // Datetime of the last file available to be used as an input of this process. }; diff --git a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Candles-Volumes/CandlesVolumesMultiPeriodMarket.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Candles-Volumes/CandlesVolumesMultiPeriodMarket.js index a2decf316..94e47da0c 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Candles-Volumes/CandlesVolumesMultiPeriodMarket.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/Candles-Volumes/CandlesVolumesMultiPeriodMarket.js @@ -50,7 +50,7 @@ try { /* Context Variables */ let contextVariables = { - lastCandleFile: undefined, // Datetime of the last file files sucessfully produced by this process. + lastCandleFile: undefined, // Datetime of the last file files successfully produced by this process. firstTradeFile: undefined, // Datetime of the first trade file in the whole market history. maxCandleFile: undefined // Datetime of the last file available to be used as an input of this process. }; diff --git a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js index c2143c4a8..cc81d84ce 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js +++ b/Projects/Superalgos/TS/Bot-Modules/Indicator-Bot/MultiPeriodDaily.js @@ -41,7 +41,7 @@ /* Context Variables */ let contextVariables = { - lastFile: undefined, // Datetime of the last file files sucessfully produced by this process. + lastFile: undefined, // Datetime of the last file files successfully produced by this process. dateBeginOfMarket: undefined, // Datetime of the first trade file in the whole market history. dateEndOfMarket: undefined // Datetime of the last file available to be used as an input of this process. }; diff --git a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingProcess.js b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingProcess.js index 49bc6a47d..5fa0d90b7 100644 --- a/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingProcess.js +++ b/Projects/Superalgos/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingProcess.js @@ -60,7 +60,7 @@ /* Context Variables */ let contextVariables = { - lastFile: undefined, // Datetime of the last file files sucessfully produced by this process. + lastFile: undefined, // Datetime of the last file files successfully produced by this process. dateBeginOfMarket: undefined, // Datetime of the first trade file in the whole market history. dateEndOfMarket: undefined // Datetime of the last file available to be used as an input of this process. }; diff --git a/Projects/Superalgos/UI/Spaces/Design-Space/DesignSpace.js b/Projects/Superalgos/UI/Spaces/Design-Space/DesignSpace.js index 0090f75b3..09a05e437 100644 --- a/Projects/Superalgos/UI/Spaces/Design-Space/DesignSpace.js +++ b/Projects/Superalgos/UI/Spaces/Design-Space/DesignSpace.js @@ -40,18 +40,25 @@ function newSuperalgosDesignSpace() { /* Take types-icons relationships defined at the schema */ for (let i = 0; i < PROJECTS_ARRAY.length; i++) { let project = PROJECTS_ARRAY[i] - let appSchema = SCHEMAS_BY_PROJECT.get(project).array.appSchema - for (let j = 0; j < appSchema.length; j++) { - let schemaDocument = appSchema[j] - let iconName = schemaDocument.icon - if (iconName === undefined) { - iconName = schemaDocument.type.toLowerCase() - iconName = iconName.split(" ").join("-") - } - let icon = thisObject.getIconByProjectAndName(project, iconName) - if (icon !== undefined) { - let key = project + '-' + schemaDocument.type - thisObject.iconsByProjectAndType.set(key, icon) + + addSchemaTypes(SCHEMAS_BY_PROJECT.get(project).array.appSchema) + addSchemaTypes(SCHEMAS_BY_PROJECT.get(project).array.docsNodeSchema) + addSchemaTypes(SCHEMAS_BY_PROJECT.get(project).array.docsConceptSchema) + addSchemaTypes(SCHEMAS_BY_PROJECT.get(project).array.docsTopicSchema) + + function addSchemaTypes(schema) { + for (let j = 0; j < schema.length; j++) { + let schemaDocument = schema[j] + let iconName = schemaDocument.icon + if (iconName === undefined) { + iconName = schemaDocument.type.toLowerCase() + iconName = iconName.split(" ").join("-") + } + let icon = thisObject.getIconByProjectAndName(project, iconName) + if (icon !== undefined) { + let key = project + '-' + schemaDocument.type + thisObject.iconsByProjectAndType.set(key, icon) + } } } } diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js index 01bc62288..39c7c6689 100644 --- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js @@ -1972,27 +1972,24 @@ function newSuperalgosDocSpace() { let definitionText = getTextBasedOnLanguage(docsSchemaDocument.definition) definitionText = definitionText + addWarningIfTranslationIsOutdated(docsSchemaDocument.definition) - if (category === 'Topic' || category === 'Concept') { + /* We will test if we can draw an image here or not*/ + let testElement = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndType(project, type) + + if ((category === 'Topic' || category === 'Concept') && testElement === undefined) { HTML = HTML + '
Summary: ' + addToolTips(definitionText) + '
' } else { HTML = HTML + '
' - if (category === 'Node') { - - let imageItem = { - div: 'definition-image-div-' + definitionImagesArray.length, - project: project, - category: category, - type: type - } - definitionImagesArray.push(imageItem) - - HTML = HTML + '
' - + let imageItem = { + div: 'definition-image-div-' + definitionImagesArray.length, + project: project, + category: category, + type: type } + definitionImagesArray.push(imageItem) + HTML = HTML + '
' HTML = HTML + '
' + addToolTips(definitionText) + '
' - HTML = HTML + '
' } } @@ -2180,11 +2177,14 @@ function newSuperalgosDocSpace() { for (let i = 0; i < definitionImagesArray.length; i++) { let imageItem = definitionImagesArray[i] - let appSchemaDocument = SCHEMAS_BY_PROJECT.get(imageItem.project).map.appSchema.get(imageItem.type) - let imageElement - if (appSchemaDocument.icon === undefined) { + if (appSchemaDocument !== undefined && appSchemaDocument.icon === undefined) { + /* + We are checking this because there is a possibility that a different icon is specified + for this Node Type, in that case we would override the default that is that the icon name is + equal to the Node Type. + */ let imageName = appSchemaDocument.type.toLowerCase().replaceAll(' ', '-') imageElement = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName(imageItem.project, imageName) } else { @@ -3608,12 +3608,12 @@ function newSuperalgosDocSpace() { function addCodeToCamelCase(text) { let expandedText = text - .replaceAll('{',' { ') - .replaceAll('}',' } ') - .replaceAll('(',' ( ') - .replaceAll(')',' ) ') - .replaceAll('[',' [ ') - .replaceAll(']',' ] ') + .replaceAll('{', ' { ') + .replaceAll('}', ' } ') + .replaceAll('(', ' ( ') + .replaceAll(')', ' ) ') + .replaceAll('[', ' [ ') + .replaceAll(']', ' ] ') let splittedText = expandedText.split(' ') let result = '' for (let i = 0; i < splittedText.length; i++) { @@ -3628,12 +3628,12 @@ function newSuperalgosDocSpace() { } } result = result - .replaceAll(' { ','{') - .replaceAll(' } ','}') - .replaceAll(' ( ','(') - .replaceAll(' ) ',')') - .replaceAll(' [ ','[') - .replaceAll(' ] ',']') + .replaceAll(' { ', '{') + .replaceAll(' } ', '}') + .replaceAll(' ( ', '(') + .replaceAll(' ) ', ')') + .replaceAll(' [ ', '[') + .replaceAll(' ] ', ']') return result } diff --git a/TaskServer/ProcessInstance.js b/TaskServer/ProcessInstance.js index 8c44a7997..c5a6ace61 100644 --- a/TaskServer/ProcessInstance.js +++ b/TaskServer/ProcessInstance.js @@ -87,7 +87,7 @@ let botId = TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.parentNode.config.codeName + "." + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.parentNode.config.codeName + "." + TS.projects.superalgos.globals.taskConstants.TASK_NODE.bot.processes[processIndex].referenceParent.config.codeName; if (err.result === TS.projects.superalgos.globals.standardResponses.DEFAULT_OK_RESPONSE.result) { - TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE_OBJECT.write(MODULE_NAME, "[INFO] start -> onInitializeReady -> whenStartFinishes -> Bot execution finished sucessfully."); + TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE_OBJECT.write(MODULE_NAME, "[INFO] start -> onInitializeReady -> whenStartFinishes -> Bot execution finished successfully."); TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE_OBJECT.write(MODULE_NAME, "[INFO] start -> onInitializeReady -> whenStartFinishes -> Bot Id = " + botId); TS.projects.superalgos.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).PROCESS_INSTANCE_LOGGER_MODULE_OBJECT.persist() } else {