diff --git a/6/ecolyo.e0c236395f093ccde707.js b/6/ecolyo.22960faffb0acb9e49a6.js
similarity index 98%
rename from 6/ecolyo.e0c236395f093ccde707.js
rename to 6/ecolyo.22960faffb0acb9e49a6.js
index b19b1e3aef37554883dbecae003face319ed956e..05ece69f3d8bf03d21234c5fa73fd02e21d17054 100644
--- a/6/ecolyo.e0c236395f093ccde707.js
+++ b/6/ecolyo.22960faffb0acb9e49a6.js
@@ -340,6 +340,7 @@ Object.defineProperty(exports, "__esModule", {
});
exports.default = void 0;
var _regenerator = _interopRequireDefault(__webpack_require__("hJxD"));
+var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("HZZ/"));
var _core = __webpack_require__("rMFn");
var _Dialog = _interopRequireDefault(__webpack_require__("L/1U"));
@@ -441,7 +442,7 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) {
}(), [client, t]);
var getExportDataSheet = (0, _react2.useCallback)( /*#__PURE__*/function () {
var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(fluidType) {
- var consumptionService, firstDataDate, lastDataDate, timePeriod, dataLoad, exportDataSheet, _iterator2, _step2, data, dataRow;
+ var consumptionService, _yield$consumptionSer, _yield$consumptionSer2, firstDataDate, _yield$consumptionSer3, _yield$consumptionSer4, lastDataDate, timePeriod, dataLoad, exportDataSheet, _iterator2, _step2, data, dataRow;
return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
@@ -450,22 +451,26 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) {
_context2.next = 3;
return consumptionService.fetchAllFirstDateData([fluidType], _enums.TimeStep.MONTH);
case 3:
- firstDataDate = _context2.sent;
- _context2.next = 6;
+ _yield$consumptionSer = _context2.sent;
+ _yield$consumptionSer2 = (0, _slicedToArray2.default)(_yield$consumptionSer, 1);
+ firstDataDate = _yield$consumptionSer2[0];
+ _context2.next = 8;
return consumptionService.fetchAllLastDateData([fluidType], _enums.TimeStep.MONTH);
- case 6:
- lastDataDate = _context2.sent;
- if (!(!firstDataDate[0] || !lastDataDate[0])) {
- _context2.next = 9;
+ case 8:
+ _yield$consumptionSer3 = _context2.sent;
+ _yield$consumptionSer4 = (0, _slicedToArray2.default)(_yield$consumptionSer3, 1);
+ lastDataDate = _yield$consumptionSer4[0];
+ if (!(!firstDataDate || !lastDataDate)) {
+ _context2.next = 13;
break;
}
return _context2.abrupt("return", null);
- case 9:
+ case 13:
timePeriod = {
- startDate: firstDataDate[0],
- endDate: lastDataDate[0]
+ startDate: firstDataDate,
+ endDate: lastDataDate
};
- _context2.next = 12;
+ _context2.next = 16;
return consumptionService.getGraphData({
timePeriod: timePeriod,
timeStep: _enums.TimeStep.MONTH,
@@ -473,60 +478,60 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) {
isHome: false,
isExport: true
});
- case 12:
+ case 16:
dataLoad = _context2.sent;
if (dataLoad !== null && dataLoad !== void 0 && dataLoad.actualData) {
- _context2.next = 15;
+ _context2.next = 19;
break;
}
return _context2.abrupt("return", null);
- case 15:
+ case 19:
exportDataSheet = {
fluidName: t("FLUID.".concat(_enums.FluidType[fluidType], ".LABEL")),
data: []
};
_iterator2 = _createForOfIteratorHelper(dataLoad.actualData);
- _context2.prev = 17;
+ _context2.prev = 21;
_iterator2.s();
- case 19:
+ case 23:
if ((_step2 = _iterator2.n()).done) {
- _context2.next = 29;
+ _context2.next = 33;
break;
}
data = _step2.value;
if (!(data.value === -1)) {
- _context2.next = 23;
+ _context2.next = 27;
break;
}
- return _context2.abrupt("continue", 27);
- case 23:
- _context2.next = 25;
+ return _context2.abrupt("continue", 31);
+ case 27:
+ _context2.next = 29;
return buildDataRow(data, fluidType);
- case 25:
+ case 29:
dataRow = _context2.sent;
exportDataSheet.data.push(dataRow);
- case 27:
- _context2.next = 19;
+ case 31:
+ _context2.next = 23;
break;
- case 29:
- _context2.next = 34;
+ case 33:
+ _context2.next = 38;
break;
- case 31:
- _context2.prev = 31;
- _context2.t0 = _context2["catch"](17);
+ case 35:
+ _context2.prev = 35;
+ _context2.t0 = _context2["catch"](21);
_iterator2.e(_context2.t0);
- case 34:
- _context2.prev = 34;
+ case 38:
+ _context2.prev = 38;
_iterator2.f();
- return _context2.finish(34);
- case 37:
+ return _context2.finish(38);
+ case 41:
return _context2.abrupt("return", exportDataSheet);
- case 38:
+ case 42:
case "end":
return _context2.stop();
}
}
- }, _callee2, null, [[17, 31, 34, 37]]);
+ }, _callee2, null, [[21, 35, 38, 41]]);
}));
return function (_x3) {
return _ref3.apply(this, arguments);
diff --git a/app/ecolyo.0bf2f78f487a87e1cb5e.js b/app/ecolyo.a0905e6284cc487a4d66.js
similarity index 99%
rename from app/ecolyo.0bf2f78f487a87e1cb5e.js
rename to app/ecolyo.a0905e6284cc487a4d66.js
index 76dc65219b1287b606aa712816bb455c3e804d14..0e9cd6a98da8367552f12c2fc20a5d64badb8e77 100644
--- a/app/ecolyo.0bf2f78f487a87e1cb5e.js
+++ b/app/ecolyo.a0905e6284cc487a4d66.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"95b2454562935abe3938","4":"441219e784196cc9bbea","5":"dbb9361b7c3d2399eabb","6":"e0c236395f093ccde707","7":"62d0f8799ccda737a9e5","8":"52e866a28719760e1d4b","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"95b2454562935abe3938","4":"441219e784196cc9bbea","5":"dbb9361b7c3d2399eabb","6":"22960faffb0acb9e49a6","7":"62d0f8799ccda737a9e5","8":"52e866a28719760e1d4b","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 229f5938209016d9e261773ccf1741beb1dd3f54..ae3d1ed372390ba625a70118889d4025b720ade5 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.9cebad5ae7ea932ed345.js"></script><script src="app/ecolyo.0bf2f78f487a87e1cb5e.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.9cebad5ae7ea932ed345.js"></script><script src="app/ecolyo.a0905e6284cc487a4d66.js"></script></div></body></html>
\ No newline at end of file