diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 15f2b7b3e..2b0b8b163 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -228,8 +228,10 @@ export class EventsPage implements OnInit { let date = new Date(); let month = date.getMonth() + 1; + let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59"; + if(SessionStore.user) { let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => { this.showLoader = false; diff --git a/src/app/services/Repositorys/Agenda/agenda-data.service.ts b/src/app/services/Repositorys/Agenda/agenda-data.service.ts index 41af8decd..0c99ec684 100644 --- a/src/app/services/Repositorys/Agenda/agenda-data.service.ts +++ b/src/app/services/Repositorys/Agenda/agenda-data.service.ts @@ -40,9 +40,18 @@ export class AgendaDataService { } getEvents(userId: number, startDate: string, endDate: string, status: number, category: string, type: string): Observable { - const params = new HttpParams() + let params = new HttpParams() .set('UserId', userId) .set('Status', status) + + if (startDate !== null && startDate !== undefined) { + params = params.set('startDate', startDate); + } + + if (endDate !== null && endDate !== undefined) { + params = params.set('endDate', endDate); + } + return this.http.get(`${this.baseUrl}/Events`, { params }); }