Select the first filter as default

This commit is contained in:
mauriziovitale84
2016-09-19 09:48:13 +01:00
parent 8cfcba4b02
commit 4462247a2e
4 changed files with 73 additions and 2 deletions

View File

@@ -14,7 +14,8 @@
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp">
<span>Task Filters</span>
<activiti-filters [appId]="appId" (filterClick)="onTaskFilterClick($event)" #activitifilter></activiti-filters>
<activiti-filters [appId]="appId" (filterClick)="onTaskFilterClick($event)" (onSuccess)="onSuccessTaskFilterList($event)"
#activitifilter></activiti-filters>
</div>
<div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp">
<span>Task List</span>
@@ -38,7 +39,8 @@
<span>Process Filters</span>
<activiti-start-process-instance [appId]="appId"></activiti-start-process-instance>
<activiti-process-instance-filters [appId]="appId"
(filterClick)="onProcessFilterClick($event)"></activiti-process-instance-filters>
(filterClick)="onProcessFilterClick($event)" (onSuccess)="onSuccessProcessFilterList($event)"
#activitiprocessfilter></activiti-process-instance-filters>
</div>
<div class="mdl-cell mdl-cell--3-col task-column">
<span>Process List</span>

View File

@@ -53,6 +53,9 @@ export class ActivitiDemoComponent implements AfterViewChecked {
@ViewChild('activititasklist')
activititasklist: any;
@ViewChild('activitiprocessfilter')
activitiprocessfilter: any;
@ViewChild('activitiprocesslist')
activitiprocesslist: any;
@@ -120,6 +123,10 @@ export class ActivitiDemoComponent implements AfterViewChecked {
this.taskFilter = event;
}
onSuccessTaskFilterList(event: any) {
this.taskFilter = this.activitifilter.getCurrentFilter();
}
onSuccessTaskList(event: UserTaskFilterRepresentationModel) {
this.currentTaskId = this.activititasklist.getCurrentTaskId();
}
@@ -128,6 +135,10 @@ export class ActivitiDemoComponent implements AfterViewChecked {
this.processFilter = event;
}
onSuccessProcessFilterList(event: any) {
this.processFilter = this.activitiprocessfilter.getCurrentFilter();
}
onSuccessProcessList(event: any) {
this.currentProcessInstanceId = this.activitiprocesslist.getCurrentProcessId();
}

View File

@@ -107,6 +107,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
res.forEach((filter) => {
this.filterObserver.next(filter);
});
this.selectFirstFilter();
this.onSuccess.emit(res);
},
(err) => {
@@ -120,6 +121,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
this.activiti.getDeployedApplications(this.appName).subscribe(
application => {
this.filterByAppId(application.id);
this.selectFirstFilter();
},
(err) => {
console.log(err);
@@ -136,6 +138,33 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
this.filterClick.emit(filter);
}
/**
* Select the first filter of a list if present
*/
private selectFirstFilter() {
if (!this.isFilterListEmpty()) {
this.currentFilter = this.filters[0];
} else {
this.currentFilter = null;
}
}
/**
* Return the current task
* @returns {FilterRepresentationModel}
*/
getCurrentFilter(): FilterRepresentationModel {
return this.currentFilter;
}
/**
* Check if the filter list is empty
* @returns {boolean}
*/
isFilterListEmpty(): boolean {
return this.filters === undefined || (this.filters && this.filters.length === 0);
}
/**
* Reset the filters properties
*/

View File

@@ -106,6 +106,7 @@ export class ActivitiFilters implements OnInit, OnChanges {
(res: FilterRepresentationModel[]) => {
res.forEach((filter) => {
this.filterObserver.next(filter);
this.selectFirstFilter();
});
this.onSuccess.emit(res);
},
@@ -120,6 +121,7 @@ export class ActivitiFilters implements OnInit, OnChanges {
this.activiti.getDeployedApplications(this.appName).subscribe(
application => {
this.filterByAppId(application.id);
this.selectFirstFilter();
},
(err) => {
console.log(err);
@@ -136,6 +138,33 @@ export class ActivitiFilters implements OnInit, OnChanges {
this.filterClick.emit(filter);
}
/**
* Select the first filter of a list if present
*/
private selectFirstFilter() {
if (!this.isFilterListEmpty()) {
this.currentFilter = this.filters[0];
} else {
this.currentFilter = null;
}
}
/**
* Return the current task
* @returns {FilterRepresentationModel}
*/
getCurrentFilter(): FilterRepresentationModel {
return this.currentFilter;
}
/**
* Check if the filter list is empty
* @returns {boolean}
*/
isFilterListEmpty(): boolean {
return this.filters === undefined || (this.filters && this.filters.length === 0);
}
/**
* Reset the filters properties
*/