TT-85 fix: fix overlapping seconds on time entries

Author: PaulRC-ioet

src/app/modules/shared/components/details-fields/details-fields.component.spec.ts

@@ -76,6 +76,11 @@ describe('DetailsFieldsComponent', () => {
     description: '',
     technology: '',
   };
+  const dateTest = moment().format('YYYY-MM-DD');
+  const endHourTest = moment().format('HH:mm:ss');
+  const endDateTest = new Date(`${dateTest}T${endHourTest.trim()}`);
+  const startHourTest = moment().subtract(3, 'hours').format('HH:mm:ss');
+  const startDateTest = new Date(`${dateTest}T${startHourTest.trim()}`);
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -101,8 +106,8 @@ describe('DetailsFieldsComponent', () => {
       project_id: 'id',
       activity_id: '',
       uri: 'ticketUri',
-      start_date: null,
-      end_date: null,
+      start_date: startDateTest,
+      end_date: endDateTest,
       description: '',
       technologies: [],
       id: 'xyz'
@@ -314,6 +319,19 @@ describe('DetailsFieldsComponent', () => {
     expect(component.saveEntry.emit).toHaveBeenCalledWith(data);
   });
 
+  fit('onSubmit an entry without change hours, should not modify the start_date and end_date ', () => {
+    component.entryToEdit = {...entryToEdit, description: 'test', };
+    fixture.componentInstance.ngOnChanges();
+
+    const startHourValue = moment().subtract(3, 'hours').format('HH:mm');
+    const endHourValue = moment().format('HH:mm');
+
+    component.onSubmit();
+
+    expect(component.starDateValue).toEqual(startHourValue);
+    expect(component.endDateValue).toEqual(endHourValue);
+  });
+
   it('displays error message when the date selected is in the future', () => {
     spyOn(toastrServiceStub, 'error');
 

src/app/modules/shared/components/details-fields/details-fields.component.ts

@@ -42,6 +42,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
   activities: Activity[] = [];
   goingToWorkOnThis = false;
   shouldRestartEntry = false;
+  starDateValue;
+  endDateValue;
 
   constructor(private formBuilder: FormBuilder, private store: Store<Merged>,
               private actionsSubject$: ActionsSubject, private toastrService: ToastrService) {
@@ -139,6 +141,8 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
         uri: this.entryToEdit.uri,
         technology: '',
       });
+      this.starDateValue = formatDate(get(this.entryToEdit, 'start_date', '00:00'), 'HH:mm', 'en');
+      this.endDateValue = formatDate(get(this.entryToEdit, 'end_date', '00:00'), 'HH:mm', 'en');
     } else {
       this.cleanForm();
     }
@@ -204,13 +208,20 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
     }
     const startDate = this.entryForm.value.start_date;
     const endDate = this.entryForm.value.end_date;
+    this.starDateValue = this.entryForm.value.start_hour === this.starDateValue ?
+      this.entryToEdit.start_date :
+      new Date(`${startDate}T${this.entryForm.value.start_hour.trim()}`).toISOString();
+    this.endDateValue = this.entryForm.value.end_hour === this.endDateValue ?
+      this.entryToEdit.end_date :
+      new Date(`${endDate}T${this.entryForm.value.end_hour.trim()}`).toISOString();
+
     const entry = {
       project_id: this.entryForm.value.project_id,
       activity_id: this.entryForm.value.activity_id,
       technologies: get(this, 'selectedTechnologies', []),
       description: this.entryForm.value.description,
-      start_date: new Date(`${startDate}T${this.entryForm.value.start_hour.trim()}`).toISOString(),
-      end_date: new Date(`${endDate}T${this.entryForm.value.end_hour.trim()}`).toISOString(),
+      start_date: this.starDateValue,
+      end_date: this.endDateValue,
       uri: this.entryForm.value.uri,
       timezone_offset: new Date().getTimezoneOffset(),
     };