From 34be4f90e8f35a18676f81099fac03ec2293e395 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Thu, 8 Dec 2022 16:58:34 +0000
Subject: [PATCH] publish: Merge remote-tracking branch 'origin/master' into
dev
generated from commit 139f42536aff8d50dee222b1ffe5f98600aeac10
---
...02066c2f7231fc48.js => ecolyo.b713b08a67af6deb8c93.js} | 8 ++++----
index.html | 2 +-
services/aggregatorUsageEvents/ecolyo.js | 8 ++++----
services/consumptionAlert/ecolyo.js | 8 ++++----
services/enedisHalfHourMonthlyAnalysis/ecolyo.js | 8 ++++----
services/fluidsPrices/ecolyo.js | 8 ++++----
services/monthlyReportNotification/ecolyo.js | 8 ++++----
7 files changed, 25 insertions(+), 25 deletions(-)
rename app/{ecolyo.f46802066c2f7231fc48.js => ecolyo.b713b08a67af6deb8c93.js} (99%)
diff --git a/app/ecolyo.f46802066c2f7231fc48.js b/app/ecolyo.b713b08a67af6deb8c93.js
similarity index 99%
rename from app/ecolyo.f46802066c2f7231fc48.js
rename to app/ecolyo.b713b08a67af6deb8c93.js
index fb82dd862..907495375 100644
--- a/app/ecolyo.f46802066c2f7231fc48.js
+++ b/app/ecolyo.b713b08a67af6deb8c93.js
@@ -17009,11 +17009,11 @@ var QueryRunner = /*#__PURE__*/function () {
}()
}, {
key: "filterDataList",
- value: function filterDataList(data, timePeriod, timeStep) {
+ value: function filterDataList(data, timePeriod) {
var _this = this;
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
+ if (timePeriod.endDate.day === timePeriod.startDate.day) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
@@ -17249,7 +17249,7 @@ var QueryRunner = /*#__PURE__*/function () {
break;
}
- filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ filteredResult = this.filterDataList(result, timePeriod);
mappedResult = this.mapDataList(filteredResult, timeStep);
return _context2.abrupt("return", mappedResult);
@@ -17339,7 +17339,7 @@ var QueryRunner = /*#__PURE__*/function () {
break;
}
- filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
+ filteredResult = this.filterDataList(result, maxTimePeriod);
mappedResult = this.mapDataList(filteredResult, timeStep);
if (!withDate) {
diff --git a/index.html b/index.html
index cbd13d418..dc3dc4d2d 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.f46802066c2f7231fc48.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.b713b08a67af6deb8c93.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 08ea0a6b3..f6a156b08 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -95893,9 +95893,9 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod, timeStep) {
+ filterDataList(data, timePeriod) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
+ if (timePeriod.endDate.day === timePeriod.startDate.day) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
@@ -96106,7 +96106,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, timePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
return mappedResult;
}
@@ -96138,7 +96138,7 @@ class QueryRunner {
}
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, maxTimePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index 9362335f8..796821428 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -94489,9 +94489,9 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod, timeStep) {
+ filterDataList(data, timePeriod) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
+ if (timePeriod.endDate.day === timePeriod.startDate.day) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
@@ -94702,7 +94702,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, timePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
return mappedResult;
}
@@ -94734,7 +94734,7 @@ class QueryRunner {
}
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, maxTimePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index 5bf7c444c..667e7a5d1 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -94400,9 +94400,9 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod, timeStep) {
+ filterDataList(data, timePeriod) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
+ if (timePeriod.endDate.day === timePeriod.startDate.day) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
@@ -94613,7 +94613,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, timePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
return mappedResult;
}
@@ -94645,7 +94645,7 @@ class QueryRunner {
}
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, maxTimePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index 7ce08620b..7d841876e 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -94400,9 +94400,9 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod, timeStep) {
+ filterDataList(data, timePeriod) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
+ if (timePeriod.endDate.day === timePeriod.startDate.day) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
@@ -94613,7 +94613,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, timePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
return mappedResult;
}
@@ -94645,7 +94645,7 @@ class QueryRunner {
}
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, maxTimePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index c2966582f..900eb65df 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -94489,9 +94489,9 @@ class QueryRunner {
return result;
}
- filterDataList(data, timePeriod, timeStep) {
+ filterDataList(data, timePeriod) {
// increase timeperiod range because the last data for a day is actually stored the next day at 00:00
- if (timeStep === _timeStep.TimeStep.HALF_AN_HOUR) {
+ if (timePeriod.endDate.day === timePeriod.startDate.day) {
timePeriod.startDate = timePeriod.startDate.plus({
minutes: 30
});
@@ -94702,7 +94702,7 @@ class QueryRunner {
const result = await this.fetchData(query);
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, timePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, timePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
return mappedResult;
}
@@ -94734,7 +94734,7 @@ class QueryRunner {
}
if (result !== null && result !== void 0 && result.data) {
- const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
+ const filteredResult = this.filterDataList(result, maxTimePeriod);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
--
GitLab