fix: TT-117 two-entries-in-progress-bug

Author: scastillo-jp

src/app/modules/time-entries/pages/time-entries.component.spec.ts

@@ -245,7 +245,7 @@ describe('TimeEntriesComponent', () => {
         description: 'description',
         technologies: [],
         uri: 'abc',
-      }, shouldRestartEntry: false
+      }, shouldRestartEntry: true
     };
     component.entryId = 'new-entry';
     spyOn(injectedToastrService, 'error');
@@ -265,7 +265,7 @@ describe('TimeEntriesComponent', () => {
         description: 'description',
         technologies: [],
         uri: 'abc',
-      }, shouldRestartEntry: false
+      }, shouldRestartEntry: true
     };
     component.entryId = 'new-entry';
     spyOn(injectedToastrService, 'error');
@@ -361,7 +361,7 @@ describe('TimeEntriesComponent', () => {
         technologies: [],
         uri: 'abc',
 
-      }, shouldRestartEntry: true
+      }, shouldRestartEntry: false
     };
     component.entryId = '123';
     spyOn(store, 'dispatch');

src/app/modules/time-entries/pages/time-entries.component.ts

@@ -104,17 +104,18 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
   }
 
   saveEntry(event: SaveEntryEvent): void {
-    if (this.activeTimeEntry) {
+
+    if (this.activeTimeEntry && this.entryId === this.activeTimeEntry.id) {
       const startDateAsLocalDate = new Date(event.entry.start_date);
       const endDateAsLocalDate = new Date(event.entry.end_date);
       const activeEntryAsLocalDate = new Date(this.activeTimeEntry.start_date);
-      const isEditingEntryEqualToActiveEntry = this.entryId === this.activeTimeEntry.id;
       const isStartDateGreaterThanActiveEntry = startDateAsLocalDate > activeEntryAsLocalDate;
       const isEndDateGreaterThanActiveEntry = endDateAsLocalDate > activeEntryAsLocalDate;
       const isTimeEntryOverlapping = isStartDateGreaterThanActiveEntry || isEndDateGreaterThanActiveEntry;
-      if (!isEditingEntryEqualToActiveEntry && isTimeEntryOverlapping) {
+
+      if (isTimeEntryOverlapping) {
         this.toastrService.error('You are on the clock and this entry overlaps it, try with earlier times.');
-      } else {
+      } else  {
         this.doSave(event);
       }
     } else {
@@ -145,7 +146,7 @@ export class TimeEntriesComponent implements OnInit, OnDestroy {
     if (this.entryId) {
       event.entry.id = this.entryId;
       this.store.dispatch(new entryActions.UpdateEntry(event.entry));
-      if (event.shouldRestartEntry) {
+      if (event.shouldRestartEntry && this.entryId === this.activeTimeEntry.id) {
         this.store.dispatch(new entryActions.RestartEntry(event.entry));
       }
     } else {