Refactoring TimePeriods for TimeFramesArray

UI/Data-Files/src/DailyFiles.js

@@ -150,9 +150,9 @@ function newDailyFiles() {
       function createFileCursors() {
         try {
           /* Now we will get the daily files */
-          for (let i = 0; i < dailyFilePeriods.length; i++) {
-            let periodTime = dailyFilePeriods[i][0]
-            let periodName = dailyFilePeriods[i][1]
+          for (let i = 0; i < dailyTimeFramesArray.length; i++) {
+            let periodTime = dailyTimeFramesArray[i][0]
+            let periodName = dailyTimeFramesArray[i][1]
 
             if (pDataset.config.validTimeFrames.includes(periodName) === false) {
               continue
@@ -198,9 +198,9 @@ function newDailyFiles() {
 
       function loadThemAll() {
         try {
-          for (let i = 0; i < dailyFilePeriods.length; i++) {
-            let periodTime = dailyFilePeriods[i][0]
-            let periodName = dailyFilePeriods[i][1]
+          for (let i = 0; i < dailyTimeFramesArray.length; i++) {
+            let periodTime = dailyTimeFramesArray[i][0]
+            let periodName = dailyTimeFramesArray[i][1]
 
             if (pDataset.config.validTimeFrames.includes(periodName) === true) {
               let fileCursor = fileCursors.get(periodTime)

UI/Data-Files/src/FileCursor.js

@@ -207,8 +207,8 @@ function newFileCursor() {
 
       let positionA
 
-      for (let i = 0; i < dailyFilePeriods.length; i++) {
-        let period = dailyFilePeriods[i]
+      for (let i = 0; i < dailyTimeFramesArray.length; i++) {
+        let period = dailyTimeFramesArray[i]
 
         if (period[0] === pTimeFrame) {
           positionA = i

UI/Data-Files/src/MarketFiles.js

@@ -148,9 +148,9 @@ function newMarketFiles() {
 
       function getMarketFiles() {
         /* Now we will get the market files */
-        for (let i = 0; i < marketFilesPeriods.length; i++) {
-          let periodTime = marketFilesPeriods[i][0]
-          let periodName = marketFilesPeriods[i][1]
+        for (let i = 0; i < marketTimeFramesArray.length; i++) {
+          let periodTime = marketTimeFramesArray[i][0]
+          let periodName = marketTimeFramesArray[i][1]
 
           if (dataset.config.validTimeFrames.includes(periodName) === false) {
             filesNotLoaded++
@@ -176,7 +176,7 @@ function newMarketFiles() {
                 filesNotLoaded++
               }
 
-              if (filesLoaded + filesNotLoaded === marketFilesPeriods.length) {
+              if (filesLoaded + filesNotLoaded === marketTimeFramesArray.length) {
                 let key = mine.config.codeName + '-' + bot.config.codeName + '-' + product.config.codeName + '-' + dataset.config.codeName + '-' + exchange.config.codeName + '-' + market.baseAsset + '/' + market.quotedAsset
                 let callerId = key + '-' + periodName + newUniqueId()
                 eventsServerClient.listenToEvent(key, 'Dataset Updated', undefined, callerId, onResponse, updateFiles)
@@ -209,9 +209,9 @@ function newMarketFiles() {
 
       /* Now we will get the market files */
 
-      for (let i = 0; i < marketFilesPeriods.length; i++) {
-        let periodTime = marketFilesPeriods[i][0]
-        let periodName = marketFilesPeriods[i][1]
+      for (let i = 0; i < marketTimeFramesArray.length; i++) {
+        let periodTime = marketTimeFramesArray[i][0]
+        let periodName = marketTimeFramesArray[i][1]
 
         if (dataset.config.validTimeFrames.includes(periodName) !== true) { continue }
         if (message.event !== undefined) {
@@ -245,7 +245,7 @@ function newMarketFiles() {
   }
 
   function getExpectedFiles() {
-    return marketFilesPeriods.length
+    return marketTimeFramesArray.length
   }
 
   function getFilesLoaded() {

UI/Globals.js

@@ -129,7 +129,7 @@ const UI_PANEL = {
 };
 
 
-let marketFilesPeriods =
+let marketTimeFramesArray =
     '[' +
     '[' + 24 * 60 * 60 * 1000 + ',' + '"24-hs"' + ']' + ',' +
     '[' + 12 * 60 * 60 * 1000 + ',' + '"12-hs"' + ']' + ',' +
@@ -140,9 +140,9 @@ let marketFilesPeriods =
     '[' + 2 * 60 * 60 * 1000 + ',' + '"02-hs"' + ']' + ',' +
     '[' + 1 * 60 * 60 * 1000 + ',' + '"01-hs"' + ']' + ']';
 
-marketFilesPeriods = JSON.parse(marketFilesPeriods);
+marketTimeFramesArray = JSON.parse(marketTimeFramesArray);
 
-let dailyFilePeriods =
+let dailyTimeFramesArray =
     '[' +
     '[' + 45 * 60 * 1000 + ',' + '"45-min"' + ']' + ',' +
     '[' + 40 * 60 * 1000 + ',' + '"40-min"' + ']' + ',' +
@@ -156,7 +156,7 @@ let dailyFilePeriods =
     '[' + 02 * 60 * 1000 + ',' + '"02-min"' + ']' + ',' +
     '[' + 01 * 60 * 1000 + ',' + '"01-min"' + ']' + ']';
 
-dailyFilePeriods = JSON.parse(dailyFilePeriods);
+dailyTimeFramesArray = JSON.parse(dailyTimeFramesArray);
 
 let SHOW_ANIMATION_PERFORMACE = false;
 let MENU_ITEM_ON_FOCUS

UI/Utilities.js

@@ -37,15 +37,15 @@ function dynamicDecimals(value, minDecimals) {
 }
 
 function convertTimeFrameToName(pTimeFrame) {
-    for (let i = 0; i < dailyFilePeriods.length; i++) {
-        let period = dailyFilePeriods[i]
+    for (let i = 0; i < dailyTimeFramesArray.length; i++) {
+        let period = dailyTimeFramesArray[i]
         if (period[0] === pTimeFrame) {
             return period[1]
         }
     }
 
-    for (let i = 0; i < marketFilesPeriods.length; i++) {
-        let period = marketFilesPeriods[i]
+    for (let i = 0; i < marketTimeFramesArray.length; i++) {
+        let period = marketTimeFramesArray[i]
         if (period[0] === pTimeFrame) {
             return period[1]
         }