inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

add types and fix date probblem in process list (#5176)

Browse Source
This commit is contained in:
Eugenio Romano
2019-10-21 16:10:19 +01:00
committed by Denys Vuika
parent 1970b1da82
commit 9f69a7d4ee
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/process-services/src/lib/process-list/components/process-list.component.ts
View File

@@ -47,7 +47,7 @@ import { processPresetsDefaultModel } from '../models/process-preset.model';
import { ProcessService } from '../services/process.service'; import { ProcessService } from '../services/process.service';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { ProcessListModel } from '../models/process-list.model'; import { ProcessListModel } from '../models/process-list.model';
import moment from 'moment-es6'; import { ProcessInstanceRepresentation } from '@alfresco/js-api';
@Component({ @Component({
selector: 'adf-process-instance-list', selector: 'adf-process-instance-list',
@@ -57,7 +57,6 @@ import moment from 'moment-es6';
export class ProcessInstanceListComponent extends DataTableSchema implements OnChanges, AfterContentInit, PaginatedComponent { export class ProcessInstanceListComponent extends DataTableSchema implements OnChanges, AfterContentInit, PaginatedComponent {
static PRESET_KEY = 'adf-process-list.presets'; static PRESET_KEY = 'adf-process-list.presets';
public FORMAT_DATE: string = 'll';
@ContentChild(CustomEmptyContentTemplateDirective) @ContentChild(CustomEmptyContentTemplateDirective)
customEmptyContent: CustomEmptyContentTemplateDirective; customEmptyContent: CustomEmptyContentTemplateDirective;
@@ -75,7 +74,7 @@ export class ProcessInstanceListComponent extends DataTableSchema implements On
/** The id of the process instance. */ /** The id of the process instance. */
@Input() @Input()
processInstanceId: number|string; processInstanceId: number | string;
/** Defines the state of the processes. Possible values are `running`, `completed` and `all` */ /** Defines the state of the processes. Possible values are `running`, `completed` and `all` */
@Input() @Input()
@@ -290,18 +289,15 @@ export class ProcessInstanceListComponent extends DataTableSchema implements On
* Optimize name field * Optimize name field
* @param instances * @param instances
*/ */
private optimizeProcessDetails(instances: any[]): any[] { private optimizeProcessDetails(instances: ProcessInstanceRepresentation[]): ProcessInstanceRepresentation[] {
instances = instances.map((instance) => { instances = instances.map((instance) => {
instance.name = this.getProcessNameOrDescription(instance, 'medium'); instance.name = this.getProcessNameOrDescription(instance, 'medium');
if (instance.started) {
instance.started = moment(instance.started).format(this.FORMAT_DATE);
}
return instance; return instance;
}); });
return instances; return instances;
} }
getProcessNameOrDescription(processInstance, dateFormat: string): string { getProcessNameOrDescription(processInstance: ProcessInstanceRepresentation, dateFormat: string): string {
let name = ''; let name = '';
if (processInstance) { if (processInstance) {
name = processInstance.name || name = processInstance.name ||
@@ -310,7 +306,7 @@ export class ProcessInstanceListComponent extends DataTableSchema implements On
return name; return name;
} }
getFormatDate(value: any, format: string) { getFormatDate(value: Date, format: string) {
const datePipe = new DatePipe('en-US'); const datePipe = new DatePipe('en-US');
try { try {
return datePipe.transform(value, format); return datePipe.transform(value, format);

3
lib/process-services/src/lib/task-list/components/task-list.component.ts
View File

@@ -30,6 +30,7 @@ import { taskPresetsDefaultModel } from '../models/task-preset.model';
import { TaskListService } from './../services/tasklist.service'; import { TaskListService } from './../services/tasklist.service';
import moment from 'moment-es6'; import moment from 'moment-es6';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { TaskDetailsModel } from '../models/task-details.model';
@Component({ @Component({
selector: 'adf-tasklist', selector: 'adf-tasklist',
@@ -353,7 +354,7 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
* Optimize name field * Optimize name field
* @param instances * @param instances
*/ */
private optimizeTaskDetails(instances: any[]): any[] { private optimizeTaskDetails(instances: TaskDetailsModel[]): TaskDetailsModel[] {
instances = instances.map((task) => { instances = instances.map((task) => {
if (!task.name) { if (!task.name) {
task.name = 'No name'; task.name = 'No name';