diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo
index 137ffc25e..9d90c6861 100644
Binary files a/.vs/AAWebPlatform/v15/.suo and b/.vs/AAWebPlatform/v15/.suo differ
diff --git a/AAWebPlatform.njsproj b/AAWebPlatform.njsproj
index 53dafe941..88a022a23 100644
--- a/AAWebPlatform.njsproj
+++ b/AAWebPlatform.njsproj
@@ -97,7 +97,7 @@
Code
-
+
Code
diff --git a/FileCloud.js b/FileCloud.js
index 9462d17a6..030e63e72 100644
--- a/FileCloud.js
+++ b/FileCloud.js
@@ -18,14 +18,16 @@ function newFileCloud() {
}
- function getFile(pSet, pDevTeam, pBot, pExchange, pMarket, pPeriodName, pDatetime, callBackFunction) {
+ function getFile(pDevTeam, pBot, pSet, pExchange, pMarket, pPeriodName, pDatetime, callBackFunction) {
let fileName = pSet.fileName;
let filePath = pSet.filePath;
if (fileName === undefined) {
- console.log("Inconsistant data. Check the following. ");
+ console.log("Inconsistant data. Check the following: ");
+ console.log(JSON.stringify(pDevTeam));
+ console.log(JSON.stringify(pBot));
console.log(JSON.stringify(pSet));
console.log(JSON.stringify(pExchange));
console.log(JSON.stringify(pMarket));
diff --git a/Storage.js b/ProductStorage.js
similarity index 99%
rename from Storage.js
rename to ProductStorage.js
index deabab773..7e5266058 100644
--- a/Storage.js
+++ b/ProductStorage.js
@@ -1,5 +1,5 @@
-function newStorage(pName) {
+function newProductStorage(pName) {
const CONSOLE_LOG = false;
diff --git a/TimelineChart.js b/TimelineChart.js
index acf8e51bd..10604b9a8 100644
--- a/TimelineChart.js
+++ b/TimelineChart.js
@@ -112,7 +112,7 @@ function newTimelineChart() {
/* Before Initializing a Plotter, we need the Storage it will use, loaded with the files it will initially need. */
let objName = pProductCard.devTeam.codeName + "-" + pProductCard.bot.codeName + "-" + pProductCard.product.codeName;
- let storage = newStorage(objName);
+ let storage = newProductStorage(objName);
/*
diff --git a/index.html b/index.html
index 07c4f451b..67f0c3930 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
-
+
diff --git a/server.js b/server.js
index 840ac4d98..32033320a 100644
--- a/server.js
+++ b/server.js
@@ -375,29 +375,36 @@ function onBrowserRequest(request, response) {
' break;' + '\n' + '\n'
let devTeams = ecosystemObject.devTeams;
+ let competitionHosts = ecosystemObject.competitionHosts;
- for (let i = 0; i < devTeams.length; i++) {
+ addToFileContent(devTeams);
+ addToFileContent(competitionHosts);
- let devTeam = devTeams[i];
+ function addToFileContent(pDevTeamsOrCompetitionHosts) {
- for (let j = 0; j < devTeam.plotters.length; j++) {
+ for (let i = 0; i < pDevTeamsOrCompetitionHosts.length; i++) {
- let plotter = devTeam.plotters[j];
+ let devTeam = pDevTeamsOrCompetitionHosts[i];
- let caseStringCopy = caseString;
+ for (let j = 0; j < devTeam.plotters.length; j++) {
- let newFunctionName = devTeam.codeName + plotter.repo + plotter.moduleName;
- newFunctionName = newFunctionName.replace(/-/g, "");
+ let plotter = devTeam.plotters[j];
- let stringToInsert;
- stringToInsert = caseStringCopy.replace('@newFunctionName@', newFunctionName);
- stringToInsert = stringToInsert.replace('newPlotterName', 'new' + newFunctionName);
+ let caseStringCopy = caseString;
- let firstPart = fileContent.substring(0,fileContent.indexOf('// Cases'));
- let secondPart = fileContent.substring(fileContent.indexOf('// Cases'));
+ let newFunctionName = devTeam.codeName + plotter.repo + plotter.moduleName;
+ newFunctionName = newFunctionName.replace(/-/g, "");
- fileContent = firstPart + stringToInsert + secondPart;
-
+ let stringToInsert;
+ stringToInsert = caseStringCopy.replace('@newFunctionName@', newFunctionName);
+ stringToInsert = stringToInsert.replace('newPlotterName', 'new' + newFunctionName);
+
+ let firstPart = fileContent.substring(0, fileContent.indexOf('// Cases'));
+ let secondPart = fileContent.substring(fileContent.indexOf('// Cases'));
+
+ fileContent = firstPart + stringToInsert + secondPart;
+
+ }
}
}
@@ -516,29 +523,36 @@ function onBrowserRequest(request, response) {
' '
let devTeams = ecosystemObject.devTeams;
+ let competitionHosts = ecosystemObject.competitionHosts;
- for (let i = 0; i < devTeams.length; i++) {
+ addScript(devTeams);
+ addScript(competitionHosts);
- let devTeam = devTeams[i];
+ function addScript(pDevTeamsOrCompetitionHosts) {
- for (let j = 0; j < devTeam.plotters.length; j++) {
+ for (let i = 0; i < pDevTeamsOrCompetitionHosts.length; i++) {
- let plotter = devTeam.plotters[j];
+ let devTeam = pDevTeamsOrCompetitionHosts[i];
- /* Now each of these layers has a plotter that we need to define on the Plotter.js file. */
+ for (let j = 0; j < devTeam.plotters.length; j++) {
- let htmlLineCopy = htmlLine;
+ let plotter = devTeam.plotters[j];
- let stringToInsert;
- stringToInsert = htmlLineCopy.replace('@devTeam@', devTeam.codeName);
- stringToInsert = stringToInsert.replace('@repo@', plotter.repo);
- stringToInsert = stringToInsert.replace('@module@', plotter.moduleName);
+ /* Now each of these layers has a plotter that we need to define on the Plotter.js file. */
- let firstPart = fileContent.substring(0, fileContent.indexOf('') + 15);
- let secondPart = fileContent.substring(fileContent.indexOf('') + 15);
+ let htmlLineCopy = htmlLine;
- fileContent = firstPart + stringToInsert + secondPart;
+ let stringToInsert;
+ stringToInsert = htmlLineCopy.replace('@devTeam@', devTeam.codeName);
+ stringToInsert = stringToInsert.replace('@repo@', plotter.repo);
+ stringToInsert = stringToInsert.replace('@module@', plotter.moduleName);
+ let firstPart = fileContent.substring(0, fileContent.indexOf('') + 15);
+ let secondPart = fileContent.substring(fileContent.indexOf('') + 15);
+
+ fileContent = firstPart + stringToInsert + secondPart;
+
+ }
}
}