From fe1d30964d751e686193ee91f09f570bf10a44a7 Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Mon, 11 Oct 2021 09:06:06 +0200 Subject: [PATCH] Fixed linting and test --- .../periodisk-redovisning-form.component.ts | 7 ++----- ...ltagare-signal-arbete-studier.component.ts | 20 ++++++++++--------- .../franvaro-report.component.spec.ts | 2 ++ .../src/app/shared/constants/regex.ts | 2 +- .../shared/models/deltagare-handelse.model.ts | 2 +- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts index a6e6691..c0271ec 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-periodisk-redovisning/components/periodisk-redovisning-form/periodisk-redovisning-form.component.ts @@ -1,18 +1,15 @@ -import { Component, ChangeDetectionStrategy, Input, EventEmitter, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { FormGroup } from '@angular/forms'; @Component({ 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-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts index 75f2460..5d9392f 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/deltagare-signal-arbete-studier/deltagare-signal-arbete-studier.component.ts @@ -61,17 +61,17 @@ export class DeltagareSignalArbeteStudierComponent implements OnInit { private deltagareSignalArbeteStudierService: DeltagareSignalArbeteStudierService, private deltagareApiService: DeltagareApiService, private activatedRoute: ActivatedRoute - ) { } + ) {} ngOnInit(): void { this.avrop$ = this.activatedRoute.params.pipe( switchMap(({ genomforandeReferens }) => this.deltagareApiService.fetchAvropInformation$(genomforandeReferens)) - ) + ); this.signalArbeteStudierFormGroup = new FormGroup({ ersattningsTyp: new FormControl(null, [RequiredValidator()]), - date: new FormControl(new Date().toLocaleDateString(), [Validators.required]), - percent: new FormControl('', [Validators.min(1), Validators.max(99)]) + date: new FormControl(new Date().toLocaleDateString(), [RequiredValidator()]), + percent: new FormControl('', [Validators.min(1), Validators.max(99)]), }); } @@ -85,7 +85,8 @@ export class DeltagareSignalArbeteStudierComponent implements OnInit { antalProcent: +this.percentFormControl.value, }; - this.deltagareSignalArbeteStudierService.createSignalArbeteStudier$(postSignalArbeteStudier) + this.deltagareSignalArbeteStudierService + .createSignalArbeteStudier$(postSignalArbeteStudier) .then(() => { this._submittedDate$.next(new Date()); this.signalArbeteStudierFormGroup.reset(); @@ -93,8 +94,7 @@ export class DeltagareSignalArbeteStudierComponent implements OnInit { }) .catch((error: Error) => { this._error$.next(new CustomError({ error, message: error.message, type: ErrorType.API })); - }) - + }); } } @@ -118,8 +118,10 @@ export class DeltagareSignalArbeteStudierComponent implements OnInit { } get partTimeIsSelected(): boolean { - return +this.ersattningsTypFormControl.value === ErsattningsGrundTypKod.ARBETE_DELTID || - +this.ersattningsTypFormControl.value === ErsattningsGrundTypKod.UTBILDNING_DELTID; + return ( + +this.ersattningsTypFormControl.value === ErsattningsGrundTypKod.ARBETE_DELTID || + +this.ersattningsTypFormControl.value === ErsattningsGrundTypKod.UTBILDNING_DELTID + ); } setMinDate(startdatumAvrop: Date): Date { diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.spec.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.spec.ts index 5e6e8fe..ece43b4 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.spec.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-reports/franvaro-report/franvaro-report.component.spec.ts @@ -4,6 +4,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { LayoutComponent } from '@msfa-shared/components/layout/layout.component'; import { FranvaroReportComponent } from './franvaro-report.component'; +import { FranvaroReportService } from './franvaro-report.service'; describe('FranvaroReportComponent', () => { let component: FranvaroReportComponent; @@ -14,6 +15,7 @@ describe('FranvaroReportComponent', () => { schemas: [CUSTOM_ELEMENTS_SCHEMA], declarations: [FranvaroReportComponent, LayoutComponent], imports: [RouterTestingModule, HttpClientTestingModule], + providers: [FranvaroReportService], }).compileComponents(); }); diff --git a/apps/mina-sidor-fa/src/app/shared/constants/regex.ts b/apps/mina-sidor-fa/src/app/shared/constants/regex.ts index b77d3e7..6949a19 100644 --- a/apps/mina-sidor-fa/src/app/shared/constants/regex.ts +++ b/apps/mina-sidor-fa/src/app/shared/constants/regex.ts @@ -1,2 +1,2 @@ export const EMAIL_REGEX = /^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$/; -export const ISO_DATE_NO_TIME = /^\d{4}[\-\/\s]?((((0[13578])|(1[02]))[\-\/\s]?(([0-2][0-9])|(3[01])))|(((0[469])|(11))[\-\/\s]?(([0-2][0-9])|(30)))|(02[\-\/\s]?[0-2][0-9]))$/; +export const ISO_DATE_NO_TIME = /^\d{4}[-/\s]?((((0[13578])|(1[02]))[-/\s]?(([0-2][0-9])|(3[01])))|(((0[469])|(11))[-/\s]?(([0-2][0-9])|(30)))|(02[-/\s]?[0-2][0-9]))$/; diff --git a/apps/mina-sidor-fa/src/app/shared/models/deltagare-handelse.model.ts b/apps/mina-sidor-fa/src/app/shared/models/deltagare-handelse.model.ts index b4480c5..0300d8a 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/deltagare-handelse.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/deltagare-handelse.model.ts @@ -39,7 +39,7 @@ export function mapDeltagareHandelseApiResponse( const { description, receivedDate, isAvbrott } = deltagareHandelseApiResponse; const effectDate = deltagareHandelseApiResponse.tidpunkt; const effectDescription = - GENOMFORANDEHANDELSE_EFFECT_MAP[deltagareHandelseApiResponse.tidpunktDescription] ?? + (GENOMFORANDEHANDELSE_EFFECT_MAP[deltagareHandelseApiResponse.tidpunktDescription] as string) ?? deltagareHandelseApiResponse.tidpunktDescription ?? ''; return { description, receivedDate, isAvbrott, effectDate, effectDescription };