Merge pull request #239 from admin-ch/feature/VACCINECER-2310-VACCINE…

…CER-2252-VACCINECER-2307 Feature/vaccinecer 2310 vaccinecer 2252 vaccinecer 2307
admin-ch · Aug 16, 2022 · f685489 · f685489
2 parents a35d59c + 16e4557
commit f685489
Show file tree

Hide file tree

Showing 22 changed files with 210 additions and 147 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/auth/login-feedback.component.spec.ts b/src/app/auth/login-feedback.component.spec.ts
@@ -6,11 +6,13 @@ describe('LoginFeedbackComponent', () => {
 	let component: LoginFeedbackComponent;
 	let fixture: ComponentFixture<LoginFeedbackComponent>;
 
-	beforeEach(waitForAsync(() => {
-		TestBed.configureTestingModule({
-			declarations: [LoginFeedbackComponent]
-		}).compileComponents();
-	}));
+	beforeEach(
+		waitForAsync(() => {
+			TestBed.configureTestingModule({
+				declarations: [LoginFeedbackComponent]
+			}).compileComponents();
+		})
+	);
 
 	beforeEach(() => {
 		fixture = TestBed.createComponent(LoginFeedbackComponent);

diff --git a/...nts/vaccination-important-information/vaccination-important-information.component.spec.ts b/...nts/vaccination-important-information/vaccination-important-information.component.spec.ts
@@ -9,13 +9,15 @@ describe('WhoCheckboxComponent', () => {
 	let component: VaccinationImportantInformationComponent;
 	let fixture: ComponentFixture<VaccinationImportantInformationComponent>;
 
-	beforeEach(waitForAsync(() => {
-		TestBed.configureTestingModule({
-			imports: [ObliqueTestingModule, ReactiveFormsModule, MatCheckboxModule],
-			declarations: [VaccinationImportantInformationComponent],
-			schemas: [NO_ERRORS_SCHEMA]
-		}).compileComponents();
-	}));
+	beforeEach(
+		waitForAsync(() => {
+			TestBed.configureTestingModule({
+				imports: [ObliqueTestingModule, ReactiveFormsModule, MatCheckboxModule],
+				declarations: [VaccinationImportantInformationComponent],
+				schemas: [NO_ERRORS_SCHEMA]
+			}).compileComponents();
+		})
+	);
 
 	beforeEach(() => {
 		fixture = TestBed.createComponent(VaccinationImportantInformationComponent);

diff --git a/src/app/create/components/who-checkbox/who-checkbox.component.spec.ts b/src/app/create/components/who-checkbox/who-checkbox.component.spec.ts
@@ -9,13 +9,15 @@ describe('WhoCheckboxComponent', () => {
 	let component: WhoCheckboxComponent;
 	let fixture: ComponentFixture<WhoCheckboxComponent>;
 
-	beforeEach(waitForAsync(() => {
-		TestBed.configureTestingModule({
-			imports: [ObliqueTestingModule, ReactiveFormsModule, MatCheckboxModule],
-			declarations: [WhoCheckboxComponent],
-			schemas: [NO_ERRORS_SCHEMA]
-		}).compileComponents();
-	}));
+	beforeEach(
+		waitForAsync(() => {
+			TestBed.configureTestingModule({
+				imports: [ObliqueTestingModule, ReactiveFormsModule, MatCheckboxModule],
+				declarations: [WhoCheckboxComponent],
+				schemas: [NO_ERRORS_SCHEMA]
+			}).compileComponents();
+		})
+	);
 
 	beforeEach(() => {
 		fixture = TestBed.createComponent(WhoCheckboxComponent);

diff --git a/src/app/create/date-time-picker/date-time-picker.component.spec.ts b/src/app/create/date-time-picker/date-time-picker.component.spec.ts
@@ -8,13 +8,15 @@ describe('DateTimePickerComponent', () => {
 	let component: DateTimePickerComponent;
 	let fixture: ComponentFixture<DateTimePickerComponent>;
 
-	beforeEach(waitForAsync(() => {
-		TestBed.configureTestingModule({
-			imports: [ObliqueTestingModule, ReactiveFormsModule],
-			declarations: [DateTimePickerComponent],
-			schemas: [NO_ERRORS_SCHEMA]
-		}).compileComponents();
-	}));
+	beforeEach(
+		waitForAsync(() => {
+			TestBed.configureTestingModule({
+				imports: [ObliqueTestingModule, ReactiveFormsModule],
+				declarations: [DateTimePickerComponent],
+				schemas: [NO_ERRORS_SCHEMA]
+			}).compileComponents();
+		})
+	);
 
 	beforeEach(() => {
 		fixture = TestBed.createComponent(DateTimePickerComponent);

diff --git a/src/app/dashboard/dashboard.component.spec.ts b/src/app/dashboard/dashboard.component.spec.ts
@@ -42,27 +42,29 @@ describe('DashboardComponent', () => {
 		currentLang: 'en'
 	};
 
-	beforeEach(waitForAsync(() => {
-		TestBed.configureTestingModule({
-			imports: [
-				RouterTestingModule.withRoutes([
-					{
-						path: 'test',
-						component: DashboardComponent
-					}
-				]),
-				ObliqueTestingModule
-			],
-			declarations: [DashboardComponent, HasAuthorizationForMockDirective],
-			schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
-			providers: [
-				{provide: Router, useValue: router},
-				{provide: NotificationService, useValue: notificationServiceMock},
-				{provide: ObNotificationService, useValue: obNotificationServiceMock},
-				{provide: TranslateService, useValue: translateServiceMock}
-			]
-		}).compileComponents();
-	}));
+	beforeEach(
+		waitForAsync(() => {
+			TestBed.configureTestingModule({
+				imports: [
+					RouterTestingModule.withRoutes([
+						{
+							path: 'test',
+							component: DashboardComponent
+						}
+					]),
+					ObliqueTestingModule
+				],
+				declarations: [DashboardComponent, HasAuthorizationForMockDirective],
+				schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
+				providers: [
+					{provide: Router, useValue: router},
+					{provide: NotificationService, useValue: notificationServiceMock},
+					{provide: ObNotificationService, useValue: obNotificationServiceMock},
+					{provide: TranslateService, useValue: translateServiceMock}
+				]
+			}).compileComponents();
+		})
+	);
 
 	beforeEach(() => {
 		fixture = TestBed.createComponent(DashboardComponent);

diff --git a/src/app/eiam-self-admin/eiam-self-admin.component.spec.ts b/src/app/eiam-self-admin/eiam-self-admin.component.spec.ts
@@ -8,14 +8,16 @@ describe('EiamSelfAdminComponent', () => {
 	let component: EiamSelfAdminComponent;
 	let fixture: ComponentFixture<EiamSelfAdminComponent>;
 
-	beforeEach(waitForAsync(() => {
-		TestBed.configureTestingModule({
-			imports: [ObliqueTestingModule],
-			declarations: [EiamSelfAdminComponent],
-			schemas: [NO_ERRORS_SCHEMA],
-			providers: [{provide: 'EIAM_SELF_ADMIN', useValue: 'prefix_CURRENT_PAGE_middle_LANGUAGE_suffix'}]
-		}).compileComponents();
-	}));
+	beforeEach(
+		waitForAsync(() => {
+			TestBed.configureTestingModule({
+				imports: [ObliqueTestingModule],
+				declarations: [EiamSelfAdminComponent],
+				schemas: [NO_ERRORS_SCHEMA],
+				providers: [{provide: 'EIAM_SELF_ADMIN', useValue: 'prefix_CURRENT_PAGE_middle_LANGUAGE_suffix'}]
+			}).compileComponents();
+		})
+	);
 
 	beforeEach(() => {
 		fixture = TestBed.createComponent(EiamSelfAdminComponent);

diff --git a/src/app/notifications/notifications.component.spec.ts b/src/app/notifications/notifications.component.spec.ts
@@ -10,23 +10,25 @@ describe('NotificationsComponent', () => {
 	let component: NotificationsComponent;
 	let fixture: ComponentFixture<NotificationsComponent>;
 
-	beforeEach(waitForAsync(() => {
-		TestBed.configureTestingModule({
-			imports: [],
-			declarations: [NotificationsComponent],
-			schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
-			providers: [
-				{
-					provide: NotificationService,
-					useValue: {
-						imminentNotifications$: new Subject()
-					}
-				},
-				{provide: ObNotificationService, useValue: {}},
-				{provide: TranslateService, useValue: {}}
-			]
-		}).compileComponents();
-	}));
+	beforeEach(
+		waitForAsync(() => {
+			TestBed.configureTestingModule({
+				imports: [],
+				declarations: [NotificationsComponent],
+				schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
+				providers: [
+					{
+						provide: NotificationService,
+						useValue: {
+							imminentNotifications$: new Subject()
+						}
+					},
+					{provide: ObNotificationService, useValue: {}},
+					{provide: TranslateService, useValue: {}}
+				]
+			}).compileComponents();
+		})
+	);
 
 	beforeEach(() => {
 		fixture = TestBed.createComponent(NotificationsComponent);

diff --git a/...eport/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.html b/...eport/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.html
@@ -1,5 +1,5 @@
 <fieldset>
-	<legend>{{ "reports.dateFromTo.text" | translate }}</legend>
+	<legend>{{ label }}</legend>
 	<div class="period-container">
 		<mat-form-field>
 			<input

diff --git a/...rt/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.spec.ts b/...rt/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.spec.ts
@@ -7,9 +7,9 @@ import {TranslateModule} from '@ngx-translate/core';
 import {FormArray, FormControl, FormGroup} from '@angular/forms';
 import {REPORT_ERROR_STATE_MATCHER} from '../../../errorStateMatcher';
 import {ErrorStateMatcher} from '@angular/material/core';
-import {ReportService} from "../../../report.service";
-import {ReportType} from "shared/model";
-import {Subject} from "rxjs";
+import {ReportService} from '../../../report.service';
+import {ReportType} from 'shared/model';
+import {Subject} from 'rxjs';
 
 describe('DateFromToFieldsetComponent', () => {
 	let component: DateFromToFieldsetComponent;
@@ -19,18 +19,21 @@ describe('DateFromToFieldsetComponent', () => {
 		await TestBed.configureTestingModule({
 			imports: [ObliqueTestingModule, TranslateModule],
 			declarations: [DateFromToFieldsetComponent],
-			providers: [{
-				provide: ReportService,
-				useValue: {
-					formGroup: new FormGroup({
-						[ReportType.A4]: new FormGroup({
-							from: new FormControl(''),
-							to: new FormControl(''),
-						})
-					}),
-					reset$: new Subject()
-				}
-			}, {provide: REPORT_ERROR_STATE_MATCHER, useClass: ErrorStateMatcher}],
+			providers: [
+				{
+					provide: ReportService,
+					useValue: {
+						formGroup: new FormGroup({
+							[ReportType.A4]: new FormGroup({
+								from: new FormControl(''),
+								to: new FormControl('')
+							})
+						}),
+						reset$: new Subject()
+					}
+				},
+				{provide: REPORT_ERROR_STATE_MATCHER, useClass: ErrorStateMatcher}
+			],
 			schemas: [NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA]
 		}).compileComponents();
 	});

diff --git a/.../report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.ts b/.../report/report-parameter/_shared/date-from-to-fieldset/date-from-to-fieldset.component.ts
@@ -4,20 +4,18 @@ import {FormControl} from '@angular/forms';
 import * as moment from 'moment/moment';
 import {ErrorStateMatcher} from '@angular/material/core';
 import {REPORT_ERROR_STATE_MATCHER} from '../../../errorStateMatcher';
-import {ReportService} from "../../../report.service";
-import {Subscription} from "rxjs";
+import {ReportService} from '../../../report.service';
+import {Subscription} from 'rxjs';
 
 @Component({
 	selector: 'ec-date-from-to-fieldset',
 	templateUrl: './date-from-to-fieldset.component.html',
 	styleUrls: ['./date-from-to-fieldset.component.scss']
 })
 export class DateFromToFieldsetComponent implements OnInit, OnDestroy {
-	@Input()
-	dateFromFormControl: FormControl;
-
-	@Input()
-	dateToFormControl: FormControl;
+	@Input() dateFromFormControl: FormControl;
+	@Input() dateToFormControl: FormControl;
+	@Input() label: string;
 
 	subscription: Subscription;
 
@@ -32,12 +30,12 @@ export class DateFromToFieldsetComponent implements OnInit, OnDestroy {
 
 	ngOnInit() {
 		this.subscription = this.reportService.reset$.subscribe(_ => {
-			this.dateFromFormControl.reset()
-			this.dateToFormControl.reset()
-		})
+			this.dateFromFormControl.reset();
+			this.dateToFormControl.reset();
+		});
 	}
 
 	ngOnDestroy() {
-		this.subscription?.unsubscribe()
+		this.subscription?.unsubscribe();
 	}
 }