Merge pull request #32 from AAMasters/develop

Manipulate Strategies from Charting System

Images/calendar.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M400 64h-48V12c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v52H160V12c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v52H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V112c0-26.5-21.5-48-48-48zm-6 400H54c-3.3 0-6-2.7-6-6V160h352v298c0 3.3-2.7 6-6 6z"/></svg>

Scripts/AppLoader.js

@@ -1,27 +1,24 @@
-let dashboard;
+let dashboard
 
-function newAppLoader() {
+function newAppLoader () {
+  const MODULE_NAME = 'App Loader'
+  const INFO_LOG = false
+  const ERROR_LOG = true
+  const INTENSIVE_LOG = false
+  const logger = newWebDebugLog()
+  logger.fileName = MODULE_NAME
 
-    const MODULE_NAME = "App Loader";
-    const INFO_LOG = false;
-    const ERROR_LOG = true;
-    const INTENSIVE_LOG = false;
-    const logger = newWebDebugLog();
-    logger.fileName = MODULE_NAME;
+  let thisObject = {
+    loadModules: loadModules
+  }
 
-    let thisObject = {
-        loadModules: loadModules
-    };
+  return thisObject
 
-    return thisObject;
+  function loadModules () {
+    try {
+      if (INFO_LOG === true) { logger.write('[INFO] loadModules -> Entering function.') }
 
-    function loadModules() {
-
-        try {
-
-            if (INFO_LOG === true) { logger.write("[INFO] loadModules -> Entering function."); }
-
-            let modulesArray = [
+      let modulesArray = [
 
                 /* CloudWebScripts */
 
@@ -29,136 +26,133 @@ function newAppLoader() {
 
                 /* PlotterPanels */
 
+        'Globals.js',
+        'Ecosystem.js',
+        'MQService',
 
-                "Globals.js",
-                "Ecosystem.js",
-                "MQService",
+        'TopSpace/CurrentEvent.js',
+        'TopSpace/EndUser.js',
+        'TopSpace/Login.js',
 
-                "TopSpace/CurrentEvent.js",
-                "TopSpace/EndUser.js",
-                "TopSpace/Login.js",
+        'StrategySpace/Workspace.js',
+        'StrategySpace/TradingSystem.js',
+        'StrategySpace/ConstGetStrategies.js',
+        'StrategySpace/ConstNewStrategy.js',
+        'StrategySpace/ConstUpdateStrategy.js',
+        'StrategySpace/ConstDeleteStrategy.js',
 
-                "StrategySpace/StrategyCollection.js",
-                "StrategySpace/StrategyCollectionItem.js",
+        'Utilities/RoundedCornersBackground.js',
 
-                "Utilities/RoundedCornersBackground.js",
+        'Panels/TimeControlPanel.js',
+        'Panels/ProductsPanel.js',
+        'Panels/PanelTabButton.js',
+        'Panels/ProductCard.js',
 
-                "Panels/TimeControlPanel.js",
-                "Panels/ProductsPanel.js",
-                "Panels/PanelTabButton.js",
+        'ControlsToolBox/SidePanel.js',
+        'ControlsToolBox/SidePanelTab.js',
 
-                "ControlsToolBox/SidePanel.js",
-                "ControlsToolBox/SidePanelTab.js",
+        'Spaces/BottomSpace.js',
+        'Spaces/TopSpace.js',
+        'Spaces/PanelsSpace.js',
+        'Spaces/ChartSpace.js',
+        'Spaces/FloatingSpace.js',
+        'Spaces/StrategySpace.js',
 
-                "Spaces/BottomSpace.js",
-                "Spaces/TopSpace.js",
-                "Spaces/PanelsSpace.js",
-                "Spaces/ChartSpace.js",
-                "Spaces/FloatingSpace.js",
-                "Spaces/StrategySpace.js",
+        'Files/SingleFile.js',
+        'Files/FileCloud.js',
+        'Files/MarketFiles.js',
+        'Files/DailyFiles.js',
+        'Files/FileCursor.js',
+        'Files/FileSequence.js',
+        'Files/FileStorage.js',
 
-                "Files/SingleFile.js",
-                "Files/FileCloud.js",
-                "Files/MarketFiles.js",
-                "Files/DailyFiles.js",
-                "Files/FileCursor.js",
-                "Files/FileSequence.js",
-                "Files/FileStorage.js",
+        'FloatingSpace/NoteSets.js',
+        'FloatingSpace/Note.js',
+        'FloatingSpace/ProfileBalls.js',
+        'FloatingSpace/ProfileBall.js',
+        'FloatingSpace/FloatingObject.js',
+        'FloatingSpace/FloatingLayer.js',
+        'FloatingSpace/StrategyPartConstructor.js',
+        'FloatingSpace/StrategyPart.js',
+        'FloatingSpace/StrategyPartTitle.js',
+        'FloatingSpace/CircularMenu.js',
+        'FloatingSpace/CircularMenuItem.js',
+        'FloatingSpace/CodeEditor.js',
 
-                "FloatingSpace/NoteSets.js",
-                "FloatingSpace/Note.js",
-                "FloatingSpace/ProfileBalls.js",
-                "FloatingSpace/ProfileBall.js",
-                "FloatingSpace/FloatingObject.js",
-                "FloatingSpace/FloatingLayer.js",
-                "FloatingSpace/StrategyParts.js",
-                "FloatingSpace/StrategyPart.js",
+        'Scales/RateScale.js',
+        'Scales/TimeScale.js',
+        'Scales/TimePeriodScale.js',
 
-                "Scales/RateScale.js",
-                "Scales/TimeScale.js",
-                "Scales/TimePeriodScale.js",
+        'ChartsSpace/ChartUtilities.js',
+        'ChartsSpace/PlottersManager.js',
+        'ChartsSpace/TimelineChart.js',
+        'ChartsSpace/TimeMachine.js',
+        'ChartsSpace/ViewPort.js',
+        'ChartsSpace/TimeLineCoordinateSystem.js',
 
-                "Plotter.js",
-                "PlotterPanel.js",
-                "UIControl.js",
+        'BottomSpace/UIControl.js',
 
-                "PlottersManager.js",
-                "ProductStorage.js",
-                "CompetitionStorage.js",
-                "ProductCard.js",
+        'Plotter.js',
+        'PlotterPanel.js',
 
-                "SplashScreen.js",
-                "Canvas.js",
-                "EventHandler.js",
-                "Frame.js",
+        'ProductStorage.js',
+        'CompetitionStorage.js',
 
-                "ViewPort.js",
-                "TimeMachine.js",
+        'SplashScreen.js',
+        'Canvas.js',
+        'EventHandler.js',
+        'Frame.js',
 
-                "ChartUtilities.js",
-                "TimelineChart.js",
+        'Animation.js',
 
-                "Animation.js",
+        'Container.js',
+        'Displace.js',
 
-                "Container.js",
-                "Displace.js",
+        'Azure/azure-storage.blob.js',
 
-                "Azure/azure-storage.blob.js",
-                "TimeLineCoordinateSystem.js",
-                "Utilities.js",
-                "Dashboard.js"
-            ];
+        'Utilities.js',
+        'Dashboard.js'
+      ]
 
-            let downloadedCounter = 0;
-            let versionParam = window.canvasApp.version;
-            if (versionParam === undefined) { versionParam = ''; }
-            else {
-                versionParam = '?' + versionParam;
+      let downloadedCounter = 0
+      let versionParam = window.canvasApp.version
+      if (versionParam === undefined) { versionParam = '' } else {
+        versionParam = '?' + versionParam
+      }
+
+      for (let i = 0; i < modulesArray.length; i++) {
+        let path = window.canvasApp.urlPrefix + modulesArray[i] + versionParam
+
+        REQUIREJS([path], onRequired)
+
+        if (INFO_LOG === true) { logger.write('[INFO] loadModules -> Module Requested.') }
+        if (INFO_LOG === true) { logger.write('[INFO] loadModules -> path = ' + path) }
+        if (INFO_LOG === true) { logger.write('[INFO] loadModules -> total requested = ' + (i + 1)) }
+
+        function onRequired (pModule) {
+          try {
+            if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Entering function.') }
+            if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Module Downloaded.') }
+            if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> path = ' + path) }
+
+            downloadedCounter++
+
+            if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> downloadedCounter = ' + downloadedCounter) }
+
+            if (downloadedCounter === modulesArray.length) {
+              if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Starting Advanced Algos Platform.') }
+
+              dashboard = newDashboard()
+
+              dashboard.start()
             }
-
-            for (let i = 0; i < modulesArray.length; i++) {
-
-                let path = window.canvasApp.urlPrefix + modulesArray[i] + versionParam;
-
-                REQUIREJS([path], onRequired);
-
-                if (INFO_LOG === true) { logger.write("[INFO] loadModules -> Module Requested."); }
-                if (INFO_LOG === true) { logger.write("[INFO] loadModules -> path = " + path); }
-                if (INFO_LOG === true) { logger.write("[INFO] loadModules -> total requested = " + (i + 1)); }
-
-                function onRequired(pModule) {
-
-                    try {
-
-                        if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Entering function."); }
-                        if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Module Downloaded."); }
-                        if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> path = " + path); }
-
-                        downloadedCounter++;
-
-                        if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> downloadedCounter = " + downloadedCounter); }
-
-                        if (downloadedCounter === modulesArray.length) {
-
-                            if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Starting Advanced Algos Platform."); }
-
-                            dashboard = newDashboard();
-
-                            dashboard.start();
-                        }
-
-                    } catch (err) {
-
-                        if (ERROR_LOG === true) { logger.write("[ERROR] loadModules -> onRequired -> err = " + err); }
-
-                    }
-                }
-            }
-
-        } catch (err) {
-
-            if (ERROR_LOG === true) { logger.write("[ERROR] loadModules -> err = " + err); }
-
+          } catch (err) {
+            if (ERROR_LOG === true) { logger.write('[ERROR] loadModules -> onRequired -> err = ' + err) }
+          }
         }
+      }
+    } catch (err) {
+      if (ERROR_LOG === true) { logger.write('[ERROR] loadModules -> err = ' + err) }
     }
+  }
 }

index.html

@@ -34,5 +34,12 @@
 
     <div id="masterApp"></div>
     <div id="canvasApp"></div>
+    <div id="textAreaDiv">
+        <textarea id="textArea" spellcheck="false" style="border: none; outline: none; box-shadow: none; overflow:hidden;  width: 0px; height: 0px;"></textarea>
+    </div>
+    <div id="inputDiv">
+        <input id="input" spellcheck="false" style="border: none; outline: none; box-shadow: none; overflow:hidden;  width: 0px; height: 0px;"></input>
+    </div>
+
 </body>
 </html>

server.js

@@ -856,6 +856,12 @@ function onBrowserRequest (request, response) {
       }
       break
 
+    case 'ChartsSpace':
+        {
+            respondWithFile(serverConfig.pathToCanvasApp + '/' + requestParameters[1] + '/' + requestParameters[2], response)
+        }
+        break
+
     default:
       {
         homePage()