From 7d18a696c4feff8805fe05abbb1721f4f2f9a84c Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Fri, 12 Nov 2021 10:51:29 +0100 Subject: [PATCH] Added typings, scroll to top when step is changed --- .../slutredovisning-form-step0-work.model.ts | 2 +- ...slutredovisning-form-step0-work.validator.ts | 4 ++-- .../slutredovisning-form.component.ts | 13 ++++++++----- .../slutredovisning-form.service.ts | 8 ++++---- .../utils/form-data-to-slutredovisning.util.ts | 17 ++++++++--------- .../radiobutton-group.component.ts | 1 - 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-work/slutredovisning-form-step0-work.model.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-work/slutredovisning-form-step0-work.model.ts index fed71ad..647d338 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-work/slutredovisning-form-step0-work.model.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-work/slutredovisning-form-step0-work.model.ts @@ -2,7 +2,7 @@ export interface SlutredovisningFormStep0WorkFormData { yrkesomrade: string; yrkesgrupp: string; anstallningsform: string; - otherExplanation: string; + annatAnstallningComment: string; omfattning: string; omfattningPercent: number; } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-work/slutredovisning-form-step0-work.validator.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-work/slutredovisning-form-step0-work.validator.ts index ba1032b..14ef482 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-work/slutredovisning-form-step0-work.validator.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-work/slutredovisning-form-step0-work.validator.ts @@ -11,7 +11,7 @@ export class SlutredovisningFormStep0WorkValidator { yrkesomrade, yrkesgrupp, anstallningsform, - otherExplanation, + annatAnstallningComment, omfattning, omfattningPercent, } = c.value as SlutredovisningFormStep0WorkFormData; @@ -33,7 +33,7 @@ export class SlutredovisningFormStep0WorkValidator { ...errors, anstallningsform: 'Anställningsform måste väljas', }; - } else if (anstallningsform === Anstallningsform.Annat && !otherExplanation) { + } else if (anstallningsform === Anstallningsform.Annat && !annatAnstallningComment) { errors = { ...errors, annatAnstallningComment: 'Beskrivning av annat är obligatorisk om "annat" är vald under anställningsform', diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts index 85487d3..a20d25d 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts @@ -110,27 +110,30 @@ export class SlutredovisningFormComponent implements OnDestroy { } } - backFromStep1() { + backFromStep1(): void { this.slutredovisningFormService.setStep('step0'); } - backFromStep2() { + backFromStep2(): void { this.slutredovisningFormService.setStep('step1'); } - backFromStep3() { + backFromStep3(): void { this.slutredovisningFormService.setStep('step2'); } processStep0Data(formData: SlutredovisningStep0FormData): void { this.slutredovisningFormService.processStep0Data(formData); + window.scrollTo(0, 0); } - processStep1Data(formData: SlutredovisningStep1FormData) { + processStep1Data(formData: SlutredovisningStep1FormData): void { this.slutredovisningFormService.processStep1Data(formData); + window.scrollTo(0, 0); } - processStep2Data(formData: SlutredovisningStep2FormData) { + processStep2Data(formData: SlutredovisningStep2FormData): void { this.slutredovisningFormService.processStep2Data(formData); + window.scrollTo(0, 0); } } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.service.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.service.ts index 6910c76..d6d3a71 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.service.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.service.ts @@ -41,7 +41,7 @@ export class SlutredovisningFormService { private deltagareApiService: DeltagareApiService, private gemensamPlaneringApiService: GemensamPlaneringApiService ) {} - setStep(step: SlutredovisningStep) { + setStep(step: SlutredovisningStep): void { this._currentStep$.next(step); } @@ -53,17 +53,17 @@ export class SlutredovisningFormService { return this.deltagareApiService.fetchAvropInformation$(genomforandeReferens); } - processStep0Data(formData: SlutredovisningStep0FormData) { + processStep0Data(formData: SlutredovisningStep0FormData): void { this._step0FormData$.next(formData); this.setStep('step1'); } - processStep1Data(formData: SlutredovisningStep1FormData) { + processStep1Data(formData: SlutredovisningStep1FormData): void { this._step1FormData$.next(formData); this.setStep('step2'); } - processStep2Data(formData: SlutredovisningStep2FormData) { + processStep2Data(formData: SlutredovisningStep2FormData): void { this._step2FormData$.next(formData); this.setStep('step3'); } diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/form-data-to-slutredovisning.util.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/form-data-to-slutredovisning.util.ts index debf9f6..eb17c4a 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/form-data-to-slutredovisning.util.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/form-data-to-slutredovisning.util.ts @@ -1,18 +1,17 @@ -import { SlutredovisningStep0FormData } from '../slutredovisning-form-step0/slutredovisning-form-step0.component'; -import { SlutredovisningStep1FormData } from '../slutredovisning-form-step1/slutredovisning-form-step1.component'; -import { SlutredovisningStep2FormData } from '../slutredovisning-form-step2/slutredovisning-form-step2.component'; - +import { + SlutredovisningRequest, + SlutredovisningRequestMainOccupationDetails, +} from '@msfa-models/api/slutredovisning.request.model'; import { Anstallningsform, MainOccupation, Omfattning, StillUnemployedReason, } from '@msfa-models/slutredovisning.model'; -import { - SlutredovisningRequest, - SlutredovisningRequestMainOccupationDetails, -} from '@msfa-models/api/slutredovisning.request.model'; import { SlutredovisningFormData } from '../models/slutredovisning-form-data.model'; +import { SlutredovisningStep0FormData } from '../slutredovisning-form-step0/slutredovisning-form-step0.component'; +import { SlutredovisningStep1FormData } from '../slutredovisning-form-step1/slutredovisning-form-step1.component'; +import { SlutredovisningStep2FormData } from '../slutredovisning-form-step2/slutredovisning-form-step2.component'; export function formsToSlutredovisningFormData( genomforandereferens: number, @@ -43,7 +42,7 @@ export function formsToSlutredovisningFormData( yrkesgrupp: workItem.yrkesgrupp, omfattning: workItem.omfattning as Omfattning, omfattningPercent: workItem.omfattningPercent, - otherExplanation: workItem.otherExplanation, + otherExplanation: workItem.annatAnstallningComment, anstallningsform: workItem.anstallningsform as Anstallningsform, }; }), diff --git a/libs/ui/src/radiobutton-group/radiobutton-group.component.ts b/libs/ui/src/radiobutton-group/radiobutton-group.component.ts index 51488ed..33859ff 100644 --- a/libs/ui/src/radiobutton-group/radiobutton-group.component.ts +++ b/libs/ui/src/radiobutton-group/radiobutton-group.component.ts @@ -100,7 +100,6 @@ export class RadiobuttonGroupComponent implements ControlValueAccessor, AfterVie checkForChange(rawValue: any): void { const value = this._transformValue(rawValue); - console.log(value); if (this._value !== value) { if (this.onChange) { this.onChange(value);