demo app improvements (#1796)

- fix navigation within process details
- fix ‘create task’ button name (was ‘start task’ previously)
- put ‘create task’ and ‘start process’ buttons to proper places in
layout
This commit is contained in:
Denys Vuika
2017-03-31 15:44:54 +01:00
committed by Mario Romano
parent d25d070229
commit 8272b08f6a
7 changed files with 113 additions and 78 deletions

View File

@@ -1,5 +1,6 @@
<button type="button" (click)="showDialog()" class="mdl-button" id="start-task-button">
{{'START_TASK.BUTTON'|translate}}
<button md-raised-button (click)="showDialog()" id="start-task-button">
<md-icon>add</md-icon>
<span>{{'START_TASK.BUTTON'|translate}}</span>
</button>
<dialog class="mdl-dialog" id="start-task-dialog" #dialog>

View File

@@ -21,7 +21,6 @@ import { TaskDetailsModel } from '../models/task-details.model';
import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
import { Form } from '../models/form.model';
declare let componentHandler: any;
declare let dialogPolyfill: any;
@Component({

View File

@@ -36,8 +36,6 @@ import {
import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
declare let componentHandler: any;
@Component({
selector: 'activiti-tasklist',
moduleId: module.id,
@@ -46,6 +44,8 @@ declare let componentHandler: any;
})
export class ActivitiTaskList implements OnChanges, AfterContentInit {
private requestNode: TaskQueryRequestRepresentationModel;
@ContentChild(DataColumnListComponent) columnList: DataColumnListComponent;
@Input()
@@ -69,8 +69,6 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
@Input()
landingTaskId: string;
requestNode: TaskQueryRequestRepresentationModel;
@Input()
data: DataTableAdapter;
@@ -85,6 +83,16 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
currentInstanceId: string;
/**
* Toggles custom data source mode.
* When enabled the component reloads data from it's current source instead of the server side.
* This allows generating and displaying custom data sets (i.e. filtered out content).
*
* @type {boolean}
* @memberOf ActivitiTaskList
*/
hasCustomDataSource: boolean = false;
private defaultSchemaColumn: DataColumn[] = [
{ type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true },
{ type: 'text', key: 'created', title: 'Created', cssClass: 'hidden', sortable: true }
@@ -106,7 +114,7 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
* Setup html-based (html definitions) or code behind (data adapter) schema.
* If component is assigned with an empty data adater the default schema settings applied.
*/
setupSchema() {
setupSchema(): void {
let schema: DataColumn[] = [];
if (this.columnList && this.columnList.columns && this.columnList.columns.length > 0) {
@@ -130,6 +138,13 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
}
}
setCustomDataSource(rows: ObjectDataRow[]): void {
if (this.data) {
this.data.setRows(rows);
this.hasCustomDataSource = true;
}
}
private isPropertyChanged(changes: SimpleChanges): boolean {
let changed: boolean = false;
@@ -158,9 +173,11 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
return changed;
}
public reload() {
this.requestNode = this.createRequestNode();
this.load(this.requestNode);
reload(): void {
if (!this.hasCustomDataSource) {
this.requestNode = this.createRequestNode();
this.load(this.requestNode);
}
}
private load(requestNode: TaskQueryRequestRepresentationModel) {
@@ -209,7 +226,7 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
/**
* Select the task given in input if present
*/
selectTask(taskIdToSelect: string) {
selectTask(taskIdToSelect: string): void {
if (!this.isListEmpty()) {
let rows = this.data.getRows();
if (rows.length > 0) {

View File

@@ -62,7 +62,7 @@
}
},
"START_TASK": {
"BUTTON": "Start Task",
"BUTTON": "CREATE TASK",
"DIALOG": {
"TITLE": "Start Task",
"LABEL": {