From 674ce0a705e5b52d12fde90e5da6061c6f43b233 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 9 Mar 2018 16:54:27 +0100 Subject: [PATCH] devTeam and Bot as parameters on fileCloud getFile --- .vs/AAWebPlatform/v15/.suo | Bin 74752 -> 75776 bytes File.js | 2 +- FileCache.js | 2 +- FileCloud.js | 4 +++- FileCursor.js | 8 ++++++-- FileCursorCache.js | 2 +- TimelineChart.js | 7 ++++++- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index 6fdc2e19996a1d97611f8082c6da41c62b690157..137ffc25e9b38a9a0af6b30709497761a014a015 100644 GIT binary patch delta 5056 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 delta 4913 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 diff --git a/File.js b/File.js index 290a28a1b..73068a2f3 100644 --- a/File.js +++ b/File.js @@ -26,7 +26,7 @@ function newFile() { /* Now we will get the file */ - fileCloud.getFile(pSet, exchange, pMarket, undefined, undefined, onFileReceived); + fileCloud.getFile(pDevTeam, pBot, pSet, exchange, pMarket, undefined, undefined, onFileReceived); function onFileReceived(pFile) { diff --git a/FileCache.js b/FileCache.js index 164523cf1..34de3368f 100644 --- a/FileCache.js +++ b/FileCache.js @@ -40,7 +40,7 @@ function newFileCache() { if (pSet.validPeriods.includes(periodName) === true) { - fileCloud.getFile(pSet, exchange, pMarket, periodName, undefined, onFileReceived); + fileCloud.getFile(pDevTeam, pBot, pSet, exchange, pMarket, periodName, undefined, onFileReceived); function onFileReceived(file) { diff --git a/FileCloud.js b/FileCloud.js index f4933a4e3..9462d17a6 100644 --- a/FileCloud.js +++ b/FileCloud.js @@ -18,7 +18,7 @@ function newFileCloud() { } - function getFile(pSet, pExchange, pMarket, pPeriodName, pDatetime, callBackFunction) { + function getFile(pSet, pDevTeam, pBot, pExchange, pMarket, pPeriodName, pDatetime, callBackFunction) { let fileName = pSet.fileName; let filePath = pSet.filePath; @@ -37,6 +37,8 @@ function newFileCloud() { fileName = fileName.replace("@AssetA", pMarket.assetA); fileName = fileName.replace("@AssetB", pMarket.assetB); + filePath = filePath.replace("@DevTeam", pDevTeam.codeName); + filePath = filePath.replace("@Bot", pBot.codeName); filePath = filePath.replace("@Exchange", pExchange.name); filePath = filePath.replace("@Period", pPeriodName); diff --git a/FileCursor.js b/FileCursor.js index 44c557d16..2aa2e591a 100644 --- a/FileCursor.js +++ b/FileCursor.js @@ -20,17 +20,21 @@ function newFileCursor() { let market; let exchange; let fileCloud; + let devTeam; + let bot; let thisSet; let periodName; let timePeriod; return fileCursor; - function initialize(pFileCloud, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, callBackFunction) { + function initialize(pFileCloud, pDevTeam, pBot, pSet, pExchange, pMarket, pPeriodName, pTimePeriod, pCursorDate, pCurrentTimePeriod, callBackFunction) { market = pMarket; exchange = pExchange; fileCloud = pFileCloud; + devTeam = pDevTeam; + bot = pBot; thisSet = pSet; periodName = pPeriodName; cursorDate = pCursorDate; @@ -291,7 +295,7 @@ function newFileCursor() { if (fileCursor.files.get(dateString) === undefined) { // We dont reload files we already have. - fileCloud.getFile(thisSet, exchange, market, periodName, targetDate, onFileReceived); + fileCloud.getFile(devTeam, bot, thisSet, exchange, market, periodName, targetDate, onFileReceived); } else { diff --git a/FileCursorCache.js b/FileCursorCache.js index 3ffd833bb..8015cd864 100644 --- a/FileCursorCache.js +++ b/FileCursorCache.js @@ -49,7 +49,7 @@ function newFileCursorCache() { if (pSet.validPeriods.includes(periodName) === true) { let fileCursor = newFileCursor(); - fileCursor.initialize(fileCloud, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, onFileReceived); + fileCursor.initialize(fileCloud, pDevTeam, pBot, pSet, exchange, pMarket, periodName, periodTime, pDatetime, pTimePeriod, onFileReceived); fileCursors.set(periodTime, fileCursor); diff --git a/TimelineChart.js b/TimelineChart.js index a202fec1a..acf8e51bd 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -100,6 +100,11 @@ function newTimelineChart() { initializePlotter(loadingProductCards[i]); } + + /* Finally we initialize the Competition Plotter. */ + + + } function initializePlotter(pProductCard) { @@ -111,7 +116,7 @@ function newTimelineChart() { /* - Before Initializing the Storage, we will put put the Product Card to listen to the events the storage will raise every time a file is loaded, + Before Initializing the Storage, we will put the Product Card to listen to the events the storage will raise every time a file is loaded, so that the UI can somehow show this. There are different types of events. */