diff --git a/4/ecolyo.8ead148de64ba3b0f926.js b/4/ecolyo.f03be0cafa79816c7d30.js similarity index 99% rename from 4/ecolyo.8ead148de64ba3b0f926.js rename to 4/ecolyo.f03be0cafa79816c7d30.js index 315ff7fa655a650766e16f6b49e19c45abdfb407..a6457b681dcd36116e5cad104f984a8c297fcf63 100644 --- a/4/ecolyo.8ead148de64ba3b0f926.js +++ b/4/ecolyo.f03be0cafa79816c7d30.js @@ -895,7 +895,8 @@ var Comparison = function Comparison(_ref) { } }; }, [analysisMonth]); - var loaderPlaceholderHeight = fluidsWithData.length * 84 + (fluidsWithData.length - 1) * 10; + var NAVIGATION_HEIGHT = 40; + var loaderPlaceholderHeight = fluidsWithData.length * 84 + (fluidsWithData.length - 1) * 10 + NAVIGATION_HEIGHT; (0, _react.useEffect)(function () { var subscribed = true; function populateData() { @@ -918,6 +919,11 @@ var Comparison = function Comparison(_ref) { fetchedYearIndicators = _context.sent; if (fetchedYearIndicators) { setYearPerformanceIndicators(fetchedYearIndicators); + if (fetchedYearIndicators.some(function (indicator) { + return indicator.value !== 0 || indicator.compareValue !== 0; + })) { + dispatch((0, _analysis.setPeriod)('year')); + } } setIsLoading(false); case 6: @@ -933,22 +939,22 @@ var Comparison = function Comparison(_ref) { return function () { subscribed = false; }; - }, [client, fluidTypes, analysisMonth, consumptionService, fluidsWithData, periods.monthPeriod, periods.previousYearPeriod]); + }, [client, fluidTypes, analysisMonth, consumptionService, fluidsWithData, periods.monthPeriod, periods.previousYearPeriod, dispatch]); return /*#__PURE__*/_react.default.createElement("div", { className: "comparison" - }, /*#__PURE__*/_react.default.createElement("div", { + }, !isLoading && /*#__PURE__*/_react.default.createElement("div", { className: "tabs" }, /*#__PURE__*/_react.default.createElement(_core.Button, { - className: period === 'month' ? 'active' : '', - onClick: function onClick() { - return dispatch((0, _analysis.setPeriod)('month')); - } - }, t('analysis.compare.month_tab')), /*#__PURE__*/_react.default.createElement(_core.Button, { className: period === 'year' ? 'active' : '', onClick: function onClick() { return dispatch((0, _analysis.setPeriod)('year')); } - }, t('analysis.compare.year_tab'))), /*#__PURE__*/_react.default.createElement("div", { + }, t("analysis.compare.year_tab")), /*#__PURE__*/_react.default.createElement(_core.Button, { + className: period === 'month' ? 'active' : '', + onClick: function onClick() { + return dispatch((0, _analysis.setPeriod)('month')); + } + }, t("analysis.compare.month_tab"))), /*#__PURE__*/_react.default.createElement("div", { className: "performanceIndicators" }, isLoading && /*#__PURE__*/_react.default.createElement("div", { style: { diff --git a/app/ecolyo.989d2442ff0d41130bba.js b/app/ecolyo.3f59f7f478552e5c7344.js similarity index 99% rename from app/ecolyo.989d2442ff0d41130bba.js rename to app/ecolyo.3f59f7f478552e5c7344.js index c4a5ec423011f08dd0996b10258f68566a02e252..0b4b59393393a4f55525da148b1d6e93097ec350 100644 --- a/app/ecolyo.989d2442ff0d41130bba.js +++ b/app/ecolyo.3f59f7f478552e5c7344.js @@ -64,7 +64,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"5304880c279a328fb5fb","4":"8ead148de64ba3b0f926","5":"5756da96fd0a3f02b7f8","6":"549e52f150fb1855a51a","7":"0aa5f5c57c463f74cbec","8":"e5c126b21505089b1bec","9":"d291da09c33bf88b3d41","10":"48e22fe54b797e13649d","11":"b5b57265a7650f49bb4f"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"5304880c279a328fb5fb","4":"f03be0cafa79816c7d30","5":"5756da96fd0a3f02b7f8","6":"549e52f150fb1855a51a","7":"0aa5f5c57c463f74cbec","8":"e5c126b21505089b1bec","9":"d291da09c33bf88b3d41","10":"48e22fe54b797e13649d","11":"b5b57265a7650f49bb4f"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function diff --git a/index.html b/index.html index 1f87cba68b297bcc7c2c1bade0e0d6e4f3b81638..e0b6b8654b9efe5560956ae1c787d666d14131eb 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.f97b7a5aeecbd744b032.js"></script><script src="app/ecolyo.989d2442ff0d41130bba.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.f97b7a5aeecbd744b032.js"></script><script src="app/ecolyo.3f59f7f478552e5c7344.js"></script></div></body></html> \ No newline at end of file