Use the activiti page instead of task page in the demo shell

This commit is contained in:
mauriziovitale84
2016-07-27 09:43:34 +01:00
parent 3366ca43ac
commit 5e9cbcdfeb
5 changed files with 66 additions and 155 deletions

View File

@@ -2,3 +2,10 @@
cursor: pointer;
font-weight: bold;
}
.task-column {
background-color: #f5f5f5;
padding: 10px 10px 10px 10px;
border-left: solid 2px rgb(31,188,210);
border-right : solid 2px rgb(31,188,210);
}

View File

@@ -1,22 +1,30 @@
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col">
<div *ngIf="!hasTasks()">No tasks found</div>
<div *ngIf="hasTasks()">
<ul class="mdl-list">
<li *ngFor="let task of tasks"
class="mdl-list__item activiti-task-list__item"
(click)="onTaskClicked(task, $event)">
<span class="mdl-list__item-primary-content">
<i class="material-icons mdl-list__item-icon">launch</i>
{{task.name || 'Nameless task'}}
</span>
</ul>
</div>
<div class="mdl-cell mdl-cell--2-col task-column"
style="">
<ul class="demo-list-item mdl-list">
<li class="mdl-list__item">
<span class="mdl-list__item-primary-content">
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="option-1">
<input type="radio" value="task-list"
(change)="setChoice($event)" name="options" id="option-1" checked class="mdl-radio__button">
<span class="mdl-radio__label">Task List</span>
</label>
</span>
</li>
<li class="mdl-list__item">
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="option-2">
<input type="radio" value="process-list"
(change)="setChoice($event)" name="options" id="option-2" class="mdl-radio__button">
<span class="mdl-radio__label">Process List</span>
</label>
</li>
</ul>
</div>
<div class="mdl-cell mdl-cell--10-col">
<activiti-form [taskId]="selectedTask?.id"></activiti-form>
<div class="mdl-cell mdl-cell--3-col task-column"
style="">
<activiti-tasklist *ngIf="isTaskListSelected()" [data]="data" (rowClick)="onRowClick($event)"></activiti-tasklist>
</div>
</div>
<div class="mdl-cell mdl-cell--7-col task-column">
<activiti-task-details [taskId]="currentTaskId"></activiti-task-details>
</div>
</div>

View File

@@ -16,7 +16,10 @@
*/
import { Component, OnInit, AfterViewChecked } from '@angular/core';
import { ActivitiForm, FormService } from 'ng2-activiti-form';
import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist';
import { ActivitiForm } from 'ng2-activiti-form';
import { ObjectDataTableAdapter, ObjectDataColumn } from 'ng2-alfresco-datatable';
declare let __moduleName: string;
@@ -27,22 +30,42 @@ declare var componentHandler;
selector: 'activiti-demo',
templateUrl: './activiti-demo.component.html',
styleUrls: ['./activiti-demo.component.css'],
directives: [ActivitiForm],
providers: [FormService]
directives: [ALFRESCO_TASKLIST_DIRECTIVES, ActivitiForm]
})
export class ActivitiDemoComponent implements OnInit, AfterViewChecked {
tasks: any[] = [];
selectedTask: any;
currentChoice: string = 'task-list';
hasTasks(): boolean {
return this.tasks && this.tasks.length > 0;
currentTaskId: string;
data: ObjectDataTableAdapter;
constructor() {
this.data = new ObjectDataTableAdapter([], []);
}
constructor(private formService: FormService) {}
setChoice($event) {
this.currentChoice = $event.target.value;
}
isProcessListSelected() {
return this.currentChoice === 'process-list';
}
isTaskListSelected() {
return this.currentChoice === 'task-list';
}
ngOnInit() {
this.formService.getTasks().subscribe(val => this.tasks = val || []);
let schema = [
{type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true}
];
let columns = schema.map(col => new ObjectDataColumn(col));
this.data.setColumns(columns);
}
onRowClick(taskId) {
this.currentTaskId = taskId;
}
ngAfterViewChecked() {
@@ -52,8 +75,4 @@ export class ActivitiDemoComponent implements OnInit, AfterViewChecked {
}
}
onTaskClicked(task, e) {
this.selectedTask = task;
}
}

View File

@@ -1,24 +0,0 @@
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col">
<ul class="demo-list-item mdl-list">
<li class="mdl-list__item">
<span class="mdl-list__item-primary-content">
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="option-1">
<input type="radio" id="option-1" class="mdl-radio__button" name="options" value="1" checked>
<span class="mdl-radio__label">Task List</span>
</label>
</span>
</li>
<li class="mdl-list__item">
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="option-2">
<input type="radio" id="option-2" class="mdl-radio__button" name="options" value="2">
<span class="mdl-radio__label">Process List</span>
</label>
</li>
</ul>
</div>
<div class="mdl-cell mdl-cell--2-col">
<activiti-tasklist [data]="data"></activiti-tasklist>
</div>
<div class="mdl-cell mdl-cell--8-col">Task Details</div>
</div>

View File

@@ -1,99 +0,0 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Component, OnInit } from '@angular/core';
import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist';
import { ActivitiForm } from 'ng2-activiti-form';
import { ObjectDataTableAdapter, ObjectDataColumn } from 'ng2-alfresco-datatable';
@Component({
selector: 'tasks-demo',
template: `
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col"
style="background-color: #ececec; padding: 10px 10px 10px 10px; border-left: solid 2px rgb(31,188,210); border-right : solid 2px rgb(31,188,210);">
<ul class="demo-list-item mdl-list">
<li class="mdl-list__item">
<span class="mdl-list__item-primary-content">
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="option-1">
<input type="radio" value="task-list"
(change)="setChoice($event)" name="options" id="option-1" checked class="mdl-radio__button">
<span class="mdl-radio__label">Task List</span>
</label>
</span>
</li>
<li class="mdl-list__item">
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="option-2">
<input type="radio" value="process-list"
(change)="setChoice($event)" name="options" id="option-2" class="mdl-radio__button">
<span class="mdl-radio__label">Process List</span>
</label>
</li>
</ul>
</div>
<div class="mdl-cell mdl-cell--3-col"
style="background-color: #ececec; padding: 10px 10px 10px 10px; border-left: solid 2px rgb(31,188,210); border-right : solid 2px rgb(31,188,210);">
<activiti-tasklist *ngIf="isTaskListSelected()" [data]="data" (rowClick)="onRowClick($event)"></activiti-tasklist>
</div>
<div class="mdl-cell mdl-cell--7-col"
style="background-color: #ececec; padding: 10px 10px 10px 10px; border-left: solid 2px rgb(31,188,210); border-right : solid 2px rgb(31,188,210);">
<activiti-task-details [taskId]="currentTaskId"></activiti-task-details>
</div>
</div>
`,
directives: [ALFRESCO_TASKLIST_DIRECTIVES, ActivitiForm],
styles: [':host > .container { padding: 10px; }']
})
export class TasksDemoComponent implements OnInit {
currentChoice: string = 'task-list';
currentTaskId: string;
data: ObjectDataTableAdapter;
constructor() {
this.data = new ObjectDataTableAdapter([], []);
}
setChoice($event) {
this.currentChoice = $event.target.value;
}
isProcessListSelected() {
return this.currentChoice === 'process-list';
}
isTaskListSelected() {
return this.currentChoice === 'task-list';
}
ngOnInit() {
let schema = [
{type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true}
];
let columns = schema.map(col => new ObjectDataColumn(col));
this.data.setColumns(columns);
}
onRowClick(taskId) {
this.currentTaskId = taskId;
}
}