Fix grid pagination, search & sort.

gaalha · Sep 11, 2019 · f55cd2d · f55cd2d
1 parent eb82f3b
commit f55cd2d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/capturas/grid-v2.png b/capturas/grid-v2.png
diff --git a/capturas/login.png b/capturas/login.png
diff --git a/src/app/modules/person/person.component.html b/src/app/modules/person/person.component.html
@@ -17,8 +17,8 @@
     matSort matSortActive="name" matSortDisableClear matSortDirection="asc">
 
         <ng-container matColumnDef="name">
-            <mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
-            <mat-cell *matCellDef="let row">{{ row.name }}</mat-cell>
+            <mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell>
+            <mat-cell *matCellDef="let row">{{ row.first_name + ' ' + row.last_name }}</mat-cell>
         </ng-container>
 
         <ng-container matColumnDef="age">

diff --git a/src/app/modules/person/person.component.ts b/src/app/modules/person/person.component.ts
@@ -99,13 +99,15 @@ export class PersonComponent implements AfterViewInit {
     // GET PERSONS
     getData() {
         this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
+
         merge(this.sort.sortChange, this.paginator.page)
         .pipe(
             startWith({}),
             switchMap(() => {
                 this.isLoading = true;
                 return this.personService!
                 .getList(
+                    this.sort.active,
                     this.sort.direction,
                     this.pageSize,
                     this.page,

diff --git a/src/app/services/person.service.ts b/src/app/services/person.service.ts
@@ -23,8 +23,9 @@ export class PersonService {
         'x-access-token': localStorage.getItem('token')
     });
 
-    getList(order: string, pageSize: number, page: number, search: string) {
+    getList(sortActive: string, order: string, pageSize: number, page: number, search: string) {
         let params = new HttpParams();
+        params = params.append('active', sortActive);
         params = params.append('order', order);
         params = params.append('search', search);
         params = params.append('pageSize', pageSize.toString());