diff --git a/3/ecolyo.673e8ddd696663d6ffcf.js b/3/ecolyo.756f7b49c5e712ba37bf.js
similarity index 98%
rename from 3/ecolyo.673e8ddd696663d6ffcf.js
rename to 3/ecolyo.756f7b49c5e712ba37bf.js
index 2a497509dfe9965d47fea27caea43e175f5a1faf..69e9f620a3eaac02b5dc83d328cb1ba9620dd88f 100644
--- a/3/ecolyo.673e8ddd696663d6ffcf.js
+++ b/3/ecolyo.756f7b49c5e712ba37bf.js
@@ -127,10 +127,10 @@ var _profileType = _interopRequireDefault(__webpack_require__("7e12"));
var _profileTypeEntity = _interopRequireDefault(__webpack_require__("aypK"));
-__webpack_require__("u5Ob");
-
var _AnalysisConsumptionRow = _interopRequireDefault(__webpack_require__("lZiS"));
+__webpack_require__("u5Ob");
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
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; }
@@ -285,46 +285,27 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
};
}, [profile.monthlyAnalysisDate.month, getTotalValueWithConnectedFluids, client, analysisDate.month, analysisDate]);
- var profileNotCompleted = function profileNotCompleted() {
- return /*#__PURE__*/_react.default.createElement("div", {
- className: "no-profile"
- }, /*#__PURE__*/_react.default.createElement("div", {
- className: "text-16-normal"
- }, t('analysis.approximative_description')), /*#__PURE__*/_react.default.createElement(_Button.default, {
- "aria-label": t('analysis.accessibility.button_go_to_profil'),
- onClick: goToForm,
- classes: {
- root: 'btn-highlight',
- label: 'text-18-bold'
- }
- }, t('analysis.accessibility.button_go_to_profil')), /*#__PURE__*/_react.default.createElement(_Icon.default, {
- icon: _noProfilePlaceholder.default,
- width: "100%",
- height: "60%",
- alt: "pas de profil remplis"
- }));
- };
-
- var Consumption = /*#__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", {
+ var profileNotCompleted = /*#__PURE__*/_react.default.createElement("div", {
+ className: "no-profile"
+ }, /*#__PURE__*/_react.default.createElement("div", {
className: "text-16-normal"
- }, t('analysis.compare.title'))), profile.isProfileTypeCompleted && /*#__PURE__*/_react.default.createElement(_Button.default, {
+ }, t('analysis.approximative_description')), /*#__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'
+ root: 'btn-highlight',
+ label: 'text-18-bold'
}
- }, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
- icon: _profileEdit.default,
- size: 40
- }))), /*#__PURE__*/_react.default.createElement("div", {
+ }, t('analysis.accessibility.button_go_to_profil')), /*#__PURE__*/_react.default.createElement(_Icon.default, {
+ icon: _noProfilePlaceholder.default,
+ width: "100%",
+ height: "60%",
+ alt: "pas de profil remplis"
+ }));
+
+ var Consumption = /*#__PURE__*/_react.default.createElement("div", {
className: "analysis-graph"
- }, !profile.isProfileTypeCompleted ? profileNotCompleted() : isLoading ? /*#__PURE__*/_react.default.createElement("div", {
+ }, isLoading ? /*#__PURE__*/_react.default.createElement("div", {
className: "loader-container"
}, /*#__PURE__*/_react.default.createElement(_Loader.default, {
color: "elec"
@@ -347,7 +328,7 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
})), fluidTypes.map(function (fluid) {
var _performanceIndicator2;
- return ((_performanceIndicator2 = performanceIndicators[fluid]) === null || _performanceIndicator2 === void 0 ? void 0 : _performanceIndicator2.value) && /*#__PURE__*/_react.default.createElement(_AnalysisConsumptionRow.default, {
+ return Boolean((_performanceIndicator2 = performanceIndicators[fluid]) === null || _performanceIndicator2 === void 0 ? void 0 : _performanceIndicator2.value) && /*#__PURE__*/_react.default.createElement(_AnalysisConsumptionRow.default, {
key: fluid,
fluid: fluid,
userPriceConsumption: userPriceConsumption,
@@ -406,7 +387,7 @@ 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"
@@ -427,11 +408,7 @@ var AnalysisConsumption = function AnalysisConsumption(_ref) {
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));
+ }, !profile.isProfileTypeCompleted && profileNotCompleted, profile.isProfileTypeCompleted && Consumption));
};
var _default = AnalysisConsumption;
@@ -2383,13 +2360,23 @@ var AnalysisConsumptionRow = function AnalysisConsumptionRow(_ref) {
}
};
+ var comparaisonText;
+
+ if (connected) {
+ comparaisonText = formatFluidConsumptionForConso(fluid);
+ } else if (noData) {
+ comparaisonText = t("analysis.no_data_2");
+ } else {
+ comparaisonText = t("analysis.not_connected");
+ }
+
return /*#__PURE__*/_react.default.createElement("div", {
className: "consumption-".concat(_fluid2.FluidType[fluid].toLowerCase(), " analysisRow")
}, /*#__PURE__*/_react.default.createElement("div", {
className: "user-graph"
}, /*#__PURE__*/_react.default.createElement("div", {
className: (0, _classnames.default)('price', 'text-15-bold', (0, _defineProperty2.default)({}, 'not-connected', !connected || noData))
- }, connected ? formatFluidConsumptionForConso(fluid) : noData ? t("analysis.no_data_2") : t("analysis.not_connected")), /*#__PURE__*/_react.default.createElement("div", {
+ }, comparaisonText), /*#__PURE__*/_react.default.createElement("div", {
className: "container-graph"
}, connected && /*#__PURE__*/_react.default.createElement("div", {
className: "graph",
diff --git a/app/ecolyo.86b297f32c235b377d75.js b/app/ecolyo.4d242fdd5e1c1611633f.js
similarity index 99%
rename from app/ecolyo.86b297f32c235b377d75.js
rename to app/ecolyo.4d242fdd5e1c1611633f.js
index 67f1c67fa410f4756a27fe44eee234dd90ba8bc9..2152296085e48f0ffcde22d4d52a93a9121dccc4 100644
--- a/app/ecolyo.86b297f32c235b377d75.js
+++ b/app/ecolyo.4d242fdd5e1c1611633f.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"673e8ddd696663d6ffcf","4":"39d7b1099221e57244fe","5":"32856d540af4f4ee2abc","6":"68590aa155e034150cca","7":"d2a6fc631880361b47a0","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"756f7b49c5e712ba37bf","4":"39d7b1099221e57244fe","5":"32856d540af4f4ee2abc","6":"68590aa155e034150cca","7":"d2a6fc631880361b47a0","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index dca81dd2716e1d3a224d38643476e226fd21779e..75d967919fee8f7f534ddc9eaee2e6c011180a05 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.d332a37d84cf028b68a7.js"></script><script src="app/ecolyo.86b297f32c235b377d75.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.d332a37d84cf028b68a7.js"></script><script src="app/ecolyo.4d242fdd5e1c1611633f.js"></script></div></body></html>
\ No newline at end of file