From 402fadeb2fc8b3eb3748a0f5fe30993126e0344f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 11 Jan 2021 21:55:29 +0100 Subject: [PATCH 1/3] Tutorials Names Fixed --- ...-002-tutorial-topic-frame-it-flexibly.json | 3 +- ...-step-are-you-ready-for the next one.json} | 0 ...stage-002-tutorial-step- the pipeline.json | 3 +- ...-tutorial-step- lets mine some data..json} | 0 ...tutorial-step- reinforce the learning.json | 3 +- ...tage-015-tutorial-step- we need data.json} | 0 ...e-031-tutorial-step- first backtest..json} | 0 ...age-033-tutorial-step- lets do this..json} | 0 ...-tutorial-step- take position event..json} | 0 ...-stage-065-tutorial-step- lets do it.json} | 0 .../tutorial-step-reinforce-the-learning.json | 31 --------------- .../tutorial-step-the-pipeline.json | 39 ------------------- .../tutorial-topic-frame-it-flexibly.json | 27 ------------- 13 files changed, 6 insertions(+), 100 deletions(-) rename Projects/Superalgos/Schemas/Docs-Tutorials/{1.-intro-to-trading-systems-015-tutorial-step-ready-for-the-next one.json => 1.-intro-to-trading-systems-015-tutorial-step-are-you-ready-for the next one.json} (100%) rename Projects/Superalgos/Schemas/Docs-Tutorials/{3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data.json => 3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data..json} (100%) rename Projects/Superalgos/Schemas/Docs-Tutorials/{3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- are we up to date.json => 3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- we need data.json} (100%) rename Projects/Superalgos/Schemas/Docs-Tutorials/{3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest.json => 3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest..json} (100%) rename Projects/Superalgos/Schemas/Docs-Tutorials/{3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this.json => 3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this..json} (100%) rename Projects/Superalgos/Schemas/Docs-Tutorials/{3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event.json => 3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event..json} (100%) rename Projects/Superalgos/Schemas/Docs-Tutorials/{3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do this.json => 3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do it.json} (100%) delete mode 100644 Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-reinforce-the-learning.json delete mode 100644 Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-the-pipeline.json delete mode 100644 Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-topic-frame-it-flexibly.json diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-002-tutorial-topic-frame-it-flexibly.json b/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-002-tutorial-topic-frame-it-flexibly.json index 029c33a65..1defe1b43 100644 --- a/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-002-tutorial-topic-frame-it-flexibly.json +++ b/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-002-tutorial-topic-frame-it-flexibly.json @@ -12,7 +12,8 @@ "paragraphs": [ { "style": "Callout", - "text": "Please, read this page to get up to speed with how trading systems work!" + "text": "Please, read this page to get up to speed with how trading systems work!", + "updated": 1610367185240 }, { "style": "Success", diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-015-tutorial-step-ready-for-the-next one.json b/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-015-tutorial-step-are-you-ready-for the next one.json similarity index 100% rename from Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-015-tutorial-step-ready-for-the-next one.json rename to Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-015-tutorial-step-are-you-ready-for the next one.json diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-002-tutorial-step- the pipeline.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-002-tutorial-step- the pipeline.json index 34df5ac64..e8d6ec5d4 100644 --- a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-002-tutorial-step- the pipeline.json +++ b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-002-tutorial-step- the pipeline.json @@ -12,7 +12,8 @@ "paragraphs": [ { "style": "List", - "text": "The Trigger Stage with it's three events: Trigger On Event, Trigger Off Event, and Take Position Event." + "text": "The Trigger Stage with it's three events (Trigger On Event, Trigger Off Event, and Take Position Event).", + "updated": 1610382946451 }, { "style": "List", diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data..json similarity index 100% rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data.json rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data..json diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-014-tutorial-step- reinforce the learning.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-014-tutorial-step- reinforce the learning.json index efb57b26e..9671ca72e 100644 --- a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-014-tutorial-step- reinforce the learning.json +++ b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-014-tutorial-step- reinforce the learning.json @@ -24,7 +24,8 @@ }, { "style": "List", - "text": "FOURTH: Compound words in the product and property name are written altogether, with the first word in lowercase and the rest of the words capitalized! (i.e.: forExampleLikeThis)" + "text": "FOURTH: Compound words in the product and property name are written in camel case, that is, altogether, with the first word in lowercase and the rest of the words capitalized! (forExampleLikeThis)", + "updated": 1610384140775 } ] } \ No newline at end of file diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- are we up to date.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- we need data.json similarity index 100% rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- are we up to date.json rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- we need data.json diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest..json similarity index 100% rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest.json rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest..json diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this..json similarity index 100% rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this.json rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this..json diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event..json similarity index 100% rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event.json rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event..json diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do this.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do it.json similarity index 100% rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do this.json rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do it.json diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-reinforce-the-learning.json b/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-reinforce-the-learning.json deleted file mode 100644 index 9671ca72e..000000000 --- a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-reinforce-the-learning.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "tutorial": "3. Testing a Trading Idea - The Trigger Stage", - "pageNumber": 14, - "type": "Tutorial Step - Reinforce The Learning!", - "definition": { - "icon": { - "project": "Superalgos", - "name": "learning-bot" - }, - "text": "Let's do a quick recap on the matter of the syntax! I'll push this until you learn it!" - }, - "paragraphs": [ - { - "style": "List", - "text": "FIRST: The time frame! (i.e.: chart.at24hs)" - }, - { - "style": "List", - "text": "SECOND: Each segment of the instruction is separated by dots! (i.e.: like.this)" - }, - { - "style": "List", - "text": "THIRD: Product name and property name are determined by the indicator you are using. No need to memorize them, as you may copy and paste them from the docs when you need them!" - }, - { - "style": "List", - "text": "FOURTH: Compound words in the product and property name are written in camel case, that is, altogether, with the first word in lowercase and the rest of the words capitalized! (forExampleLikeThis)", - "updated": 1610384140775 - } - ] -} \ No newline at end of file diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-the-pipeline.json b/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-the-pipeline.json deleted file mode 100644 index e8d6ec5d4..000000000 --- a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-the-pipeline.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "tutorial": "3. Testing a Trading Idea - The Trigger Stage", - "pageNumber": 2, - "type": "Tutorial Step - The Pipeline", - "definition": { - "icon": { - "project": "Superalgos", - "name": "dataset-definition" - }, - "text": "We will cover several topics! Let's make a quick list to use as a guide along the way!" - }, - "paragraphs": [ - { - "style": "List", - "text": "The Trigger Stage with it's three events (Trigger On Event, Trigger Off Event, and Take Position Event).", - "updated": 1610382946451 - }, - { - "style": "List", - "text": "Basic definitions including what is a Situation, a Condition, and a Formula." - }, - { - "style": "List", - "text": "Syntax, or how to write conditions and formulas." - }, - { - "style": "List", - "text": "Indicator properties and how to use them." - }, - { - "style": "List", - "text": "Open, Manage, and Close Stages basics." - }, - { - "style": "Success", - "text": "Have you read about these topics? No worries... you will!" - } - ] -} \ No newline at end of file diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-topic-frame-it-flexibly.json b/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-topic-frame-it-flexibly.json deleted file mode 100644 index 1defe1b43..000000000 --- a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-topic-frame-it-flexibly.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "tutorial": "1. Intro to Trading Systems", - "pageNumber": 2, - "type": "Tutorial Topic - Frame It Flexibly!", - "definition": { - "icon": { - "project": "Superalgos", - "name": "trading-system" - }, - "text": "A Trading System governs trading strategies, and provides a flexible—but structured— framework to build them." - }, - "paragraphs": [ - { - "style": "Callout", - "text": "Please, read this page to get up to speed with how trading systems work!", - "updated": 1610367185240 - }, - { - "style": "Success", - "text": "There is no substitute for knowledge, so you will need to do some reading before I get your hands dirty with good ol' trading logic!" - }, - { - "style": "Warning", - "text": "Skipping the reading may result in permanent neurological impairment. Your call!" - } - ] -} \ No newline at end of file From d705a391cc5eb5b82f3b3ff5f5c14bf62ed1912f Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 11 Jan 2021 22:05:39 +0100 Subject: [PATCH 2/3] Error when no pages found --- ...7-no-matching-topic-or-tutorial-found.json | 30 +++++++++++++++++++ .../UI/Spaces/Docs-Space/CommandInterface.js | 26 +++++----------- 2 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 Projects/Superalgos/Schemas/Docs-Topics/docs-commands-errors-017-no-matching-topic-or-tutorial-found.json diff --git a/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-errors-017-no-matching-topic-or-tutorial-found.json b/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-errors-017-no-matching-topic-or-tutorial-found.json new file mode 100644 index 000000000..e6f5dd070 --- /dev/null +++ b/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-errors-017-no-matching-topic-or-tutorial-found.json @@ -0,0 +1,30 @@ +{ + "topic": "Docs Commands Errors", + "pageNumber": "17", + "type": "No Matching Topic Or Tutorial Found", + "definition": { + "text": "The Topic or Tutorial you specified did not produce any match of pages within that Topic or Tutorial.", + "updated": 1610398888306 + }, + "paragraphs": [ + { + "style": "Error", + "text": "No pages found. There are no Topics or Tutorials with the name provided.", + "updated": 1610398925565 + }, + { + "style": "Success", + "text": "Tip: Check that the name Topic or Tutorial name provided is correctly spelled.", + "updated": 1610398957505 + }, + { + "style": "Title", + "text": "Applies to" + }, + { + "style": "List", + "text": "Docs Repaginate Command", + "updated": 1610398971728 + } + ] +} \ No newline at end of file diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js b/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js index 99a19161b..66e155ebc 100644 --- a/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js +++ b/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js @@ -550,27 +550,17 @@ function newSuperalgosDocsCommmandInterface() { query ) + if (orderedArray.length = 0) { + UI.projects.superalgos.spaces.docsSpace.navigateTo('Superalgos', 'Topic', 'No Matching Topic Or Tutorial Found') + return + } + let pageNumber = 1 for (let i = 0; i < orderedArray.length; i++) { schemaDocument = orderedArray[i] - switch (category) { - case 'Topic': { - if (schemaDocument.topic === query) { - schemaDocument.pageNumber = pageNumber - pageNumber++ - schemaDocument.updated = true - } - break - } - case 'Tutorial': { - if (schemaDocument.tutorial === query) { - schemaDocument.pageNumber = pageNumber - pageNumber++ - schemaDocument.updated = true - } - break - } - } + schemaDocument.pageNumber = pageNumber + pageNumber++ + schemaDocument.updated = true } UI.projects.superalgos.spaces.docsSpace.navigateTo('Superalgos', 'Topic', 'Docs Message Repagination Succeed') } From 1992605d06715c4d424b26e5edd4aad11b1ab742 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 11 Jan 2021 22:11:59 +0100 Subject: [PATCH 3/3] CODE added to Tutorials --- .../UI/Spaces/Tutorial-Space/TutorialSpace.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js b/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js index 45c452d7d..3c255939f 100644 --- a/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js +++ b/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js @@ -1265,6 +1265,16 @@ function newSuperalgosTutorialSpace() { html = html + '
' + text + '
' break } + case 'Json': { + let text = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) + html = html + '
' + text + '
' + break + } + case 'Javascript': { + let text = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) + html = html + '
' + text + '
' + break + } case 'List': { let text = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) text = UI.projects.superalgos.utilities.docs.addKeyboard(text)