Skip to content

TTL-908 modify filter by multiple employees #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2023
Merged

TTL-908 modify filter by multiple employees #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ece46f
feat: TTL-908 modify filter to support multiple employees
Santiago220991 Jun 26, 2023
5c2ebf2
Merge branch 'master' into TTL-908-Modify-filter-by-users
Santiago220991 Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/modules/shared/components/search-user/search-user.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="form-group" >
<label>Users: </label>

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

Expand Down
6 changes: 3 additions & 3 deletions src/app/modules/shared/components/search-user/search-user.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string>();
@Output() selectedUserId = new EventEmitter<string[] | string>();

updateUser() {
this.selectedUserId.emit(this.selectedUser || '*');
this.selectedUserId.emit(this.selectedUser.length === 0 ? '*' : this.selectedUser);
}
}

2 changes: 1 addition & 1 deletion src/app/modules/time-clock/services/entry.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class EntryService {
return this.http.get<Entry[]>(findEntriesByProjectURL);
}

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