From 4ecd10e8c326fa1e926201d7e281f95228ea70c4 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Tue, 28 Sep 2021 14:27:35 +0000
Subject: [PATCH] publish: Merge branch
'143-visualisation-conso-mauvais-calcul-bilan-si-demi-heure-non-activee' into
'dev'
generated from commit bba68befc03b6771389d75a910d9d3351d0e5470
---
...1a65.js => ecolyo.b1865972a1c775dc8dd3.js} | 69 +++++++++++++++----
...b00e.js => ecolyo.4554832bbcb6202e4074.js} | 2 +-
index.html | 2 +-
3 files changed, 59 insertions(+), 14 deletions(-)
rename 3/{ecolyo.26192bb162b715431a65.js => ecolyo.b1865972a1c775dc8dd3.js} (98%)
rename app/{ecolyo.292e4ea35dfac4afb00e.js => ecolyo.4554832bbcb6202e4074.js} (99%)
diff --git a/3/ecolyo.26192bb162b715431a65.js b/3/ecolyo.b1865972a1c775dc8dd3.js
similarity index 98%
rename from 3/ecolyo.26192bb162b715431a65.js
rename to 3/ecolyo.b1865972a1c775dc8dd3.js
index 2581622a1..fb77c4f1c 100644
--- a/3/ecolyo.26192bb162b715431a65.js
+++ b/3/ecolyo.b1865972a1c775dc8dd3.js
@@ -2998,6 +2998,10 @@ Object.defineProperty(exports, "__esModule", {
});
exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__("o0o1"));
+
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("yXPU"));
+
var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
@@ -3014,6 +3018,14 @@ var _converter = _interopRequireDefault(__webpack_require__("LXmx"));
var _utils = __webpack_require__("c+yx");
+var _consumption = _interopRequireDefault(__webpack_require__("AVq/"));
+
+var _cozyClient = __webpack_require__("SH7X");
+
+var _timeStep = __webpack_require__("cKQ8");
+
+var _reactRedux = __webpack_require__("/MKj");
+
(function () {
var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
enterModule && enterModule(module);
@@ -3031,24 +3043,55 @@ var TotalConsumption = function TotalConsumption(_ref) {
var actualData = _ref.actualData,
fluidType = _ref.fluidType;
+ var _useSelector = (0, _reactRedux.useSelector)(function (state) {
+ return state.ecolyo.chart;
+ }),
+ currentTimeStep = _useSelector.currentTimeStep;
+
+ var client = (0, _cozyClient.useClient)();
+
var _useState = (0, _react.useState)(),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
totalValue = _useState2[0],
setTotalValue = _useState2[1];
(0, _react.useEffect)(function () {
- var calculateTotalValue = function calculateTotalValue() {
- var converterService = new _converter.default();
- var total = 0;
- actualData.forEach(function (data) {
- if (data.value !== -1) total += data.value;
- });
- var displayedValue = total <= 0 ? '-----' : fluidType === _fluid.FluidType.MULTIFLUID ? (0, _utils.formatNumberValues)(total).toString() : (0, _utils.formatNumberValues)(converterService.LoadToEuro(total, fluidType)).toString();
- return displayedValue;
- };
+ var calculateTotalValue = /*#__PURE__*/function () {
+ var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+ var consumptionService, activateHalfHourLoad, converterService, total, displayedValue;
+ return _regenerator.default.wrap(function _callee$(_context) {
+ while (1) {
+ switch (_context.prev = _context.next) {
+ case 0:
+ consumptionService = new _consumption.default(client);
+ _context.next = 3;
+ return consumptionService.checkDoctypeEntries(_fluid.FluidType.ELECTRICITY, _timeStep.TimeStep.HALF_AN_HOUR);
+
+ case 3:
+ activateHalfHourLoad = _context.sent;
+ converterService = new _converter.default();
+ total = 0;
+ actualData.forEach(function (data) {
+ if (data.value !== -1) total += data.value;
+ });
+ displayedValue = total <= 0 || !activateHalfHourLoad && currentTimeStep === _timeStep.TimeStep.HALF_AN_HOUR && fluidType === _fluid.FluidType.ELECTRICITY ? '-----' : fluidType === _fluid.FluidType.MULTIFLUID ? (0, _utils.formatNumberValues)(total).toString() : (0, _utils.formatNumberValues)(converterService.LoadToEuro(total, fluidType)).toString();
+ setTotalValue(displayedValue);
- setTotalValue(calculateTotalValue());
- }, [actualData, fluidType]);
+ case 9:
+ case "end":
+ return _context.stop();
+ }
+ }
+ }, _callee);
+ }));
+
+ return function calculateTotalValue() {
+ return _ref2.apply(this, arguments);
+ };
+ }();
+
+ calculateTotalValue();
+ }, [actualData, fluidType, currentTimeStep, client]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "icon-line"
}, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
@@ -3062,7 +3105,9 @@ var TotalConsumption = function TotalConsumption(_ref) {
}, " \u20AC")));
};
-__signature__(TotalConsumption, "useState{[totalValue, setTotalValue]}\nuseEffect{}");
+__signature__(TotalConsumption, "useSelector{{ currentTimeStep }}\nuseClient{client}\nuseState{[totalValue, setTotalValue]}\nuseEffect{}", function () {
+ return [_reactRedux.useSelector, _cozyClient.useClient];
+});
var _default = TotalConsumption;
var _default2 = _default;
diff --git a/app/ecolyo.292e4ea35dfac4afb00e.js b/app/ecolyo.4554832bbcb6202e4074.js
similarity index 99%
rename from app/ecolyo.292e4ea35dfac4afb00e.js
rename to app/ecolyo.4554832bbcb6202e4074.js
index 01225152f..ea11f5d6f 100644
--- a/app/ecolyo.292e4ea35dfac4afb00e.js
+++ b/app/ecolyo.4554832bbcb6202e4074.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"a74d792d3e6e0eb3fdb6","3":"26192bb162b715431a65","4":"c6442ed0e3750f08d796","5":"7a8bd2f1b952ef43da0d","6":"764cac87e3c93a2277bc","7":"872ea0527fa5ab47be45","8":"577347ded7ce8fc1b917","9":"52c6379e8febe625f87b","10":"6f00ecdbad3e36040fb3","11":"32dd907134cee9a21ba8","12":"6c8d5abaa410f671dff9","13":"1089c3d7747490a626d5","14":"c3167753796c6514062b"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"a74d792d3e6e0eb3fdb6","3":"b1865972a1c775dc8dd3","4":"c6442ed0e3750f08d796","5":"7a8bd2f1b952ef43da0d","6":"764cac87e3c93a2277bc","7":"872ea0527fa5ab47be45","8":"577347ded7ce8fc1b917","9":"52c6379e8febe625f87b","10":"6f00ecdbad3e36040fb3","11":"32dd907134cee9a21ba8","12":"6c8d5abaa410f671dff9","13":"1089c3d7747490a626d5","14":"c3167753796c6514062b"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index b8b4d459a..1b969e870 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="theme-color" content="#ffffff"><!-- 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="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.7ec2f99d334bc5028d00.js"></script><script src="app/ecolyo.292e4ea35dfac4afb00e.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="theme-color" content="#ffffff"><!-- 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="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.7ec2f99d334bc5028d00.js"></script><script src="app/ecolyo.4554832bbcb6202e4074.js"></script></div></body></html>
\ No newline at end of file
--
GitLab