diff --git a/app/ecolyo.feadf7c950aaa4f8734e.js b/app/ecolyo.0e95982944c4056355f6.js
similarity index 99%
rename from app/ecolyo.feadf7c950aaa4f8734e.js
rename to app/ecolyo.0e95982944c4056355f6.js
index 34e25e0a59998dd4c1a3569efeeaed599d11aa9e..276e7285c2e8d69a021cf536962e87461643c087 100644
--- a/app/ecolyo.feadf7c950aaa4f8734e.js
+++ b/app/ecolyo.0e95982944c4056355f6.js
@@ -17020,34 +17020,58 @@ var QueryRunner = /*#__PURE__*/function () {
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);
+ });
- 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;
+ 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;
- 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;
+
+ 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;
+ }
}
}, {
key: "withinDateBoundaries",
diff --git a/index.html b/index.html
index ce1b9d5a9be2b112d2184ac9051794a8abf29c63..1891556fc88381fd8794d673e39c65c1b2677513 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.feadf7c950aaa4f8734e.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.0e95982944c4056355f6.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 7b984106259d0b8b8afbae0fe1de9e3a99644bdf..e833ab68df3dab402a3724b3daeec084a1d0a34f 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -95902,29 +95902,47 @@ class QueryRunner {
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 === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, 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;
- 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;
+
+ 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;
+ }
}
withinDateBoundaries(dateTime, timePeriod) {
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index c515ab1a801863031d4ffec42d530c56f7f4f9c1..e8bd3ae3a57dd3b46afdbb4b41cde9a9844a7753 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -94498,29 +94498,47 @@ class QueryRunner {
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 === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, 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;
- 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;
+
+ 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;
+ }
}
withinDateBoundaries(dateTime, timePeriod) {
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index 62eed4c5ea77f1cee77913f00a06f5b2b06e74cc..0241fcaf72abe5ad4efeb2be176b77ab93242dfb 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -94409,29 +94409,47 @@ class QueryRunner {
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 === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, 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;
- 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;
+
+ 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;
+ }
}
withinDateBoundaries(dateTime, timePeriod) {
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index 05696c9843fc3091ee9c573351d6caab5a6b0bfe..b98ab2a89c4a00dec68836500d4ba837fd11907d 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -94409,29 +94409,47 @@ class QueryRunner {
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 === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, 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;
- 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;
+
+ 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;
+ }
}
withinDateBoundaries(dateTime, timePeriod) {
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index 282f84a4b813cde72e014b83bc7d45dc077a2038..780ccb93104b725338a988dc2d948342bcd5cef1 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -94498,29 +94498,47 @@ class QueryRunner {
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 === 0 ? 1 : entry.month, entry.day === 0 ? 1 : entry.day, 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;
- 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;
+
+ 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;
+ }
}
withinDateBoundaries(dateTime, timePeriod) {