From b8be54f696b9af092088a6779db3b77aec9fe6b8 Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Mon, 19 Sep 2022 14:26:22 +0200
Subject: [PATCH] publish: Update .gitlab/merge_request_templates/default.md
generated from commit a24a43e189b99de70d5f93e9d454ff2060b8684f
---
...9d4da08.js => ecolyo.f24f655a97bced1b2482.js} | 16 ++++++++--------
index.html | 2 +-
services/consumptionAlert/ecolyo.js | 6 ++++--
services/monthlyReportNotification/ecolyo.js | 3 ++-
4 files changed, 15 insertions(+), 12 deletions(-)
rename app/{ecolyo.d2d2f74e505de9d4da08.js => ecolyo.f24f655a97bced1b2482.js} (99%)
diff --git a/app/ecolyo.d2d2f74e505de9d4da08.js b/app/ecolyo.f24f655a97bced1b2482.js
similarity index 99%
rename from app/ecolyo.d2d2f74e505de9d4da08.js
rename to app/ecolyo.f24f655a97bced1b2482.js
index 7872e491a..6c420efb3 100644
--- a/app/ecolyo.d2d2f74e505de9d4da08.js
+++ b/app/ecolyo.f24f655a97bced1b2482.js
@@ -3235,7 +3235,6 @@ var _classCallCheck2 = _interopRequireDefault(__webpack_require__("lwsE"));
var _createClass2 = _interopRequireDefault(__webpack_require__("W8MJ"));
-/* eslint-disable @typescript-eslint/no-explicit-any */
var MailService = /*#__PURE__*/function () {
function MailService() {
(0, _classCallCheck2.default)(this, MailService);
@@ -3250,25 +3249,26 @@ var MailService = /*#__PURE__*/function () {
while (1) {
switch (_context.prev = _context.next) {
case 0:
- _context.prev = 0;
+ console.log('InfoMail111', mailInfo);
+ _context.prev = 1;
jobCollection = client.collection('io.cozy.jobs');
jobCollection.create('sendmail', mailInfo);
- _context.next = 9;
+ _context.next = 10;
break;
- case 5:
- _context.prev = 5;
- _context.t0 = _context["catch"](0);
+ case 6:
+ _context.prev = 6;
+ _context.t0 = _context["catch"](1);
// eslint-disable-next-line no-console
console.log(_context.t0);
throw new Error('Failed to send mail');
- case 9:
+ case 10:
case "end":
return _context.stop();
}
}
- }, _callee, null, [[0, 5]]);
+ }, _callee, null, [[1, 6]]);
}));
function SendMail(_x, _x2) {
diff --git a/index.html b/index.html
index 9ebf0b854..d54435867 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.c1180bc5cd66dfd3234e.js"></script><script src="app/ecolyo.d2d2f74e505de9d4da08.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.c1180bc5cd66dfd3234e.js"></script><script src="app/ecolyo.f24f655a97bced1b2482.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index d888597f6..e0856250c 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -80964,7 +80964,8 @@ const consumptionAlert = async ({
}]
};
log('info', 'Sending mail...');
- log('info', `Subject : ${JSON.stringify(mailData)}`);
+ log('info', `MAILSUBJECTTTTTT : ${JSON.stringify(mailData)}`);
+ log('info', `MAILSUBJECTTTTTT2 : ${mailData}`);
mailService.SendMail(client, mailData);
};
@@ -80982,9 +80983,10 @@ Object.defineProperty(exports, "__esModule", {
});
exports.default = void 0;
-/* eslint-disable @typescript-eslint/no-explicit-any */
class MailService {
async SendMail(client, mailInfo) {
+ console.log('InfoMail111', mailInfo);
+
try {
const jobCollection = client.collection('io.cozy.jobs');
jobCollection.create('sendmail', mailInfo);
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index e6fe0ee85..abc6e08da 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -80868,9 +80868,10 @@ Object.defineProperty(exports, "__esModule", {
});
exports.default = void 0;
-/* eslint-disable @typescript-eslint/no-explicit-any */
class MailService {
async SendMail(client, mailInfo) {
+ console.log('InfoMail111', mailInfo);
+
try {
const jobCollection = client.collection('io.cozy.jobs');
jobCollection.create('sendmail', mailInfo);
--
GitLab