From 7cbca509dd5c506d9a5462a7c37f4556c2707971 Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Mon, 19 Sep 2022 17:19:25 +0200
Subject: [PATCH] publish: Update .gitlab/merge_request_templates/default.md
generated from commit a24a43e189b99de70d5f93e9d454ff2060b8684f
---
...1d847c.js => ecolyo.0e74c254ff01c19945ff.js} | 17 ++++++++---------
index.html | 2 +-
services/consumptionAlert/ecolyo.js | 11 +++--------
services/monthlyReportNotification/ecolyo.js | 3 +--
4 files changed, 13 insertions(+), 20 deletions(-)
rename app/{ecolyo.502b71a015ef111d847c.js => ecolyo.0e74c254ff01c19945ff.js} (99%)
diff --git a/app/ecolyo.502b71a015ef111d847c.js b/app/ecolyo.0e74c254ff01c19945ff.js
similarity index 99%
rename from app/ecolyo.502b71a015ef111d847c.js
rename to app/ecolyo.0e74c254ff01c19945ff.js
index b9c604f84..0d900f5bb 100644
--- a/app/ecolyo.502b71a015ef111d847c.js
+++ b/app/ecolyo.0e74c254ff01c19945ff.js
@@ -3249,28 +3249,27 @@ var MailService = /*#__PURE__*/function () {
while (1) {
switch (_context.prev = _context.next) {
case 0:
- console.log('InfoMail111', JSON.stringify(mailInfo));
- console.log('InfoMail1112', mailInfo); // mailInfo.subject = 'Coucou MetroMollo'
+ console.log('InfoMail111', JSON.stringify(mailInfo)); // mailInfo.subject = 'Coucou MetroMollo'
- _context.prev = 2;
+ _context.prev = 1;
jobCollection = client.collection('io.cozy.jobs');
jobCollection.create('sendmail', mailInfo);
- _context.next = 11;
+ _context.next = 10;
break;
- case 7:
- _context.prev = 7;
- _context.t0 = _context["catch"](2);
+ 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 11:
+ case 10:
case "end":
return _context.stop();
}
}
- }, _callee, null, [[2, 7]]);
+ }, _callee, null, [[1, 6]]);
}));
function SendMail(_x, _x2) {
diff --git a/index.html b/index.html
index c3012028c..3b675c199 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.502b71a015ef111d847c.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.0e74c254ff01c19945ff.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index f6d2f5d45..839717030 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -80955,20 +80955,16 @@ const consumptionAlert = async ({
limitDate: `${alertDay.day} ${(0, _utils.getPreviousMonthName)(alertDay)}`,
consumption: lastDayValue
});
- log('info', `TEMPLATEE : ${template}`);
- log('info', `TEMPLATEE2 `);
- log('info', template);
const mailData = {
mode: 'noreply',
- subject: 'Ecolyo ca deborde',
+ subject: '[Ecolyo] ca deborde',
parts: [{
type: 'text/html',
- body: await (0, _mjml.default)(template).html
+ body: (0, _mjml.default)(template).html
}]
};
log('info', `MAILSUBJECTTTTTT1 : ${mailData.subject}`);
log('info', `SUBJ `);
- log('info', mailData.subject);
log('info', 'Sending mail1...');
log('info', `MAILSUBJECTTTTTT : ${JSON.stringify(mailData.subject)}`);
console.log('thesubject', mailData.subject);
@@ -80993,8 +80989,7 @@ exports.default = void 0;
class MailService {
async SendMail(client, mailInfo) {
- console.log('InfoMail111', JSON.stringify(mailInfo));
- console.log('InfoMail1112', mailInfo); // mailInfo.subject = 'Coucou MetroMollo'
+ console.log('InfoMail111', JSON.stringify(mailInfo)); // mailInfo.subject = 'Coucou MetroMollo'
try {
const jobCollection = client.collection('io.cozy.jobs');
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index 5ebb01af9..46102b280 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -80870,8 +80870,7 @@ exports.default = void 0;
class MailService {
async SendMail(client, mailInfo) {
- console.log('InfoMail111', JSON.stringify(mailInfo));
- console.log('InfoMail1112', mailInfo); // mailInfo.subject = 'Coucou MetroMollo'
+ console.log('InfoMail111', JSON.stringify(mailInfo)); // mailInfo.subject = 'Coucou MetroMollo'
try {
const jobCollection = client.collection('io.cozy.jobs');
--
GitLab