diff --git a/2/ecolyo.9a81bb5949723e491a93.js b/2/ecolyo.7b0014b06996ba183b7b.js
similarity index 99%
rename from 2/ecolyo.9a81bb5949723e491a93.js
rename to 2/ecolyo.7b0014b06996ba183b7b.js
index 8e779186bb574b4fbdb50896a37e4e86ab341920..e523cf0d9bc6e4fbc98e966153ea4b535275d195 100644
--- a/2/ecolyo.9a81bb5949723e491a93.js
+++ b/2/ecolyo.7b0014b06996ba183b7b.js
@@ -1674,7 +1674,7 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
var isDataFullyComplete = (0, _react.useCallback)(function (monthDataloads) {
var _monthDataloads$weeke, _monthDataloads$week$;
- if (monthDataloads && monthDataloads.weekend && monthDataloads.week && ((_monthDataloads$weeke = monthDataloads.weekend[0]) === null || _monthDataloads$weeke === void 0 ? void 0 : _monthDataloads$weeke.value) !== null && ((_monthDataloads$week$ = monthDataloads.week[0]) === null || _monthDataloads$week$ === void 0 ? void 0 : _monthDataloads$week$.value) !== null) {
+ if (monthDataloads !== null && monthDataloads !== void 0 && monthDataloads.weekend && monthDataloads.week && ((_monthDataloads$weeke = monthDataloads.weekend[0]) === null || _monthDataloads$weeke === void 0 ? void 0 : _monthDataloads$weeke.value) !== null && ((_monthDataloads$week$ = monthDataloads.week[0]) === null || _monthDataloads$week$ === void 0 ? void 0 : _monthDataloads$week$.value) !== null) {
return true;
} else return false;
}, []);
@@ -2075,7 +2075,7 @@ var MonthlyAnalysis = function MonthlyAnalysis(_ref) {
if (isLoaded) {
var app = document.querySelector('.app-content');
window.scrollTo(0, scrollPosition);
- app && app.scrollTo(0, scrollPosition);
+ app === null || app === void 0 ? void 0 : app.scrollTo(0, scrollPosition);
}
}, [isLoaded, scrollPosition]);
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isLoaded && /*#__PURE__*/_react.default.createElement("div", {
diff --git a/3/ecolyo.08f7e7c389f79e81ae12.js b/3/ecolyo.5ece55736571b5c91afd.js
similarity index 99%
rename from 3/ecolyo.08f7e7c389f79e81ae12.js
rename to 3/ecolyo.5ece55736571b5c91afd.js
index 26980997fd6d94edd8d996e4b14a7a1b97a939b9..2a8e596f4d2fe43c667e8d74255c02cdb4babcef 100644
--- a/3/ecolyo.08f7e7c389f79e81ae12.js
+++ b/3/ecolyo.5ece55736571b5c91afd.js
@@ -1075,11 +1075,13 @@ var BarChart = function BarChart(_ref) {
}), /*#__PURE__*/_react.default.createElement("g", {
transform: "translate(".concat(marginLeft, ",").concat(marginTop, ")")
}, chartData.actualData.map(function (d, index) {
+ var _chartData$comparison;
+
return /*#__PURE__*/_react.default.createElement(_Bar.default, {
key: index,
index: index,
dataload: d,
- compareDataload: chartData.comparisonData && chartData.comparisonData[index] ? chartData.comparisonData[index] : null,
+ compareDataload: (_chartData$comparison = chartData.comparisonData) !== null && _chartData$comparison !== void 0 && _chartData$comparison[index] ? chartData.comparisonData[index] : null,
fluidType: fluidType,
timeStep: timeStep,
showCompare: showCompare,
@@ -2103,7 +2105,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
for (_iterator.s(); !(_step = _iterator.n()).done;) {
fluid = _step.value;
- if (fluid && fluid !== null && fluid !== void 0 && fluid.lastDataDate && (fluid === null || fluid === void 0 ? void 0 : fluid.lastDataDate) > _lastDataDate) {
+ if (fluid !== null && fluid !== void 0 && fluid.lastDataDate && (fluid === null || fluid === void 0 ? void 0 : fluid.lastDataDate) > _lastDataDate) {
_lastDataDate = fluid.lastDataDate;
}
}
diff --git a/5/ecolyo.401a99b573fa3e497045.js b/5/ecolyo.4c1d9ae558d5214ade9c.js
similarity index 99%
rename from 5/ecolyo.401a99b573fa3e497045.js
rename to 5/ecolyo.4c1d9ae558d5214ade9c.js
index dade51751b90b653bcc22db240ae7f04a6bc40cc..872207057909d60e0deea3f63296943de5aa582e 100644
--- a/5/ecolyo.401a99b573fa3e497045.js
+++ b/5/ecolyo.4c1d9ae558d5214ade9c.js
@@ -147,7 +147,7 @@ var DateNavigator = function DateNavigator(_ref) {
} else {
var _updatedDate = dateChartService.incrementeDate(_timeStep.TimeStep.MONTH, currentAnalysisDate, increment);
- setCurrentAnalysisDate && setCurrentAnalysisDate(_updatedDate);
+ setCurrentAnalysisDate === null || setCurrentAnalysisDate === void 0 ? void 0 : setCurrentAnalysisDate(_updatedDate);
}
};
diff --git a/app/ecolyo.a7b41fae640027908dcb.js b/app/ecolyo.2ef6ca7d5dec16671b46.js
similarity index 99%
rename from app/ecolyo.a7b41fae640027908dcb.js
rename to app/ecolyo.2ef6ca7d5dec16671b46.js
index 5a91b6c4f293267a240310d27ff82487638dbb65..6946634da13bba6d8925e9b2cd0b1a641d656663 100644
--- a/app/ecolyo.a7b41fae640027908dcb.js
+++ b/app/ecolyo.2ef6ca7d5dec16671b46.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"9a81bb5949723e491a93","3":"08f7e7c389f79e81ae12","4":"cb0065196f4258175382","5":"401a99b573fa3e497045","6":"cf351296060960978fe9","7":"403585665c5e67c3d156","8":"5830bb8afb143f3420a7","9":"9ad8f654859d6a5af353"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"7b0014b06996ba183b7b","3":"5ece55736571b5c91afd","4":"cb0065196f4258175382","5":"4c1d9ae558d5214ade9c","6":"cf351296060960978fe9","7":"403585665c5e67c3d156","8":"5830bb8afb143f3420a7","9":"9ad8f654859d6a5af353"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -947,6 +947,7 @@ var useUserInstanceSettings = function useUserInstanceSettings() {
var client = (0, _cozyClient.useClient)();
var _useState = (0, _react.useState)({
+ // eslint-disable-next-line camelcase
public_name: ''
}),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -4937,7 +4938,9 @@ var ActionService = /*#__PURE__*/function () {
}).filter(function (action) {
return action.state === _userAction.UserActionState.DONE;
}).map(function (action) {
- return action.ecogesture && action.ecogesture.id;
+ var _action$ecogesture;
+
+ return (_action$ecogesture = action.ecogesture) === null || _action$ecogesture === void 0 ? void 0 : _action$ecogesture.id;
}); // Remove actions Done from the list
if (actionsDone.length > 0) {
@@ -9476,6 +9479,8 @@ var ConsumptionDataManager = /*#__PURE__*/function () {
try {
for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+ var _singleFluidChart$cha;
+
var singleFluidChart = _step6.value;
if (!singleFluidChart.chartData) break;
if (!singleFluidChart.chartData.actualData[i]) break;
@@ -9491,7 +9496,7 @@ var ConsumptionDataManager = /*#__PURE__*/function () {
state: singleFluidChart.chartData.actualData[i].state
};
- if (singleFluidChart.chartData.comparisonData && singleFluidChart.chartData.comparisonData[i]) {
+ if ((_singleFluidChart$cha = singleFluidChart.chartData.comparisonData) !== null && _singleFluidChart$cha !== void 0 && _singleFluidChart$cha[i]) {
var comparisonValue = singleFluidChart.chartData.comparisonData[i].value;
tempComparisonAggregatedState.push(singleFluidChart.chartData.comparisonData[i].state);
var convertedComparisonValue = -1;
@@ -10434,7 +10439,7 @@ var QuizService = /*#__PURE__*/function () {
case 3:
_yield$this$_client$q2 = _context2.sent;
data = _yield$this$_client$q2.data;
- return _context2.abrupt("return", data && data[0]);
+ return _context2.abrupt("return", data === null || data === void 0 ? void 0 : data[0]);
case 6:
case "end":
@@ -10958,7 +10963,7 @@ var QuizService = /*#__PURE__*/function () {
var _getMaxLoadOnLastInterval = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(timeStep, interval, fluidType) {
var _graphData;
- var dateMax, max, consumptionService, limit, graphData, _graphData3, newInterval, objectTimeStep, _graphData2, _newInterval;
+ var dateMax, max, consumptionService, limit, graphData, _graphData4, newInterval, objectTimeStep, _graphData2, _graphData3, _newInterval;
return _regenerator.default.wrap(function _callee9$(_context9) {
while (1) {
@@ -11031,7 +11036,7 @@ var QuizService = /*#__PURE__*/function () {
limit.reached = true;
}
- if (graphData && graphData.actualData) {
+ if ((_graphData3 = graphData) !== null && _graphData3 !== void 0 && _graphData3.actualData) {
max = Math.max.apply(Math, (0, _toConsumableArray2.default)(graphData.actualData.map(function (d) {
return d.value;
})));
@@ -11066,7 +11071,7 @@ var QuizService = /*#__PURE__*/function () {
graphData = _context9.sent;
case 33:
- if ((_graphData3 = graphData) !== null && _graphData3 !== void 0 && _graphData3.actualData) {
+ if ((_graphData4 = graphData) !== null && _graphData4 !== void 0 && _graphData4.actualData) {
max = Math.max.apply(Math, (0, _toConsumableArray2.default)(graphData.actualData.map(function (d) {
return d.value;
})));
@@ -11124,7 +11129,7 @@ var QuizService = /*#__PURE__*/function () {
graphData = _context10.sent;
average = 0;
- if (graphData && graphData.actualData) {
+ if (graphData !== null && graphData !== void 0 && graphData.actualData) {
total = 0;
length = 0;
graphData.actualData.forEach(function (d) {
@@ -11265,11 +11270,11 @@ var QuizService = /*#__PURE__*/function () {
var roll2 = coefList.splice(index2, 1);
var coef2 = roll2[0]; // Format answers
- maxLoad = Math.round(maxLoad * 100) / 100;
- var wrongAnswer1 = Math.round(maxLoad * coef1 * 100) / 100;
- var wrongAnswer2 = Math.round(maxLoad * coef2 * 100) / 100;
+ var load = Math.round(maxLoad * 100) / 100;
+ var wrongAnswer1 = Math.round(load * coef1 * 100) / 100;
+ var wrongAnswer2 = Math.round(load * coef2 * 100) / 100;
return [{
- answerLabel: "".concat((0, _utils.formatNumberValues)(maxLoad), " ").concat(unit),
+ answerLabel: "".concat((0, _utils.formatNumberValues)(load), " ").concat(unit),
isTrue: true
}, {
answerLabel: "".concat((0, _utils.formatNumberValues)(wrongAnswer1), " ").concat(unit),
@@ -13092,9 +13097,7 @@ var _react = _interopRequireDefault(__webpack_require__("q1tI"));
__webpack_require__("7kNj");
-var MinorUpdateContent = function MinorUpdateContent(_ref) {
- var toggleLegalNoticeModal = _ref.toggleLegalNoticeModal;
-
+var MinorUpdateContent = function MinorUpdateContent() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
@@ -14214,9 +14217,7 @@ var TermsView = function TermsView() {
}
}, t('dataShare.button_accept')))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
className: "terms-content"
- }, /*#__PURE__*/_react.default.createElement(_MinorUpdateContent.default, {
- toggleLegalNoticeModal: toggleLegalNoticeModal
- })), /*#__PURE__*/_react.default.createElement("div", {
+ }, /*#__PURE__*/_react.default.createElement(_MinorUpdateContent.default, null)), /*#__PURE__*/_react.default.createElement("div", {
className: "terms-footer"
}, /*#__PURE__*/_react.default.createElement(_core.Button, {
"aria-label": t('minorUpdate.button'),
@@ -17533,7 +17534,8 @@ var QueryRunner = /*#__PURE__*/function () {
key: "fetchFluidMaxData",
value: function () {
var _fetchFluidMaxData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(maxTimePeriod, timeStep, fluidType, withDate) {
- var query, result, lastDayOfPreviousMonth, lastDayOfPreviousMonthQuery, lastDayOfPreviousMonthResult, filteredResult, mappedResult;
+ var query, result, lastDayOfPreviousMonth, lastDayOfPreviousMonthQuery, lastDayOfPreviousMonthResult, _mappedResult$, filteredResult, mappedResult;
+
return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
@@ -17564,7 +17566,7 @@ var QueryRunner = /*#__PURE__*/function () {
case 9:
lastDayOfPreviousMonthResult = _context4.sent;
- return _context4.abrupt("return", Math.max(lastDayOfPreviousMonthResult && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result && result.data[0] ? result.data[0].load : 0));
+ return _context4.abrupt("return", Math.max(lastDayOfPreviousMonthResult !== null && lastDayOfPreviousMonthResult !== void 0 && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result !== null && result !== void 0 && result.data[0] ? result.data[0].load : 0));
case 11:
if (!(result !== null && result !== void 0 && result.data)) {
@@ -17580,10 +17582,10 @@ var QueryRunner = /*#__PURE__*/function () {
break;
}
- return _context4.abrupt("return", mappedResult && mappedResult[0] && mappedResult[0]);
+ return _context4.abrupt("return", mappedResult === null || mappedResult === void 0 ? void 0 : mappedResult[0]);
case 16:
- return _context4.abrupt("return", mappedResult && mappedResult[0] && mappedResult[0].value);
+ return _context4.abrupt("return", mappedResult === null || mappedResult === void 0 ? void 0 : (_mappedResult$ = mappedResult[0]) === null || _mappedResult$ === void 0 ? void 0 : _mappedResult$.value);
case 17:
return _context4.abrupt("return", null);
@@ -17769,26 +17771,28 @@ var Loader = function Loader(_ref) {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
+ var variant = color;
+
switch (fluidType) {
case _fluid.FluidType.MULTIFLUID:
- color = 'gold';
+ variant = 'gold';
break;
case _fluid.FluidType.ELECTRICITY:
- color = 'elec';
+ variant = 'elec';
break;
case _fluid.FluidType.GAS:
- color = 'gaz';
+ variant = 'gaz';
break;
case _fluid.FluidType.WATER:
- color = 'water';
+ variant = 'water';
break;
}
return /*#__PURE__*/_react.default.createElement("div", {
- className: "loader ".concat(color),
+ className: "loader ".concat(variant),
"aria-busy": "true",
"aria-label": t('common.accessibility.loading'),
title: t('common.accessibility.loading')
@@ -20832,7 +20836,7 @@ var DuelService = /*#__PURE__*/function () {
case 3:
_yield$this$_client$q2 = _context4.sent;
data = _yield$this$_client$q2.data;
- return _context4.abrupt("return", data && data[0]);
+ return _context4.abrupt("return", data === null || data === void 0 ? void 0 : data[0]);
case 6:
case "end":
@@ -21016,7 +21020,7 @@ var DuelService = /*#__PURE__*/function () {
fetchLastValidData = _context7.sent;
maxData = performanceService.aggregatePerformanceIndicators(fetchLastValidData); // Set the threshold
- if (maxData && maxData.value && maxData.value > 0) {
+ if (maxData !== null && maxData !== void 0 && maxData.value && maxData.value > 0) {
updatedThreshold = (0, _math.getRoundFloat)(maxData.value);
} else {
updatedThreshold = -1;
@@ -34354,8 +34358,6 @@ var _createClass2 = _interopRequireDefault(__webpack_require__("W8MJ"));
var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
-var _appDataset = __webpack_require__("uVqs");
-
var MatomoTracker = /*#__PURE__*/function () {
function MatomoTracker(_ref) {
var cozyUrl = _ref.cozyUrl,
@@ -34401,31 +34403,11 @@ var MatomoTracker = /*#__PURE__*/function () {
track: this.track
};
}
- }, {
- key: "configure",
- value: function configure() {
- var cozyDomain;
- var userId;
- var root = document.querySelector('[role=application]');
-
- if (root !== null && root !== void 0 && root.dataset) {
- cozyDomain = (0, _appDataset.readCozyDataFromDOM)('cozyDomain');
- }
-
- if (cozyDomain) {
- userId = cozyDomain;
- var indexOfPort = cozyDomain.indexOf(':');
-
- if (indexOfPort >= 0) {
- userId = userId.substring(0, indexOfPort);
- }
- }
- }
- /** If matomo find a cookie "mtm_consent_removed" tracking will not be sent */
-
}, {
key: "track",
- value: function track(loc) {
+ value:
+ /** If matomo find a cookie "mtm_consent_removed" tracking will not be sent */
+ function track(loc) {
if (typeof window === 'undefined') {
return;
}
@@ -36718,7 +36700,7 @@ exports.default = FluidService;
fluid = _step.value;
diffInDays = 0;
- if (fluid && fluid.lastDataDate) {
+ if (fluid !== null && fluid !== void 0 && fluid.lastDataDate) {
dateToCompare = fluid.lastDataDate;
diffInDays = dateToCompare.diffNow('days').toObject().days || 0;
diff --git a/index.html b/index.html
index ea4060e0e21bb4b4760e2bad5cd716123ba44009..e4baab632355b5e564c9ebde6e0ce42dbed1fafd 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,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">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.35f915516b9585855081.js"></script><script src="app/ecolyo.a7b41fae640027908dcb.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,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">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.35f915516b9585855081.js"></script><script src="app/ecolyo.2ef6ca7d5dec16671b46.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 099bedecb7d63744298149c18844ce0b714a766c..7572622e3b758721eb61857a588d48f34485e8ef 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -196,21 +196,21 @@ const sendAggregatedEventByDay = async (events, eventType, client, groupsKeys, g
let group2 = {};
let group3 = {};
- if (groupsKeys.group1 && (groupsIndexes[0] !== 0 || customValues && customValues[0])) {
+ if (groupsKeys.group1 && (groupsIndexes[0] !== 0 || customValues !== null && customValues !== void 0 && customValues[0])) {
group1 = {
- [groupsKeys.group1]: customValues && customValues[0] ? customValues[0] : splitedKey[groupsIndexes[0]]
+ [groupsKeys.group1]: customValues !== null && customValues !== void 0 && customValues[0] ? customValues[0] : splitedKey[groupsIndexes[0]]
};
}
- if (groupsKeys.group2 && (groupsIndexes[1] !== 0 || customValues && customValues[1])) {
+ if (groupsKeys.group2 && (groupsIndexes[1] !== 0 || customValues !== null && customValues !== void 0 && customValues[1])) {
group2 = {
- [groupsKeys.group2]: customValues && customValues[1] ? customValues[1] : splitedKey[groupsIndexes[1]]
+ [groupsKeys.group2]: customValues !== null && customValues !== void 0 && customValues[1] ? customValues[1] : splitedKey[groupsIndexes[1]]
};
}
- if (groupsKeys.group3 && (groupsIndexes[2] !== 0 || customValues && customValues[2])) {
+ if (groupsKeys.group3 && (groupsIndexes[2] !== 0 || customValues !== null && customValues !== void 0 && customValues[2])) {
group3 = {
- [groupsKeys.group3]: customValues && customValues[2] ? customValues[2] : splitedKey[groupsIndexes[2]]
+ [groupsKeys.group3]: customValues !== null && customValues !== void 0 && customValues[2] ? customValues[2] : splitedKey[groupsIndexes[2]]
};
}
@@ -577,6 +577,8 @@ const calculateConsumptionVariation = async client => {
});
if (firstConnectionEvent) {
+ var _consumptionData$flui;
+
const seniority = 0; // Seniority is set to 0, otherwise the indicator is too specific
// DateTime.local()
// .setZone('utc', {
@@ -591,7 +593,7 @@ const calculateConsumptionVariation = async client => {
startDate: _luxon.DateTime.local().setZone('utc', {
keepLocalTime: true
}).startOf('day').toISODate(),
- value: consumptionData[fluidType] && consumptionData[fluidType].percentageVariation ? consumptionData[fluidType].percentageVariation : 0,
+ value: (_consumptionData$flui = consumptionData[fluidType]) !== null && _consumptionData$flui !== void 0 && _consumptionData$flui.percentageVariation ? consumptionData[fluidType].percentageVariation : 0,
// in percent
// eslint-disable-next-line camelcase
group1: {
@@ -96189,6 +96191,8 @@ class ConsumptionDataManager {
const comparisonConvertedValueDetail = [];
for (const singleFluidChart of singleFluidCharts) {
+ var _singleFluidChart$cha;
+
if (!singleFluidChart.chartData) break;
if (!singleFluidChart.chartData.actualData[i]) break;
const value = singleFluidChart.chartData.actualData[i].value;
@@ -96203,7 +96207,7 @@ class ConsumptionDataManager {
state: singleFluidChart.chartData.actualData[i].state
};
- if (singleFluidChart.chartData.comparisonData && singleFluidChart.chartData.comparisonData[i]) {
+ if ((_singleFluidChart$cha = singleFluidChart.chartData.comparisonData) !== null && _singleFluidChart$cha !== void 0 && _singleFluidChart$cha[i]) {
const comparisonValue = singleFluidChart.chartData.comparisonData[i].value;
tempComparisonAggregatedState.push(singleFluidChart.chartData.comparisonData[i].state);
let convertedComparisonValue = -1;
@@ -97670,18 +97674,20 @@ class QueryRunner {
};
const lastDayOfPreviousMonthQuery = this.buildMaxQuery(timeStep, lastDayOfPreviousMonth, fluidType, this._max_limit);
const lastDayOfPreviousMonthResult = await this.fetchData(lastDayOfPreviousMonthQuery);
- return Math.max(lastDayOfPreviousMonthResult && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result && result.data[0] ? result.data[0].load : 0);
+ return Math.max(lastDayOfPreviousMonthResult !== null && lastDayOfPreviousMonthResult !== void 0 && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result !== null && result !== void 0 && result.data[0] ? result.data[0].load : 0);
}
if (result !== null && result !== void 0 && result.data) {
+ var _mappedResult$;
+
const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
- return mappedResult && mappedResult[0] && mappedResult[0];
+ return mappedResult === null || mappedResult === void 0 ? void 0 : mappedResult[0];
}
- return mappedResult && mappedResult[0] && mappedResult[0].value;
+ return mappedResult === null || mappedResult === void 0 ? void 0 : (_mappedResult$ = mappedResult[0]) === null || _mappedResult$ === void 0 ? void 0 : _mappedResult$.value;
}
return null;
@@ -97898,7 +97904,7 @@ class DuelService {
const {
data
} = await this._client.query(query);
- return data && data[0];
+ return data === null || data === void 0 ? void 0 : data[0];
}
/**
* Delete all duel entities from the db
@@ -97972,7 +97978,7 @@ class DuelService {
let updatedThreshold;
- if (maxData && maxData.value && maxData.value > 0) {
+ if (maxData !== null && maxData !== void 0 && maxData.value && maxData.value > 0) {
updatedThreshold = (0, _math.getRoundFloat)(maxData.value);
} else {
updatedThreshold = -1;
@@ -98261,7 +98267,7 @@ class QuizService {
const {
data
} = await this._client.query(query);
- return data && data[0];
+ return data === null || data === void 0 ? void 0 : data[0];
}
/**
* Delete all quiz entities from the db
@@ -98611,7 +98617,7 @@ class QuizService {
let graphData = await consumptionService.getGraphData(interval, timeStep, fluidType);
if ((_graphData = graphData) !== null && _graphData !== void 0 && _graphData.actualData) {
- var _graphData3;
+ var _graphData4;
max = Math.max(...graphData.actualData.map(d => d.value));
@@ -98640,7 +98646,7 @@ class QuizService {
}
do {
- var _graphData2;
+ var _graphData2, _graphData3;
newInterval.startDate = newInterval.startDate.minus(objectTimeStep);
newInterval.endDate = newInterval.endDate.minus(objectTimeStep);
@@ -98653,7 +98659,7 @@ class QuizService {
limit.reached = true;
}
- if (graphData && graphData.actualData) {
+ if ((_graphData3 = graphData) !== null && _graphData3 !== void 0 && _graphData3.actualData) {
max = Math.max(...graphData.actualData.map(d => d.value));
}
} while (max == -1 && (_graphData2 = graphData) !== null && _graphData2 !== void 0 && _graphData2.actualData && !limit.reached);
@@ -98673,7 +98679,7 @@ class QuizService {
graphData = await consumptionService.getGraphData(newInterval, timeStep, fluidType);
}
- if ((_graphData3 = graphData) !== null && _graphData3 !== void 0 && _graphData3.actualData) {
+ if ((_graphData4 = graphData) !== null && _graphData4 !== void 0 && _graphData4.actualData) {
max = Math.max(...graphData.actualData.map(d => d.value));
graphData.actualData.forEach(d => {
if (d.value === max) dateMax = d.date;
@@ -98704,7 +98710,7 @@ class QuizService {
const graphData = await consumptionService.getGraphData(interval, timeStep, fluidType, undefined, undefined, !singleFluid);
let average = 0;
- if (graphData && graphData.actualData) {
+ if (graphData !== null && graphData !== void 0 && graphData.actualData) {
let total = 0;
let length = 0;
graphData.actualData.forEach(d => {
@@ -98829,11 +98835,11 @@ class QuizService {
const roll2 = coefList.splice(index2, 1);
const coef2 = roll2[0]; // Format answers
- maxLoad = Math.round(maxLoad * 100) / 100;
- const wrongAnswer1 = Math.round(maxLoad * coef1 * 100) / 100;
- const wrongAnswer2 = Math.round(maxLoad * coef2 * 100) / 100;
+ const load = Math.round(maxLoad * 100) / 100;
+ const wrongAnswer1 = Math.round(load * coef1 * 100) / 100;
+ const wrongAnswer2 = Math.round(load * coef2 * 100) / 100;
return [{
- answerLabel: `${(0, _utils.formatNumberValues)(maxLoad)} ${unit}`,
+ answerLabel: `${(0, _utils.formatNumberValues)(load)} ${unit}`,
isTrue: true
}, {
answerLabel: `${(0, _utils.formatNumberValues)(wrongAnswer1)} ${unit}`,
@@ -100471,7 +100477,11 @@ class ActionService {
const userChallenges = await this._challengeService.getAllUserChallengeEntities();
const ecogestures = await this._ecogestureService.getAllEcogestures();
const actionsListIds = ecogestures.filter(ecogesture => ecogesture.action === true).map(action => action._id);
- const actionsDone = userChallenges.map(challenge => challenge.action).filter(action => action.state === _userAction.UserActionState.DONE).map(action => action.ecogesture && action.ecogesture.id); // Remove actions Done from the list
+ const actionsDone = userChallenges.map(challenge => challenge.action).filter(action => action.state === _userAction.UserActionState.DONE).map(action => {
+ var _action$ecogesture;
+
+ return (_action$ecogesture = action.ecogesture) === null || _action$ecogesture === void 0 ? void 0 : _action$ecogesture.id;
+ }); // Remove actions Done from the list
if (actionsDone.length > 0) {
actionsListIds.forEach(id => {
@@ -101309,7 +101319,7 @@ exports.default = FluidService;
for (const fluid of fluidStatus) {
let diffInDays = 0;
- if (fluid && fluid.lastDataDate) {
+ if (fluid !== null && fluid !== void 0 && fluid.lastDataDate) {
const dateToCompare = fluid.lastDataDate;
diffInDays = dateToCompare.diffNow('days').toObject().days || 0;
@@ -101361,6 +101371,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+/* eslint-disable camelcase */
const logStack = _cozyLogger.default.namespace('accountService');
class AccountService {
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index 3bfd9240fd3c674f3a25eeb2dc5f3a3b3755ee71..5fcc023a547dc1daf2f059b1e46f94035703a14e 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -93871,6 +93871,8 @@ class ConsumptionDataManager {
const comparisonConvertedValueDetail = [];
for (const singleFluidChart of singleFluidCharts) {
+ var _singleFluidChart$cha;
+
if (!singleFluidChart.chartData) break;
if (!singleFluidChart.chartData.actualData[i]) break;
const value = singleFluidChart.chartData.actualData[i].value;
@@ -93885,7 +93887,7 @@ class ConsumptionDataManager {
state: singleFluidChart.chartData.actualData[i].state
};
- if (singleFluidChart.chartData.comparisonData && singleFluidChart.chartData.comparisonData[i]) {
+ if ((_singleFluidChart$cha = singleFluidChart.chartData.comparisonData) !== null && _singleFluidChart$cha !== void 0 && _singleFluidChart$cha[i]) {
const comparisonValue = singleFluidChart.chartData.comparisonData[i].value;
tempComparisonAggregatedState.push(singleFluidChart.chartData.comparisonData[i].state);
let convertedComparisonValue = -1;
@@ -95352,18 +95354,20 @@ class QueryRunner {
};
const lastDayOfPreviousMonthQuery = this.buildMaxQuery(timeStep, lastDayOfPreviousMonth, fluidType, this._max_limit);
const lastDayOfPreviousMonthResult = await this.fetchData(lastDayOfPreviousMonthQuery);
- return Math.max(lastDayOfPreviousMonthResult && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result && result.data[0] ? result.data[0].load : 0);
+ return Math.max(lastDayOfPreviousMonthResult !== null && lastDayOfPreviousMonthResult !== void 0 && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result !== null && result !== void 0 && result.data[0] ? result.data[0].load : 0);
}
if (result !== null && result !== void 0 && result.data) {
+ var _mappedResult$;
+
const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
- return mappedResult && mappedResult[0] && mappedResult[0];
+ return mappedResult === null || mappedResult === void 0 ? void 0 : mappedResult[0];
}
- return mappedResult && mappedResult[0] && mappedResult[0].value;
+ return mappedResult === null || mappedResult === void 0 ? void 0 : (_mappedResult$ = mappedResult[0]) === null || _mappedResult$ === void 0 ? void 0 : _mappedResult$.value;
}
return null;
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index 37a426f00dc1fe07e91a048203fe00ae5ab93c43..91d1b3ed2c27ba00d529e30eb158f5314af1297f 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -93871,6 +93871,8 @@ class ConsumptionDataManager {
const comparisonConvertedValueDetail = [];
for (const singleFluidChart of singleFluidCharts) {
+ var _singleFluidChart$cha;
+
if (!singleFluidChart.chartData) break;
if (!singleFluidChart.chartData.actualData[i]) break;
const value = singleFluidChart.chartData.actualData[i].value;
@@ -93885,7 +93887,7 @@ class ConsumptionDataManager {
state: singleFluidChart.chartData.actualData[i].state
};
- if (singleFluidChart.chartData.comparisonData && singleFluidChart.chartData.comparisonData[i]) {
+ if ((_singleFluidChart$cha = singleFluidChart.chartData.comparisonData) !== null && _singleFluidChart$cha !== void 0 && _singleFluidChart$cha[i]) {
const comparisonValue = singleFluidChart.chartData.comparisonData[i].value;
tempComparisonAggregatedState.push(singleFluidChart.chartData.comparisonData[i].state);
let convertedComparisonValue = -1;
@@ -95352,18 +95354,20 @@ class QueryRunner {
};
const lastDayOfPreviousMonthQuery = this.buildMaxQuery(timeStep, lastDayOfPreviousMonth, fluidType, this._max_limit);
const lastDayOfPreviousMonthResult = await this.fetchData(lastDayOfPreviousMonthQuery);
- return Math.max(lastDayOfPreviousMonthResult && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result && result.data[0] ? result.data[0].load : 0);
+ return Math.max(lastDayOfPreviousMonthResult !== null && lastDayOfPreviousMonthResult !== void 0 && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result !== null && result !== void 0 && result.data[0] ? result.data[0].load : 0);
}
if (result !== null && result !== void 0 && result.data) {
+ var _mappedResult$;
+
const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
- return mappedResult && mappedResult[0] && mappedResult[0];
+ return mappedResult === null || mappedResult === void 0 ? void 0 : mappedResult[0];
}
- return mappedResult && mappedResult[0] && mappedResult[0].value;
+ return mappedResult === null || mappedResult === void 0 ? void 0 : (_mappedResult$ = mappedResult[0]) === null || _mappedResult$ === void 0 ? void 0 : _mappedResult$.value;
}
return null;
@@ -96529,7 +96533,7 @@ const syncEnedisMonthlyAnalysisDataDoctype = async ({
const firstMinuteData = await cs.getFirsDataDateFromDoctype(_doctypes.ENEDIS_MINUTE_DOCTYPE);
const lastEnedisMonthlyAnalysis = await emas.getLastEnedisMonthlyAnalysis();
- if (firstMinuteData && firstMinuteData[0]) {
+ if (firstMinuteData !== null && firstMinuteData !== void 0 && firstMinuteData[0]) {
// First creates the analysis of the month - 1
logStack('info', 'Fetching last Enedis monthly Analysis...');
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index 2c6f6cb9ad3694333ee2b03e95ec57f7f705418b..f591b4f5601c4c60d2143c9bf032bf8f6c36e788 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -93871,6 +93871,8 @@ class ConsumptionDataManager {
const comparisonConvertedValueDetail = [];
for (const singleFluidChart of singleFluidCharts) {
+ var _singleFluidChart$cha;
+
if (!singleFluidChart.chartData) break;
if (!singleFluidChart.chartData.actualData[i]) break;
const value = singleFluidChart.chartData.actualData[i].value;
@@ -93885,7 +93887,7 @@ class ConsumptionDataManager {
state: singleFluidChart.chartData.actualData[i].state
};
- if (singleFluidChart.chartData.comparisonData && singleFluidChart.chartData.comparisonData[i]) {
+ if ((_singleFluidChart$cha = singleFluidChart.chartData.comparisonData) !== null && _singleFluidChart$cha !== void 0 && _singleFluidChart$cha[i]) {
const comparisonValue = singleFluidChart.chartData.comparisonData[i].value;
tempComparisonAggregatedState.push(singleFluidChart.chartData.comparisonData[i].state);
let convertedComparisonValue = -1;
@@ -95352,18 +95354,20 @@ class QueryRunner {
};
const lastDayOfPreviousMonthQuery = this.buildMaxQuery(timeStep, lastDayOfPreviousMonth, fluidType, this._max_limit);
const lastDayOfPreviousMonthResult = await this.fetchData(lastDayOfPreviousMonthQuery);
- return Math.max(lastDayOfPreviousMonthResult && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result && result.data[0] ? result.data[0].load : 0);
+ return Math.max(lastDayOfPreviousMonthResult !== null && lastDayOfPreviousMonthResult !== void 0 && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result !== null && result !== void 0 && result.data[0] ? result.data[0].load : 0);
}
if (result !== null && result !== void 0 && result.data) {
+ var _mappedResult$;
+
const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
- return mappedResult && mappedResult[0] && mappedResult[0];
+ return mappedResult === null || mappedResult === void 0 ? void 0 : mappedResult[0];
}
- return mappedResult && mappedResult[0] && mappedResult[0].value;
+ return mappedResult === null || mappedResult === void 0 ? void 0 : (_mappedResult$ = mappedResult[0]) === null || _mappedResult$ === void 0 ? void 0 : _mappedResult$.value;
}
return null;
@@ -96644,7 +96648,7 @@ const applyPrices = async (client, fluidType) => {
const firstMinuteData = await cdm.getFirstDataDateFromDoctypeWithPrice(getDoctypeTypeByFluid(fluidType)); // const firstDoctypeData = await cdm.getFirsDataDateFromDoctype()
// If there is data, update hourly data and daily data
- if (firstDataDate && firstDataDate[0] && (firstMinuteData || firstEditedPriceDate !== null)) {
+ if (firstDataDate !== null && firstDataDate !== void 0 && firstDataDate[0] && (firstMinuteData || firstEditedPriceDate !== null)) {
const today = _luxon.DateTime.now();
const tsa = getTimeSetByFluid(fluidType);
@@ -96704,7 +96708,7 @@ const applyPrices = async (client, fluidType) => {
if (lastItem && priceData) {
// if a price has been updated in backoffice re-calculates all price from the firstEditedPriceDate
- data && data.data.forEach(element => {
+ data === null || data === void 0 ? void 0 : data.data.forEach(element => {
element.price = element.load * priceData.price;
}); // Save updated docs
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index 712f48cb1a8f688e0acfaf6f56bcd55a4d577fe0..2e9d17af0d5fcbc4968e7918eceb30de9b0c8b9f 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -93871,6 +93871,8 @@ class ConsumptionDataManager {
const comparisonConvertedValueDetail = [];
for (const singleFluidChart of singleFluidCharts) {
+ var _singleFluidChart$cha;
+
if (!singleFluidChart.chartData) break;
if (!singleFluidChart.chartData.actualData[i]) break;
const value = singleFluidChart.chartData.actualData[i].value;
@@ -93885,7 +93887,7 @@ class ConsumptionDataManager {
state: singleFluidChart.chartData.actualData[i].state
};
- if (singleFluidChart.chartData.comparisonData && singleFluidChart.chartData.comparisonData[i]) {
+ if ((_singleFluidChart$cha = singleFluidChart.chartData.comparisonData) !== null && _singleFluidChart$cha !== void 0 && _singleFluidChart$cha[i]) {
const comparisonValue = singleFluidChart.chartData.comparisonData[i].value;
tempComparisonAggregatedState.push(singleFluidChart.chartData.comparisonData[i].state);
let convertedComparisonValue = -1;
@@ -95352,18 +95354,20 @@ class QueryRunner {
};
const lastDayOfPreviousMonthQuery = this.buildMaxQuery(timeStep, lastDayOfPreviousMonth, fluidType, this._max_limit);
const lastDayOfPreviousMonthResult = await this.fetchData(lastDayOfPreviousMonthQuery);
- return Math.max(lastDayOfPreviousMonthResult && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result && result.data[0] ? result.data[0].load : 0);
+ return Math.max(lastDayOfPreviousMonthResult !== null && lastDayOfPreviousMonthResult !== void 0 && lastDayOfPreviousMonthResult.data[0] ? lastDayOfPreviousMonthResult.data[0].load : 0, result !== null && result !== void 0 && result.data[0] ? result.data[0].load : 0);
}
if (result !== null && result !== void 0 && result.data) {
+ var _mappedResult$;
+
const filteredResult = this.filterDataList(result, maxTimePeriod, timeStep);
const mappedResult = this.mapDataList(filteredResult, timeStep);
if (withDate) {
- return mappedResult && mappedResult[0] && mappedResult[0];
+ return mappedResult === null || mappedResult === void 0 ? void 0 : mappedResult[0];
}
- return mappedResult && mappedResult[0] && mappedResult[0].value;
+ return mappedResult === null || mappedResult === void 0 ? void 0 : (_mappedResult$ = mappedResult[0]) === null || _mappedResult$ === void 0 ? void 0 : _mappedResult$.value;
}
return null;
@@ -163050,7 +163054,9 @@ const buildConsumptionText = async client => {
}
if (consumption[_fluid.FluidType.GAS]) {
- const value = consumption[_fluid.FluidType.GAS] && consumption[_fluid.FluidType.GAS].percentageVariation !== null ? consumption[_fluid.FluidType.GAS].percentageVariation : 0;
+ var _consumption$FluidTyp;
+
+ const value = ((_consumption$FluidTyp = consumption[_fluid.FluidType.GAS]) === null || _consumption$FluidTyp === void 0 ? void 0 : _consumption$FluidTyp.percentageVariation) !== null ? consumption[_fluid.FluidType.GAS].percentageVariation : 0;
if (value) {
if (value > 0) {