diff --git a/2/ecolyo.7b0014b06996ba183b7b.js b/2/ecolyo.043a1a3c0c0d747c22c5.js
similarity index 99%
rename from 2/ecolyo.7b0014b06996ba183b7b.js
rename to 2/ecolyo.043a1a3c0c0d747c22c5.js
index e523cf0d9bc6e4fbc98e966153ea4b535275d195..fca616ff617615c3f0927433c551e514679cbaf1 100644
--- a/2/ecolyo.7b0014b06996ba183b7b.js
+++ b/2/ecolyo.043a1a3c0c0d747c22c5.js
@@ -168,7 +168,7 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
var _useState5 = (0, _react.useState)(true),
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
isLoading = _useState6[0],
- setisLoading = _useState6[1];
+ setIsLoading = _useState6[1];
var _useState7 = (0, _react.useState)(false),
_useState8 = (0, _slicedToArray2.default)(_useState7, 2),
@@ -203,7 +203,7 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
for (var i = 0; i < performanceIndicators.length; i++) {
var _performanceIndicator;
- if (!((_performanceIndicator = performanceIndicators[i]) !== null && _performanceIndicator !== void 0 && _performanceIndicator.value)) {
+ if (!((_performanceIndicator = performanceIndicators[i]) !== null && _performanceIndicator !== void 0 && _performanceIndicator.value) && fluidTypes[i]) {
emptyFluidTypes.push(fluidTypes[i]);
}
}
@@ -227,12 +227,12 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
(0, _react.useEffect)(function () {
var subscribed = true;
- function loadAverageComsumption() {
- return _loadAverageComsumption.apply(this, arguments);
+ function loadAverageConsumption() {
+ return _loadAverageConsumption.apply(this, arguments);
}
- function _loadAverageComsumption() {
- _loadAverageComsumption = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+ function _loadAverageConsumption() {
+ _loadAverageConsumption = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
var profileTypeEntityService, profileType, profileTypeService, monthlyForecast;
return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
@@ -268,7 +268,7 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
getTotalValueWithConnectedFluids(monthlyForecast);
}
- setisLoading(false);
+ setIsLoading(false);
}
case 10:
@@ -278,10 +278,10 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
}
}, _callee);
}));
- return _loadAverageComsumption.apply(this, arguments);
+ return _loadAverageConsumption.apply(this, arguments);
}
- loadAverageComsumption();
+ loadAverageConsumption();
return function () {
subscribed = false;
};
@@ -307,30 +307,7 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
}));
};
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
- className: "status-header"
- }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
- icon: _analysis.default,
- size: 44
- }), /*#__PURE__*/_react.default.createElement("p", {
- className: "text-16-normal"
- }, t('analysis.compare.title'))), profile.isProfileTypeCompleted && /*#__PURE__*/_react.default.createElement(_Button.default, {
- "aria-label": t('analysis.accessibility.button_go_to_profil'),
- onClick: goToForm,
- classes: {
- root: 'btn-secondary-negative',
- label: 'text-16-normal'
- }
- }, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
- icon: _profileEdit.default,
- size: 40
- }))), /*#__PURE__*/_react.default.createElement("div", {
- className: "analysis-graph"
- }, !profile.isProfileTypeCompleted ? profileNotCompleted() : isLoading ? /*#__PURE__*/_react.default.createElement("div", {
- className: "loader-container"
- }, /*#__PURE__*/_react.default.createElement(_Loader.default, {
- color: "elec"
- })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+ var Consumption = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
className: "consumption-title text-20-bold"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "user-title"
@@ -408,7 +385,32 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
}
}, /*#__PURE__*/_react.default.createElement("span", {
className: "accordion-desc text-16-normal"
- }, t('analysis.average_home_description')))))));
+ }, t('analysis.average_home_description')))));
+
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+ className: "status-header"
+ }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+ icon: _analysis.default,
+ size: 44
+ }), /*#__PURE__*/_react.default.createElement("p", {
+ className: "text-16-normal"
+ }, t('analysis.compare.title'))), profile.isProfileTypeCompleted && /*#__PURE__*/_react.default.createElement(_Button.default, {
+ "aria-label": t('analysis.accessibility.button_go_to_profil'),
+ onClick: goToForm,
+ classes: {
+ root: 'btn-secondary-negative',
+ label: 'text-16-normal'
+ }
+ }, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+ icon: _profileEdit.default,
+ size: 40
+ }))), /*#__PURE__*/_react.default.createElement("div", {
+ className: "analysis-graph"
+ }, !profile.isProfileTypeCompleted && profileNotCompleted(), profile.isProfileTypeCompleted && isLoading ? /*#__PURE__*/_react.default.createElement("div", {
+ className: "loader-container"
+ }, /*#__PURE__*/_react.default.createElement(_Loader.default, {
+ color: "elec"
+ })) : Consumption));
};
var _default = AnalysisConsumption;
diff --git a/app/ecolyo.2ef6ca7d5dec16671b46.js b/app/ecolyo.e2fd258cef29255dc684.js
similarity index 99%
rename from app/ecolyo.2ef6ca7d5dec16671b46.js
rename to app/ecolyo.e2fd258cef29255dc684.js
index 6946634da13bba6d8925e9b2cd0b1a641d656663..d58831a67c476427e196d8bddb90169d3c010454 100644
--- a/app/ecolyo.2ef6ca7d5dec16671b46.js
+++ b/app/ecolyo.e2fd258cef29255dc684.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ 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"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"043a1a3c0c0d747c22c5","3":"5ece55736571b5c91afd","4":"cb0065196f4258175382","5":"4c1d9ae558d5214ade9c","6":"cf351296060960978fe9","7":"403585665c5e67c3d156","8":"5830bb8afb143f3420a7","9":"9ad8f654859d6a5af353"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index e4baab632355b5e564c9ebde6e0ce42dbed1fafd..e0a145e995e82559d0f7b0b7c74e75968c7f5bb7 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.2ef6ca7d5dec16671b46.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.e2fd258cef29255dc684.js"></script></div></body></html>
\ No newline at end of file