From ef263a9eb2f571ad46a0863298ac5c3818469dcb Mon Sep 17 00:00:00 2001 From: Daniel Appelgren Date: Fri, 24 Sep 2021 13:59:33 +0200 Subject: [PATCH] Merge pull request #130 in TEA/mina-sidor-fa-web from correct-lint-and-tests to develop Squashed commit of the following: commit 82c88cc8bdae25f4306b4500921076776b9eb547 Author: Daniel Appelgren Date: Fri Sep 24 13:57:55 2021 +0200 fixed errors and lint commit 08ec0b9005ce08a6eecd0d3b083a4fa9e06e38af Author: Daniel Appelgren Date: Fri Sep 24 13:48:27 2021 +0200 Update deltagare-tab-reports.component.spec.ts --- .../deltagare-tab-reports.component.spec.ts | 11 +++++++- .../periodisk-redovisning-form.component.ts | 5 +--- .../periodisk-redovisning.component.html | 20 +++++++------- .../periodisk-redovisning.component.ts | 27 +++++++++---------- .../periodisk-redovisning-form.service.ts | 14 +++------- .../shared/services/deltagare-card.service.ts | 6 ++--- 6 files changed, 39 insertions(+), 44 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.spec.ts index 7f10ba0..27456af 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.spec.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.spec.ts @@ -4,6 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; import { LoaderModule } from '@msfa-shared/components/loader/loader.module'; import { DeltagareTabReportsComponent } from './deltagare-tab-reports.component'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { DigiNgFormSelectModule } from '@af/digi-ng/_form/form-select'; describe('DeltagareTabReportsComponent', () => { let component: DeltagareTabReportsComponent; @@ -12,7 +14,14 @@ describe('DeltagareTabReportsComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ declarations: [DeltagareTabReportsComponent], - imports: [RouterTestingModule, HttpClientTestingModule, ReactiveFormsModule, LoaderModule], + imports: [ + RouterTestingModule, + HttpClientTestingModule, + ReactiveFormsModule, + LoaderModule, + DigiNgFormSelectModule, + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], }).compileComponents(); }); diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts index a6e6691..11ae275 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts @@ -5,14 +5,11 @@ import { FormGroup } from '@angular/forms'; selector: 'msfa-periodisk-redovisning-form', templateUrl: './periodisk-redovisning-form.component.html', styleUrls: ['./periodisk-redovisning-form.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + changeDetection: ChangeDetectionStrategy.OnPush, }) export class PeriodiskRedovisningFormComponent { @Input() periodiskRedovisningFormGroup: FormGroup; @Input() totalAmountOfSteps: number; @Input() currentStep: number; @Output() submitPRFormGroup = new EventEmitter(); - - - constructor() {} } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/periodisk-redovisning.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/periodisk-redovisning.component.html index 88d942e..8ea5297 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/periodisk-redovisning.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/periodisk-redovisning.component.html @@ -1,14 +1,12 @@ - + [endDate]="'2021-09-30'">
- Svar på frågorna är obligatoriskt - +

Har ni, under perioden, tillhandahållit språkstöd?

