diff --git a/2/ecolyo.142b551142a9ad6133d7.js b/2/ecolyo.0ec96f5678f1cb3e9176.js
similarity index 99%
rename from 2/ecolyo.142b551142a9ad6133d7.js
rename to 2/ecolyo.0ec96f5678f1cb3e9176.js
index de25dbce6201aedcf620eeba9a33a3d0a4d34a58..0b2aa82cfdd60c8e4c34cd4022aa8119c07176f0 100644
--- a/2/ecolyo.142b551142a9ad6133d7.js
+++ b/2/ecolyo.0ec96f5678f1cb3e9176.js
@@ -1662,8 +1662,15 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
return !prev;
});
}, []);
+ var isDataFullyComplete = (0, _react.useCallback)(function (monthDataloads) {
+ var _monthDataloads$weeke, _monthDataloads$week$;
+
+ if (monthDataloads && (monthDataloads === null || monthDataloads === void 0 ? void 0 : (_monthDataloads$weeke = monthDataloads.weekend[0]) === null || _monthDataloads$weeke === void 0 ? void 0 : _monthDataloads$weeke.value) !== null && (monthDataloads === null || monthDataloads === void 0 ? void 0 : (_monthDataloads$week$ = monthDataloads.week[0]) === null || _monthDataloads$week$ === void 0 ? void 0 : _monthDataloads$week$.value) !== null) {
+ return true;
+ } else return false;
+ }, []);
var getPowerChart = (0, _react.useCallback)(function () {
- if (monthDataloads && monthDataloads.weekend && monthDataloads.week && monthDataloads.weekend[0] !== null && monthDataloads.week[0] !== null) {
+ if (isDataFullyComplete(monthDataloads)) {
return /*#__PURE__*/_react.default.createElement(_ElecHalfHourChart.default, {
dataLoad: isWeekend ? monthDataloads.weekend : monthDataloads.week,
isWeekend: isWeekend
@@ -1673,7 +1680,7 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
className: "text-20-bold no_data"
}, t('analysis.no_data'));
}
- }, [isWeekend, monthDataloads, t]);
+ }, [isDataFullyComplete, isWeekend, monthDataloads, t]);
(0, _react.useEffect)(function () {
var subscribed = true;
@@ -1824,7 +1831,7 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
}, /*#__PURE__*/_react.default.createElement(_Icon.default, {
icon: _rightArrow.default,
size: 24
- }))), !isLoading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, getPowerChart(), enedisAnalysisValues && /*#__PURE__*/_react.default.createElement("div", {
+ }))), !isLoading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, getPowerChart(), enedisAnalysisValues && isDataFullyComplete(monthDataloads) && /*#__PURE__*/_react.default.createElement("div", {
className: "min-max"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "container"
@@ -2203,7 +2210,7 @@ exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE
exports = module.exports = __webpack_require__("JPst")(false);
// Module
-exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.special-elec-container {\n color: white;\n}\n.special-elec-container .elec-icon {\n margin: auto;\n display: block;\n}\n.special-elec-container .title {\n text-align: center;\n margin-top: 1rem;\n color: #e0e0e0;\n}\n.special-elec-container .navigator {\n display: flex;\n justify-content: space-between;\n align-items: center;\n width: 100%;\n text-align: center;\n margin: 1rem 0;\n}\n.special-elec-container .navigator .text-1 {\n color: #e0e0e0;\n}\n.special-elec-container .navigator .week {\n color: #e2bca1;\n}\n.special-elec-container .navigator .weekend {\n color: #ffd597;\n}\n.special-elec-container .minIcon {\n margin: auto 0.8rem auto 0;\n}\n.special-elec-container .activation-text {\n margin: 1rem 0 0.7rem 0;\n}\n.special-elec-container .oauthform-button-content {\n display: flex;\n padding: 0.5rem;\n}\n.special-elec-container .oauthform-button-text {\n text-align: left;\n margin-left: 1rem;\n}\n.special-elec-container .container {\n margin-bottom: 1rem;\n padding: 1rem;\n border: 1px solid #e0e0e0;\n border-radius: 10px;\n display: flex;\n}\n.special-elec-container .container .min {\n max-width: 150px;\n}\n.special-elec-container .container .text {\n display: flex;\n flex-direction: column;\n justify-content: space-between;\n}\n.special-elec-container .container .value {\n margin-left: auto;\n display: flex;\n flex-direction: column;\n align-items: self-end;\n min-width: 80px;\n justify-content: space-between;\n}\n.special-elec-container .container .kvAval {\n margin: auto 0 auto auto;\n}\n.special-elec-container .consomin {\n min-height: 100px;\n}\n.special-elec-container .loader-container {\n text-align: center;\n}\n.special-elec-container .no_data {\n text-align: center;\n color: white;\n}\n.special-elec-container .showmodal {\n cursor: pointer;\n margin: 1.5rem 0 1rem 0;\n text-align: center;\n color: #e0e0e0;\n text-decoration: underline;\n}\n\n.graph-elec-half-hour {\n height: 13rem;\n}", ""]);
+exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.special-elec-container {\n color: white;\n}\n.special-elec-container .elec-icon {\n margin: auto;\n display: block;\n}\n.special-elec-container .title {\n text-align: center;\n margin-top: 1rem;\n color: #e0e0e0;\n}\n.special-elec-container .navigator {\n display: flex;\n justify-content: space-between;\n align-items: center;\n width: 100%;\n text-align: center;\n margin: 1rem 0;\n}\n.special-elec-container .navigator .text-1 {\n color: #e0e0e0;\n}\n.special-elec-container .navigator .week {\n color: #e2bca1;\n}\n.special-elec-container .navigator .weekend {\n color: #ffd597;\n}\n.special-elec-container .minIcon {\n margin: auto 0.8rem auto 0;\n}\n.special-elec-container .activation-text {\n margin: 1rem 0 0.7rem 0;\n}\n.special-elec-container .oauthform-button-content {\n display: flex;\n padding: 0.5rem;\n}\n.special-elec-container .oauthform-button-text {\n text-align: left;\n margin-left: 1rem;\n}\n.special-elec-container .container {\n margin-bottom: 1rem;\n padding: 1rem;\n border: 1px solid #e0e0e0;\n border-radius: 10px;\n display: flex;\n}\n.special-elec-container .container .min {\n max-width: 150px;\n}\n.special-elec-container .container .text {\n display: flex;\n flex-direction: column;\n justify-content: space-between;\n}\n.special-elec-container .container .value {\n margin-left: auto;\n display: flex;\n flex-direction: column;\n align-items: self-end;\n min-width: 80px;\n justify-content: space-between;\n}\n.special-elec-container .container .kvAval {\n margin: auto 0 auto auto;\n}\n.special-elec-container .consomin {\n min-height: 100px;\n}\n.special-elec-container .loader-container {\n text-align: center;\n}\n.special-elec-container .no_data {\n text-align: center;\n color: white;\n}\n.special-elec-container .showmodal {\n cursor: pointer;\n margin: 1.5rem 0 1rem 0;\n text-align: center;\n color: #e0e0e0;\n text-decoration: underline;\n}\n\n.graph-elec-half-hour {\n height: 12rem;\n margin-top: 2rem;\n}", ""]);
@@ -2684,7 +2691,7 @@ var ElecHalfHourChart = function ElecHalfHourChart(_ref) {
(0, _react.useEffect)(function () {
function handleResize() {
var maxWidth = 940;
- var maxHeight = 200;
+ var maxHeight = 170;
var _width = chartContainer.current ? chartContainer.current.offsetWidth > maxWidth ? maxWidth : chartContainer.current.offsetWidth : 400;
diff --git a/3/ecolyo.f9819317aec60f8d1b6f.js b/3/ecolyo.7b45b0a2bd1fc8ae05d1.js
similarity index 99%
rename from 3/ecolyo.f9819317aec60f8d1b6f.js
rename to 3/ecolyo.7b45b0a2bd1fc8ae05d1.js
index 67701cd92488c26f66e2dfe744e03e3b8de23555..ba5f487315dbcff0cfb632c639df4683b2de21d8 100644
--- a/3/ecolyo.f9819317aec60f8d1b6f.js
+++ b/3/ecolyo.7b45b0a2bd1fc8ae05d1.js
@@ -5621,7 +5621,7 @@ var FluidChart = function FluidChart(_ref) {
setMinuteBlocked(true);
}
- setEnedisConsentKO(!isEnedisConsentValid);
+ setEnedisConsentKO(false);
setIsLoaded(true);
}
diff --git a/app/ecolyo.05ff72119282dc183847.js b/app/ecolyo.add38768993c0b338033.js
similarity index 99%
rename from app/ecolyo.05ff72119282dc183847.js
rename to app/ecolyo.add38768993c0b338033.js
index 1a7be4da9d59cb9de72951e1d8ec8d43fee0852e..eaa88871f7e1253c0b44b89ca59ec96bcf1946f1 100644
--- a/app/ecolyo.05ff72119282dc183847.js
+++ b/app/ecolyo.add38768993c0b338033.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"142b551142a9ad6133d7","3":"f9819317aec60f8d1b6f","4":"5e481431cf0b2359d58d","5":"be40de25a698f7337c41","6":"cf316224f80d91ba8e19","7":"8e0088481e1baf094fa4","8":"bcd9da9f5a58c3f60050","9":"b67676e3ba222d0c6efa","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"0ec96f5678f1cb3e9176","3":"7b45b0a2bd1fc8ae05d1","4":"5e481431cf0b2359d58d","5":"be40de25a698f7337c41","6":"cf316224f80d91ba8e19","7":"8e0088481e1baf094fa4","8":"bcd9da9f5a58c3f60050","9":"b67676e3ba222d0c6efa","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index c397a7882c5dfa49390d323999938e778a5ce9f7..5dc9b4b4903cb73e0e401eb6b09decb68ba3624d 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">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.c1180bc5cd66dfd3234e.js"></script><script src="app/ecolyo.05ff72119282dc183847.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">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.c1180bc5cd66dfd3234e.js"></script><script src="app/ecolyo.add38768993c0b338033.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index f2c4cdbaa452a5bfdad9dd369de692f7de214dc9..be7a8d8776dadcf0858b26828891a4b967ed4ae1 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -79714,10 +79714,13 @@ const getMinMonthlyLoad = (weekEndValuesArray, weekValuesArray, numberofDaysInMo
const populateArrayWithTotalData = (monthlyArray, dataChart, isWeekend) => {
let halfHourDayData;
+ log('info', `dataChart ${dataChart} `);
+ log('info', `isWeekend ${isWeekend} `);
if (isWeekend) {
// we only keep weekend days
halfHourDayData = dataChart.actualData.filter(day => day.date.weekday === 6 || day.date.weekday === 7).map(day => day.value);
+ log('info', `halfHourDayData ${halfHourDayData} `);
} else {
// we only keep weekdays
halfHourDayData = dataChart.actualData.filter(day => day.date.weekday !== 6 && day.date.weekday !== 7).map(day => day.value);
@@ -79781,6 +79784,7 @@ const getEnedisMonthAnalysisData = async (client, month, year) => {
};
const cs = new _consumption.default(client);
const data = await cs.getGraphData(timePeriod, _timeStep.TimeStep.DAY, [_fluid.FluidType.ELECTRICITY]);
+ log('info', `GraphData : ${data}`);
const monthlyAveragesLoads = {
weekDaysHalfHourAverageValues: [],
weekEndDaysHalfHourAverageValues: [],
@@ -79794,6 +79798,9 @@ const getEnedisMonthAnalysisData = async (client, month, year) => {
// 48 is the number of halfhour entries in a day
const weekEndValuesArray = new Array([]);
const weekValuesArray = new Array([]);
+ const actualData = data.actualData;
+ log('info', `actualData : ${actualData}`);
+ log('info', `actualData length : ${actualData.length}`);
for (const day of data.actualData) {
const timePeriod = {
@@ -79803,6 +79810,7 @@ const getEnedisMonthAnalysisData = async (client, month, year) => {
// so we get 48 entries per day
const halfHourDayData = await cs.getGraphData(timePeriod, _timeStep.TimeStep.HALF_AN_HOUR, [_fluid.FluidType.ELECTRICITY]);
+ log('info', `halfHourDayData for day ${day} : ${halfHourDayData}`);
if (halfHourDayData) {
populateArrayWithTotalData(weekEndValuesArray, halfHourDayData, true);
@@ -79810,6 +79818,9 @@ const getEnedisMonthAnalysisData = async (client, month, year) => {
}
}
+ log('info', `weekEndValuesArray${weekEndValuesArray} `);
+ log('info', `weekValuesArray${weekValuesArray} `);
+
const numberofDaysInMonth = _luxon.DateTime.fromObject({
month: month,
year: year