arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #141 in TEA/mina-sidor-fa-web from bugfix/TV-691 to next

Browse Source 
Squashed commit of the following:

commit 82470de75a2543a7e7724d30905c38efe7bb8eef
Merge: 0b99bfa3 86a57347
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 28 09:33:38 2021 +0200

    Merged next and fixed CHANGELOG conflicts

commit 0b99bfa340d093fbfd6c8f015165cca9171b6ec8
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 28 09:03:32 2021 +0200

    Updated changelog

commit e77db83c6c46f2ee6764e2d50c00d79fd84a1924
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 28 08:58:12 2021 +0200

    Now showing track-name instead of code inside avrop
This commit is contained in:
Erik Tiekstra
2021-09-28 09:34:10 +02:00
parent 86a5734749
commit b4d2db5251
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/mina-sidor-fa/src/app/shared/enums/track-name.enum.ts Normal file
View File

@@ -0,0 +1,6 @@
export enum TrackName {
A012SP1 = 'Nivå A',
A012SP2 = 'Nivå B',
A012SP3 = 'Nivå C',
UNKNOWN = 'Info saknas',
}

3
apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts
View File

@@ -1,3 +1,4 @@
import { TrackName } from '@msfa-enums/track-name.enum';
import { AvropResponse } from './api/avrop.response.model';
import { PaginationMeta } from './pagination-meta.model';
@@ -59,7 +60,7 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop {
sprakstod: sprakstod,
utforandeAdress: adress,
trackCode: sparkod,
trackName: sparNamn,
trackName: TrackName[sparkod] || TrackName.UNKNOWN,
genomforandeReferens,
participationFrequency: deltagandeGrad,
utforandeVerksamhet: utforandeverksamhet,