From a1c3d1ed95c8fca3e5ad693e18ce0a958c6343c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20M=C3=BCller?= Date: Wed, 29 Nov 2023 17:12:05 +0100 Subject: [PATCH] fix ui tests --- .../angular/src/app/shared/days-of-week.ts | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/angular/src/app/shared/days-of-week.ts b/src/main/angular/src/app/shared/days-of-week.ts index 552b1cf5..74063884 100644 --- a/src/main/angular/src/app/shared/days-of-week.ts +++ b/src/main/angular/src/app/shared/days-of-week.ts @@ -39,16 +39,14 @@ export class DaysOfWeek { private static subject: Subject; public static getDows(translate: TranslateService, includedHoliday = true): Observable { - if (! DaysOfWeek.subject) { - const filteredDows = DaysOfWeek.daysOfWeek.filter(dow => dow.id !== 8); - DaysOfWeek.subject = new BehaviorSubject(DaysOfWeek.daysOfWeek); - const keys = filteredDows.map(dayOfWeek => dayOfWeek.name); - translate.get(keys).subscribe( - translatedKeys => { - filteredDows.forEach(dayOfWeek => dayOfWeek.name = translatedKeys[dayOfWeek.name]); - DaysOfWeek.subject.next(filteredDows); - }); - } - return DaysOfWeek.subject; + const filteredDows = DaysOfWeek.daysOfWeek.filter(dow => includedHoliday || dow.id !== 8); + const subject = new BehaviorSubject(DaysOfWeek.daysOfWeek); + const keys = filteredDows.map(dayOfWeek => dayOfWeek.name); + translate.get(keys).subscribe( + translatedKeys => { + filteredDows.forEach(dayOfWeek => dayOfWeek.name = translatedKeys[dayOfWeek.name]); + subject.next(filteredDows); + }); + return subject; } }