From cdda4be1fd46b8f7f63cc67b182f6f21f51f21f9 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Wed, 20 Mar 2024 16:23:34 +0100
Subject: [PATCH] publish: Merge branch 'feat/grdf-tier-direct' into 'dev'
generated from commit 85d764f22478a9b17b5a4c9efa9abd29a2dae768
---
...a1e93d70bb7ffeecfcc0.js => ecolyo.89884d73de9c7ea70af0.js} | 4 ++--
...d8985aed4520dad3aa52.js => ecolyo.b868b9f8b7a7b800f615.js} | 2 +-
index.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename 5/{ecolyo.a1e93d70bb7ffeecfcc0.js => ecolyo.89884d73de9c7ea70af0.js} (99%)
rename app/{ecolyo.d8985aed4520dad3aa52.js => ecolyo.b868b9f8b7a7b800f615.js} (99%)
diff --git a/5/ecolyo.a1e93d70bb7ffeecfcc0.js b/5/ecolyo.89884d73de9c7ea70af0.js
similarity index 99%
rename from 5/ecolyo.a1e93d70bb7ffeecfcc0.js
rename to 5/ecolyo.89884d73de9c7ea70af0.js
index 909aaa590..2959e8bdd 100644
--- a/5/ecolyo.a1e93d70bb7ffeecfcc0.js
+++ b/5/ecolyo.89884d73de9c7ea70af0.js
@@ -4644,8 +4644,8 @@ var ConsumptionView = function ConsumptionView(_ref) {
_useState10 = (0, _slicedToArray2.default)(_useState9, 2),
consentExpiredFluids = _useState10[0],
setConsentExpiredFluids = _useState10[1];
- var updateKey = fluidType !== _enums.FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate ? "".concat(fluidStatus[fluidType].lastDataDate.toLocaleString(), " + ").concat(fluidStatus[fluidType].status + fluidType) : '';
- var lastDataDateKey = fluidType !== _enums.FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate ? "".concat(fluidStatus[fluidType].lastDataDate.toLocaleString() + fluidType) : '';
+ var updateKey = !isMulti && fluidStatus[fluidType].lastDataDate ? "".concat(fluidStatus[fluidType].lastDataDate.toLocaleString(), " + ").concat(fluidStatus[fluidType].status + fluidType) : '';
+ var lastDataDateKey = !isMulti && fluidStatus[fluidType].lastDataDate ? "".concat(fluidStatus[fluidType].lastDataDate.toLocaleString() + fluidType) : '';
var handleCloseReleaseNoteModal = (0, _react.useCallback)(function () {
setOpenReleaseNoteModal(false);
dispatch((0, _global.showReleaseNotes)({
diff --git a/app/ecolyo.d8985aed4520dad3aa52.js b/app/ecolyo.b868b9f8b7a7b800f615.js
similarity index 99%
rename from app/ecolyo.d8985aed4520dad3aa52.js
rename to app/ecolyo.b868b9f8b7a7b800f615.js
index f7afd292b..a53e9ca5e 100644
--- a/app/ecolyo.d8985aed4520dad3aa52.js
+++ b/app/ecolyo.b868b9f8b7a7b800f615.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"4691b499045ab5abaaa1","4":"4d0cba6449d311d8b400","5":"a1e93d70bb7ffeecfcc0","6":"3a563ea3a37323fef350","7":"0aa5f5c57c463f74cbec","8":"e5c126b21505089b1bec","9":"d291da09c33bf88b3d41","10":"48e22fe54b797e13649d","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"4691b499045ab5abaaa1","4":"4d0cba6449d311d8b400","5":"89884d73de9c7ea70af0","6":"3a563ea3a37323fef350","7":"0aa5f5c57c463f74cbec","8":"e5c126b21505089b1bec","9":"d291da09c33bf88b3d41","10":"48e22fe54b797e13649d","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 069749eed..0fdbc54cb 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.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.d8985aed4520dad3aa52.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.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.b868b9f8b7a7b800f615.js"></script></div></body></html>
\ No newline at end of file
--
GitLab