From c6e5ad0b7b90205fd7e506b817e047be5aec00b3 Mon Sep 17 00:00:00 2001
From: "guilhem.carron" <gcarron@grandlyon.com>
Date: Wed, 8 Dec 2021 16:10:50 +0100
Subject: [PATCH] fix(newsletter): Fix month display + symbol revert

---
 src/targets/services/monthlyReportNotification.ts | 12 ++++++------
 src/utils/utils.ts                                |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts
index 9e40cbd78..908e35d0d 100644
--- a/src/targets/services/monthlyReportNotification.ts
+++ b/src/targets/services/monthlyReportNotification.ts
@@ -71,12 +71,12 @@ const buildConsumptionText = async (client: Client) => {
     if (value) {
       if (value > 0) {
         text +=
-          '<span class="elec-text">+&nbsp;' +
+          '<span class="elec-text">-&nbsp;' +
           Math.ceil(value * 100) +
           "&nbsp;%&nbsp;d'électricité</span>"
       } else {
         text +=
-          '<span class="elec-text">-&nbsp;' +
+          '<span class="elec-text">+&nbsp;' +
           Math.ceil(Math.abs(value * 100)) +
           "&nbsp;%&nbsp;d'électricité</span>"
       }
@@ -94,12 +94,12 @@ const buildConsumptionText = async (client: Client) => {
       }
       if (value > 0) {
         text +=
-          '<span class="gas-text">+&nbsp;' +
+          '<span class="gas-text">-&nbsp;' +
           Math.ceil(value * 100) +
           '&nbsp;%&nbsp;de&nbsp;gaz</span>'
       } else {
         text +=
-          '<span class="gas-text">-&nbsp;' +
+          '<span class="gas-text">+&nbsp;' +
           Math.ceil(Math.abs(value * 100)) +
           '&nbsp;%&nbsp;de&nbsp;gaz</span>'
       }
@@ -115,12 +115,12 @@ const buildConsumptionText = async (client: Client) => {
       }
       if (value > 0) {
         text +=
-          '<span class="water-text">+&nbsp;' +
+          '<span class="water-text">-&nbsp;' +
           Math.ceil(value * 100) +
           "&nbsp;%&nbsp;d'eau</span>"
       } else {
         text +=
-          '<span class="water-text">-&nbsp;' +
+          '<span class="water-text">+&nbsp;' +
           Math.ceil(Math.abs(value * 100)) +
           "&nbsp;%&nbsp;d'eau</span>"
       }
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 90b97ad05..4bc9d1068 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -145,7 +145,7 @@ export const getPreviousMonthName = (date: DateTime) => {
     'novembre',
     'décembre',
   ]
-  return monthNames[date.month - 1]
+  return monthNames[date.month - 2]
 }
 
 /**
@@ -155,7 +155,7 @@ export const getPreviousMonthName = (date: DateTime) => {
  */
 export const getMonthNameWithPrep = (date: DateTime) => {
   const monthNames = [
-    'de janavier',
+    'de janvier',
     'de février',
     'de mars',
     `d'avril`,
@@ -168,7 +168,7 @@ export const getMonthNameWithPrep = (date: DateTime) => {
     'de novembre',
     'de décembre',
   ]
-  return monthNames[date.month]
+  return monthNames[date.month - 1]
 }
 
 /**
-- 
GitLab