GNM-1101 FE Sicherstellen, dass die Färbung in der Haupttabelle sofort erfolgt
diff --git a/src/app/lists/grid-measures/grid-measures.component.ts b/src/app/lists/grid-measures/grid-measures.component.ts
index 67ea76d..62d44a8 100644
--- a/src/app/lists/grid-measures/grid-measures.component.ts
+++ b/src/app/lists/grid-measures/grid-measures.component.ts
@@ -9,7 +9,7 @@
*
******************************************************************************
*/
-import { Component } from '@angular/core';
+import { Component, AfterViewChecked } from '@angular/core';
import { AbstractListComponent } from '../common-components/abstract-list/abstract-list.component';
import { ErrorType } from '../../common/enums';
import { Globals } from './../../common/globals';
@@ -49,16 +49,17 @@
retrieveData() {
+ this.doGetCurrReminders();
+ this.doGetExpiredReminders();
+
if (this.statusMainFilter.item.onlyUsersGMsDesired === true) {
this.statusMainFilter.item.isCanceledStatusActive = false;
this.statusMainFilter.item.isClosedStatusActive = false;
}
this.gridMeasureService.getGridMeasures(this.statusMainFilter).subscribe(gms => {
-
- this.doGetCurrReminders(gms);
- this.doGetExpiredReminders(gms);
-
+ this.gridmeasures = gms;
+ this.showSpinner = false;
}, error => {
console.log(error);
this.messageService.emitError(this.gridId, ErrorType.retrieve, error);
@@ -71,27 +72,21 @@
this.gridApi.setFilterModel(this.filteringSearchText);
this.gridApi.onFilterChanged();
}, 1000);
-
}
-
}
- private doGetExpiredReminders(gms) {
+ private doGetExpiredReminders() {
this.reminderService.getExpiredReminders().subscribe(expiredrems => {
this.sessionContext.setExpiredReminders(expiredrems);
- this.gridmeasures = gms;
- this.showSpinner = false;
}, error => {
console.log(error);
this.messageService.emitError(this.gridId, ErrorType.retrieve, error);
});
}
- private doGetCurrReminders(gms) {
+ private doGetCurrReminders() {
this.reminderService.getCurrentReminders().subscribe(currentrems => {
this.sessionContext.setCurrentReminders(currentrems);
- this.gridmeasures = gms;
- this.showSpinner = false;
}, error => {
console.log(error);
this.messageService.emitError(this.gridId, ErrorType.retrieve, error);
diff --git a/src/app/services/jobs/reminder-caller-job.service.spec.ts b/src/app/services/jobs/reminder-caller-job.service.spec.ts
index 7979294..ab4d5fa 100644
--- a/src/app/services/jobs/reminder-caller-job.service.spec.ts
+++ b/src/app/services/jobs/reminder-caller-job.service.spec.ts
@@ -76,7 +76,7 @@
xit('should set isReminder to true when remindernotifications exist', fakeAsync(() => {
spyOn(injectedService, 'init').and.callThrough();
- mockReminderService.content = [];
+ mockReminderService.content = [1111];
Globals.REMINDER_JOB_POLLING_START_DELAY = 10;
expect(sessionContext.getUpcomingReminder).toBeTruthy();
