diff --git a/.vs/AAOlivia-Indicator-Bot/v15/.suo b/.vs/AAOlivia-Indicator-Bot/v15/.suo index 8eb388427..af340d6dc 100644 Binary files a/.vs/AAOlivia-Indicator-Bot/v15/.suo and b/.vs/AAOlivia-Indicator-Bot/v15/.suo differ diff --git a/Commons.js b/Commons.js index cf510cf27..384080203 100644 --- a/Commons.js +++ b/Commons.js @@ -22,15 +22,32 @@ return thisObject; - function initializeStorage(oliviaFileStorage, callBackFunction) { + function initializeStorage(oliviaFileStorage, bruceFileStorage, callBackFunction) { try { if (FULL_LOG === true) { logger.write("[INFO] initializeStorage -> Entering function."); } - initializeCharlyStorage(); + initializeBruceStorage(); - function initializeCharlyStorage() { + function initializeBruceStorage() { + + bruceFileStorage.initialize("AABruce", onBruceInizialized); + + function onBruceInizialized(err) { + + if (err.result === global.DEFAULT_OK_RESPONSE.result) { + + initializeOliviaStorage(); + + } else { + logger.write("[ERROR] initializeStorage -> initializeBruceStorage -> onBruceInizialized -> err = " + err.message); + callBackFunction(err); + } + } + } + + function initializeOliviaStorage() { oliviaFileStorage.initialize("AAOlivia", onOliviaInizialized); diff --git a/Multi-Period-Daily/User.bot.js b/Multi-Period-Daily/User.bot.js index c5c57b8c9..986b834d5 100644 --- a/Multi-Period-Daily/User.bot.js +++ b/Multi-Period-Daily/User.bot.js @@ -33,6 +33,7 @@ }; let oliviaFileStorage = FILE_STORAGE.newFileStorage(bot); + let bruceFileStorage = FILE_STORAGE.newFileStorage(bot); let utilities = UTILITIES.newUtilities(bot); @@ -40,7 +41,7 @@ return thisObject; - function initialize(pDependencies, callBackFunction) { + function initialize(pDependencies, pMonth, pYear, callBackFunction) { try { @@ -50,7 +51,7 @@ dependencies = pDependencies; - commons.initializeStorage(oliviaFileStorage, onInizialized); + commons.initializeStorage(oliviaFileStorage, bruceFileStorage, onInizialized); function onInizialized(err) { @@ -619,7 +620,7 @@ Read the candles and volumes from Bruce and produce a file for each day and for try { let reportKey = "AAMasters" + "-" + "AAOlivia" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; - let thisReport = dependencies.statusReports.get(key); + let thisReport = dependencies.statusReports.get(reportKey); thisReport.file.lastExecution = global.processDatetime; thisReport.file.lastFile = lastFileDate; diff --git a/Multi-Period-Market/User.bot.js b/Multi-Period-Market/User.bot.js index 8bb40210b..6a4d9acf3 100644 --- a/Multi-Period-Market/User.bot.js +++ b/Multi-Period-Market/User.bot.js @@ -33,6 +33,7 @@ }; let oliviaFileStorage = FILE_STORAGE.newFileStorage(bot); + let bruceFileStorage = FILE_STORAGE.newFileStorage(bot); let utilities = UTILITIES.newUtilities(bot); @@ -40,7 +41,7 @@ return thisObject; - function initialize(pDependencies, callBackFunction) { + function initialize(pDependencies, pMonth, pYear, callBackFunction) { try { @@ -50,7 +51,7 @@ dependencies = pDependencies; - commons.initializeStorage(oliviaFileStorage, onInizialized); + commons.initializeStorage(oliviaFileStorage, bruceFileStorage, onInizialized); function onInizialized(err) { @@ -128,7 +129,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark contextVariables.maxCandleFile = new Date(thisReport.lastFile.year + "-" + thisReport.lastFile.month + "-" + thisReport.lastFile.days + " " + thisReport.lastFile.hours + ":" + thisReport.lastFile.minutes + GMT_SECONDS); - reportKey = "AAMasters" + "-" + "AAOlivia" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; + reportKey = "AAMasters" + "-" + "AAOlivia" + "-" + "Multi-Period-Market" + "-" + "dataSet.V1"; thisReport = dependencies.statusReports.get(reportKey).file; if (thisReport.lastFile === undefined) { @@ -806,7 +807,7 @@ Read the candles and volumes from Bruce and produce a single Index File for Mark try { let reportKey = "AAMasters" + "-" + "AAOlivia" + "-" + "Multi-Period-Market" + "-" + "dataSet.V1"; - let thisReport = dependencies.statusReports.get(key); + let thisReport = dependencies.statusReports.get(reportKey); thisReport.file.lastExecution = global.processDatetime; thisReport.file.lastFile = lastFileDate; diff --git a/bin/Microsoft.NodejsTools.WebRole.dll b/bin/Microsoft.NodejsTools.WebRole.dll index e0d0ccfca..03b93f4a1 100644 Binary files a/bin/Microsoft.NodejsTools.WebRole.dll and b/bin/Microsoft.NodejsTools.WebRole.dll differ diff --git a/obj/Debug/Project.njsproj.FileListAbsolute.txt b/obj/Debug/Project.njsproj.FileListAbsolute.txt new file mode 100644 index 000000000..47f5b5415 --- /dev/null +++ b/obj/Debug/Project.njsproj.FileListAbsolute.txt @@ -0,0 +1,3 @@ +C:\Users\Luis\source\repos\Bots\AAMasters\AAOlivia-Indicator-Bot\obj\Debug\Project.njsprojResolveAssemblyReference.cache +C:\Users\Luis\source\repos\Bots\AAMasters\AAOlivia-Indicator-Bot\obj\Debug\Project.njsproj.CoreCompileInputs.cache +C:\Users\Luis\source\repos\Bots\AAMasters\AAOlivia-Indicator-Bot\bin\Microsoft.NodejsTools.WebRole.dll diff --git a/this.bot.config.json b/this.bot.config.json index a6876fc47..861415ff7 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -49,7 +49,8 @@ "minor": 0 }, "process": "One-Min-Daily-Candles-Volumes", - "dataSetVersion": "dataSet.V1" + "dataSetVersion": "dataSet.V1", + "dataSetSection": "Month" }, { "devTeam": "AAMasters", @@ -102,7 +103,8 @@ "minor": 0 }, "process": "One-Min-Daily-Candles-Volumes", - "dataSetVersion": "dataSet.V1" + "dataSetVersion": "dataSet.V1", + "dataSetSection": "Month" }, { "devTeam": "AAMasters",