From 9d7f8b3f1268a0b2dc2ba1aa2796f762b6abcfa7 Mon Sep 17 00:00:00 2001 From: Javier Sarango Date: Mon, 3 May 2021 10:06:40 -0500 Subject: [PATCH] fix: TT-86 Change set hour in end_hour --- .../components/details-fields/details-fields.component.html | 1 + .../details-fields/details-fields.component.spec.ts | 4 +++- .../components/details-fields/details-fields.component.ts | 2 +- 3 files changed, 5 insertions(+), 2 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 ae713e67f..e666a15c7 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 @@ -140,6 +140,7 @@ formControlName="end_hour" id="end_hour" class="timepicker-input" + [defaultTime]="'00:00'" [class.timepicker-input--disabled]="!(project_id.value && project_name.value)" > diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts index 92f95babc..23e0f90bd 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts @@ -318,7 +318,9 @@ describe('DetailsFieldsComponent', () => { component.onGoingToWorkOnThisChange({ currentTarget: { checked: false } }); - expect(component.entryForm.patchValue).toHaveBeenCalledWith({ end_date: '2020-12-30', end_hour: '09:45', }); + expect(component.entryForm.patchValue).toHaveBeenCalledWith( + { end_date: '2020-12-30', end_hour: formatDate(new Date(), 'HH:mm', 'en'), } + ); }); it('when creating a new entry, then the new entry should be marked as not run', () => { diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts index a1d920e81..947f38786 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts @@ -301,7 +301,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { if (!this.goingToWorkOnThis) { this.entryForm.patchValue({ end_date: formatDate(get(this.entryToEdit, 'start_date', ''), DATE_FORMAT, 'en'), - end_hour: formatDate(get(this.entryToEdit, 'start_date', '00:00'), 'HH:mm', 'en'), + end_hour: formatDate(new Date(), 'HH:mm', 'en'), }); } this.shouldRestartEntry = !this.entryToEdit?.running && this.goingToWorkOnThis;