diff --git a/app/ecolyo.9e718ad2ae319da46d05.js b/app/ecolyo.4a7da0fe743f1c380806.js
similarity index 99%
rename from app/ecolyo.9e718ad2ae319da46d05.js
rename to app/ecolyo.4a7da0fe743f1c380806.js
index 3eea2b14f5a68dc1794371ba92912b2309fe350e..bd680543ea906e1d5b5a44f142ea8125aaadf8a9 100644
--- a/app/ecolyo.9e718ad2ae319da46d05.js
+++ b/app/ecolyo.4a7da0fe743f1c380806.js
@@ -27147,7 +27147,9 @@ var Bar = function Bar(_ref) {
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
return state.ecolyo;
}),
- selectedDate = _useAppSelector.chart.selectedDate,
+ _useAppSelector$chart = _useAppSelector.chart,
+ selectedDate = _useAppSelector$chart.selectedDate,
+ currentTimeStep = _useAppSelector$chart.currentTimeStep,
fluidStatus = _useAppSelector.global.fluidStatus;
var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -27184,12 +27186,20 @@ var Bar = function Bar(_ref) {
var _fluid$lastDataDate;
return (_fluid$lastDataDate = fluid.lastDataDate) !== null && _fluid$lastDataDate !== void 0 ? _fluid$lastDataDate : _luxon.DateTime.local(0);
});
+ /** Pick current fluid date or max for multi */
var lastDataDate = isMulti ? _luxon.DateTime.max.apply(_luxon.DateTime, (0, _toConsumableArray2.default)(lastDataDates)) : lastDataDates[fluidType];
- var dataMissingUpcoming = Boolean(dataload.date > lastDataDate && dataload.date < _luxon.DateTime.local());
+
+ /** Remove a day when viewing half-hour */
+ lastDataDate = lastDataDate.plus({
+ days: currentTimeStep === _enums.TimeStep.HALF_AN_HOUR ? 1 : 0
+ });
+
+ /** True when between lastData and today's range */
+ var isDataMissingOrUpcoming = Boolean(dataload.date > lastDataDate && dataload.date < _luxon.DateTime.local());
var value = dataload.value;
/** Adjust value for upcoming data (placeholder bars) */
- if (dataMissingUpcoming && average) {
+ if (isDataMissingOrUpcoming && average) {
if (average > 1) {
// Use 10% of average if average is above 1
value = average * 0.1;
@@ -27251,7 +27261,7 @@ var Bar = function Bar(_ref) {
height: height + 40,
className: "background-".concat(barBackgroundClass),
fill: "#E0E0E0"
- })), height > 0 && dataMissingUpcoming && /*#__PURE__*/_react.default.createElement("g", {
+ })), height > 0 && isDataMissingOrUpcoming && /*#__PURE__*/_react.default.createElement("g", {
transform: "translate(".concat(xScaleValue, ", ").concat(yScaleValue, ")"),
className: "barFill"
}, /*#__PURE__*/_react.default.createElement("defs", null, /*#__PURE__*/_react.default.createElement("linearGradient", {
diff --git a/index.html b/index.html
index a5d7cd6003008e066dfcb48bf005fddf4e7306fc..993017f34e06da197c4692494e75d9cd1f1b2875 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.50523ef7f4b4a6406417.js"></script><script src="app/ecolyo.9e718ad2ae319da46d05.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.50523ef7f4b4a6406417.js"></script><script src="app/ecolyo.4a7da0fe743f1c380806.js"></script></div></body></html>
\ No newline at end of file