diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html index ef099d4f9f..ddf6a0aadc 100644 --- a/src/app/process-page/detail/process-detail.component.html +++ b/src/app/process-page/detail/process-detail.component.html @@ -2,7 +2,7 @@

{{'process.detail.title' | translate:{id: process?.processId, name: process?.scriptName} }}

- {{'process.detail.create' | translate}} +
@@ -23,11 +23,11 @@ -
{{ process.startTime }}
+
{{ process.startTime | date:dateFormat:'UTC' }}
-
{{ process.endTime }}
+
{{ process.endTime | date:dateFormat:'UTC' }}
@@ -35,7 +35,7 @@ - @@ -47,7 +47,7 @@

-
- {{'process.detail.back' | translate}} +
+ {{'process.detail.back' | translate}}
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts index 481189cf05..b48afe5586 100644 --- a/src/app/process-page/detail/process-detail.component.ts +++ b/src/app/process-page/detail/process-detail.component.ts @@ -66,6 +66,11 @@ export class ProcessDetailComponent implements OnInit { */ retrievingOutputLogs$: BehaviorSubject; + /** + * Date format to use for start and end time of processes + */ + dateFormat = 'yyyy-MM-dd HH:mm:ss ZZZZ'; + constructor(protected route: ActivatedRoute, protected router: Router, protected processService: ProcessDataService, diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html index 62b1433b2c..7d3f15f074 100644 --- a/src/app/process-page/overview/process-overview.component.html +++ b/src/app/process-page/overview/process-overview.component.html @@ -26,8 +26,8 @@ {{process.processId}} {{process.scriptName}} {{ePersonName}} - {{process.startTime | date:dateFormat}} - {{process.endTime | date:dateFormat}} + {{process.startTime | date:dateFormat:'UTC'}} + {{process.endTime | date:dateFormat:'UTC'}} {{process.processStatus}} diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts index 98e78f6b36..84ef4bca56 100644 --- a/src/app/process-page/overview/process-overview.component.spec.ts +++ b/src/app/process-page/overview/process-overview.component.spec.ts @@ -12,12 +12,9 @@ import { By } from '@angular/platform-browser'; import { ProcessStatus } from '../processes/process-status.model'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { createPaginatedList } from '../../shared/testing/utils.test'; -import { of as observableOf } from 'rxjs'; import { PaginationService } from '../../core/pagination/pagination.service'; -import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model'; -import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model'; -import { FindListOptions } from '../../core/data/request.models'; import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub'; +import { DatePipe } from '@angular/common'; describe('ProcessOverviewComponent', () => { let component: ProcessOverviewComponent; @@ -30,27 +27,29 @@ describe('ProcessOverviewComponent', () => { let processes: Process[]; let ePerson: EPerson; + const pipe = new DatePipe('en-US'); + function init() { processes = [ Object.assign(new Process(), { processId: 1, scriptName: 'script-name', - startTime: '2020-03-19', - endTime: '2020-03-19', + startTime: '2020-03-19 00:30:00', + endTime: '2020-03-19 23:30:00', processStatus: ProcessStatus.COMPLETED }), Object.assign(new Process(), { processId: 2, scriptName: 'script-name', - startTime: '2020-03-20', - endTime: '2020-03-20', + startTime: '2020-03-20 00:30:00', + endTime: '2020-03-20 23:30:00', processStatus: ProcessStatus.FAILED }), Object.assign(new Process(), { processId: 3, scriptName: 'another-script-name', - startTime: '2020-03-21', - endTime: '2020-03-21', + startTime: '2020-03-21 00:30:00', + endTime: '2020-03-21 23:30:00', processStatus: ProcessStatus.RUNNING }) ]; @@ -135,14 +134,14 @@ describe('ProcessOverviewComponent', () => { it('should display the start time in the fourth column', () => { rowElements.forEach((rowElement, index) => { const el = rowElement.query(By.css('td:nth-child(4)')).nativeElement; - expect(el.textContent).toContain(processes[index].startTime); + expect(el.textContent).toContain(pipe.transform(processes[index].startTime, component.dateFormat, 'UTC')); }); }); it('should display the end time in the fifth column', () => { rowElements.forEach((rowElement, index) => { const el = rowElement.query(By.css('td:nth-child(5)')).nativeElement; - expect(el.textContent).toContain(processes[index].endTime); + expect(el.textContent).toContain(pipe.transform(processes[index].endTime, component.dateFormat, 'UTC')); }); }); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 081f48df3e..0cc3a0402d 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2777,13 +2777,13 @@ - "process.overview.table.finish" : "Finish time", + "process.overview.table.finish" : "Finish time (UTC)", "process.overview.table.id" : "Process ID", "process.overview.table.name" : "Name", - "process.overview.table.start" : "Start time", + "process.overview.table.start" : "Start time (UTC)", "process.overview.table.status" : "Status",