Merge e55970b into d617e1d

Author: almeida-erick

src/app/modules/reports/components/time-entries-table/time-entries-table.component.spec.ts

@@ -190,7 +190,7 @@ describe('Reports Page', () => {
 
     it('Should populate the users with the payload from the action executed', () => {
       const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
-      const usersArray = []
+      const usersArray = [];
       const action = {
         type: UserActionTypes.LOAD_USERS_SUCCESS,
         payload: usersArray
@@ -201,7 +201,7 @@ describe('Reports Page', () => {
 
       expect(component.users).toEqual(usersArray);
     });
-    
+
     it('The sum of the data dates is equal to {"hours": 3, "minutes":20,"seconds":0}', () => {
       let {hours,minutes,seconds}: TotalHours = component.sumDates(timeEntryList);
       expect({hours, minutes, seconds}).toEqual({hours:3,minutes:20,seconds:0});

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

@@ -361,7 +361,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
 
     const isStartDateInTheFuture = moment(startDateToSubmit).isAfter(moment());
     const isEndDateInTheFuture = moment(endDateToSubmit).isAfter(moment());
-    const timeEntryIsInTheFuture = isStartDateInTheFuture || isEndDateInTheFuture;
+    const timeEntryIsInTheFuture = isStartDateInTheFuture || (isEndDateInTheFuture && !this.goingToWorkOnThis);
 
     if (timeEntryIsInTheFuture) {
       this.toastrService.error('You cannot start a time-entry in the future');