inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade ng2-activiti-processlist

Browse Source
This commit is contained in:
Denys Vuika 2016-09-21 21:43:03 +01:00
parent f922e5dd3e
commit 3886b4a13b
12 changed files with 85 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
demo-shell-ng2/app/app.module.ts
View File

@ -32,12 +32,11 @@ import { WebScriptModule } from 'ng2-alfresco-webscript';
import { ViewerModule } from 'ng2-alfresco-viewer';
import { ActivitiFormModule } from 'ng2-activiti-form';
import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
import { ActivitiProcessListModule } from 'ng2-activiti-processlist';
import { AppComponent } from './app.component';
import { routing } from './app.routes';
import { ACTIVITI_PROCESSLIST_DIRECTIVES } from 'ng2-activiti-processlist';
import { AlfrescoTranslationLoader } from 'ng2-alfresco-core';
import { Http } from '@angular/http';
@ -77,13 +76,12 @@ import {
WebScriptModule,
ViewerModule.forRoot(),
ActivitiFormModule.forRoot(),
ActivitiTaskListModule.forRoot()
ActivitiTaskListModule.forRoot(),
ActivitiProcessListModule.forRoot()
],
declarations: [
AppComponent,
SearchBarComponent,
...ACTIVITI_PROCESSLIST_DIRECTIVES,
DataTableDemoComponent,
SearchComponent,
SearchBarComponent,

2
ng2-components/ng2-activiti-processlist/data/processlist-datatable-adapter.ts
View File

@ -66,7 +66,7 @@ export class ProcessListDataTableAdapter extends ObjectDataTableAdapter implemen
let value = row.getValue(col.key);
if (col.type === 'date') {
let datePipe = new DatePipe();
let datePipe = new DatePipe('en-US');
let format = (<ActivitiDataColumn>(col)).format || this.DEFAULT_DATE_FORMAT;
try {
return datePipe.transform(value, format);

40
ng2-components/ng2-activiti-processlist/index.ts
View File

@ -15,6 +15,15 @@
* limitations under the License.
*/
import { NgModule, ModuleWithProviders } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { HttpModule } from '@angular/http';
import { CommonModule } from '@angular/common';
import { TranslateModule } from 'ng2-translate/ng2-translate';
import { CoreModule } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
import { ActivitiTaskListModule } from 'ng2-activiti-tasklist';
import { ActivitiProcessInstanceListComponent } from './src/components/activiti-processlist.component';
import { ActivitiProcessFilters } from './src/components/activiti-filters.component';
import { ActivitiProcessInstanceHeader } from './src/components/activiti-process-instance-header.component';
@ -44,3 +53,34 @@ export const ACTIVITI_PROCESSLIST_DIRECTIVES: [any] = [
export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [
ActivitiProcessService
];
@NgModule({
imports: [
CommonModule,
FormsModule,
HttpModule,
TranslateModule,
CoreModule,
DataTableModule,
ActivitiTaskListModule
],
declarations: [
...ACTIVITI_PROCESSLIST_DIRECTIVES
],
providers: [
...ACTIVITI_PROCESSLIST_PROVIDERS
],
exports: [
...ACTIVITI_PROCESSLIST_DIRECTIVES
]
})
export class ActivitiProcessListModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: ActivitiProcessListModule,
providers: [
...ACTIVITI_PROCESSLIST_PROVIDERS
]
};
}
}

31
ng2-components/ng2-activiti-processlist/package.json
View File

@ -44,22 +44,23 @@
"alfresco"
],
"dependencies": {
"@angular/common": "2.0.0-rc.3",
"@angular/compiler": "2.0.0-rc.3",
"@angular/core": "2.0.0-rc.3",
"@angular/http": "2.0.0-rc.3",
"@angular/platform-browser": "2.0.0-rc.3",
"@angular/platform-browser-dynamic": "2.0.0-rc.3",
"@angular/router": "3.0.0-alpha.7",
"@angular/router-deprecated": "2.0.0-rc.2",
"@angular/upgrade": "2.0.0-rc.3",
"alfresco-js-api": "^0.3.0",
"systemjs": "0.19.27",
"core-js": "^2.4.0",
"@angular/common": "2.0.0",
"@angular/compiler": "2.0.0",
"@angular/core": "2.0.0",
"@angular/forms": "2.0.0",
"@angular/http": "2.0.0",
"@angular/platform-browser": "2.0.0",
"@angular/platform-browser-dynamic": "2.0.0",
"@angular/router": "3.0.0",
"@angular/upgrade": "2.0.0",
"core-js": "^2.4.1",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.12",
"ng2-translate": "2.2.2",
"rxjs": "5.0.0-beta.12",
"systemjs": "0.19.27",
"zone.js": "^0.6.23",
"ng2-translate": "2.5.0",
"alfresco-js-api": "^0.3.0",
"ng2-alfresco-core": "0.3.2",
"ng2-alfresco-datatable": "0.3.2",
"ng2-activiti-tasklist": "0.3.3"

13
ng2-components/ng2-activiti-processlist/src/components/activiti-comments.component.ts
View File

@ -16,7 +16,7 @@
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ActivitiProcessService } from './../services/activiti-process.service';
import { Comment } from '../models/comment.model';
import { Observer } from 'rxjs/Observer';
@ -29,8 +29,7 @@ declare let __moduleName: string;
selector: 'activiti-process-instance-comments',
moduleId: __moduleName,
templateUrl: './activiti-comments.component.html',
styleUrls: ['./activiti-comments.component.css'],
providers: [ActivitiProcessService]
styleUrls: ['./activiti-comments.component.css']
})
export class ActivitiComments implements OnInit {
@ -47,13 +46,7 @@ export class ActivitiComments implements OnInit {
message: string;
/**
* Constructor
* @param auth
* @param translate
*/
constructor(private auth: AlfrescoAuthenticationService,
private translate: AlfrescoTranslationService,
constructor(private translate: AlfrescoTranslationService,
private activitiProcess: ActivitiProcessService) {
if (translate) {

19
ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
View File

@ -16,11 +16,10 @@
*/
import { Component, Output, EventEmitter, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ActivitiProcessService } from './../services/activiti-process.service';
import { FilterRepresentationModel } from '../models/filter.model';
import { Observer } from 'rxjs/Observer';
import { Observable } from 'rxjs/Observable';
import { Observable, Observer } from 'rxjs/Rx';
declare let componentHandler: any;
declare let __moduleName: string;
@ -29,8 +28,7 @@ declare let __moduleName: string;
selector: 'activiti-process-instance-filters',
moduleId: __moduleName,
templateUrl: './activiti-filters.component.html',
styleUrls: ['activiti-filters.component.css'],
providers: [ActivitiProcessService]
styleUrls: ['activiti-filters.component.css']
})
export class ActivitiProcessFilters implements OnInit, OnChanges {
@ -56,15 +54,8 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
filters: FilterRepresentationModel [] = [];
/**
* Constructor
* @param auth
* @param translate
* @param activiti
*/
constructor(private auth: AlfrescoAuthenticationService,
private translate: AlfrescoTranslationService,
public activiti: ActivitiProcessService) {
constructor(private translate: AlfrescoTranslationService,
private activiti: ActivitiProcessService) {
this.filter$ = new Observable<FilterRepresentationModel>(observer => this.filterObserver = observer).share();
if (translate) {

9
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts
View File

@ -16,7 +16,7 @@
*/
import { Component, Input, ViewChild, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ActivitiProcessService } from './../services/activiti-process.service';
import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component';
import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component';
@ -31,9 +31,7 @@ declare let __moduleName: string;
selector: 'activiti-process-instance-details',
moduleId: __moduleName,
templateUrl: './activiti-process-instance-details.component.html',
styleUrls: ['./activiti-process-instance-details.component.css'],
providers: [ActivitiProcessService],
directives: [ActivitiProcessInstanceHeader, ActivitiComments, ActivitiProcessInstanceTasks]
styleUrls: ['./activiti-process-instance-details.component.css']
})
export class ActivitiProcessInstanceDetails implements OnInit, OnChanges {
@ -69,8 +67,7 @@ export class ActivitiProcessInstanceDetails implements OnInit, OnChanges {
* @param translate
* @param activitiProcess
*/
constructor(private auth: AlfrescoAuthenticationService,
private translate: AlfrescoTranslationService,
constructor(private translate: AlfrescoTranslationService,
private activitiProcess: ActivitiProcessService) {
if (translate) {

11
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts
View File

@ -16,7 +16,7 @@
*/
import { Component, Input, Output, EventEmitter } from '@angular/core';
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ProcessInstance } from '../models/process-instance';
import { ActivitiProcessService } from './../services/activiti-process.service';
@ -37,14 +37,7 @@ export class ActivitiProcessInstanceHeader {
@Output()
processCancelled = new EventEmitter();
/**
* Constructor
* @param auth
* @param translate
* @param activitiProcess
*/
constructor(private auth: AlfrescoAuthenticationService,
private translate: AlfrescoTranslationService,
constructor(private translate: AlfrescoTranslationService,
private activitiProcess: ActivitiProcessService) {
if (translate) {

21
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
View File

@ -16,12 +16,10 @@
*/
import { Component, Input, OnInit, ViewChild, Output, EventEmitter } from '@angular/core';
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ActivitiProcessService } from './../services/activiti-process.service';
import { TaskDetailsModel } from '../models/task-details.model';
import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist';
import { Observer } from 'rxjs/Observer';
import { Observable } from 'rxjs/Observable';
import { Observable, Observer } from 'rxjs/Rx';
declare let componentHandler: any;
declare let __moduleName: string;
@ -30,9 +28,7 @@ declare let __moduleName: string;
selector: 'activiti-process-instance-tasks',
moduleId: __moduleName,
templateUrl: './activiti-process-instance-tasks.component.html',
styleUrls: ['./activiti-process-instance-tasks.component.css'],
providers: [ActivitiProcessService],
directives: [ ALFRESCO_TASKLIST_DIRECTIVES ]
styleUrls: ['./activiti-process-instance-tasks.component.css']
})
export class ActivitiProcessInstanceTasks implements OnInit {
@ -64,23 +60,14 @@ export class ActivitiProcessInstanceTasks implements OnInit {
@ViewChild('taskdetails')
taskdetails: any;
/**
* Constructor
* @param auth
* @param translate
* @param activitiProcess
*/
constructor(private auth: AlfrescoAuthenticationService,
private translate: AlfrescoTranslationService,
constructor(private translate: AlfrescoTranslationService,
private activitiProcess: ActivitiProcessService) {
if (translate) {
translate.addTranslationFolder('node_modules/ng2-activiti-processlist/src');
}
this.task$ = new Observable<TaskDetailsModel>(observer => this.taskObserver = observer).share();
this.completedTask$ = new Observable<TaskDetailsModel>(observer => this.completedTaskObserver = observer).share();
}
ngOnInit() {

8
ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
View File

@ -16,8 +16,8 @@
*/
import {Component, OnInit, Input, Output, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService, CONTEXT_MENU_DIRECTIVES, CONTEXT_MENU_PROVIDERS } from 'ng2-alfresco-core';
import { ALFRESCO_DATATABLE_DIRECTIVES, ObjectDataTableAdapter, DataRowEvent, DataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ObjectDataTableAdapter, DataRowEvent, DataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable';
import { ActivitiProcessService } from '../services/activiti-process.service';
import { UserProcessInstanceFilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
@ -33,9 +33,7 @@ declare let __moduleName: string;
}
`
],
templateUrl: './activiti-processlist.component.html',
directives: [ ALFRESCO_DATATABLE_DIRECTIVES, CONTEXT_MENU_DIRECTIVES ],
providers: [ CONTEXT_MENU_PROVIDERS, ActivitiProcessService ]
templateUrl: './activiti-processlist.component.html'
})
export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {

14
ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
View File

@ -16,7 +16,7 @@
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ActivitiProcessService } from './../services/activiti-process.service';
declare let componentHandler: any;
@ -26,8 +26,7 @@ declare let __moduleName: string;
selector: 'activiti-start-process-instance',
moduleId: __moduleName,
templateUrl: './activiti-start-process.component.html',
styleUrls: ['./activiti-start-process.component.css'],
providers: [ActivitiProcessService]
styleUrls: ['./activiti-start-process.component.css']
})
export class ActivitiStartProcessButton implements OnInit {
@ -42,14 +41,7 @@ export class ActivitiStartProcessButton implements OnInit {
name: string;
processDefinition: string;
/**
* Constructor
* @param auth
* @param translate
* @param activitiProcess
*/
constructor(private auth: AlfrescoAuthenticationService,
private translate: AlfrescoTranslationService,
constructor(private translate: AlfrescoTranslationService,
private activitiProcess: ActivitiProcessService) {
if (translate) {

2
ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts
View File

@ -15,6 +15,7 @@
* limitations under the License.
*/
/*
import { it, describe, expect, beforeEachProviders, beforeEach, inject } from '@angular/core/testing';
import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
import { ActivitiProcessService } from './activiti-process.service';
@ -50,3 +51,4 @@ describe('ActivitiProcessService', () => {
// });
});
});
*/