diff --git a/src/app/core/services/users.service.ts b/src/app/core/services/users.service.ts index 724bf09..93726d6 100644 --- a/src/app/core/services/users.service.ts +++ b/src/app/core/services/users.service.ts @@ -38,7 +38,7 @@ export class UsersDataService { .get( `users.json?pageSize=${pageSize}&page=${page}${ q ? '&query=' + q : '' - }&fields=id,firstName,organisationUnits[id,level,name,code,path],surname,name,email,userCredentials[username,lastlogin,disabled]&order=firstName~asc${ + }&fields=id,firstName,organisationUnits[id,level,name,code,path,parent[id,name,parent[id,name]]],surname,name,email,phoneNumber,userCredentials[username,lastlogin,disabled]&order=firstName~asc${ pathSection ? '&filter=organisationUnits.path:ilike:' + pathSection : '' diff --git a/src/app/pages/user-accounts/components/users-list/users-list.component.html b/src/app/pages/user-accounts/components/users-list/users-list.component.html index 2ff41c4..37e6d6d 100644 --- a/src/app/pages/user-accounts/components/users-list/users-list.component.html +++ b/src/app/pages/user-accounts/components/users-list/users-list.component.html @@ -18,8 +18,9 @@ {{ 'Names' | translate }} {{ 'Username' | translate }} {{ 'Email' | translate }} + {{ 'Phone number' | translate }} {{ 'Last login' | translate }} - {{ 'Disabled' | translate }} + {{ 'Status' | translate }} {{ 'Action' | translate }} @@ -40,11 +41,17 @@ {{ user?.email }} + + {{ user?.phoneNumber }} + {{ user?.userCredentials?.lastLogin }} - done + Inactive(Disable) + Active