diff --git a/app/ecolyo.66237d660c471a9f3b9b.js b/app/ecolyo.8778845ab7ed9fa808dd.js
similarity index 99%
rename from app/ecolyo.66237d660c471a9f3b9b.js
rename to app/ecolyo.8778845ab7ed9fa808dd.js
index d5a05e0b8368f95ae4a609ff0ca986b44f6f8143..5cf8f112649a3669d494ec6c355d089bda101a17 100644
--- a/app/ecolyo.66237d660c471a9f3b9b.js
+++ b/app/ecolyo.8778845ab7ed9fa808dd.js
@@ -17264,7 +17264,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).setZone('utc', {
+ return _context5.abrupt("return", _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
}));
@@ -17306,7 +17306,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).setZone('utc', {
+ return _context6.abrupt("return", _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
}));
@@ -36430,7 +36430,7 @@ var ConsumptionFormatterService = /*#__PURE__*/function () {
value: -1,
state: _dataload.DataloadState.EMPTY,
valueDetail: null
- }, fluidType, fluidStatus);
+ }, fluidType, timeStep, fluidStatus);
filledData.push((0, _objectSpread2.default)({}, newElement));
parsingDate = parsingDate.plus(this.getTimeFromStepTime(timeStep));
}
@@ -36439,7 +36439,7 @@ var ConsumptionFormatterService = /*#__PURE__*/function () {
}
}, {
key: "defineDataloadState",
- value: function defineDataloadState(data, fluidType, fluidStatus) {
+ value: function defineDataloadState(data, fluidType, timeStep, fluidStatus) {
var today = _luxon.DateTime.local().setZone('utc', {
keepLocalTime: true
}); // Return coming state if data data is >= today
@@ -36456,7 +36456,19 @@ var ConsumptionFormatterService = /*#__PURE__*/function () {
} // Define state in function of first and last fluid data date
- if (fluidStatus.firstDataDate && data.date < fluidStatus.firstDataDate) {
+ if (fluidStatus.firstDataDate && timeStep !== _timeStep.TimeStep.MONTH && timeStep !== _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.MONTH && data.date < fluidStatus.firstDataDate.startOf('month')) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate.startOf('year')) {
return (0, _objectSpread2.default)({}, data, {
state: _dataload.DataloadState.EMPTY
});
diff --git a/index.html b/index.html
index 5d4868dfbd307193bb4b2c93aaa5b903e373b766..f6084a71a1b9860f64a008eef7db059b7d873d5b 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">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.3256cfd41a1e2c66ff46.js"></script><script src="app/ecolyo.66237d660c471a9f3b9b.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">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.3256cfd41a1e2c66ff46.js"></script><script src="app/ecolyo.8778845ab7ed9fa808dd.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index acd3b517998123456608f21d4a5f527fecf04909..ce20c772d8479958f1f63feeb90972b15386306f 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -74768,7 +74768,7 @@ class ConsumptionFormatterService {
value: -1,
state: _dataload.DataloadState.EMPTY,
valueDetail: null
- }, fluidType, fluidStatus);
+ }, fluidType, timeStep, fluidStatus);
filledData.push((0, _objectSpread2.default)({}, newElement));
parsingDate = parsingDate.plus(this.getTimeFromStepTime(timeStep));
}
@@ -74776,7 +74776,7 @@ class ConsumptionFormatterService {
return filledData;
}
- defineDataloadState(data, fluidType, fluidStatus) {
+ defineDataloadState(data, fluidType, timeStep, fluidStatus) {
const today = _luxon.DateTime.local().setZone('utc', {
keepLocalTime: true
}); // Return coming state if data data is >= today
@@ -74793,7 +74793,19 @@ class ConsumptionFormatterService {
} // Define state in function of first and last fluid data date
- if (fluidStatus.firstDataDate && data.date < fluidStatus.firstDataDate) {
+ if (fluidStatus.firstDataDate && timeStep !== _timeStep.TimeStep.MONTH && timeStep !== _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.MONTH && data.date < fluidStatus.firstDataDate.startOf('month')) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate.startOf('year')) {
return (0, _objectSpread2.default)({}, data, {
state: _dataload.DataloadState.EMPTY
});
@@ -76024,7 +76036,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -76037,7 +76049,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index a5fab9171ab925720975850ed9a69a22b33d3e4a..6e060b013d46b2ee3e0727b03b3d588700bb1f4a 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -73470,7 +73470,7 @@ class ConsumptionFormatterService {
value: -1,
state: _dataload.DataloadState.EMPTY,
valueDetail: null
- }, fluidType, fluidStatus);
+ }, fluidType, timeStep, fluidStatus);
filledData.push((0, _objectSpread2.default)({}, newElement));
parsingDate = parsingDate.plus(this.getTimeFromStepTime(timeStep));
}
@@ -73478,7 +73478,7 @@ class ConsumptionFormatterService {
return filledData;
}
- defineDataloadState(data, fluidType, fluidStatus) {
+ defineDataloadState(data, fluidType, timeStep, fluidStatus) {
const today = _luxon.DateTime.local().setZone('utc', {
keepLocalTime: true
}); // Return coming state if data data is >= today
@@ -73495,7 +73495,19 @@ class ConsumptionFormatterService {
} // Define state in function of first and last fluid data date
- if (fluidStatus.firstDataDate && data.date < fluidStatus.firstDataDate) {
+ if (fluidStatus.firstDataDate && timeStep !== _timeStep.TimeStep.MONTH && timeStep !== _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.MONTH && data.date < fluidStatus.firstDataDate.startOf('month')) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate.startOf('year')) {
return (0, _objectSpread2.default)({}, data, {
state: _dataload.DataloadState.EMPTY
});
@@ -74726,7 +74738,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -74739,7 +74751,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index f316306ef90c13602425f5212920fe0c0c263d63..16f613c2d69e247ae8570075a499806b374f5f3c 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -73349,7 +73349,7 @@ class ConsumptionFormatterService {
value: -1,
state: _dataload.DataloadState.EMPTY,
valueDetail: null
- }, fluidType, fluidStatus);
+ }, fluidType, timeStep, fluidStatus);
filledData.push((0, _objectSpread2.default)({}, newElement));
parsingDate = parsingDate.plus(this.getTimeFromStepTime(timeStep));
}
@@ -73357,7 +73357,7 @@ class ConsumptionFormatterService {
return filledData;
}
- defineDataloadState(data, fluidType, fluidStatus) {
+ defineDataloadState(data, fluidType, timeStep, fluidStatus) {
const today = _luxon.DateTime.local().setZone('utc', {
keepLocalTime: true
}); // Return coming state if data data is >= today
@@ -73374,7 +73374,19 @@ class ConsumptionFormatterService {
} // Define state in function of first and last fluid data date
- if (fluidStatus.firstDataDate && data.date < fluidStatus.firstDataDate) {
+ if (fluidStatus.firstDataDate && timeStep !== _timeStep.TimeStep.MONTH && timeStep !== _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.MONTH && data.date < fluidStatus.firstDataDate.startOf('month')) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate.startOf('year')) {
return (0, _objectSpread2.default)({}, data, {
state: _dataload.DataloadState.EMPTY
});
@@ -74605,7 +74617,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -74618,7 +74630,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index 207b5da055ff4ecf56fc49f2043f17d84c4c7a49..59d7da1042561b235784de174ba8c09f2bb8feb3 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -73349,7 +73349,7 @@ class ConsumptionFormatterService {
value: -1,
state: _dataload.DataloadState.EMPTY,
valueDetail: null
- }, fluidType, fluidStatus);
+ }, fluidType, timeStep, fluidStatus);
filledData.push((0, _objectSpread2.default)({}, newElement));
parsingDate = parsingDate.plus(this.getTimeFromStepTime(timeStep));
}
@@ -73357,7 +73357,7 @@ class ConsumptionFormatterService {
return filledData;
}
- defineDataloadState(data, fluidType, fluidStatus) {
+ defineDataloadState(data, fluidType, timeStep, fluidStatus) {
const today = _luxon.DateTime.local().setZone('utc', {
keepLocalTime: true
}); // Return coming state if data data is >= today
@@ -73374,7 +73374,19 @@ class ConsumptionFormatterService {
} // Define state in function of first and last fluid data date
- if (fluidStatus.firstDataDate && data.date < fluidStatus.firstDataDate) {
+ if (fluidStatus.firstDataDate && timeStep !== _timeStep.TimeStep.MONTH && timeStep !== _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.MONTH && data.date < fluidStatus.firstDataDate.startOf('month')) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate.startOf('year')) {
return (0, _objectSpread2.default)({}, data, {
state: _dataload.DataloadState.EMPTY
});
@@ -74605,7 +74617,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -74618,7 +74630,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index f15f18474ac1ab0493dcb7e771c5790ec67331b8..862c619138393ec423a6f0e00191ae4603b5b9aa 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -73470,7 +73470,7 @@ class ConsumptionFormatterService {
value: -1,
state: _dataload.DataloadState.EMPTY,
valueDetail: null
- }, fluidType, fluidStatus);
+ }, fluidType, timeStep, fluidStatus);
filledData.push((0, _objectSpread2.default)({}, newElement));
parsingDate = parsingDate.plus(this.getTimeFromStepTime(timeStep));
}
@@ -73478,7 +73478,7 @@ class ConsumptionFormatterService {
return filledData;
}
- defineDataloadState(data, fluidType, fluidStatus) {
+ defineDataloadState(data, fluidType, timeStep, fluidStatus) {
const today = _luxon.DateTime.local().setZone('utc', {
keepLocalTime: true
}); // Return coming state if data data is >= today
@@ -73495,7 +73495,19 @@ class ConsumptionFormatterService {
} // Define state in function of first and last fluid data date
- if (fluidStatus.firstDataDate && data.date < fluidStatus.firstDataDate) {
+ if (fluidStatus.firstDataDate && timeStep !== _timeStep.TimeStep.MONTH && timeStep !== _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.MONTH && data.date < fluidStatus.firstDataDate.startOf('month')) {
+ return (0, _objectSpread2.default)({}, data, {
+ state: _dataload.DataloadState.EMPTY
+ });
+ }
+
+ if (fluidStatus.firstDataDate && timeStep === _timeStep.TimeStep.YEAR && data.date < fluidStatus.firstDataDate.startOf('year')) {
return (0, _objectSpread2.default)({}, data, {
state: _dataload.DataloadState.EMPTY
});
@@ -74726,7 +74738,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}
@@ -74739,7 +74751,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result && result.data && result.data[0] && result.data[0].year && result.data[0].month && result.data[0].day) {
- return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day).setZone('utc', {
+ return _luxon.DateTime.local(result.data[0].year, result.data[0].month, result.data[0].day, result.data[0].hour ? result.data[0].hour : 0, result.data[0].minute ? result.data[0].minute : 0).setZone('utc', {
keepLocalTime: true
});
}