diff --git a/6/ecolyo.c03889ab8782bad3bebe.js b/6/ecolyo.54d0e15353c0b4003a05.js
similarity index 99%
rename from 6/ecolyo.c03889ab8782bad3bebe.js
rename to 6/ecolyo.54d0e15353c0b4003a05.js
index 3db59504b1f3a62463869888d36ce60cddbad5c9..da7ff5c41d728df279b0dc133763e47ba99f2a2a 100644
--- a/6/ecolyo.c03889ab8782bad3bebe.js
+++ b/6/ecolyo.54d0e15353c0b4003a05.js
@@ -408,7 +408,7 @@ exports.default = _default;
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.ec-empty-container {\n margin-top: 6rem;\n}\n.ec-empty-container .ec-empty-content {\n color: #e0e0e0;\n text-align: center;\n padding: 0 1.5rem;\n display: flex;\n gap: 1rem;\n flex-direction: column;\n align-items: center;\n margin: 0 auto;\n}\n@media (min-width: 576px) {\n .ec-empty-container .ec-empty-content {\n max-width: 45%;\n }\n}\n@media (min-width: 1200px) {\n .ec-empty-container .ec-empty-content {\n max-width: 35%;\n }\n}\n.ec-empty-container .ec-empty-content .btn-container {\n margin-top: 1rem;\n display: flex;\n gap: 1rem;\n}\n.ec-empty-container .ec-empty-content .btn-container button {\n margin: 0;\n}\n.ec-empty-container .ec-empty-content .btn-container button.btn2 {\n margin-left: 1rem;\n}\n.ec-empty-container .ec-empty-content .reinit-button {\n margin-left: 15px;\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.ec-empty-container {\n margin-top: 6rem;\n}\n.ec-empty-container .ec-empty-content {\n color: #e0e0e0;\n text-align: center;\n padding: 0 1.5rem;\n display: flex;\n gap: 1rem;\n flex-direction: column;\n align-items: center;\n margin: 0 auto;\n}\n@media (min-width: 576px) {\n .ec-empty-container .ec-empty-content {\n max-width: 45%;\n }\n}\n@media (min-width: 1200px) {\n .ec-empty-container .ec-empty-content {\n max-width: 35%;\n }\n}\n.ec-empty-container .ec-empty-content .btn-container {\n margin-top: 1rem;\n display: flex;\n gap: 1rem;\n}\n.ec-empty-container .ec-empty-content .btn-container button {\n margin: 0;\n}\n.ec-empty-container .ec-empty-content .reinit-button {\n margin-left: 15px;\n}", ""]);
@@ -1393,7 +1393,7 @@ var EcogestureEmptyList = function EcogestureEmptyList(_ref) {
navigate('/ecogesture-form');
},
classes: {
- root: 'btn-highlight btn2',
+ root: 'btn-highlight',
label: 'text-16-bold'
}
}, t('ecogesture.emptyList.btn2')))));
diff --git a/app/ecolyo.dcfbc89e7d447dd82770.js b/app/ecolyo.b74e33c668eeadd34a80.js
similarity index 99%
rename from app/ecolyo.dcfbc89e7d447dd82770.js
rename to app/ecolyo.b74e33c668eeadd34a80.js
index 200b7c585f3e03b520722bbd36c2befeb27ddc3c..301dac1726e4c1146641ba1f6b16a593e4f432e3 100644
--- a/app/ecolyo.dcfbc89e7d447dd82770.js
+++ b/app/ecolyo.b74e33c668eeadd34a80.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"eff4cc1e75bcc37e8fed","4":"4bdc1836bb506dfd5fea","5":"cf7d1f9bca710f0b366e","6":"c03889ab8782bad3bebe","7":"1850b6ce28566211a509","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"eff4cc1e75bcc37e8fed","4":"4bdc1836bb506dfd5fea","5":"cf7d1f9bca710f0b366e","6":"54d0e15353c0b4003a05","7":"1850b6ce28566211a509","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -12846,6 +12846,19 @@ Object.keys(_profile).forEach(function (key) {
});
});
+var _profileEcogesture = __webpack_require__("ZzqV");
+
+Object.keys(_profileEcogesture).forEach(function (key) {
+ if (key === "default" || key === "__esModule") return;
+ if (key in exports && exports[key] === _profileEcogesture[key]) return;
+ Object.defineProperty(exports, key, {
+ enumerable: true,
+ get: function get() {
+ return _profileEcogesture[key];
+ }
+ });
+});
+
var _profileType = __webpack_require__("G32H");
Object.keys(_profileType).forEach(function (key) {
@@ -16735,6 +16748,8 @@ var _profileType2 = __webpack_require__("D9qV");
var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _reactRedux = __webpack_require__("/MKj");
+
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; }
@@ -16760,6 +16775,12 @@ var ProfileTypeFormSingleChoice = function ProfileTypeFormSingleChoice(_ref) {
answer = _useState2[0],
setAnswer = _useState2[1];
+ var _useSelector = (0, _reactRedux.useSelector)(function (state) {
+ return state.ecolyo;
+ }),
+ isProfileEcogestureCompleted = _useSelector.profile.isProfileEcogestureCompleted,
+ profileEcogesture = _useSelector.profileEcogesture;
+
var handlePrevious = (0, _react.useCallback)(function () {
setPreviousStep(profileType);
}, [profileType, setPreviousStep]);
@@ -16767,8 +16788,16 @@ var ProfileTypeFormSingleChoice = function ProfileTypeFormSingleChoice(_ref) {
setNextStep(_objectSpread(_objectSpread({}, profileType), {}, (0, _defineProperty2.default)({}, answerType.attribute, answer)));
}, [profileType, setNextStep, answer, answerType.attribute]);
(0, _react.useEffect)(function () {
+ // Set answer if profileType is completed
if (step < viewedStep || isProfileTypeComplete) {
setAnswer(profileType[answerType.attribute]);
+ return;
+ } // Set answer if ecogestureProfile is completed
+
+
+ if (isProfileEcogestureCompleted) {
+ setAnswer(profileEcogesture[answerType.attribute]);
+ return;
}
}, [step, viewedStep, profileType, answerType, isProfileTypeComplete]);
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
@@ -16786,7 +16815,7 @@ var ProfileTypeFormSingleChoice = function ProfileTypeFormSingleChoice(_ref) {
className: (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, 'radio_short', answerType.choices.length < 5), (0, _defineProperty2.default)(_classNames, 'radio_long', answerType.choices.length > 4), (0, _defineProperty2.default)(_classNames, 'answer-checked', answer === value), _classNames))
}, /*#__PURE__*/_react.default.createElement("input", {
type: 'radio',
- value: value,
+ value: value.toString(),
name: value.toString(),
onChange: function onChange() {
return setAnswer(value);
@@ -16797,7 +16826,7 @@ var ProfileTypeFormSingleChoice = function ProfileTypeFormSingleChoice(_ref) {
step: step,
handlePrevious: handlePrevious,
handleNext: handleNext,
- disableNextButton: answer === ''
+ disableNextButton: answer === '' || answer === undefined
}));
};
@@ -23612,6 +23641,14 @@ var symbol = new _node_modules_svg_baker_runtime_browser_symbol_js__WEBPACK_IMPO
var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WEBPACK_IMPORTED_MODULE_1___default.a.add(symbol);
/* harmony default export */ __webpack_exports__["default"] = (symbol);
+/***/ }),
+
+/***/ "ZzqV":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
/***/ }),
/***/ "a3QZ":
@@ -32241,16 +32278,24 @@ var ProfileTypeView = function ProfileTypeView() {
var defineHeaderHeight = (0, _react.useCallback)(function (height) {
setHeaderHeight(height);
- }, []);
+ }, []); // if ecogesture profile is completed, update default profileType
+
+ (0, _react.useEffect)(function () {
+ if (profile.isProfileEcogestureCompleted) {
+ setProfileType(_objectSpread(_objectSpread({}, profileType), {}, {
+ hotWater: curProfileEcogesture.hotWater,
+ heating: curProfileEcogesture.heating,
+ warmingFluid: curProfileEcogesture.warmingFluid,
+ equipments: curProfileEcogesture.equipments
+ }));
+ }
+ }, [profile.isProfileEcogestureCompleted]);
var setNextStep = (0, _react.useCallback)(function (_profileType) {
var profileTypeFormService;
if (_profileType) {
setProfileType(_profileType);
profileTypeFormService = new _profileTypeForm.default(_profileType);
- curProfileEcogesture.heating = _profileType.heating;
- curProfileEcogesture.hotWater = _profileType.hotWater;
- curProfileEcogesture.warmingFluid = _profileType.warmingFluid;
} else {
// if equipments are updated, keep profileType as it is
profileTypeFormService = new _profileTypeForm.default(_objectSpread({}, profileType));
diff --git a/index.html b/index.html
index 8540be1977185ec7fbf01e72a18e45752201e153..0802677d8c5a69feaa35c137d5403e6242a5d493 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.69beab954af56959f24c.js"></script><script src="app/ecolyo.dcfbc89e7d447dd82770.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.69beab954af56959f24c.js"></script><script src="app/ecolyo.b74e33c668eeadd34a80.js"></script></div></body></html>
\ No newline at end of file