diff --git a/Desktop/DesktopApp.js b/Desktop/DesktopApp.js index 8fa39fafc..e05811c30 100644 --- a/Desktop/DesktopApp.js +++ b/Desktop/DesktopApp.js @@ -15,10 +15,11 @@ exports.newDesktopApp = function newDesktopApp() { /* This is the Web Sockets client that interacts with the Superalgos Network. */ - DK.webSocketsClient = SA.projects.network.modules.webSocketsClient.newNetworkModulesWebSocketsClient() - await DK.webSocketsClient.initialize() - return - + /* + DK.webSocketsClient = SA.projects.network.modules.webSocketsClient.newNetworkModulesWebSocketsClient() + await DK.webSocketsClient.initialize() + */ + /* These are the Network Interfaces by which the UI interacts with the Desktop App.*/ //let WEB_SOCKETS_INTERFACE = require('./Client/webSocketsInterface.js') let HTTP_INTERFACE = require('./Client/httpInterface.js') @@ -35,7 +36,6 @@ exports.newDesktopApp = function newDesktopApp() { return - let queryMessage let query /* diff --git a/Desktop/WebServer/css/main.css b/Desktop/WebServer/css/main.css index 5e3eedde8..fe419c965 100644 --- a/Desktop/WebServer/css/main.css +++ b/Desktop/WebServer/css/main.css @@ -22,13 +22,134 @@ font-style: normal; } - kbd { - padding: 2px 8px; - font-size: 125%; - font-weight: 500; + .page-table { + position:fixed; + top:0px; + left:18%; + width: 64%; + height: 100%; + color: #000; + background-color: #ffffff; + border-width: 1px; + } + + .left-column { + position:relative; + top:0px; + width: 20%; + height: 100%; + color: #000; + border-width: 1px; + } + + .middle-column { + position:relative; + top:0px; + width: 50%; + height: 100%; + color: #000; + border-width: 1px; + } + + .right-column { + position:relative; + top:0px; + left:0px; + width: 30%; + height: 100%; + color: #000; + border-width: 1px; + } + + .left-table { + position:relative; + width: 100%; + height: 100%; + color: #000; + border-width: 1px; + } + + .logo-cell { + vertical-align: top; + width: 100%; + height: 70px; + color: #000; + border-width: 1px; + } + + .menu-cell { + vertical-align: top; + width: 100%; + color: #000; + border-width: 1px; + } + + .profile-cell { + vertical-align: bottom; + width: 100%; + height: 50px; + color: #000; + border-width: 1px; + } + + .middle-table { + position:relative; + width: 100%; + height: 100%; + color: #000; + border-width: 1px; + } + + .content-title-cell { + vertical-align: top; + width: 100%; + height: 50px; + color: #000; + border-width: 1px; + } + + .content-cell { + vertical-align: top; + width: 100%; + color: #000; + border-width: 1px; + } + + .right-table { + position:relative; + width: 100%; + height: 100%; + color: #000; + border-width: 1px; + } + + .search-cell { + vertical-align: top; + width: 100%; + height: 50px; + color: #000; + border-width: 1px; + } + + .context-cell { + vertical-align: top; + width: 100%; + color: #000; + border-width: 1px; + } + + .menu-table { + position:relative; + width: 100%; + height: 65%; + color: #000; + border-width: 1px; + } + + .menu-item-cell { + vertical-align: top; + width: 100%; + height: 50px; color: #000; - background-color: #bcd643; - border-radius: 5px; - border-style: outset; border-width: 1px; } \ No newline at end of file diff --git a/Desktop/WebServer/index.html b/Desktop/WebServer/index.html index 362ffc495..6d6572c60 100644 --- a/Desktop/WebServer/index.html +++ b/Desktop/WebServer/index.html @@ -42,11 +42,74 @@ Hello World! -
-
-
- + + + + + + +
+ + + + + + + + + + +
LOGO
PROFILE
+
+ + + + + + + +
CONTENT TITLE
CONTENT
+
+ + + + + + + +
SEARCH
CONTEXT
+
diff --git a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingSimulation.js b/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingSimulation.js index 0be553078..3e8d114ae 100644 --- a/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingSimulation.js +++ b/Projects/Foundations/TS/Bot-Modules/Trading-Bot/Low-Frequency-Trading/TradingSimulation.js @@ -88,7 +88,8 @@ exports.newFoundationsBotModulesTradingSimulation = function (processIndex) { This will happen when the sessionParameters.timeRange.config.initialDatetime is beyond the last candle available, meaning that the dataSet needs to be updated with more up-to-date data. */ - TS.projects.foundations.functionLibraries.sessionFunctions.stopSession(processIndex, 'Data is not up-to-date enough. Please start the Masters Data Mining Operation.') + console.log('DEBUGGING ..................', initialCandle, candles.length) + TS.projects.foundations.functionLibraries.sessionFunctions.stopSession(processIndex, 'Data is not up-to-date enough. Please start the Data Mining Operation.') TS.projects.foundations.globals.loggerVariables.VARIABLES_BY_PROCESS_INDEX_MAP.get(processIndex).BOT_MAIN_LOOP_LOGGER_MODULE_OBJECT.write(MODULE_NAME, '[IMPORTANT] runSimulation -> Data is not up-to-date enough. Stopping the Session now. ') return