diff --git a/src/app/modules/time-entries/pages/time-entries.component.spec.ts b/src/app/modules/time-entries/pages/time-entries.component.spec.ts index 8f87089db..3297489bd 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.spec.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.spec.ts @@ -381,14 +381,18 @@ describe('TimeEntriesComponent', () => { it('should preload data of last entry when a project is selected while creating new entry ', waitForAsync(() => { component.entry = null; component.entryId = null; + const defaultSeconds = 0; + const currentDate = new Date(); + currentDate.setSeconds(defaultSeconds); + currentDate.setMilliseconds(defaultSeconds); const lastEntry = { description: 'testing is fun', technologies: [], uri: 'http://testing.is.fun', activity_id: 'sss', project_id: 'id', - start_date: new Date(), - end_date: new Date(new Date().setHours(0, 0, 0, 0)) + start_date: currentDate, + end_date: currentDate }; state.timeEntriesDataSource.data = [lastEntry]; mockEntriesSelector = store.overrideSelector(getTimeEntriesDataSource, state.timeEntriesDataSource); diff --git a/src/app/modules/time-entries/pages/time-entries.component.ts b/src/app/modules/time-entries/pages/time-entries.component.ts index c8e7b4660..429424d0b 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.ts @@ -139,15 +139,18 @@ export class TimeEntriesComponent implements OnInit, OnDestroy { this.store.pipe(select(getTimeEntriesDataSource)).subscribe(ds => { const dataToUse = ds.data.find(item => item.project_id === event.projectId); if (dataToUse && this.isNewEntry()) { - const startDate = new Date(new Date().setHours(0, 0, 0, 0)); + const defaultSeconds = 0; + const currentDate = new Date(); + currentDate.setSeconds(defaultSeconds); + currentDate.setMilliseconds(defaultSeconds); const entry = { description: dataToUse.description ? dataToUse.description : '', technologies: dataToUse.technologies ? dataToUse.technologies : [], uri: dataToUse.uri ? dataToUse.uri : '', activity_id: dataToUse.activity_id, project_id: dataToUse.project_id, - start_date: new Date(), - end_date: startDate + start_date: currentDate, + end_date: currentDate }; this.entry = entry; }