diff --git a/ng2-components/ng2-activiti-tasklist/README.md b/ng2-components/ng2-activiti-tasklist/README.md index b2a5798c0e..dc719bb90f 100644 --- a/ng2-components/ng2-activiti-tasklist/README.md +++ b/ng2-components/ng2-activiti-tasklist/README.md @@ -39,6 +39,11 @@ - [Task People Component](#task-people-component) * [Properties](#properties-8) + [Events](#events-7) + + [How to customize the people component behavior](#how-to-customize-the-people-component-behavior) + + [Involve People single click and close search](#involve-people-single-click-and-close-search) + + [Involve People single click without close search](#involve-people-single-click-without-close-search) + + [Involve People double click and close search](#involve-people-double-click-and-close-search) + + [Involve People double double without close search](#involve-people-double-double-without-close-search) - [ADF Comments Component](#adf-comments-component) * [Properties](#properties-9) + [Events](#events-8) @@ -50,7 +55,7 @@ + [Events](#events-10) - [People Search Component](#people-search-component) * [Properties](#properties-12) - * [Events](#events-12) + * [Events](#events-11) - [Build from sources](#build-from-sources) - [NPM scripts](#npm-scripts) - [Demo](#demo) @@ -474,6 +479,66 @@ This component displays involved users to a specified task No Events +#### How to customize the people component behavior + +The people component provide two methods to customize the behavior: +- involveUserAndCloseSearch: The selected user is going to be added and the search section closed +- involveUserWithoutCloseSearch: The selected user is going to be added without close the search section + +In this way will be easy customize the people component to involve the user with the single or double click event: + +#### Involve People single click and close search + +```html + + +``` + +![involve-people-single-click-and-close-search](docs/assets/involve-people-single-click-and-close-search.gif) + +#### Involve People single click without close search + +```html + + +``` + +![involve-people-single-click-without-close-search](docs/assets/involve-people-single-click-without-close-search.gif) + +#### Involve People double click and close search + +```html + + +``` + +![involve-people-double-click-and-close-search](docs/assets/involve-people-double-click-and-close-search.gif) + +#### Involve People double double without close search + +```html + + +``` + +![involve-people-double-click-without-close-search](docs/assets/involve-people-double-click-without-close-search.gif) + ## ADF Comments Component This component displays comments entered by involved users to a specified task. It also allows an involved user to add his/her comment to the task. diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-and-close-search.gif b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-and-close-search.gif new file mode 100644 index 0000000000..310e36ff97 Binary files /dev/null and b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-and-close-search.gif differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-without-close-search.gif b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-without-close-search.gif new file mode 100644 index 0000000000..54c03c256c Binary files /dev/null and b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-without-close-search.gif differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-and-close-search.gif b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-and-close-search.gif new file mode 100644 index 0000000000..e3300f5c1f Binary files /dev/null and b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-and-close-search.gif differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-without-close-search.gif b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-without-close-search.gif new file mode 100644 index 0000000000..8e40815a01 Binary files /dev/null and b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-without-close-search.gif differ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.html index ce6964b3e4..7881fc124d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-list.component.html @@ -2,6 +2,7 @@ [rows]="users" [actions]="hasActions()" (rowClick)="selectUser($event)" + (rowDblClick)="selectUser($event)" (showRowActionsMenu)="onShowRowActionsMenu($event)" (executeRowAction)="onExecuteRowAction($event)"> \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html index c11c8439ec..27b7d22775 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html @@ -26,7 +26,7 @@ - diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts index 29f3c57b21..3274655544 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.ts @@ -73,7 +73,12 @@ export class PeopleSearchComponent implements OnInit { this.closeSearch.emit(); } - addInvolvedUser() { + involveUserAndClose() { + this.involveUser(); + this.closeSearchList(); + } + + involveUser() { if (this.selectedUser === undefined) { return; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/people.component.ts index b16879b3e2..d0b34e3595 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/people.component.ts @@ -15,11 +15,12 @@ * limitations under the License. */ -import { AfterViewInit, Component, Input } from '@angular/core'; +import { AfterViewInit, Component, Input, ViewChild } from '@angular/core'; import { LogService } from 'ng2-alfresco-core'; import { Observable, Observer } from 'rxjs/Rx'; import { UserEventModel } from '../models/user-event.model'; import { User } from '../models/user.model'; +import { PeopleSearchComponent } from './people-search.component'; import { PeopleService } from '../services/people.service'; @@ -45,6 +46,9 @@ export class PeopleComponent implements AfterViewInit { @Input() readOnly: boolean = false; + @ViewChild(PeopleSearchComponent) + peopleSearch: PeopleSearchComponent; + showAssignment: boolean = false; private peopleSearchObserver: Observer; @@ -74,6 +78,18 @@ export class PeopleComponent implements AfterViewInit { return isUpgraded; } + involveUserAndCloseSearch() { + if (this.peopleSearch) { + this.peopleSearch.involveUserAndClose(); + } + } + + involveUserWithoutCloseSearch() { + if (this.peopleSearch) { + this.peopleSearch.involveUser(); + } + } + searchUser(searchedWord: string) { this.peopleService.getWorkflowUsers(this.taskId, searchedWord) .subscribe((users) => { @@ -82,7 +98,6 @@ export class PeopleComponent implements AfterViewInit { } involveUser(user: User) { - this.showAssignment = false; this.peopleService.involveUserWithTask(this.taskId, user.id.toString()) .subscribe(() => { this.people = [...this.people, user]; diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html index 67529819da..427abdf2f8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html @@ -76,7 +76,7 @@

-