From 9ece46f2b5aae41c6326dfa1c9111b79cf6f43eb Mon Sep 17 00:00:00 2001 From: Santiago220991 Date: Mon, 26 Jun 2023 18:38:17 -0500 Subject: [PATCH] feat: TTL-908 modify filter to support multiple employees --- .../components/search-user/search-user.component.html | 2 +- .../shared/components/search-user/search-user.component.ts | 6 +++--- src/app/modules/time-clock/services/entry.service.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/modules/shared/components/search-user/search-user.component.html b/src/app/modules/shared/components/search-user/search-user.component.html index 05a214947..b141cf65b 100644 --- a/src/app/modules/shared/components/search-user/search-user.component.html +++ b/src/app/modules/shared/components/search-user/search-user.component.html @@ -1,7 +1,7 @@
- + 👤{{user.name}}📨{{ user.email}} diff --git a/src/app/modules/shared/components/search-user/search-user.component.ts b/src/app/modules/shared/components/search-user/search-user.component.ts index 4ed732f3c..e2a95db94 100644 --- a/src/app/modules/shared/components/search-user/search-user.component.ts +++ b/src/app/modules/shared/components/search-user/search-user.component.ts @@ -9,14 +9,14 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; export class SearchUserComponent { readonly ALLOW_SELECT_MULTIPLE = true; - selectedUser: string; + selectedUser: string[]; @Input() users: string[] = []; - @Output() selectedUserId = new EventEmitter(); + @Output() selectedUserId = new EventEmitter(); updateUser() { - this.selectedUserId.emit(this.selectedUser || '*'); + this.selectedUserId.emit(this.selectedUser.length === 0 ? '*' : this.selectedUser); } } diff --git a/src/app/modules/time-clock/services/entry.service.ts b/src/app/modules/time-clock/services/entry.service.ts index 939f94c79..ebe4ddd0c 100644 --- a/src/app/modules/time-clock/services/entry.service.ts +++ b/src/app/modules/time-clock/services/entry.service.ts @@ -68,7 +68,7 @@ export class EntryService { return this.http.get(findEntriesByProjectURL); } - loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string): Observable { + loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string[] | string ): Observable { const MAX_NUMBER_OF_ENTRIES_FOR_REPORTS = 9999; const loadEntriesByTimeRangeURL = this.urlInProductionLegacy ? this.baseUrl : this.baseUrl + '/report/'; return this.http.get(loadEntriesByTimeRangeURL,