diff --git a/7/ecolyo.113c7a862b3be81f81b5.js b/7/ecolyo.9377682bc269ccdf25c4.js
similarity index 99%
rename from 7/ecolyo.113c7a862b3be81f81b5.js
rename to 7/ecolyo.9377682bc269ccdf25c4.js
index 447626a8a4affc4f0a508e60134d0c8b4582dd4b..caa6995c1fdd70f9fe80cd2951fd644d235dabf2 100644
--- a/7/ecolyo.113c7a862b3be81f81b5.js
+++ b/7/ecolyo.9377682bc269ccdf25c4.js
@@ -131,13 +131,13 @@ var BarChart = function BarChart(_ref) {
marginTop: marginTop
}), /*#__PURE__*/_react.default.createElement("g", {
transform: "translate(".concat(marginLeft, ",").concat(marginTop, ")")
- }, chartData.actualData.map(function (d, index) {
+ }, chartData.actualData.map(function (data, index) {
var _chartData$comparison;
return /*#__PURE__*/_react.default.createElement(_Bar.default, {
key: index,
index: index,
- dataload: d,
+ dataload: data,
compareDataload: (_chartData$comparison = chartData.comparisonData) !== null && _chartData$comparison !== void 0 && _chartData$comparison[index] ? chartData.comparisonData[index] : null,
fluidType: fluidType,
timeStep: timeStep,
@@ -146,7 +146,7 @@ var BarChart = function BarChart(_ref) {
yScale: yScale,
height: getContentHeight(),
isSwitching: isSwitching,
- isMultiMissingFluid: d.state === _enums.DataloadState.AGGREGATED_WITH_EMPTY || d.state === _enums.DataloadState.AGGREGATED_WITH_COMING || d.state === _enums.DataloadState.AGGREGATED_WITH_HOLE_OR_MISSING ? true : false,
+ isMultiMissingFluid: data.state === _enums.DataloadState.AGGREGATED_WITH_EMPTY || data.state === _enums.DataloadState.AGGREGATED_WITH_COMING || data.state === _enums.DataloadState.AGGREGATED_WITH_HOLE_OR_MISSING,
clickable: clickable,
average: averageConsumption
});
diff --git a/app/ecolyo.d52b1092c588bbe5087a.js b/app/ecolyo.88d8c2cbee016aba09e6.js
similarity index 99%
rename from app/ecolyo.d52b1092c588bbe5087a.js
rename to app/ecolyo.88d8c2cbee016aba09e6.js
index 5b42d4f2094750fa0f6107e8d8511ce793bfd61c..7ac243e5205f27cc712e6dc3485eb27cc62c127c 100644
--- a/app/ecolyo.d52b1092c588bbe5087a.js
+++ b/app/ecolyo.88d8c2cbee016aba09e6.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"1a5ceac1d989c9e1527a","2":"62e5292a592368584bc8","4":"ed87413fc9f81039a5c7","5":"eb4d57e9d898eeff1c9e","6":"19b72783897b01dc97e2","7":"113c7a862b3be81f81b5","8":"cd70845caf52d7dce840","9":"30da7dc1931663d9bbdf","10":"2946952809565809b75b"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"1a5ceac1d989c9e1527a","2":"62e5292a592368584bc8","4":"ed87413fc9f81039a5c7","5":"eb4d57e9d898eeff1c9e","6":"19b72783897b01dc97e2","7":"9377682bc269ccdf25c4","8":"cd70845caf52d7dce840","9":"30da7dc1931663d9bbdf","10":"2946952809565809b75b"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -31644,10 +31644,10 @@ var Bar = function Bar(_ref) {
var index = _ref.index,
dataload = _ref.dataload,
+ compare = _ref.compare,
compareDataload = _ref.compareDataload,
fluidType = _ref.fluidType,
timeStep = _ref.timeStep,
- compare = _ref.compare,
xScale = _ref.xScale,
yScale = _ref.yScale,
height = _ref.height,
@@ -31661,9 +31661,10 @@ var Bar = function Bar(_ref) {
var dispatch = (0, _hooks.useAppDispatch)();
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
- return state.ecolyo.chart;
+ return state.ecolyo;
}),
- selectedDate = _useAppSelector.selectedDate;
+ selectedDate = _useAppSelector.chart.selectedDate,
+ fluidStatus = _useAppSelector.global.fluidStatus;
var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -31747,6 +31748,9 @@ var Bar = function Bar(_ref) {
return compare ? xScale.bandwidth() / 2 : xScale.bandwidth();
};
+ var lastDataDate = fluidType !== _enums.FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate;
+ var dataMissingUpcoming = Boolean(lastDataDate && dataload.date > lastDataDate && dataload.date < _luxon.DateTime.local());
+
var topRoundedRect = function topRoundedRect(x, y, width, height) {
var radius = height > 4 ? 4 : height / 4;
return "\n M".concat(x, ",").concat(y + radius, "\n a").concat(radius, ",").concat(radius, " 0 0 1 ").concat(radius, ",").concat(-radius, "\n h").concat(width - 2 * radius, "\n a").concat(radius, ",").concat(radius, " 0 0 1 ").concat(radius, ",").concat(radius, "\n v").concat(height - radius, "\n h").concat(-width, "\n z");
@@ -31771,7 +31775,7 @@ var Bar = function Bar(_ref) {
height: height + 40,
className: "background-".concat(barBackgroundClass),
fill: "#E0E0E0"
- })), height > 0 && dataload.state === _enums.DataloadState.COMING && dataload.date < _luxon.DateTime.local() && /*#__PURE__*/_react.default.createElement("g", {
+ })), height > 0 && dataMissingUpcoming && /*#__PURE__*/_react.default.createElement("g", {
transform: "translate(".concat(xScaleValue, ", ").concat(yScaleValue, ")"),
className: "barFill"
}, /*#__PURE__*/_react.default.createElement("defs", null, /*#__PURE__*/_react.default.createElement("linearGradient", {
@@ -31852,7 +31856,10 @@ var Bar = function Bar(_ref) {
return undefined;
},
onAnimationEnd: onAnimationEnd
- })) : height > 0 && dataload.value && dataload.value >= 0 && /*#__PURE__*/_react.default.createElement("g", {
+ })) : height > 0 && dataload.value && dataload.value >= 0 &&
+ /*#__PURE__*/
+ // default colored bar
+ _react.default.createElement("g", {
transform: "translate(".concat(xScaleValue, ", ").concat(yScaleValue, ")")
}, /*#__PURE__*/_react.default.createElement("defs", null, /*#__PURE__*/_react.default.createElement("linearGradient", {
id: "gradient",
diff --git a/index.html b/index.html
index 6feb72d8a08a3e9e86972aaf516939e8a13c276d..aef8c8d7146f3934a171098bfe9e4f6e097a157b 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.fbf1f65c47dc10085503.js"></script><script src="app/ecolyo.d52b1092c588bbe5087a.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.fbf1f65c47dc10085503.js"></script><script src="app/ecolyo.88d8c2cbee016aba09e6.js"></script></div></body></html>
\ No newline at end of file