diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index 90264f1a32..7370a9ad63 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/e2e/process-services-cloud/task-header-cloud.e2e.ts @@ -26,19 +26,22 @@ import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tas describe('Task Header cloud component', () => { const basicCreatedTaskName = StringUtil.generateRandomString(); const completedTaskName = StringUtil.generateRandomString(); - let basicCreatedTask; - let basicCreatedDate; - let completedTask; - let completedCreatedDate; - let subTask; - let subTaskCreatedDate; - let completedEndDate; - let defaultDate; - let groupInfo, testUser; + let basicCreatedTask: any; + let basicCreatedDate: any; + let completedTask: any; + let completedCreatedDate: string; + let dueDate: string; + let subTask: any; + let subTaskCreatedDate: string; + let completedEndDate: string; + let defaultDate: string; + let groupInfo: any; + let testUser: any; const simpleApp = browser.params.resources.ACTIVITI_CLOUD_APPS.SIMPLE_APP.name; const priority = 30; const description = 'descriptionTask'; const formatDate = 'MMM D, YYYY'; + const dateTimeFormat = 'MMM D, Y, H:mm'; const defaultFormat = 'M/D/YY'; const taskHeaderCloudPage = new TaskHeaderCloudPage(); @@ -75,6 +78,7 @@ describe('Task Header cloud component', () => { await tasksService.completeTask(completedTaskId.entry.id, simpleApp); completedTask = await tasksService.getTask(completedTaskId.entry.id, simpleApp); completedCreatedDate = moment(completedTask.entry.createdDate).format(formatDate); + dueDate = moment(completedTask.entry.createdDate).format(dateTimeFormat); completedEndDate = moment(completedTask.entry.endDate).format(formatDate); defaultDate = moment(completedTask.entry.createdDate).format(defaultFormat); @@ -130,7 +134,7 @@ describe('Task Header cloud component', () => { await expect(await taskHeaderCloudPage.getCategory()).toEqual(!completedTask.entry.category ? CONSTANTS.TASK_DETAILS.NO_CATEGORY : completedTask.entry.category); await expect(await taskHeaderCloudPage.getDueDate()).toEqual(completedTask.entry.dueDate === null ? - CONSTANTS.TASK_DETAILS.NO_DATE : completedCreatedDate); + CONSTANTS.TASK_DETAILS.NO_DATE : dueDate); await expect(await taskHeaderCloudPage.getEndDate()).toEqual(completedEndDate); await expect(await taskHeaderCloudPage.getCreated()).toEqual(completedCreatedDate); await expect(await taskHeaderCloudPage.getAssignee()).toEqual(completedTask.entry.assignee === null ? '' : completedTask.entry.assignee); diff --git a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts index c1fafbe984..d2f84cc25d 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts @@ -25,6 +25,7 @@ import { of, throwError } from 'rxjs'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; import { RouterTestingModule } from '@angular/router/testing'; import { TaskCloudService } from '../../services/task-cloud.service'; +import moment = require('moment'); describe('TaskHeaderCloudComponent', () => { let component: TaskHeaderCloudComponent; @@ -138,7 +139,7 @@ describe('TaskHeaderCloudComponent', () => { fixture.whenStable().then(() => { const valueEl = fixture.debugElement.query(By.css('[data-automation-id="header-dueDate"] .adf-property-value')); - expect(valueEl.nativeElement.innerText.trim()).toBe('Dec 18, 2018'); + expect(valueEl.nativeElement.innerText.trim()).toBe(moment(assignedTaskDetailsCloudMock.dueDate, 'x').format('MMM D, Y, H:mm')); }); })); diff --git a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts index 74803d0f40..0049e593e2 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.ts @@ -25,7 +25,8 @@ import { TranslationService, AppConfigService, UpdateNotification, - CardViewUpdateService + CardViewUpdateService, + CardViewDatetimeItemModel } from '@alfresco/adf-core'; import { TaskDetailsCloudModel, TaskStatusEnum } from '../../start-task/models/task-details-cloud.model'; import { Router } from '@angular/router'; @@ -66,6 +67,7 @@ export class TaskHeaderCloudComponent implements OnInit, OnDestroy, OnChanges { inEdit: boolean = false; parentTaskName: string; dateFormat: string; + dateTimeFormat: string; dateLocale: string; displayDateClearAction = false; @@ -80,6 +82,7 @@ export class TaskHeaderCloudComponent implements OnInit, OnDestroy, OnChanges { ) { this.dateFormat = this.appConfig.get('dateValues.defaultDateFormat'); this.dateLocale = this.appConfig.get('dateValues.defaultDateLocale'); + this.dateTimeFormat = this.appConfig.get('dateValue.defaultDateTimeFormat'); } ngOnInit() { @@ -145,14 +148,14 @@ export class TaskHeaderCloudComponent implements OnInit, OnDestroy, OnChanges { validators: [new NumericFieldValidator()] } ), - new CardViewDateItemModel( + new CardViewDatetimeItemModel( { label: 'ADF_CLOUD_TASK_HEADER.PROPERTIES.DUE_DATE', value: this.taskDetails.dueDate, key: 'dueDate', default: this.translationService.instant('ADF_CLOUD_TASK_HEADER.PROPERTIES.DUE_DATE_DEFAULT'), editable: true, - format: this.dateFormat, + format: this.dateTimeFormat, locale: this.dateLocale } ), diff --git a/lib/process-services-cloud/src/lib/task/task-header/mocks/task-details-cloud.mock.ts b/lib/process-services-cloud/src/lib/task/task-header/mocks/task-details-cloud.mock.ts index 9037a30759..16d05e442e 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/mocks/task-details-cloud.mock.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/mocks/task-details-cloud.mock.ts @@ -26,7 +26,7 @@ export const assignedTaskDetailsCloudMock = new TaskDetailsCloudModel( 'name': 'This is a new task ', 'description': 'This is the description ', 'createdDate': 1545048055900, - 'dueDate': 1545091200000, + 'dueDate': Date.now(), 'claimedDate': null, 'priority': 5, 'category': null,