From 215ab4ac65d044f3751fc1dba549386fdefeb99f Mon Sep 17 00:00:00 2001 From: Kevin Lopez Date: Tue, 1 Jun 2021 18:49:15 -0500 Subject: [PATCH 1/3] fix: TT-258 modificate atribute star_date to view time in --- .../modules/time-entries/pages/time-entries.component.spec.ts | 2 +- src/app/modules/time-entries/pages/time-entries.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c4cf0b699..4dde329e6 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,7 +381,7 @@ describe('TimeEntriesComponent', () => { uri: 'http://testing.is.fun', activity_id: 'sss', project_id: 'id', - start_date: new Date(new Date().setHours(0, 0, 0, 0)), + start_date: new Date(), end_date: new Date(new Date().setHours(0, 0, 0, 0)) }; state.timeEntriesDataSource.data = [lastEntry]; 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 7c06b05fe..454ec17af 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.ts @@ -129,7 +129,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy { uri: dataToUse.uri ? dataToUse.uri : '', activity_id: dataToUse.activity_id, project_id: dataToUse.project_id, - start_date: startDate, + start_date: new Date(), end_date: startDate }; this.entry = entry; From 3bcd1c724535a66eb9b0c628cda74e279daa8c4c Mon Sep 17 00:00:00 2001 From: Kevin Lopez Date: Fri, 11 Jun 2021 12:47:45 -0500 Subject: [PATCH 2/3] fix: TT-258 refactor code based on PR reviews --- src/app/modules/time-entries/pages/time-entries.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 454ec17af..6ed454e34 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.ts @@ -122,7 +122,7 @@ 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 endDate = new Date(new Date().setHours(0, 0, 0, 0)); const entry = { description: dataToUse.description ? dataToUse.description : '', technologies: dataToUse.technologies ? dataToUse.technologies : [], @@ -130,7 +130,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy { activity_id: dataToUse.activity_id, project_id: dataToUse.project_id, start_date: new Date(), - end_date: startDate + end_date: endDate }; this.entry = entry; } From 9cad28c493cf185f88f57ed13325fa72da50df85 Mon Sep 17 00:00:00 2001 From: Kevin Lopez Date: Mon, 14 Jun 2021 16:17:06 -0500 Subject: [PATCH 3/3] fix: TT-258 added canMarkEntryAsWIP how conditions in start_date --- .../components/details-fields/details-fields.component.html | 3 ++- src/app/modules/shared/models/entry.model.ts | 2 +- .../time-entries/pages/time-entries.component.spec.ts | 2 +- .../modules/time-entries/pages/time-entries.component.ts | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index fcca79501..766d48690 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -78,7 +78,7 @@ -
+
diff --git a/src/app/modules/shared/models/entry.model.ts b/src/app/modules/shared/models/entry.model.ts index 65737d410..731d0d8b6 100644 --- a/src/app/modules/shared/models/entry.model.ts +++ b/src/app/modules/shared/models/entry.model.ts @@ -1,7 +1,7 @@ export interface Entry { running?: boolean; id?: string; - start_date: Date; + start_date?: Date; end_date?: Date; activity_id?: string; technologies?: string[]; 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 4dde329e6..379a60ef9 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,7 +381,7 @@ describe('TimeEntriesComponent', () => { uri: 'http://testing.is.fun', activity_id: 'sss', project_id: 'id', - start_date: new Date(), + start_date: component.canMarkEntryAsWIP ? new Date() : new Date(new Date().setHours(0, 0, 0, 0)), end_date: new Date(new Date().setHours(0, 0, 0, 0)) }; state.timeEntriesDataSource.data = [lastEntry]; 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 6ed454e34..c6b7cf9fe 100644 --- a/src/app/modules/time-entries/pages/time-entries.component.ts +++ b/src/app/modules/time-entries/pages/time-entries.component.ts @@ -122,15 +122,15 @@ 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 endDate = new Date(new Date().setHours(0, 0, 0, 0)); + const startDate = new Date(new Date().setHours(0, 0, 0, 0)); 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: endDate + start_date: this.canMarkEntryAsWIP ? new Date() : startDate, + end_date: startDate }; this.entry = entry; }