Updated some models and changed to custom api
This commit is contained in:
+2
-2
@@ -1,7 +1,7 @@
|
||||
import { ChangeDetectionStrategy, Component } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { UnsubscribeDirective } from '@dafa-directives/unsubscribe.directive';
|
||||
import { User } from '@dafa-models/employee.model';
|
||||
import { Employee } from '@dafa-models/employee.model';
|
||||
import { Participant } from '@dafa-models/participant.model';
|
||||
import { EmployeeService } from '@dafa-services/api/employee.service';
|
||||
import { BehaviorSubject, Observable } from 'rxjs';
|
||||
@@ -13,7 +13,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class EmployeeCardComponent extends UnsubscribeDirective {
|
||||
detailedEmployeeData$: Observable<User>;
|
||||
detailedEmployeeData$: Observable<Employee>;
|
||||
private _pendingSelectedParticipants$ = new BehaviorSubject<string[]>([]);
|
||||
|
||||
constructor(private activatedRoute: ActivatedRoute, private employeeService: EmployeeService) {
|
||||
|
||||
+5
-5
@@ -1,5 +1,5 @@
|
||||
import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
|
||||
import { User } from '@dafa-models/employee.model';
|
||||
import { Employee } from '@dafa-models/employee.model';
|
||||
import { SortBy } from '@dafa-models/sort-by.model';
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
|
||||
@@ -10,9 +10,9 @@ import { BehaviorSubject } from 'rxjs';
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
})
|
||||
export class EmployeesListComponent {
|
||||
@Input() employees: User[];
|
||||
@Input() employees: Employee[];
|
||||
@Input() sortBy: SortBy | null;
|
||||
@Output() sorted = new EventEmitter<keyof User>();
|
||||
@Output() sorted = new EventEmitter<keyof Employee>();
|
||||
|
||||
private _currentPage$ = new BehaviorSubject<number>(1);
|
||||
private _employeesPerPage = 10;
|
||||
@@ -27,7 +27,7 @@ export class EmployeesListComponent {
|
||||
return Math.ceil(this.employees.length / this._employeesPerPage);
|
||||
}
|
||||
|
||||
get pagedEmployees(): User[] {
|
||||
get pagedEmployees(): Employee[] {
|
||||
return [...this.employees].slice(this.currentResultStart - 1, this.currentResultEnd - 1);
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ export class EmployeesListComponent {
|
||||
return this.currentResultStart + this._employeesPerPage;
|
||||
}
|
||||
|
||||
handleSort(key: keyof User): void {
|
||||
handleSort(key: keyof Employee): void {
|
||||
this.sorted.emit(key);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ChangeDetectionStrategy, Component } from '@angular/core';
|
||||
import { IconType } from '@dafa-enums/icon-type.enum';
|
||||
import { User } from '@dafa-models/employee.model';
|
||||
import { Employee } from '@dafa-models/employee.model';
|
||||
import { SortBy } from '@dafa-models/sort-by.model';
|
||||
import { EmployeeService } from '@dafa-services/api/employee.service';
|
||||
import { BehaviorSubject, Observable } from 'rxjs';
|
||||
@@ -13,7 +13,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
|
||||
})
|
||||
export class EmployeesComponent {
|
||||
private _searchValue$ = new BehaviorSubject<string>('');
|
||||
filteredEmployees$: Observable<User[]> = this.employeeService.filteredEmployees$;
|
||||
filteredEmployees$: Observable<Employee[]> = this.employeeService.filteredEmployees$;
|
||||
employeesSortBy$: Observable<SortBy | null> = this.employeeService.employeesSortBy$;
|
||||
iconType = IconType;
|
||||
|
||||
@@ -31,7 +31,7 @@ export class EmployeesComponent {
|
||||
this._searchValue$.next($event.detail.target.value);
|
||||
}
|
||||
|
||||
handleEmployeesSort(key: keyof User): void {
|
||||
handleEmployeesSort(key: keyof Employee): void {
|
||||
this.employeeService.setEmployeesSortKey(key);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user