fix: Update SR enums to swedish (match with BÄR)

This commit is contained in:
Daniel Appelgren
2021-11-25 17:35:24 +01:00
parent e36f910b52
commit d339ed34ee
2 changed files with 35 additions and 12 deletions

View File

@@ -1,4 +1,7 @@
import { SlutredovisningRequest } from '@msfa-models/api/slutredovisning.request.model'; import {
SlutredovisningRequest,
SlutredovisningRequestMainOccupationType,
} from '@msfa-models/api/slutredovisning.request.model';
import { import {
Anstallningsform, Anstallningsform,
MainOccupation, MainOccupation,
@@ -90,8 +93,20 @@ export function formsToSlutredovisningFormData(
export function slutredovisningFormDataToSlutredovisningRequest( export function slutredovisningFormDataToSlutredovisningRequest(
slutredovisningResponse: SlutredovisningFormData slutredovisningResponse: SlutredovisningFormData
): SlutredovisningRequest { ): SlutredovisningRequest {
const mainOccupationToSwedish: { [key: string]: SlutredovisningRequestMainOccupationType } = {
[MainOccupation.Work]: 'arbete',
[MainOccupation.Education]: 'utbildning',
[MainOccupation.ByteTillNyLeverantorIRustaOchMatcha]: 'byte till ny leverantör i rusta och matcha',
[MainOccupation.StillUnemployed]: 'fortsatt arbetssökande',
[MainOccupation.Other]: 'annat',
};
return { return {
...slutredovisningResponse, ...slutredovisningResponse,
mainOccupation: {
...slutredovisningResponse.mainOccupation,
type: mainOccupationToSwedish[slutredovisningResponse.mainOccupation.type],
},
activities: slutredovisningResponse.activities.map(({ whatHasBeenDone, id }) => ({ whatHasBeenDone, id })), activities: slutredovisningResponse.activities.map(({ whatHasBeenDone, id }) => ({ whatHasBeenDone, id })),
}; };
} }

View File

@@ -2,7 +2,6 @@ import {
Anstallningsform, Anstallningsform,
EducationLength, EducationLength,
EducationLevel, EducationLevel,
MainOccupation,
Omfattning, Omfattning,
StillUnemployedReason, StillUnemployedReason,
} from '@msfa-models/slutredovisning.model'; } from '@msfa-models/slutredovisning.model';
@@ -17,7 +16,7 @@ export interface SlutredovisningRequestMainOccupationWorkDetails {
} }
export interface SlutredovisningRequestMainOccupationWork { export interface SlutredovisningRequestMainOccupationWork {
type: MainOccupation.Work; type: 'arbete';
work: SlutredovisningRequestMainOccupationWorkDetails[]; work: SlutredovisningRequestMainOccupationWorkDetails[];
} }
@@ -28,8 +27,20 @@ export interface SlutredovisningRequestMainOccupationEducationDetails {
educationSpecification: string; educationSpecification: string;
} }
export interface SlutredovisningRequestMainOccupationEducation { export type SlutredovisningRequestMainOccupationType =
type: MainOccupation.Education; | 'arbete'
| 'utbildning'
| 'annat'
| 'fortsatt arbetssökande'
| 'byte till ny leverantör i rusta och matcha';
interface SlutredovisningRequestMainOccupationEducationBase {
type: SlutredovisningRequestMainOccupationType;
}
export interface SlutredovisningRequestMainOccupationEducation
extends SlutredovisningRequestMainOccupationEducationBase {
type: 'utbildning';
education: SlutredovisningRequestMainOccupationEducationDetails; education: SlutredovisningRequestMainOccupationEducationDetails;
} }
@@ -37,8 +48,7 @@ export interface SlutredovisningRequestMainOccupationOtherDetails {
otherExplanation: string; otherExplanation: string;
} }
export interface SlutredovisningRequestMainOccupationOther { export interface SlutredovisningRequestMainOccupationOther extends SlutredovisningRequestMainOccupationEducationBase {
type: MainOccupation.Other;
other: SlutredovisningRequestMainOccupationOtherDetails; other: SlutredovisningRequestMainOccupationOtherDetails;
} }
@@ -47,13 +57,11 @@ export interface SlutredovisningRequestMainOccupationStillUnemployedDetails {
otherExplanation: string; otherExplanation: string;
} }
export interface SlutredovisningRequestMainOccupationStillUnemployed { export interface SlutredovisningRequestMainOccupationStillUnemployed
type: MainOccupation.StillUnemployed; extends SlutredovisningRequestMainOccupationEducationBase {
stillUnemployed: SlutredovisningRequestMainOccupationStillUnemployedDetails; stillUnemployed: SlutredovisningRequestMainOccupationStillUnemployedDetails;
} }
export interface SlutredovisningRequestMainOccupationChangeVendor { export type SlutredovisningRequestMainOccupationChangeVendor = SlutredovisningRequestMainOccupationEducationBase;
type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha;
}
export type SlutredovisningRequestMainOccupationDetails = export type SlutredovisningRequestMainOccupationDetails =
| SlutredovisningRequestMainOccupationWork | SlutredovisningRequestMainOccupationWork