From 161b5a8817324cd8547af688d7d11f9428a1b7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20PAILHAREY?= <rpailharey@grandlyon.com> Date: Wed, 4 Sep 2024 15:44:49 +0200 Subject: [PATCH] publish: feat: simpler fluidPrices service generated from commit 690b373ece74ef849a689d93404f32921b9a8fc5 --- ...c9389d7c6b545c1.js => ecolyo.d21d39dda092dfe36937.js} | 9 ++++++--- index.html | 2 +- services/aggregatorUsageEvents/ecolyo.js | 3 +++ services/consumptionAlert/ecolyo.js | 3 +++ services/enedisHalfHourMonthlyAnalysis/ecolyo.js | 3 +++ services/monthlyReportNotification/ecolyo.js | 3 +++ 6 files changed, 19 insertions(+), 4 deletions(-) rename app/{ecolyo.325cfc9389d7c6b545c1.js => ecolyo.d21d39dda092dfe36937.js} (99%) diff --git a/app/ecolyo.325cfc9389d7c6b545c1.js b/app/ecolyo.d21d39dda092dfe36937.js similarity index 99% rename from app/ecolyo.325cfc9389d7c6b545c1.js rename to app/ecolyo.d21d39dda092dfe36937.js index 88ca485d9..d33524be1 100644 --- a/app/ecolyo.325cfc9389d7c6b545c1.js +++ b/app/ecolyo.d21d39dda092dfe36937.js @@ -34006,7 +34006,7 @@ var ConsumptionDataManager = /*#__PURE__*/function () { return _context2.abrupt("return", formattedData); case 13: if (!(fluidTypes.length > 1 || isHome)) { - _context2.next = 37; + _context2.next = 38; break; } toBeAggregatedData = []; @@ -34043,11 +34043,14 @@ var ConsumptionDataManager = /*#__PURE__*/function () { _iterator.f(); return _context2.finish(32); case 35: + console.log({ + toBeAggregatedData: toBeAggregatedData + }); aggregatedData = this.aggregateGraphData(toBeAggregatedData); return _context2.abrupt("return", aggregatedData); - case 37: - return _context2.abrupt("return", null); case 38: + return _context2.abrupt("return", null); + case 39: case "end": return _context2.stop(); } diff --git a/index.html b/index.html index 3c40d5639..9553adba0 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.9cebad5ae7ea932ed345.js"></script><script src="app/ecolyo.325cfc9389d7c6b545c1.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.9cebad5ae7ea932ed345.js"></script><script src="app/ecolyo.d21d39dda092dfe36937.js"></script></div></body></html> \ No newline at end of file diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js index cd60418eb..fed137d89 100644 --- a/services/aggregatorUsageEvents/ecolyo.js +++ b/services/aggregatorUsageEvents/ecolyo.js @@ -71740,6 +71740,9 @@ class ConsumptionDataManager { chartFluid: fluidType }); } + console.log({ + toBeAggregatedData + }); const aggregatedData = this.aggregateGraphData(toBeAggregatedData); return aggregatedData; } diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js index 0e3775456..a8b849d45 100644 --- a/services/consumptionAlert/ecolyo.js +++ b/services/consumptionAlert/ecolyo.js @@ -71337,6 +71337,9 @@ class ConsumptionDataManager { chartFluid: fluidType }); } + console.log({ + toBeAggregatedData + }); const aggregatedData = this.aggregateGraphData(toBeAggregatedData); return aggregatedData; } diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js index 2b40a865a..92b4057fa 100644 --- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js +++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js @@ -71337,6 +71337,9 @@ class ConsumptionDataManager { chartFluid: fluidType }); } + console.log({ + toBeAggregatedData + }); const aggregatedData = this.aggregateGraphData(toBeAggregatedData); return aggregatedData; } diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js index f2b40e09f..016243d52 100644 --- a/services/monthlyReportNotification/ecolyo.js +++ b/services/monthlyReportNotification/ecolyo.js @@ -71337,6 +71337,9 @@ class ConsumptionDataManager { chartFluid: fluidType }); } + console.log({ + toBeAggregatedData + }); const aggregatedData = this.aggregateGraphData(toBeAggregatedData); return aggregatedData; } -- GitLab