diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html index e48011f9bc..a786d753d0 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.html @@ -6,7 +6,7 @@
{{ 'DETAILS.LABELS.STARTED' | translate }}: - {{getStartedDate() | date:'medium'}} + {{getFormatDate(processInstance.started, 'medium')}}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts index ae7eb2f4bd..7c6fd392ac 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts @@ -19,6 +19,7 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ProcessInstance } from '../models/process-instance'; import { ActivitiProcessService } from './../services/activiti-process.service'; +import { DatePipe } from '@angular/common'; declare let componentHandler: any; @@ -53,8 +54,13 @@ export class ActivitiProcessInstanceHeader { return ''; } - getStartedDate() { - return this.processInstance ? new Date(this.processInstance.started) : null; + getFormatDate(value, format: string) { + let datePipe = new DatePipe('en-US'); + try { + return datePipe.transform(value, format); + } catch (err) { + console.error(`ProcessListInstanceHeader: error parsing date ${value} to format ${format}`); + } } cancelProcess() { diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html index a2dbb2f81c..58d9053139 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html @@ -32,7 +32,8 @@ assignment {{task.name}} - {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: getUserFullName(task.assignee), created: task.created | date:'mediumDate' } }} + {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: + getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts index 2b3ea03f69..ab088157b0 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts @@ -20,6 +20,7 @@ import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './../services/activiti-process.service'; import { TaskDetailsModel } from '../models/task-details.model'; import { Observable, Observer } from 'rxjs/Rx'; +import { DatePipe } from '@angular/common'; declare let componentHandler: any; @@ -132,6 +133,15 @@ export class ActivitiProcessInstanceTasks implements OnInit { return ''; } + getFormatDate(value, format: string) { + let datePipe = new DatePipe('en-US'); + try { + return datePipe.transform(value, format); + } catch (err) { + console.error(`ProcessListInstanceTask: error parsing date ${value} to format ${format}`); + } + } + public clickTask($event: any, task: TaskDetailsModel) { this.selectedTaskId = task.id; this.taskdetails.loadDetails(task.id);