diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts index c46ac50..99aca26 100644 --- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts +++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts @@ -60,11 +60,11 @@ export class UserAssignmentComponent extends BasePageComponent implements OnInit this.transferService.add(() => { if (this.isAssignment) { - this.dropToUnassigned(); + this.assign(); this.refreshService.executeAll(); } else if (this.isUnassignment) { - this.dropToAssigned(); + this.unassign(); this.refreshService.executeAll(); } }); @@ -73,15 +73,11 @@ export class UserAssignmentComponent extends BasePageComponent implements OnInit target: Target = Target.Module; targetId = 0; - dropToAssigned() { - var rows = this.unassignedUsers.selectedRows; - var users: User[] = new Array(); - if (!rows) - return + assign() { + var users: User[] = this.unassignedUsers.selectedRows.map(row => row.source) + + console.log(users) - for (var row of rows) - users.push(row.source); - this.unselectUserTables() switch (this.target) { case Target.Module: @@ -95,15 +91,9 @@ export class UserAssignmentComponent extends BasePageComponent implements OnInit } } - dropToUnassigned() { - var rows = this.assignedUsers.selectedRows; - - var users: User[] = new Array(); - if (!rows) - return - - for (var row of rows) - users.push(row.source); + unassign() { + var users: User[] = this.assignedUsers.selectedRows.map(row => row.source) + this.unselectUserTables() switch (this.target) { case Target.Module: @@ -158,15 +148,15 @@ export class UserAssignmentComponent extends BasePageComponent implements OnInit } //unselection case - private sUnassgnCount = 0; - private sAssgnCount = 0; + private sUnassgnCount: number = 0; + private sAssgnCount: number = 0; - private get isAssignment() { - return this.sAssgnCount > 0; + private get isAssignment(): boolean { + return this.sUnassgnCount > 0; } - private get isUnassignment() { - return this.sUnassgnCount > 0; + private get isUnassignment(): boolean { + return this.sAssgnCount > 0; } unassignedUsersOnSelectedRows = (rows: GuiSelectedRow[]) => {