Skip to content

Commit 9ece46f

Browse files
feat: TTL-908 modify filter to support multiple employees
1 parent cadff0d commit 9ece46f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/app/modules/shared/components/search-user/search-user.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="form-group" >
22
<label>Users: </label>
33

4-
<ng-select [(ngModel)]="selectedUser" placeholder="Select user" (change)="updateUser()" class="selectUser">
4+
<ng-select [(ngModel)]="selectedUser" [multiple]="true" placeholder="Select user" (change)="updateUser()" class="selectUser">
55
<ng-option *ngFor="let user of users" value={{user.id}}>👤{{user.name}}📨{{ user.email}}</ng-option >
66
</ng-select>
77

src/app/modules/shared/components/search-user/search-user.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
99
export class SearchUserComponent {
1010

1111
readonly ALLOW_SELECT_MULTIPLE = true;
12-
selectedUser: string;
12+
selectedUser: string[];
1313

1414
@Input() users: string[] = [];
1515

16-
@Output() selectedUserId = new EventEmitter<string>();
16+
@Output() selectedUserId = new EventEmitter<string[] | string>();
1717

1818
updateUser() {
19-
this.selectedUserId.emit(this.selectedUser || '*');
19+
this.selectedUserId.emit(this.selectedUser.length === 0 ? '*' : this.selectedUser);
2020
}
2121
}
2222

src/app/modules/time-clock/services/entry.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export class EntryService {
6868
return this.http.get<Entry[]>(findEntriesByProjectURL);
6969
}
7070

71-
loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string): Observable<any> {
71+
loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string[] | string ): Observable<any> {
7272
const MAX_NUMBER_OF_ENTRIES_FOR_REPORTS = 9999;
7373
const loadEntriesByTimeRangeURL = this.urlInProductionLegacy ? this.baseUrl : this.baseUrl + '/report/';
7474
return this.http.get(loadEntriesByTimeRangeURL,

0 commit comments

Comments
 (0)