From d58807a2197ea664c35f4dc075ee5cda08bdf7ec Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 14 Jun 2024 13:23:26 +0100 Subject: [PATCH] use enums insted of numbers --- src/app/pages/agenda/agenda.page.ts | 3 ++- .../Repositorys/Agenda/agenda-data-repository.service.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index de23e61ea..226fff510 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -38,6 +38,7 @@ import { Cy } from 'cypress/enum' import { Observable } from 'rxjs'; import { TableSharedCalendar } from 'src/app/services/Repositorys/Agenda/agenda-local-data-source.service'; import { map } from 'rxjs/operators'; +import { EEventFilterStatus } from 'src/app/services/Repositorys/Agenda/model/enums'; @Component({ selector: 'app-agenda', templateUrl: './agenda.page.html', @@ -705,7 +706,7 @@ export class AgendaPage implements OnInit { calendarOwnerName: selectedCalendar.wxFullName, endDate: endTime.toISOString(), startDate: startTime.toISOString(), - status: 3 + status: EEventFilterStatus.Approved }) if(response.isOk()) { diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts index bdf44edf5..36a498c41 100644 --- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts +++ b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts @@ -11,6 +11,7 @@ import { err, ok } from 'neverthrow'; import { HttpErrorResponse } from '@angular/common/http'; import { EventToApproveDetailsMapper } from './mapper/EventToApproveDetailsMapper'; import { AgendaLocalDataSourceService } from './agenda-local-data-source.service'; +import { EEventFilterStatus } from './model/enums'; @Injectable({ providedIn: 'root' @@ -67,7 +68,7 @@ export class AgendaDataRepositoryService { } - async EventList({ userId, startDate, endDate, status = 3, category = null, type = null, calendarOwnerName = '' }) { + async EventList({ userId, startDate, endDate, status = EEventFilterStatus.Approved, category = null, type = null, calendarOwnerName = '' }) { try { const result = await this.agendaDataService.getEvents(userId, startDate, endDate, status, category, type).pipe( @@ -205,7 +206,7 @@ export class AgendaDataRepositoryService { } else { await this.agendaLocalDataSourceService.clearSharedCalendar() return await this.createOwnCalendar() - } + } }