feat: preload data of last entry on switching project #503

Author: Angeluz-07

src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html

@@ -26,11 +26,12 @@
             <strong><span [innerHTML]="item.name"></span></strong>
           </div>
           <div class="p-2 pr-3">
-            <button *ngIf="showClockIn" class="btn btn-sm btn-primary btn-select" (click)="clockIn(item.id, item.customer_name, item.name)">Clock In</button>
+            <button *ngIf="showClockIn" class="btn btn-sm btn-primary btn-select"
+              (click)="clockIn(item.id, item.customer_name, item.name)">Clock In</button>
             <button *ngIf="!showClockIn" class="btn btn-sm btn-primary btn-select"
               (click)="switch(item.id, item.customer_name, item.name)">Switch</button>&nbsp;
-            <button *ngIf="!showClockIn" class="btn btn-sm btn-update btn-select" (click)="updateProject(item.id)">Update
-              project</button>
+            <button *ngIf="!showClockIn" class="btn btn-sm btn-update btn-select"
+              (click)="updateProject(item.id)">Update project</button>
           </div>
         </div>
       </ng-template>

src/app/modules/time-clock/store/entry.effects.spec.ts

@@ -51,14 +51,13 @@ describe('TimeEntryActionEffects', () => {
     });
   });
 
-  it('stop the active entry and return a CreateEntryAction', (done) => {
+  it('stop the active entry and return a ClockInAction', (done) => {
     actions$ = of(new SwitchTimeEntry('entry-id', 'project-id'));
     spyOn(service, 'stopEntryRunning').and.returnValue(of({ end_date: new Date() }));
-    spyOn(service, 'createEntry').and.returnValue(of({}));
 
     effects.switchEntryRunning$.subscribe(action => {
       expect(service.stopEntryRunning).toHaveBeenCalledWith('entry-id');
-      expect(action.type).toBe(EntryActionTypes.CREATE_ENTRY);
+      expect(action.type).toBe(EntryActionTypes.CLOCK_IN);
       done();
     });
   });

src/app/modules/time-clock/store/entry.effects.ts

@@ -21,11 +21,12 @@ export class EntryEffects {
         map((response) => {
           const stopDateForEntry = new Date(response.end_date);
           stopDateForEntry.setSeconds(stopDateForEntry.getSeconds() + 1);
-          return new actions.CreateEntry({
+          const entry = {
             project_id: action.idProjectSwitching,
             start_date: stopDateForEntry.toISOString(),
             timezone_offset: new Date().getTimezoneOffset(),
-          });
+          };
+          return new actions.ClockIn(entry);
         }),
         catchError((error) => {
           this.toastrService.warning('We could not perform this operation, try again later');