fix(calendar): start iCalendar on Monday

maelgangloff · Sep 22, 2021 · 1ad7b76 · 1ad7b76
1 parent 5394757
commit 1ad7b76
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 409 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kdecole-api",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "main": "dist/Kdecole.js",
   "types": "types/Kdecole.d.ts",
   "bin": {

diff --git a/src/entities/Calendar/Calendrier.ts b/src/entities/Calendar/Calendrier.ts
@@ -62,6 +62,8 @@ export default class Calendrier {
 
       const numberOfWeek = (d1: Date, d2: Date): number => ((d1.getTime() - d2.getTime()) / (7 * 24 * 60 * 60 * 1000))
 
+      const getMonday = (d: Date): Date => new Date(new Date(d.setDate((d.getDate() - d.getDay()) + (d.getDay() === 0 ? -6 : 1))).setHours(0, 0, 0, 0))
+
       return `BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//kdecole-api//ical//EN
@@ -70,7 +72,7 @@ TZID:Europe/Paris
 NAME:${name}
 X-WR-CALNAME:${name}
 ` + this.listeJourCdt
-        .filter(jour => this.currentDate <= jour.date && numberOfWeek(jour.date, this.currentDate) < weeks)
+        .filter(jour => getMonday(this.currentDate) <= jour.date && numberOfWeek(jour.date, this.currentDate) < weeks)
         .map(jour => jour.listeSeances).flat()
         .filter(seance => seance.flagActif)
         .reduce((acc, seance) =>