diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css index cd41a4d0df..11c70fd077 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.css @@ -6,7 +6,7 @@ font-weight: bolder; } -.material-icons:hover { +.material-icons.people-search__icon:hover { color: rgb(255, 152, 0); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html index f23a2d73ff..b6e13ddeb3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html @@ -7,8 +7,8 @@
  • - face - {{ user.firstName }} - {{ user.lastName }} + face + {{getDisplayUser(user)}}
    • diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts index 1c039bdbcd..0c4c3bb9fe 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.spec.ts @@ -107,7 +107,7 @@ describe('Activiti People Search', () => { }); it('should send an event when an user is clicked', async(() => { - activitiPeopleSearchComponent.onModalRowClicked.subscribe((user) => { + activitiPeopleSearchComponent.onRowClicked.subscribe((user) => { expect(user).toBeDefined(); expect(user.firstName).toBe('fake-name'); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts index ca115088ce..52bd3284cf 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts @@ -39,7 +39,7 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { onSearch: EventEmitter = new EventEmitter(); @Output() - onModalRowClicked: EventEmitter = new EventEmitter(); + onRowClicked: EventEmitter = new EventEmitter(); searchUser: FormControl = new FormControl(); @@ -79,9 +79,15 @@ export class ActivitiPeopleSearch implements OnInit, AfterViewInit { } onRowClick(userClicked: User) { - this.onModalRowClicked.emit(userClicked); + this.onRowClicked.emit(userClicked); this.userList = this.userList.filter((user) => { return user.id !== userClicked.id; }); } + + getDisplayUser(user: User): string { + let firstName = user.firstName && user.firstName !== 'null' ? user.firstName : 'N/A'; + let lastName = user.lastName && user.lastName !== 'null' ? user.lastName : 'N/A'; + return firstName + ' - ' + lastName; + } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css index 0578c7e3c3..8caacb8c93 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.css @@ -6,10 +6,10 @@ font-weight: bolder; } -.material-icons:hover { +.material-icons.people__icon:hover { color: rgb(255, 152, 0); } -.involve-user-padding { +.add-people-dialog__content { padding: 20px 24px 2px; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html index ee8e956297..616afee42d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html @@ -1,6 +1,6 @@ {{ 'TASK_DETAILS.LABELS.PEOPLE' | translate }} -
    add
    +
    add
    Add a person
    @@ -9,10 +9,10 @@
  • face - {{user.firstName}} {{user.lastName}} + {{getDisplayUser(user)}} - delete
    • @@ -24,10 +24,10 @@

    Involve User

    -
    +
    + (onRowClicked)="involveUser($event)" + [results]="peopleSearch$">
    diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts index d462229df4..7ede77c23e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.spec.ts @@ -157,7 +157,7 @@ describe('Activiti People Component', () => { })); it('should return an observable with user search results', (done) => { - activitiPeopleComponent.people$.subscribe((users) => { + activitiPeopleComponent.peopleSearch$.subscribe((users) => { expect(users.length).toBe(2); expect(users[0].firstName).toBe('fake-test-1'); expect(users[0].lastName).toBe('fake-last-1'); @@ -186,7 +186,7 @@ describe('Activiti People Component', () => { }); it('should return an empty list for not valid search', (done) => { - activitiPeopleComponent.people$.subscribe((users) => { + activitiPeopleComponent.peopleSearch$.subscribe((users) => { expect(users.length).toBe(0); done(); }); @@ -211,7 +211,7 @@ describe('Activiti People Component', () => { it('should log error message when search fails', async(() => { console.log = jasmine.createSpy('log'); - activitiPeopleComponent.people$.subscribe(() => { + activitiPeopleComponent.peopleSearch$.subscribe(() => { expect(console.log).toHaveBeenCalledWith('Could not load users'); }); activitiPeopleComponent.searchUser('fake-search'); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts index cbbed85c77..e4fa29919e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts @@ -41,8 +41,8 @@ export class ActivitiPeople { @ViewChild('dialog') dialog: any; - private peopleObserver: Observer; - people$: Observable; + private peopleSearchObserver: Observer; + peopleSearch$: Observable; /** * Constructor @@ -54,7 +54,7 @@ export class ActivitiPeople { if (translate) { translate.addTranslationFolder('node_modules/ng2-activiti-tasklist/src'); } - this.people$ = new Observable(observer => this.peopleObserver = observer).share(); + this.peopleSearch$ = new Observable(observer => this.peopleSearchObserver = observer).share(); } public showDialog() { @@ -69,14 +69,14 @@ export class ActivitiPeople { public cancel() { if (this.dialog) { this.dialog.nativeElement.close(); - this.peopleObserver.next([]); + this.peopleSearchObserver.next([]); } } searchUser(searchedWord: string) { this.peopleService.getWorkflowUsers(this.taskId, searchedWord) .subscribe((users) => { - this.peopleObserver.next(users); + this.peopleSearchObserver.next(users); }, error => console.log('Could not load users')); } @@ -96,4 +96,10 @@ export class ActivitiPeople { }, error => console.error('Impossible to remove involved user from task')); } + getDisplayUser(user: User): string { + let firstName = user.firstName && user.firstName !== 'null' ? user.firstName : 'N/A'; + let lastName = user.lastName && user.lastName !== 'null' ? user.lastName : 'N/A'; + return firstName + ' ' + lastName; + } + }