diff --git a/app/ecolyo.b713b08a67af6deb8c93.js b/app/ecolyo.feadf7c950aaa4f8734e.js similarity index 99% rename from app/ecolyo.b713b08a67af6deb8c93.js rename to app/ecolyo.feadf7c950aaa4f8734e.js index 907495375da0021ac7ea3e90371b59f82d258f48..34e25e0a59998dd4c1a3569efeeaed599d11aa9e 100644 --- a/app/ecolyo.b713b08a67af6deb8c93.js +++ b/app/ecolyo.feadf7c950aaa4f8734e.js @@ -17023,7 +17023,7 @@ var QueryRunner = /*#__PURE__*/function () { } 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', { + 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); }); @@ -17036,7 +17036,7 @@ var QueryRunner = /*#__PURE__*/function () { var minusValue = timeStep === _timeStep.TimeStep.HALF_AN_HOUR ? 30 : 0; 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', { + 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 @@ -17392,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 || 1, 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 === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', { keepLocalTime: true })); @@ -17436,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 || 1, 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 === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', { keepLocalTime: true })); diff --git a/index.html b/index.html index dc3dc4d2d052a90c46962adde735f436d8cc8d3c..ce1b9d5a9be2b112d2184ac9051794a8abf29c63 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.b713b08a67af6deb8c93.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.feadf7c950aaa4f8734e.js"></script></div></body></html> \ No newline at end of file diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js index f6a156b08d761aac28feb38d87529a3505f6e4a8..7b984106259d0b8b8afbae0fe1de9e3a99644bdf 100644 --- a/services/aggregatorUsageEvents/ecolyo.js +++ b/services/aggregatorUsageEvents/ecolyo.js @@ -95904,7 +95904,7 @@ class QueryRunner { }); } - 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', { + 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; @@ -95914,7 +95914,7 @@ class QueryRunner { // 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; const mappedResult = data.map(entry => ({ - date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', { + 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 @@ -96158,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 || 1, 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 === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', { keepLocalTime: true }); } @@ -96173,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 || 1, 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 === 0 ? 1 : result.data[0].day, 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 796821428ad85fe36c9d80812eabdc2243a17bf0..c515ab1a801863031d4ffec42d530c56f7f4f9c1 100644 --- a/services/consumptionAlert/ecolyo.js +++ b/services/consumptionAlert/ecolyo.js @@ -94500,7 +94500,7 @@ class QueryRunner { }); } - 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', { + 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; @@ -94510,7 +94510,7 @@ class QueryRunner { // 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; const mappedResult = data.map(entry => ({ - date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', { + 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 @@ -94754,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 || 1, 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 === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', { keepLocalTime: true }); } @@ -94769,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 || 1, 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 === 0 ? 1 : result.data[0].day, 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 667e7a5d136972d7073008582e6bfa9e2f7b7b13..62eed4c5ea77f1cee77913f00a06f5b2b06e74cc 100644 --- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js +++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js @@ -94411,7 +94411,7 @@ class QueryRunner { }); } - 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', { + 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; @@ -94421,7 +94421,7 @@ class QueryRunner { // 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; const mappedResult = data.map(entry => ({ - date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', { + 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 @@ -94665,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 || 1, 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 === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', { keepLocalTime: true }); } @@ -94680,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 || 1, 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 === 0 ? 1 : result.data[0].day, 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 7d841876e62bb70b6eb06391946c0f26a282e4db..05696c9843fc3091ee9c573351d6caab5a6b0bfe 100644 --- a/services/fluidsPrices/ecolyo.js +++ b/services/fluidsPrices/ecolyo.js @@ -94411,7 +94411,7 @@ class QueryRunner { }); } - 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', { + 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; @@ -94421,7 +94421,7 @@ class QueryRunner { // 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; const mappedResult = data.map(entry => ({ - date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', { + 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 @@ -94665,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 || 1, 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 === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', { keepLocalTime: true }); } @@ -94680,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 || 1, 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 === 0 ? 1 : result.data[0].day, 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 900eb65dfe5e913bc6b25886f461fb71af3f6024..282f84a4b813cde72e014b83bc7d45dc077a2038 100644 --- a/services/monthlyReportNotification/ecolyo.js +++ b/services/monthlyReportNotification/ecolyo.js @@ -94500,7 +94500,7 @@ class QueryRunner { }); } - 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', { + 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; @@ -94510,7 +94510,7 @@ class QueryRunner { // 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; const mappedResult = data.map(entry => ({ - date: _luxon.DateTime.local(entry.year, entry.month || 1, entry.day || 1, entry.hour, entry.minute).setZone('utc', { + 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 @@ -94754,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 || 1, 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 === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', { keepLocalTime: true }); } @@ -94769,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 || 1, 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 === 0 ? 1 : result.data[0].day, result.data[0].hour || 0, result.data[0].minute || 0).setZone('utc', { keepLocalTime: true }); }