Merge branch 'master' into 320-update-summaries-data

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

@@ -9,6 +9,8 @@ import { ProjectListHoverComponent } from '../components';
 import { FilterProjectPipe } from '../../shared/pipes';
 import { AzureAdB2CService } from '../../login/services/azure.ad.b2c.service';
 import { ActionsSubject } from '@ngrx/store';
+import { EntryFieldsComponent } from '../components/entry-fields/entry-fields.component';
+import { ToastrService } from 'ngx-toastr';
 
 describe('TimeClockComponent', () => {
   let component: TimeClockComponent;
@@ -17,6 +19,11 @@ describe('TimeClockComponent', () => {
   let azureAdB2CService: AzureAdB2CService;
   const actionSub: ActionsSubject = new ActionsSubject();
 
+  let injectedToastrService;
+  const toastrService = {
+    error: () => {},
+  };
+
   const state = {
     projects: {
       projects: [{ id: 'id', name: 'name', project_type_id: '' }],
@@ -50,6 +57,7 @@ describe('TimeClockComponent', () => {
         AzureAdB2CService,
         provideMockStore({ initialState: state }),
         { provide: ActionsSubject, useValue: actionSub },
+        { provide: ToastrService, useValue: toastrService },
       ],
     }).compileComponents();
     store = TestBed.inject(MockStore);

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

@@ -3,7 +3,7 @@ import { getActiveTimeEntry } from './../store/entry.selectors';
 import { StopTimeEntryRunning, EntryActionTypes, LoadEntriesSummary } from './../store/entry.actions';
 import { Entry } from './../../shared/models/entry.model';
 import { Store, select, ActionsSubject } from '@ngrx/store';
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
 import { AzureAdB2CService } from '../../login/services/azure.ad.b2c.service';
 import { Subscription } from 'rxjs';
 import { EntryFieldsComponent } from '../components/entry-fields/entry-fields.component';
@@ -14,14 +14,20 @@ import { ToastrService } from 'ngx-toastr';
   styleUrls: ['./time-clock.component.scss'],
 })
 export class TimeClockComponent implements OnInit, OnDestroy {
+  @ViewChild(EntryFieldsComponent)
+  entryFieldsComponent: EntryFieldsComponent;
   username: string;
   areFieldsVisible = false;
   activeTimeEntry: Entry;
   clockOutSubscription: Subscription;
 
-  constructor(private azureAdB2CService: AzureAdB2CService, private store: Store<Entry>,
-              private actionsSubject$: ActionsSubject) {
-  }
+
+  constructor(
+    private azureAdB2CService: AzureAdB2CService,
+    private store: Store<Entry>,
+    private toastrService: ToastrService,
+    private actionsSubject$: ActionsSubject
+  ) {}
 
   ngOnDestroy(): void {
     this.clockOutSubscription.unsubscribe();