diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts index 9e40cbd78cdc473777b85d3172cc509519cc921e..908e35d0d2d0deb12608800fddc4646f6859b3c9 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">+ ' + + '<span class="elec-text">- ' + Math.ceil(value * 100) + " % d'électricité</span>" } else { text += - '<span class="elec-text">- ' + + '<span class="elec-text">+ ' + Math.ceil(Math.abs(value * 100)) + " % d'électricité</span>" } @@ -94,12 +94,12 @@ const buildConsumptionText = async (client: Client) => { } if (value > 0) { text += - '<span class="gas-text">+ ' + + '<span class="gas-text">- ' + Math.ceil(value * 100) + ' % de gaz</span>' } else { text += - '<span class="gas-text">- ' + + '<span class="gas-text">+ ' + Math.ceil(Math.abs(value * 100)) + ' % de gaz</span>' } @@ -115,12 +115,12 @@ const buildConsumptionText = async (client: Client) => { } if (value > 0) { text += - '<span class="water-text">+ ' + + '<span class="water-text">- ' + Math.ceil(value * 100) + " % d'eau</span>" } else { text += - '<span class="water-text">- ' + + '<span class="water-text">+ ' + Math.ceil(Math.abs(value * 100)) + " % d'eau</span>" } diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 90b97ad05f7bda072243890a4e5c0b4315008e69..4bc9d10683e9f38499768f62f60d46eaa484312d 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] } /**