diff --git a/5/ecolyo.75100499f2844a051175.js b/5/ecolyo.82bfea9d56ce3943d256.js similarity index 99% rename from 5/ecolyo.75100499f2844a051175.js rename to 5/ecolyo.82bfea9d56ce3943d256.js index a19363317d5bdaca97ad22afa2a84b9781962345..e359a00fd4349bcfb064997897b94adc73e894cc 100644 --- a/5/ecolyo.75100499f2844a051175.js +++ b/5/ecolyo.82bfea9d56ce3943d256.js @@ -2978,7 +2978,7 @@ var FluidChartSlide = function FluidChartSlide(_ref) { isDataLoaded = _useState4[0], setIsDataLoaded = _useState4[1]; - var _useState5 = (0, _react.useState)(99), + var _useState5 = (0, _react.useState)(_timeStep.TimeStep.WEEK), _useState6 = (0, _slicedToArray2.default)(_useState5, 2), timeStep = _useState6[0], setTimeStep = _useState6[1]; @@ -6457,7 +6457,8 @@ var DataloadSectionValue = function DataloadSectionValue(_ref) { }, t('consumption_visualizer.estimated'))); } - return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.formatNumberValues)(dataload.value, _fluid.FluidType[fluidType], true) >= 1000 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.formatNumberValues)(dataload.value, _fluid.FluidType[fluidType]), /*#__PURE__*/_react.default.createElement("span", { + var formattedValue = (0, _utils.formatNumberValues)(dataload.value, _fluid.FluidType[fluidType], true); + return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Number(formattedValue) >= 1000 ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.formatNumberValues)(dataload.value, _fluid.FluidType[fluidType]), /*#__PURE__*/_react.default.createElement("span", { className: "text-18-normal" }, "".concat(t('FLUID.' + _fluid.FluidType[fluidType] + '.MEGAUNIT')))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _utils.formatNumberValues)(dataload.value), /*#__PURE__*/_react.default.createElement("span", { className: 'text-18-normal' diff --git a/app/ecolyo.a4b7432647bceffe5086.js b/app/ecolyo.a25b00e57c432ecc96d9.js similarity index 99% rename from app/ecolyo.a4b7432647bceffe5086.js rename to app/ecolyo.a25b00e57c432ecc96d9.js index 828c989738d1a23a3bcfe844c49ccab4e89ee4c6..c9f723d7017278923515442d4ba43c3d2429287d 100644 --- a/app/ecolyo.a4b7432647bceffe5086.js +++ b/app/ecolyo.a25b00e57c432ecc96d9.js @@ -64,7 +64,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"673e8ddd696663d6ffcf","4":"fd60d6605197e95bca7c","5":"75100499f2844a051175","6":"68590aa155e034150cca","7":"d2a6fc631880361b47a0","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"673e8ddd696663d6ffcf","4":"fd60d6605197e95bca7c","5":"82bfea9d56ce3943d256","6":"68590aa155e034150cca","7":"d2a6fc631880361b47a0","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function @@ -2470,7 +2470,7 @@ var AxisRight = function AxisRight(_ref) { var drawYAxis = function drawYAxis() { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion (0, _d3Selection.select)(yAxisRef.current).call((0, _d3Axis.axisRight)(yScale).ticks(isAnalysis ? 2 : 4).tickSize(-width).tickSizeOuter(0).tickFormat(function (d) { - return d >= 1000 && fluidStyle !== 'MULTIFLUID' ? typeof d === 'number' ? "".concat(d / 1000, " ").concat(t('FLUID.' + fluidStyle + '.MEGAUNIT')) : "".concat(d.valueOf() / 1000, " ").concat(t('FLUID.' + fluidStyle + '.MEGAUNIT')) : d === 0 ? "".concat(d) : "".concat(d, " ").concat(t('FLUID.' + fluidStyle + '.UNIT')); + return Number(d) >= 1000 && fluidStyle !== 'MULTIFLUID' ? typeof d === 'number' ? "".concat(d / 1000, " ").concat(t('FLUID.' + fluidStyle + '.MEGAUNIT')) : "".concat(d.valueOf() / 1000, " ").concat(t('FLUID.' + fluidStyle + '.MEGAUNIT')) : d === 0 ? "".concat(d) : "".concat(d, " ").concat(t('FLUID.' + fluidStyle + '.UNIT')); })); (0, _d3Selection.selectAll)('.tick text').attr('class', 'chart-ticks-y-text'); (0, _d3Selection.select)('.domain').remove(); diff --git a/index.html b/index.html index 11d15a4c2cb821a3c729f9838ea2b4f64832d5c2..088357db3904c4cc2ac946c90e6a5cb9d383672f 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.a4b7432647bceffe5086.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.a25b00e57c432ecc96d9.js"></script></div></body></html> \ No newline at end of file