diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/models/slutredovisning-form-data.model.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/models/slutredovisning-form-data.model.ts
index 7a2e3a2..3434f76 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/models/slutredovisning-form-data.model.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/models/slutredovisning-form-data.model.ts
@@ -52,10 +52,15 @@ export interface SlutredovisningFormDataMainOccupationStillUnemployed {
stillUnemployed: SlutredovisningFormDataMainOccupationStillUnemployedDetails;
}
+export interface SlutredovisningFormDataMainOccupationChangeVendor {
+ type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha;
+}
+
export type SlutredovisningFormDataMainOccupationDetails =
| SlutredovisningFormDataMainOccupationWork
| SlutredovisningFormDataMainOccupationEducation
| SlutredovisningFormDataMainOccupationOther
+ | SlutredovisningFormDataMainOccupationChangeVendor
| SlutredovisningFormDataMainOccupationStillUnemployed;
export interface SlutredovisningFormData {
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html
index d5728be..5955313 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.html
@@ -37,16 +37,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
{{slutredovisning$|async|json}}
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts
index e3e86af..7882632 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts
@@ -24,10 +24,10 @@ export class SlutredovisningFormStep3Component {
submittedDate$ = new BehaviorSubject(null);
slutredovisning$ = this.slutredovisningFormService.yrkeToTextMap$.pipe(
- map(yrkeToText => this._appendYrkeNames(this.slutredovisningFormData, yrkeToText))
+ map(yrkeToText => this._formDataToSlutredovisning(this.slutredovisningFormData, yrkeToText))
);
- private _appendYrkeNames(
+ private _formDataToSlutredovisning(
slutredovisningFormData: SlutredovisningFormData,
yrkeToText: { [key: string]: string }
): Slutredovisning {
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html
index 8fdf516..4fc365c 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.html
@@ -51,40 +51,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
+ Step 0 valueChanges:
+
+ {{ step0FormGroup.valueChanges | async | json}}
+
+ Step 1 valueChanges:
+
+ {{ step1FormGroup.valueChanges | async | json}}
+
+ Step 2 valueChanges:
+
+ {{ step2FormGroup.valueChanges | async | json}}
+
-
-
-
-
-
+ Step 0 data:
+
+ {{step0FormData$ | async | json}}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Step 1 data:
+
+ {{step1FormData$ | async | json}}
+
+ Step 2 data:
+
+ {{step2FormData$ | async | json}}
+
+ slutredovisningFormData$ data:
+
+ {{slutredovisningFormData$ | async | json}}
+
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 eb17c4a..cda4d41 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,14 +1,14 @@
-import {
- SlutredovisningRequest,
- SlutredovisningRequestMainOccupationDetails,
-} from '@msfa-models/api/slutredovisning.request.model';
+import { SlutredovisningRequest } from '@msfa-models/api/slutredovisning.request.model';
import {
Anstallningsform,
MainOccupation,
Omfattning,
StillUnemployedReason,
} from '@msfa-models/slutredovisning.model';
-import { SlutredovisningFormData } from '../models/slutredovisning-form-data.model';
+import {
+ SlutredovisningFormData,
+ SlutredovisningFormDataMainOccupationDetails,
+} 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';
@@ -23,7 +23,7 @@ export function formsToSlutredovisningFormData(
return;
}
- let mainOccupation: SlutredovisningRequestMainOccupationDetails;
+ let mainOccupation: SlutredovisningFormDataMainOccupationDetails;
if (step0FormData.mainOccupation === MainOccupation.Other) {
mainOccupation = {
type: MainOccupation.Other,
@@ -73,6 +73,10 @@ export function formsToSlutredovisningFormData(
};
}
+ if (step0FormData.mainOccupation === MainOccupation.ByteTillNyLeverantorIRustaOchMatcha) {
+ mainOccupation = { type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha };
+ }
+
return {
genomforandereferens: genomforandereferens,
mainOccupation: mainOccupation,
diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.request.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.request.model.ts
index 483c3a3..a176ff2 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.request.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.request.model.ts
@@ -51,12 +51,16 @@ export interface SlutredovisningRequestMainOccupationStillUnemployed {
type: MainOccupation.StillUnemployed;
stillUnemployed: SlutredovisningRequestMainOccupationStillUnemployedDetails;
}
+export interface SlutredovisningRequestMainOccupationChangeVendor {
+ type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha;
+}
export type SlutredovisningRequestMainOccupationDetails =
| SlutredovisningRequestMainOccupationWork
| SlutredovisningRequestMainOccupationEducation
| SlutredovisningRequestMainOccupationOther
- | SlutredovisningRequestMainOccupationStillUnemployed;
+ | SlutredovisningRequestMainOccupationStillUnemployed
+ | SlutredovisningRequestMainOccupationChangeVendor;
export interface SlutredovisningRequest {
genomforandereferens: number;
diff --git a/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts b/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts
index 56231c8..85d9b98 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts
@@ -53,11 +53,15 @@ export interface SlutredovisningResponseMainOccupationStillUnemployed {
type: MainOccupation.StillUnemployed;
stillUnemployed: SlutredovisningResponseMainOccupationStillUnemployedDetails;
}
+export interface SlutredovisningResponseMainOccupationChangeVendor {
+ type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha;
+}
export type SlutredovisningResponseMainOccupationDetails =
| SlutredovisningResponseMainOccupationWork
| SlutredovisningResponseMainOccupationEducation
| SlutredovisningResponseMainOccupationOther
+ | SlutredovisningResponseMainOccupationChangeVendor
| SlutredovisningResponseMainOccupationStillUnemployed;
export interface SlutredovisningResponse {