- Svar på frågorna är obligatoriskt @@ -45,7 +43,7 @@
- Tillbaka @@ -69,4 +67,4 @@
- \ No newline at end of file + diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/periodisk-redovisning.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/periodisk-redovisning.component.ts index 133f702..1d1fbed 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/periodisk-redovisning.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/periodisk-redovisning/periodisk-redovisning.component.ts @@ -1,6 +1,7 @@ import { RadiobuttonGroupDirection } from '@af/digi-ng/_form/form-radiobutton-group'; import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core'; -import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms'; +import { AbstractControl, FormControl, FormGroup } from '@angular/forms'; +import { RequiredValidator } from '@msfa-validators/required.validator'; @Component({ selector: 'msfa-periodisk-redovisning', @@ -9,9 +10,8 @@ import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/fo changeDetection: ChangeDetectionStrategy.OnPush, }) export class PeriodiskRedovisningComponent implements OnInit { - radiobuttonGroupDirection = RadiobuttonGroupDirection; - totalAmountOfSteps =3; + totalAmountOfSteps = 3; currentStep = 1; // Form-related variables @@ -20,8 +20,6 @@ export class PeriodiskRedovisningComponent implements OnInit { readonly lamnatJobbForslagFormControlName = 'lamnatJobbForslag'; readonly providedSprakStodFormControlName = 'providedSprakStod'; - constructor() { } - ngOnInit(): void { this.initializePeriodiskRedovisningFormGroup(); } @@ -33,15 +31,15 @@ export class PeriodiskRedovisningComponent implements OnInit { return this.periodiskRedovisningFormGroup.get(this.providedSprakStodFormControlName); } - initializePeriodiskRedovisningFormGroup():void { + initializePeriodiskRedovisningFormGroup(): void { this.periodiskRedovisningFormGroup = new FormGroup({ - lamnatJobbForslag: new FormControl(null, [Validators.required]), - providedSprakStod: new FormControl(null, [Validators.required]), + lamnatJobbForslag: new FormControl(null, [RequiredValidator()]), + providedSprakStod: new FormControl(null, [RequiredValidator()]), }); } - - nextStep():void { - if(this.periodiskRedovisningFormGroup?.valid && this.currentStep < this.totalAmountOfSteps) { + + nextStep(): void { + if (this.periodiskRedovisningFormGroup?.valid && this.currentStep < this.totalAmountOfSteps) { console.log('this.prFormGroup', this.periodiskRedovisningFormGroup); this.currentStep++; } @@ -49,14 +47,13 @@ export class PeriodiskRedovisningComponent implements OnInit { this.periodiskRedovisningFormGroup?.markAllAsTouched(); } - previousStep():void { - if(this.currentStep > 1) { + previousStep(): void { + if (this.currentStep > 1) { this.currentStep--; } } - sendRequest(val: boolean):boolean { + sendRequest(val: boolean): boolean { return val; } - } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/services/periodisk-redovisning-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/services/periodisk-redovisning-form.service.ts index 3989f77..d4c0cd2 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/services/periodisk-redovisning-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/services/periodisk-redovisning-form.service.ts @@ -1,23 +1,17 @@ import { Injectable } from '@angular/core'; import { FormGroup } from '@angular/forms'; -import { Deltagare } from '@msfa-models/deltagare.model'; -import { BehaviorSubject } from 'rxjs'; @Injectable({ - providedIn: 'root' + providedIn: 'root', }) export class PeriodiskRedovisningFormService { private periodiskRedovisningFormGroup: FormGroup; - _deltagare$ = new BehaviorSubject(null); - constructor() { } - - setPeriodiskRedovisningForm(form: FormGroup):void { + setPeriodiskRedovisningForm(form: FormGroup): void { this.periodiskRedovisningFormGroup = form; } - get periodiskRedovisningForm():FormGroup { - return this.periodiskRedovisningFormGroup + get periodiskRedovisningForm(): FormGroup { + return this.periodiskRedovisningFormGroup; } - } diff --git a/apps/mina-sidor-fa/src/app/shared/services/deltagare-card.service.ts b/apps/mina-sidor-fa/src/app/shared/services/deltagare-card.service.ts index 50e865c..e99696f 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/deltagare-card.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/deltagare-card.service.ts @@ -20,19 +20,19 @@ export class DeltagareCardService { return this.deltagareApiService.fetchContactInformation$(deltagareId); } public fetchAvropInformation$(deltagareId: string): Observable { - return this.deltagareApiService.fetchAvropInformation$(deltagareId) as Observable; + return this.deltagareApiService.fetchAvropInformation$(deltagareId); } public fetchWorkExperiences$(deltagareId: string): Observable { return this.deltagareApiService.fetchWorkExperiences$(deltagareId); } public fetchHighestEducation$(deltagareId: string): Observable { - return this.deltagareApiService.fetchHighestEducation$(deltagareId) as Observable; + return this.deltagareApiService.fetchHighestEducation$(deltagareId); } public fetchEducations$(deltagareId: string): Observable { return this.deltagareApiService.fetchEducations$(deltagareId); } public fetchDriversLicense$(deltagareId: string): Observable { - return this.deltagareApiService.fetchDriversLicense$(deltagareId) as Observable; + return this.deltagareApiService.fetchDriversLicense$(deltagareId); } public fetchWorkLanguages$(deltagareId: string): Observable { return this.deltagareApiService.fetchWorkLanguages$(deltagareId);