diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts index 356740487..60903cdc1 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.ts +++ b/src/app/modules/shared/components/details-fields/details-fields.component.ts @@ -150,9 +150,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit { /* istanbul ignore next */ closeEntryModal() { this.close(); - if (this.closeModal.nativeElement) { - this.closeModal.nativeElement.click(); - } + this.closeModal?.nativeElement?.click(); } close() { diff --git a/src/app/modules/shared/models/project.model.ts b/src/app/modules/shared/models/project.model.ts index 4a347dc0c..81efdf32f 100644 --- a/src/app/modules/shared/models/project.model.ts +++ b/src/app/modules/shared/models/project.model.ts @@ -1,6 +1,7 @@ export interface Project { id?: string; customer_id?: string; + customer_name?: string; name: string; description?: string; project_type_id?: string; diff --git a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html index f20bc47d8..39af73bbc 100644 --- a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html +++ b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html @@ -4,7 +4,7 @@ Project diff --git a/src/app/modules/time-clock/store/entry.effects.ts b/src/app/modules/time-clock/store/entry.effects.ts index 53dbe03c9..50db9702e 100644 --- a/src/app/modules/time-clock/store/entry.effects.ts +++ b/src/app/modules/time-clock/store/entry.effects.ts @@ -21,7 +21,7 @@ export class EntryEffects { return new actions.LoadEntriesSummarySuccess(response); }), catchError((error) => { - this.toastrService.success(error); + this.toastrService.warning(`Your summary information could not be loaded`); return of(new actions.LoadEntriesSummaryFail()); }) ) @@ -50,7 +50,7 @@ export class EntryEffects { this.entryService.loadEntries().pipe( map((entries) => new actions.LoadEntriesSuccess(entries)), catchError((error) => { - this.toastrService.success(error); + this.toastrService.warning(`The data could not be loaded`); return of(new actions.LoadEntriesFail(error)); }) )