diff --git a/3/ecolyo.0d47dc56df633cbd4c8b.js b/3/ecolyo.95b2454562935abe3938.js
similarity index 99%
rename from 3/ecolyo.0d47dc56df633cbd4c8b.js
rename to 3/ecolyo.95b2454562935abe3938.js
index c581e1375d373bacd72b8c745cae97d670fae78e..0ba5f8e4ae4c7905e60905b10196f25354c3487a 100644
--- a/3/ecolyo.0d47dc56df633cbd4c8b.js
+++ b/3/ecolyo.95b2454562935abe3938.js
@@ -1315,15 +1315,12 @@ var TotalAnalysisChart = function TotalAnalysisChart(_ref) {
});
case 4:
monthTotalData = _context.sent;
- console.log({
- monthTotalData: monthTotalData
- });
if (monthTotalData !== null && monthTotalData !== void 0 && monthTotalData.actualData) {
setDataLoadValueDetailArray(monthTotalData.actualData[0].valueDetail);
setTotalLoadValue(monthTotalData.actualData[0].value);
}
setIsLoading(false);
- case 8:
+ case 7:
case "end":
return _context.stop();
}
diff --git a/app/ecolyo.bcc357e839d8591be3f6.js b/app/ecolyo.f70eabd0d7175973777d.js
similarity index 99%
rename from app/ecolyo.bcc357e839d8591be3f6.js
rename to app/ecolyo.f70eabd0d7175973777d.js
index 3731118cf75eef98f1150baa13649b73c2128e2c..bd67561cb8dabdfed5ff0807a0f0e3265e106493 100644
--- a/app/ecolyo.bcc357e839d8591be3f6.js
+++ b/app/ecolyo.f70eabd0d7175973777d.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"0d47dc56df633cbd4c8b","4":"441219e784196cc9bbea","5":"dbb9361b7c3d2399eabb","6":"22960faffb0acb9e49a6","7":"62d0f8799ccda737a9e5","8":"52e866a28719760e1d4b","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"95b2454562935abe3938","4":"441219e784196cc9bbea","5":"dbb9361b7c3d2399eabb","6":"22960faffb0acb9e49a6","7":"62d0f8799ccda737a9e5","8":"52e866a28719760e1d4b","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -29353,16 +29353,25 @@ var QueryRunner = /*#__PURE__*/function () {
return this.fetchData(query);
case 3:
result = _context2.sent;
+ console.log({
+ result: result
+ });
if (!(result !== null && result !== void 0 && result.data)) {
- _context2.next = 8;
+ _context2.next = 11;
break;
}
filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ console.log({
+ filteredResult: filteredResult
+ });
mappedResult = this.mapDataList(filteredResult, timeStep);
+ console.log({
+ mappedResult: mappedResult
+ });
return _context2.abrupt("return", mappedResult);
- case 8:
+ case 11:
return _context2.abrupt("return", null);
- case 9:
+ case 12:
case "end":
return _context2.stop();
}
@@ -34006,7 +34015,7 @@ var ConsumptionDataManager = /*#__PURE__*/function () {
return _context2.abrupt("return", formattedData);
case 13:
if (!(fluidTypes.length > 1 || isHome)) {
- _context2.next = 40;
+ _context2.next = 37;
break;
}
toBeAggregatedData = [];
@@ -34015,7 +34024,7 @@ var ConsumptionDataManager = /*#__PURE__*/function () {
_iterator.s();
case 18:
if ((_step = _iterator.n()).done) {
- _context2.next = 29;
+ _context2.next = 27;
break;
}
_fluidType = _step.value;
@@ -34023,46 +34032,36 @@ var ConsumptionDataManager = /*#__PURE__*/function () {
return this.fetchSingleFluidGraphData(timePeriod, timeStep, _fluidType, compareTimePeriod);
case 22:
_fetchedData = _context2.sent;
- console.log({
- fetchedData: _fetchedData
- });
- _formattedData = this.formatGraphDataManager(_fetchedData, timeStep, timePeriod, compareTimePeriod || null, _fluidType, fluidStatus ? fluidStatus[_fluidType] : undefined);
- console.log({
- formattedData: _formattedData
- });
- // validating output data
+ _formattedData = this.formatGraphDataManager(_fetchedData, timeStep, timePeriod, compareTimePeriod || null, _fluidType, fluidStatus ? fluidStatus[_fluidType] : undefined); // validating output data
toBeAggregatedData.push({
chartData: _formattedData,
chartFluid: _fluidType
});
- case 27:
+ case 25:
_context2.next = 18;
break;
- case 29:
- _context2.next = 34;
+ case 27:
+ _context2.next = 32;
break;
- case 31:
- _context2.prev = 31;
+ case 29:
+ _context2.prev = 29;
_context2.t0 = _context2["catch"](16);
_iterator.e(_context2.t0);
- case 34:
- _context2.prev = 34;
+ case 32:
+ _context2.prev = 32;
_iterator.f();
- return _context2.finish(34);
- case 37:
- console.log({
- toBeAggregatedData: toBeAggregatedData
- });
+ return _context2.finish(32);
+ case 35:
aggregatedData = this.aggregateGraphData(toBeAggregatedData);
return _context2.abrupt("return", aggregatedData);
- case 40:
+ case 37:
return _context2.abrupt("return", null);
- case 41:
+ case 38:
case "end":
return _context2.stop();
}
}
- }, _callee2, this, [[16, 31, 34, 37]]);
+ }, _callee2, this, [[16, 29, 32, 35]]);
}));
function getGraphData(_x3) {
return _getGraphData.apply(this, arguments);
diff --git a/index.html b/index.html
index 140dc1795e1533f58e4ae9bf504c52d7a4b98652..79a9835b8a8b3a22513c30ca40e689f936fc6b03 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.9cebad5ae7ea932ed345.js"></script><script src="app/ecolyo.bcc357e839d8591be3f6.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.9cebad5ae7ea932ed345.js"></script><script src="app/ecolyo.f70eabd0d7175973777d.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 5f9cd431df279012b4792b652842622d1fc780b2..d40e544e1c4c9b2f1b1ef1b418ae0dd4978291ea 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -71733,22 +71733,13 @@ class ConsumptionDataManager {
const toBeAggregatedData = [];
for (const fluidType of fluidTypes) {
const fetchedData = await this.fetchSingleFluidGraphData(timePeriod, timeStep, fluidType, compareTimePeriod);
- console.log({
- fetchedData
- });
const formattedData = this.formatGraphDataManager(fetchedData, timeStep, timePeriod, compareTimePeriod || null, fluidType, fluidStatus ? fluidStatus[fluidType] : undefined);
- console.log({
- formattedData
- });
// validating output data
toBeAggregatedData.push({
chartData: formattedData,
chartFluid: fluidType
});
}
- console.log({
- toBeAggregatedData
- });
const aggregatedData = this.aggregateGraphData(toBeAggregatedData);
return aggregatedData;
}
@@ -127920,9 +127911,18 @@ class QueryRunner {
async fetchFluidData(timePeriod, timeStep, fluidType) {
const query = this.buildListQuery(timeStep, timePeriod, fluidType, this._max_limit);
const result = await this.fetchData(query);
+ console.log({
+ result
+ });
if (result !== null && result !== void 0 && result.data) {
const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ console.log({
+ filteredResult
+ });
const mappedResult = this.mapDataList(filteredResult, timeStep);
+ console.log({
+ mappedResult
+ });
return mappedResult;
}
return null;
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index 92d4bd34d2bbe4beb43030946fa34bac4aee6aea..1da1a1fdc06c04c7b1481665523b85539379fe72 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -71330,22 +71330,13 @@ class ConsumptionDataManager {
const toBeAggregatedData = [];
for (const fluidType of fluidTypes) {
const fetchedData = await this.fetchSingleFluidGraphData(timePeriod, timeStep, fluidType, compareTimePeriod);
- console.log({
- fetchedData
- });
const formattedData = this.formatGraphDataManager(fetchedData, timeStep, timePeriod, compareTimePeriod || null, fluidType, fluidStatus ? fluidStatus[fluidType] : undefined);
- console.log({
- formattedData
- });
// validating output data
toBeAggregatedData.push({
chartData: formattedData,
chartFluid: fluidType
});
}
- console.log({
- toBeAggregatedData
- });
const aggregatedData = this.aggregateGraphData(toBeAggregatedData);
return aggregatedData;
}
@@ -127517,9 +127508,18 @@ class QueryRunner {
async fetchFluidData(timePeriod, timeStep, fluidType) {
const query = this.buildListQuery(timeStep, timePeriod, fluidType, this._max_limit);
const result = await this.fetchData(query);
+ console.log({
+ result
+ });
if (result !== null && result !== void 0 && result.data) {
const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ console.log({
+ filteredResult
+ });
const mappedResult = this.mapDataList(filteredResult, timeStep);
+ console.log({
+ mappedResult
+ });
return mappedResult;
}
return null;
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index 5173743a7be17d0772f3780f568246f4afbf2c09..6ef2d0d17bf663f13e991a551333ce781370f6d3 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -71330,22 +71330,13 @@ class ConsumptionDataManager {
const toBeAggregatedData = [];
for (const fluidType of fluidTypes) {
const fetchedData = await this.fetchSingleFluidGraphData(timePeriod, timeStep, fluidType, compareTimePeriod);
- console.log({
- fetchedData
- });
const formattedData = this.formatGraphDataManager(fetchedData, timeStep, timePeriod, compareTimePeriod || null, fluidType, fluidStatus ? fluidStatus[fluidType] : undefined);
- console.log({
- formattedData
- });
// validating output data
toBeAggregatedData.push({
chartData: formattedData,
chartFluid: fluidType
});
}
- console.log({
- toBeAggregatedData
- });
const aggregatedData = this.aggregateGraphData(toBeAggregatedData);
return aggregatedData;
}
@@ -127517,9 +127508,18 @@ class QueryRunner {
async fetchFluidData(timePeriod, timeStep, fluidType) {
const query = this.buildListQuery(timeStep, timePeriod, fluidType, this._max_limit);
const result = await this.fetchData(query);
+ console.log({
+ result
+ });
if (result !== null && result !== void 0 && result.data) {
const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ console.log({
+ filteredResult
+ });
const mappedResult = this.mapDataList(filteredResult, timeStep);
+ console.log({
+ mappedResult
+ });
return mappedResult;
}
return null;
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index aedf2031cba70e094e7491d6b07a7c5872eff89e..99363e5909167565479a642786aa9c98818d133b 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -71330,22 +71330,13 @@ class ConsumptionDataManager {
const toBeAggregatedData = [];
for (const fluidType of fluidTypes) {
const fetchedData = await this.fetchSingleFluidGraphData(timePeriod, timeStep, fluidType, compareTimePeriod);
- console.log({
- fetchedData
- });
const formattedData = this.formatGraphDataManager(fetchedData, timeStep, timePeriod, compareTimePeriod || null, fluidType, fluidStatus ? fluidStatus[fluidType] : undefined);
- console.log({
- formattedData
- });
// validating output data
toBeAggregatedData.push({
chartData: formattedData,
chartFluid: fluidType
});
}
- console.log({
- toBeAggregatedData
- });
const aggregatedData = this.aggregateGraphData(toBeAggregatedData);
return aggregatedData;
}
@@ -127517,9 +127508,18 @@ class QueryRunner {
async fetchFluidData(timePeriod, timeStep, fluidType) {
const query = this.buildListQuery(timeStep, timePeriod, fluidType, this._max_limit);
const result = await this.fetchData(query);
+ console.log({
+ result
+ });
if (result !== null && result !== void 0 && result.data) {
const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ console.log({
+ filteredResult
+ });
const mappedResult = this.mapDataList(filteredResult, timeStep);
+ console.log({
+ mappedResult
+ });
return mappedResult;
}
return null;