diff --git a/app/ecolyo.0e95982944c4056355f6.js b/app/ecolyo.96fcd7f198538dcc0761.js
similarity index 99%
rename from app/ecolyo.0e95982944c4056355f6.js
rename to app/ecolyo.96fcd7f198538dcc0761.js
index 276e7285c2e8d69a021cf536962e87461643c087..5b7872004e680ab18cceebd6dbc314f0ea2e63e8 100644
--- a/app/ecolyo.0e95982944c4056355f6.js
+++ b/app/ecolyo.96fcd7f198538dcc0761.js
@@ -17009,69 +17009,45 @@ var QueryRunner = /*#__PURE__*/function () {
}()
}, {
key: "filterDataList",
- value: function filterDataList(data, timePeriod) {
+ value: function filterDataList(data, timePeriod, timeStep) {
var _this = this;
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timePeriod.endDate.day === timePeriod.startDate.day) {
+ if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
timePeriod.endDate = timePeriod.endDate.plus({
minutes: 30
});
- var filteredResult = data.data.filter(function (entry) {
- return _this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }), timePeriod);
- });
- return filteredResult;
- } else {
- var _filteredResult = data.data.filter(function (entry) {
- return _this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day).setZone('utc', {
- keepLocalTime: true
- }), timePeriod);
- });
-
- return _filteredResult;
}
+
+ var filteredResult = data.data.filter(function (entry) {
+ return _this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }), timePeriod);
+ });
+ return filteredResult;
}
}, {
key: "mapDataList",
value: function mapDataList(data, timeStep) {
// set back every half hour data at -30 minutes so it is displayed as 23:30 instead of 00:00 etc..
var minusValue = timeStep === _timeStep.TimeStep.HALF_AN_HOUR ? 30 : 0;
-
- if (timeStep === 10) {
- var mappedResult = data.map(function (entry) {
- return {
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }).minus({
- minutes: minusValue
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- };
- });
- return mappedResult;
- } else {
- var _mappedResult = data.map(function (entry) {
- return {
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- };
- });
-
- return _mappedResult;
- }
+ var mappedResult = data.map(function (entry) {
+ return {
+ date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }).minus({
+ minutes: minusValue
+ }),
+ value: entry.load,
+ state: _dataload.DataloadState.VALID,
+ price: entry.price,
+ valueDetail: null
+ };
+ });
+ return mappedResult;
}
}, {
key: "withinDateBoundaries",
@@ -17416,7 +17392,7 @@ var QueryRunner = /*#__PURE__*/function () {
break;
}
- return _context5.abrupt("return", _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _context5.abrupt("return", _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
}));
@@ -17460,7 +17436,7 @@ var QueryRunner = /*#__PURE__*/function () {
break;
}
- return _context6.abrupt("return", _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _context6.abrupt("return", _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
}));
diff --git a/index.html b/index.html
index 1891556fc88381fd8794d673e39c65c1b2677513..a6aec7755997fdf9b1e8cd58d361910260a18809 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,user-scalable=0,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"><!-- PWA iOS title --><meta name="apple-mobile-web-app-title" content="Ecolyo">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.71f31ccb2e4e3905e912.js"></script><script src="app/ecolyo.0e95982944c4056355f6.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,user-scalable=0,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"><!-- PWA iOS title --><meta name="apple-mobile-web-app-title" content="Ecolyo">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.71f31ccb2e4e3905e912.js"></script><script src="app/ecolyo.96fcd7f198538dcc0761.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index e833ab68df3dab402a3724b3daeec084a1d0a34f..0a90b33b50e45d090b6d4522630fa35c10b8aac4 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -95893,56 +95893,38 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod) {
+ filterDataList(data, timePeriod, timeStep) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timePeriod.endDate.day === timePeriod.startDate.day) {
+ if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
timePeriod.endDate = timePeriod.endDate.plus({
minutes: 30
});
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
- } else {
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
}
+
+ const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }), timePeriod));
+ return filteredResult;
}
mapDataList(data, timeStep) {
// set back every half hour data at -30 minutes so it is displayed as 23:30 instead of 00:00 etc..
const minusValue = timeStep === _timeStep.TimeStep.HALF_AN_HOUR ? 30 : 0;
-
- if (timeStep === 10) {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }).minus({
- minutes: minusValue
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- } else {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- }
+ const mappedResult = data.map(entry => ({
+ date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }).minus({
+ minutes: minusValue
+ }),
+ value: entry.load,
+ state: _dataload.DataloadState.VALID,
+ price: entry.price,
+ valueDetail: null
+ }));
+ return mappedResult;
}
withinDateBoundaries(dateTime, timePeriod) {
@@ -96176,7 +96158,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$ = result.data[0]) !== null && _result$data$ !== void 0 && _result$data$.year && result !== null && result !== void 0 && (_result$data$2 = result.data[0]) !== null && _result$data$2 !== void 0 && _result$data$2.month && (result === null || result === void 0 ? void 0 : (_result$data$3 = result.data[0]) === null || _result$data$3 === void 0 ? void 0 : _result$data$3.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -96191,7 +96173,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$4 = result.data[0]) !== null && _result$data$4 !== void 0 && _result$data$4.year && result !== null && result !== void 0 && (_result$data$5 = result.data[0]) !== null && _result$data$5 !== void 0 && _result$data$5.month && (result === null || result === void 0 ? void 0 : (_result$data$6 = result.data[0]) === null || _result$data$6 === void 0 ? void 0 : _result$data$6.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index e8bd3ae3a57dd3b46afdbb4b41cde9a9844a7753..8c182143d96847831e16c248ab50f0f2469e6156 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -94489,56 +94489,38 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod) {
+ filterDataList(data, timePeriod, timeStep) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timePeriod.endDate.day === timePeriod.startDate.day) {
+ if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
timePeriod.endDate = timePeriod.endDate.plus({
minutes: 30
});
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
- } else {
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
}
+
+ const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }), timePeriod));
+ return filteredResult;
}
mapDataList(data, timeStep) {
// set back every half hour data at -30 minutes so it is displayed as 23:30 instead of 00:00 etc..
const minusValue = timeStep === _timeStep.TimeStep.HALF_AN_HOUR ? 30 : 0;
-
- if (timeStep === 10) {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }).minus({
- minutes: minusValue
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- } else {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- }
+ const mappedResult = data.map(entry => ({
+ date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }).minus({
+ minutes: minusValue
+ }),
+ value: entry.load,
+ state: _dataload.DataloadState.VALID,
+ price: entry.price,
+ valueDetail: null
+ }));
+ return mappedResult;
}
withinDateBoundaries(dateTime, timePeriod) {
@@ -94772,7 +94754,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$ = result.data[0]) !== null && _result$data$ !== void 0 && _result$data$.year && result !== null && result !== void 0 && (_result$data$2 = result.data[0]) !== null && _result$data$2 !== void 0 && _result$data$2.month && (result === null || result === void 0 ? void 0 : (_result$data$3 = result.data[0]) === null || _result$data$3 === void 0 ? void 0 : _result$data$3.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -94787,7 +94769,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$4 = result.data[0]) !== null && _result$data$4 !== void 0 && _result$data$4.year && result !== null && result !== void 0 && (_result$data$5 = result.data[0]) !== null && _result$data$5 !== void 0 && _result$data$5.month && (result === null || result === void 0 ? void 0 : (_result$data$6 = result.data[0]) === null || _result$data$6 === void 0 ? void 0 : _result$data$6.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index 0241fcaf72abe5ad4efeb2be176b77ab93242dfb..4b04effa5e8448445dbe25f7f13daf3d9b957d60 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -94400,56 +94400,38 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod) {
+ filterDataList(data, timePeriod, timeStep) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timePeriod.endDate.day === timePeriod.startDate.day) {
+ if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
timePeriod.endDate = timePeriod.endDate.plus({
minutes: 30
});
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
- } else {
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
}
+
+ const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }), timePeriod));
+ return filteredResult;
}
mapDataList(data, timeStep) {
// set back every half hour data at -30 minutes so it is displayed as 23:30 instead of 00:00 etc..
const minusValue = timeStep === _timeStep.TimeStep.HALF_AN_HOUR ? 30 : 0;
-
- if (timeStep === 10) {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }).minus({
- minutes: minusValue
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- } else {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- }
+ const mappedResult = data.map(entry => ({
+ date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }).minus({
+ minutes: minusValue
+ }),
+ value: entry.load,
+ state: _dataload.DataloadState.VALID,
+ price: entry.price,
+ valueDetail: null
+ }));
+ return mappedResult;
}
withinDateBoundaries(dateTime, timePeriod) {
@@ -94683,7 +94665,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$ = result.data[0]) !== null && _result$data$ !== void 0 && _result$data$.year && result !== null && result !== void 0 && (_result$data$2 = result.data[0]) !== null && _result$data$2 !== void 0 && _result$data$2.month && (result === null || result === void 0 ? void 0 : (_result$data$3 = result.data[0]) === null || _result$data$3 === void 0 ? void 0 : _result$data$3.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -94698,7 +94680,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$4 = result.data[0]) !== null && _result$data$4 !== void 0 && _result$data$4.year && result !== null && result !== void 0 && (_result$data$5 = result.data[0]) !== null && _result$data$5 !== void 0 && _result$data$5.month && (result === null || result === void 0 ? void 0 : (_result$data$6 = result.data[0]) === null || _result$data$6 === void 0 ? void 0 : _result$data$6.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index b98ab2a89c4a00dec68836500d4ba837fd11907d..f34f1be110634f2494aa6e8f45814cbfadbed3c2 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -94400,56 +94400,38 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod) {
+ filterDataList(data, timePeriod, timeStep) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timePeriod.endDate.day === timePeriod.startDate.day) {
+ if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
timePeriod.endDate = timePeriod.endDate.plus({
minutes: 30
});
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
- } else {
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
}
+
+ const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }), timePeriod));
+ return filteredResult;
}
mapDataList(data, timeStep) {
// set back every half hour data at -30 minutes so it is displayed as 23:30 instead of 00:00 etc..
const minusValue = timeStep === _timeStep.TimeStep.HALF_AN_HOUR ? 30 : 0;
-
- if (timeStep === 10) {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }).minus({
- minutes: minusValue
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- } else {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- }
+ const mappedResult = data.map(entry => ({
+ date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }).minus({
+ minutes: minusValue
+ }),
+ value: entry.load,
+ state: _dataload.DataloadState.VALID,
+ price: entry.price,
+ valueDetail: null
+ }));
+ return mappedResult;
}
withinDateBoundaries(dateTime, timePeriod) {
@@ -94683,7 +94665,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$ = result.data[0]) !== null && _result$data$ !== void 0 && _result$data$.year && result !== null && result !== void 0 && (_result$data$2 = result.data[0]) !== null && _result$data$2 !== void 0 && _result$data$2.month && (result === null || result === void 0 ? void 0 : (_result$data$3 = result.data[0]) === null || _result$data$3 === void 0 ? void 0 : _result$data$3.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -94698,7 +94680,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$4 = result.data[0]) !== null && _result$data$4 !== void 0 && _result$data$4.year && result !== null && result !== void 0 && (_result$data$5 = result.data[0]) !== null && _result$data$5 !== void 0 && _result$data$5.month && (result === null || result === void 0 ? void 0 : (_result$data$6 = result.data[0]) === null || _result$data$6 === void 0 ? void 0 : _result$data$6.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index 780ccb93104b725338a988dc2d948342bcd5cef1..79d184df8e9bf024f3c46b97159d5b5e97fb74f6 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -94489,56 +94489,38 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod) {
+ filterDataList(data, timePeriod, timeStep) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timePeriod.endDate.day === timePeriod.startDate.day) {
+ if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
timePeriod.endDate = timePeriod.endDate.plus({
minutes: 30
});
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
- } else {
- const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day).setZone('utc', {
- keepLocalTime: true
- }), timePeriod));
- return filteredResult;
}
+
+ const filteredResult = data.data.filter(entry => this.withinDateBoundaries(_luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }), timePeriod));
+ return filteredResult;
}
mapDataList(data, timeStep) {
// set back every half hour data at -30 minutes so it is displayed as 23:30 instead of 00:00 etc..
const minusValue = timeStep === _timeStep.TimeStep.HALF_AN_HOUR ? 30 : 0;
-
- if (timeStep === 10) {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }).minus({
- minutes: minusValue
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- } else {
- const mappedResult = data.map(entry => ({
- date: _luxon.DateTime.local(entry.year, entry.month === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, entry.hour, entry.minute).setZone('utc', {
- keepLocalTime: true
- }),
- value: entry.load,
- state: _dataload.DataloadState.VALID,
- price: entry.price,
- valueDetail: null
- }));
- return mappedResult;
- }
+ const mappedResult = data.map(entry => ({
+ date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', {
+ keepLocalTime: true
+ }).minus({
+ minutes: minusValue
+ }),
+ value: entry.load,
+ state: _dataload.DataloadState.VALID,
+ price: entry.price,
+ valueDetail: null
+ }));
+ return mappedResult;
}
withinDateBoundaries(dateTime, timePeriod) {
@@ -94772,7 +94754,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$ = result.data[0]) !== null && _result$data$ !== void 0 && _result$data$.year && result !== null && result !== void 0 && (_result$data$2 = result.data[0]) !== null && _result$data$2 !== void 0 && _result$data$2.month && (result === null || result === void 0 ? void 0 : (_result$data$3 = result.data[0]) === null || _result$data$3 === void 0 ? void 0 : _result$data$3.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -94787,7 +94769,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && (_result$data$4 = result.data[0]) !== null && _result$data$4 !== void 0 && _result$data$4.year && result !== null && result !== void 0 && (_result$data$5 = result.data[0]) !== null && _result$data$5 !== void 0 && _result$data$5.month && (result === null || result === void 0 ? void 0 : (_result$data$6 = result.data[0]) === null || _result$data$6 === void 0 ? void 0 : _result$data$6.day) >= 0) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day || 1, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', {
keepLocalTime: true
});
}