Merge branch 'master' into prod

K-Fet · May 18, 2021 · 5f7bc44 · 5f7bc44
2 parents 2f607e0 + 0192164
commit 5f7bc44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/client/src/app/core/api-services/service.service.ts b/packages/client/src/app/core/api-services/service.service.ts
@@ -61,7 +61,7 @@ export class ServiceService {
     const services = await this.get(start, end);
 
     services.forEach((service) => {
-      const name = format(service.startAt, 'EEE', { locale: fr });
+      const name = format(new Date(service.startAt), 'EEE', { locale: fr });
       const day = days.find(currentDay => currentDay.name === name);
 
       if (day) return day.services.push(service);

diff --git a/packages/client/src/app/services/planning/planning.component.ts b/packages/client/src/app/services/planning/planning.component.ts
@@ -39,7 +39,7 @@ export class PlanningComponent implements OnInit {
       if (days.length > 0) {
         this.days = days;
         const today = this.days.filter((day: Day) => {
-          return isSameDay(day.date, new Date());
+          return isSameDay(new Date(day.date), new Date());
         });
         this.updateDayDetails(today[0] || this.days[0]);
       } else {