diff --git a/src/app/clients/clients.component.html b/src/app/clients/clients.component.html index 0039bb318..67fdeddc1 100644 --- a/src/app/clients/clients.component.html +++ b/src/app/clients/clients.component.html @@ -37,6 +37,18 @@ + + + Mobile Number + {{ client.mobileNo }} + + + + + Gender + {{ client.gender.name }} + + OfficeName diff --git a/src/app/clients/clients.component.ts b/src/app/clients/clients.component.ts index 014d6137b..f3e939660 100644 --- a/src/app/clients/clients.component.ts +++ b/src/app/clients/clients.component.ts @@ -14,7 +14,7 @@ import { Observable } from 'rxjs'; export class ClientsComponent implements OnInit { post: any = []; private ELEMENT_DATA: any = undefined; - displayedColumns = ['name', 'clientno', 'externalid', 'status', 'office', 'staff']; + displayedColumns = ['name', 'clientno', 'externalid', 'status', 'mobileNo', 'gender', 'office', 'staff']; dataSource = new MatTableDataSource(); @ViewChild(MatPaginator) paginator: MatPaginator; @@ -35,8 +35,13 @@ export class ClientsComponent implements OnInit { res.active = !!res.active; this.dataSource = new MatTableDataSource(res); this.dataSource.paginator = this.paginator; + this.dataSource.sortingDataAccessor = (data: any, property: any) => { + switch (property) { + case 'gender': return data.gender.name; + default: return data[property]; + } + }; this.dataSource.sort = this.sort; - this.dataSource.sortingDataAccessor = (data, header) => data[header]; }) ); }