diff --git a/app/ecolyo.5ae6156400e4cda81771.js b/app/ecolyo.d5ae577445c99ed00563.js similarity index 99% rename from app/ecolyo.5ae6156400e4cda81771.js rename to app/ecolyo.d5ae577445c99ed00563.js index 64124016aaa4493d840e695459757d13e46131b7..c885707db6678dcc75df4defc476440e533ba882 100644 --- a/app/ecolyo.5ae6156400e4cda81771.js +++ b/app/ecolyo.d5ae577445c99ed00563.js @@ -40920,34 +40920,25 @@ var FluidService = /*#__PURE__*/function () { elecTrigger = _yield$Promise$all6[0]; waterTrigger = _yield$Promise$all6[1]; gasTrigger = _yield$Promise$all6[2]; - console.log('elecKonnector', elecKonnector); - console.log('waterKonnector', waterKonnector); - console.log('gasKonnector', gasKonnector); - console.log('elecAccount', elecAccount); - console.log('waterAccount', waterAccount); - console.log('gasAccount', gasAccount); - console.log('elecTrigger', elecTrigger); - console.log('waterTrigger', waterTrigger); - console.log('gasTrigger', gasTrigger); consumptionService = new _consumption.default(_this._client); - _context2.next = 37; + _context2.next = 28; return Promise.all([elecTrigger ? triggerService.fetchTriggerState(elecTrigger) : null, waterTrigger ? triggerService.fetchTriggerState(waterTrigger) : null, gasTrigger ? triggerService.fetchTriggerState(gasTrigger) : null]); - case 37: + case 28: _yield$Promise$all7 = _context2.sent; _yield$Promise$all8 = (0, _slicedToArray2.default)(_yield$Promise$all7, 3); elecStatus = _yield$Promise$all8[0]; waterStatus = _yield$Promise$all8[1]; gasStatus = _yield$Promise$all8[2]; - _context2.next = 44; + _context2.next = 35; return consumptionService.fetchAllFirstDateData([_fluid.FluidType.ELECTRICITY, _fluid.FluidType.WATER, _fluid.FluidType.GAS]); - case 44: + case 35: firstDataDates = _context2.sent; - _context2.next = 47; + _context2.next = 38; return consumptionService.fetchAllLastDateData([_fluid.FluidType.ELECTRICITY, _fluid.FluidType.WATER, _fluid.FluidType.GAS]); - case 47: + case 38: lastDataDates = _context2.sent; result = [{ fluidType: _fluid.FluidType.ELECTRICITY, @@ -40994,7 +40985,7 @@ var FluidService = /*#__PURE__*/function () { }]; return _context2.abrupt("return", result); - case 50: + case 41: case "end": return _context2.stop(); } diff --git a/index.html b/index.html index 3d71ae3b96efb90af34c1e86392c953474794574..6202432e2b6134d2b1b88e85508a2517667cc549 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,user-scalable=0,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.e09e36019e1ed9dabedd.js"></script><script src="app/ecolyo.5ae6156400e4cda81771.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,user-scalable=0,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.e09e36019e1ed9dabedd.js"></script><script src="app/ecolyo.d5ae577445c99ed00563.js"></script></div></body></html> \ No newline at end of file diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js index e1b16041022f092bfc9322b2d5cd397422a680a0..b284ae738aad4fb533e834d1b8eb99d822953b49 100644 --- a/services/aggregatorUsageEvents/ecolyo.js +++ b/services/aggregatorUsageEvents/ecolyo.js @@ -82042,15 +82042,6 @@ class FluidService { const [elecKonnector, waterKonnector, gasKonnector] = await Promise.all([konnectorService.getKonnector(fluidConfig[_fluid.FluidType.ELECTRICITY].konnectorConfig.slug), konnectorService.getKonnector(fluidConfig[_fluid.FluidType.WATER].konnectorConfig.slug), konnectorService.getKonnector(fluidConfig[_fluid.FluidType.GAS].konnectorConfig.slug)]); const triggerService = new _triggers.default(this._client); const [elecTrigger, waterTrigger, gasTrigger] = await Promise.all([elecAccount && elecKonnector ? triggerService.getTrigger(elecAccount, elecKonnector) : null, waterAccount && waterKonnector ? triggerService.getTrigger(waterAccount, waterKonnector) : null, gasAccount && gasKonnector ? triggerService.getTrigger(gasAccount, gasKonnector) : null]); - console.log('elecKonnector', elecKonnector); - console.log('waterKonnector', waterKonnector); - console.log('gasKonnector', gasKonnector); - console.log('elecAccount', elecAccount); - console.log('waterAccount', waterAccount); - console.log('gasAccount', gasAccount); - console.log('elecTrigger', elecTrigger); - console.log('waterTrigger', waterTrigger); - console.log('gasTrigger', gasTrigger); const consumptionService = new _consumption.default(this._client); const [elecStatus, waterStatus, gasStatus] = await Promise.all([elecTrigger ? triggerService.fetchTriggerState(elecTrigger) : null, waterTrigger ? triggerService.fetchTriggerState(waterTrigger) : null, gasTrigger ? triggerService.fetchTriggerState(gasTrigger) : null]); const firstDataDates = await consumptionService.fetchAllFirstDateData([_fluid.FluidType.ELECTRICITY, _fluid.FluidType.WATER, _fluid.FluidType.GAS]);