diff --git a/src/app/user-management/setup-user/setup-user.component.html b/src/app/user-management/setup-user/setup-user.component.html index 61730c5..ed18c5b 100644 --- a/src/app/user-management/setup-user/setup-user.component.html +++ b/src/app/user-management/setup-user/setup-user.component.html @@ -79,9 +79,6 @@ ] " > - {{ - "emptySpaceRestriction" | translate - }} diff --git a/src/app/user-management/setup-user/setup-user.component.ts b/src/app/user-management/setup-user/setup-user.component.ts index 16386bd..7a077bc 100644 --- a/src/app/user-management/setup-user/setup-user.component.ts +++ b/src/app/user-management/setup-user/setup-user.component.ts @@ -238,12 +238,12 @@ export class SetupUserComponent implements OnInit { this.userForm = this.fb.group({ userId: ['', [ Validators.required, - Validators.minLength(5), + Validators.minLength(3), Validators.pattern('^[a-zA-Z0-9]*$') ]], userFullname: ['', [ Validators.required, - Validators.minLength(5), + Validators.minLength(3), Validators.maxLength(500) ]], defaultPassword: ['', [ diff --git a/src/app/user-permissions/user-permissions.component.html b/src/app/user-permissions/user-permissions.component.html index 82aa6f5..f3a57e8 100644 --- a/src/app/user-permissions/user-permissions.component.html +++ b/src/app/user-permissions/user-permissions.component.html @@ -1,13 +1,11 @@
-
-
@@ -15,7 +13,7 @@ class="form-select" formControlName="userCode" [items]="users" - bindLabel="userName" + bindLabel="displayName" bindValue="userId" placeholder="{{ 'choose' | translate }}" (change)="onUserChange()" @@ -24,10 +22,22 @@ [dropdownPosition]="'auto'" [virtualScroll]="true" [bufferAmount]="20" - appendTo="body"> + appendTo="body" + > + + +
+ {{ item.userName }} + {{ item.userId }} +
+
+ + + + {{ item.userName }} ({{ item.userId }}) +
-
@@ -35,47 +45,60 @@
- -

{{ 'permissions' | translate }}

+

{{ "permissions" | translate }}

- +
- - - + + + - +
{{ 'Permissions' | translate }}{{ 'allow' | translate }}{{ "Permissions" | translate }} + {{ "allow" | translate }} +
-
-
-
- - - + + @@ -84,18 +107,31 @@ - + - + - + -