diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 1d0aaa047..9137d0770 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -93,6 +93,7 @@ export class HomePage implements OnInit { this.router.events.subscribe((val) => { document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) + document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove()) }); window['platform'] = platform @@ -100,6 +101,9 @@ export class HomePage implements OnInit { if (window.location.pathname != '/inactivity') { + document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) + document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove()) + const pathname = window.location.pathname SessionStore.setUrlBeforeInactivity(pathname) this.router.navigate(['/inactivity']); diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index c1e6c663c..25dbbc3d8 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -160,14 +160,12 @@ export class ListBoxService { } - push(event: any, selectedDate: Date) { - - console.log(new Date(event.start).getDate(), selectedDate.getDate(), new Date(event.start).getDate() >= selectedDate.getDate()) + push(event: any, selectedDate: Date) { - return new Date(event.start).getMonth() == selectedDate.getMonth() && - new Date(event.start).getFullYear() == selectedDate.getFullYear() && - new Date(event.start).getDate() >= selectedDate.getDate() - } + return new Date(event.start).getMonth() == selectedDate.getMonth() && + new Date(event.start).getFullYear() == selectedDate.getFullYear() && + new Date(event.start).getDate() >= selectedDate.getDate() + } encapsulation(eventsList:EventListStore[], profile): CustomCalendarEvent[] {