Merge branch 'Superalgos:develop' into develop

Platform/UI/AppLoader.js

@@ -1,7 +1,6 @@
 let postLoader
 
 function newAppLoader() {
-    const MODULE_NAME = 'App Loader'
     const INFO_LOG = false
     const ERROR_LOG = true
     const logger = newWebDebugLog()
@@ -65,8 +64,8 @@ function newAppLoader() {
                     for (let i = 0; i < fileArray.length; i++) {
                         let item = fileArray[i]
 
-                        project = item[0]
-                        fileName = item[1]
+                        let project = item[0]
+                        let fileName = item[1]
                         urlArray.push('Projects' + '/' + project + '/' + 'UI' + '/' + 'Function-Libraries' + '/' + fileName)
                     }
 
@@ -85,8 +84,8 @@ function newAppLoader() {
                     for (let i = 0; i < fileArray.length; i++) {
                         let item = fileArray[i]
 
-                        project = item[0]
-                        fileName = item[1]
+                        let project = item[0]
+                        let fileName = item[1]
                         urlArray.push('Projects' + '/' + project + '/' + 'UI' + '/' + 'Utilities' + '/' + fileName)
                     }
 
@@ -105,8 +104,8 @@ function newAppLoader() {
                     for (let i = 0; i < fileArray.length; i++) {
                         let item = fileArray[i]
 
-                        project = item[0]
-                        fileName = item[1]
+                        let project = item[0]
+                        let fileName = item[1]
                         urlArray.push('Projects' + '/' + project + '/' + 'UI' + '/' + 'Globals' + '/' + fileName)
                     }
 

Projects/Education/UI/Spaces/Tutorial-Space/TutorialSpace.js

@@ -50,6 +50,7 @@ function newEducationTutorialSpace() {
     let tutorialFormDiv = document.getElementById('tutorialFormDiv')
     let htmlGif = document.createElement("IMG")
     let htmlImage = document.createElement("IMG")
+    //let htmlVid = document.createElement("iframe")
 
     let currentGifName
     let newGifName
@@ -182,6 +183,7 @@ function newEducationTutorialSpace() {
         checkPressButton()
         checkGif()
         checkImage()
+        //checkVid()
         checkDocumentation()
         checkWorkspaces()
         checkSlider()
@@ -326,6 +328,17 @@ function newEducationTutorialSpace() {
             }
         }
 
+        function checkVid() {
+            let tutorialGifDiv = document.getElementById('tutorialGifDiv')
+            if (tutorialGifDiv !== null && tutorialGifDiv !== undefined) {
+                tutorialGifDiv.appendChild(htmlGif)
+            }
+
+            if (currentGifName === newGifName) { return }
+            currentGifName = newGifName
+            htmlVid.src = currentGifName
+        }
+
         function checkDocumentation() {
             if (currentNode === undefined) { return }
             let config = JSON.parse(currentNode.config)
@@ -994,7 +1007,7 @@ function newEducationTutorialSpace() {
     function resumeTutorial(node) {
         if (UI.projects.foundations.spaces.designSpace.workspace.isInitialized !== true) { return }
         //Testing if removing the navigationStack reset here fixes the tutorial resume issues
-        //navigationStack = []
+        navigationStack = []
         node.payload.uiObject.isPlaying = true
         tutorialRootNode = node
         currentNode = node
@@ -1016,7 +1029,7 @@ function newEducationTutorialSpace() {
 
     function resumeTutorialTopic(node) {
         //Testing if removing the navigationStack reset here fixes the tutorial resume issues
-        //navigationStack = []
+        navigationStack = []
         currentTopicNode = node
         currentNode = node
         currentStatus = 'Playing Topic'
@@ -1037,7 +1050,7 @@ function newEducationTutorialSpace() {
 
     function resumeTutorialStep(node) {
         //Testing if removing the navigationStack reset here fixes the tutorial resume issues
-        //navigationStack = []
+        navigationStack = []
         currentStepNode = node
         currentNode = node
         currentStatus = 'Playing Step'
@@ -1432,6 +1445,13 @@ function newEducationTutorialSpace() {
                         newGifName = text
                         break
                     }
+                    case 'Youtube': {
+                        let text = UI.projects.education.utilities.docs.getTextBasedOnLanguage(paragraph)
+                        let src = UI.projects.education.utilities.docs.parseYoutube(text)
+                        console.log('text', src)
+                        html = html + '<iframe width="400" height="215" src="https://www.youtube.com/embed/' + text + '" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>'
+                        break
+                    }
                     case 'Text': {
                         let text = UI.projects.education.utilities.docs.getTextBasedOnLanguage(paragraph)
                         text = UI.projects.education.utilities.docs.addKeyboard(text)

Projects/Foundations/Schemas/Docs-Nodes/W/Workspace/Workspace/workspace.json

@@ -80,8 +80,8 @@
         },
         {
             "style": "Text",
-            "text": "Ctrl or Cmd + Shift + Key-S",
-            "updated": 1615891225650
+            "text": "Ctrl or Cmd + Shift + Alt + Key-S",
+            "updated": 1631372841724
         },
         {
             "style": "Success",

Projects/Foundations/Schemas/Docs-Reviews/S/Superalgos/Superalgos-Project-Review/superalgos-project-review-027-superalgos-review-my-highly-constructive-and-original-review.json

@@ -0,0 +1,23 @@
+{
+    "review": "Superalgos Project Review",
+    "pageNumber": 27,
+    "type": "Superalgos Review - My highly constructive and original review",
+    "definition": {
+        "text": "Write a summary for this review page."
+    },
+    "paragraphs": [
+        {
+            "style": "Text",
+            "text": "The project looks nice.",
+            "updated": 1631145094399
+        },
+        {
+            "style": "Text",
+            "text": "This was my highly constructive and original review."
+        },
+        {
+            "style": "Text",
+            "text": "Tentacule23"
+        }
+    ]
+}

Projects/Foundations/Schemas/Docs-Reviews/S/Superalgos/Superalgos-Project-Review/superalgos-project-review-031-superalgos-review-great-getting-started-tutorials-but-not-fully-stable-modified-review.json

@@ -0,0 +1,22 @@
+{
+    "review": "Superalgos Project Review",
+    "pageNumber": 31,
+    "type": "Superalgos Review - Great Getting Started Tutorials But Not Fully Stable",
+    "definition": {
+        "text": "Write a summary for this review page."
+    },
+    "paragraphs": [
+        {
+            "style": "Text",
+            "text": "Great GUI - hierarchy, options to move icons around, create backups, and workspaces."
+        },
+        {
+            "style": "Text",
+            "text": "Although, an opportunity to improve troubleshooting errors exists (e.g. providing more on-screen user feedback). A couple of errors occured for me during the getting started tutorials, which made my learning experience a little frustrating."
+        },
+        {
+            "style": "Text",
+            "text": "Otherwise, I'm looking forward to exploring the full potential of the app framework! :)"
+        }
+    ]
+}

Projects/Foundations/Schemas/Docs-Topics/H/How/How-to-Automate-Actions-at-The-Design-Space/how-to-automate-actions-at-the-design-space-009-automating-actions-testing-your-action.json

@@ -21,6 +21,15 @@
             "style": "Success",
             "text": "If you change the code of your function, reload the UI and you can debug it again with the new changes.",
             "updated": 1614939195464
+        },
+        {
+            "style": "Text",
+            "text": "You can find more information about setting up and debugging in this topic:",
+            "updated": 1631371694241
+        },
+        {
+            "style": "List",
+            "text": "Debugging - Download and Install Visual Studio Code"
         }
     ]
 }

Projects/Foundations/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/Snapshots.js

@@ -314,7 +314,7 @@ exports.newFoundationsBotModulesSnapshots = function(processIndex) {
         let qouteProfit = ((quoteClose / quoteOpen * 100) - 100)
         let baseProfit = ((baseClose / baseOpen * 100) - 100)
 
-        let closeHeaders = ['Trade Number', 'Open Datetime', 'Close Datetime', 'Strategy Name', 'Trigger On Situation', 'Take Position Situation', 'Open Position in Base Asset', 'Close Position in Base Asset', 'Open Position in Quoted Asset', 'Close Position in Quoted Asset', 'Result In Base Asset', 'Result In Quoted Asset', 'ROI in Base Asset', '% P/L Base Asset', 'P/L Type Base Asset', 'ROI in Quoted Asset', '% P/L Quoted Asset', 'P/L Type Quoted Asset', 'Exit Type']
+        let closeHeaders = ['Trade Number', 'Open Datetime', 'Close Datetime', 'Strategy Name', 'Trigger On Situation', 'Take Position Situation', 'Open Position in Base Asset', 'Close Position in Base Asset', 'Open Position in Quoted Asset', 'Close Position in Quoted Asset', 'Result In Base Asset', 'Result In Quoted Asset', 'ROI in Base Asset', '% P/L Base Asset', 'P/L Type Base Asset', 'ROI in Quoted Asset', '% P/L Quoted Asset', 'P/L Type Quoted Asset', 'Exit Type', '# Periods']
         closeValues = [
             tradingEngine.tradingCurrent.tradingEpisode.tradingEpisodeCounters.positions.value, // Position Number
             (new Date(openDatetime)).toISOString(), // Open Datetime
@@ -335,7 +335,8 @@ exports.newFoundationsBotModulesSnapshots = function(processIndex) {
             tradingEngine.tradingCurrent.position.positionQuotedAsset.ROI.value, // ROI in Quoted Asset <- not sure this works as intended
             qouteProfit + '%', // % profit loss in quoted Asset
             qouteProfit === 0 ? 'Even' : (qouteProfit > 0 ? "Profit" : "Loss"),
-            tradingEngine.tradingCurrent.position.exitType.value // Exit Type
+            tradingEngine.tradingCurrent.position.exitType.value, // Exit Type
+            tradingEngine.tradingCurrent.position.positionCounters.periods.value // periods counter
         ]
 
         if (createCloseHeaders === true) {
@@ -394,7 +395,7 @@ exports.newFoundationsBotModulesSnapshots = function(processIndex) {
 
                 function parseRecord(record) {
                     // if we have undefined values, we need to extract the previous stored values for this trade and append them to the new record for completion
-                    if (record[record.length - 1] === undefined) {
+                    if (record[record.length - 1] === undefined && contentArray.length > 0) {
 
                         let rowToMutateArray = contentArray[contentArray.length - 1].split(',')
                             // check if are for sure on the same tradenumber and merge the data and remove previous line incl separator

README.md

@@ -42,7 +42,7 @@ You may install Node.JS just like you would on any other machine as per the abov
 **NOTE:** It is best to use the most current and updated version of the FULL PiOS image.
 
 ```
-curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
+curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
 ```
 Followed by:
 ```

TaskServer/.vscode/launch.json

@@ -11,7 +11,7 @@
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceFolder}\\Task.js"
+            "program": "${workspaceFolder}\\..\\TaskServerRoot.js"
         }
     ]
 }