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

Merge pull request #242 in TEA/mina-sidor-fa-web from feature/TV-823 to develop

Browse Source 
Squashed commit of the following:

commit 91ac5da15406f25b89bd1f7e934cafd8ed4bd00f
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Nov 2 08:11:56 2021 +0100

    TV-823 display kommun
This commit is contained in:
Nicolas Fuentes Maturana
2021-11-02 09:30:41 +01:00
parent a48053d20d
commit 8ea64c6ce0
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html
View File

@@ -39,7 +39,7 @@
</dl> </dl>
<dl class="avrop-row__address"> <dl class="avrop-row__address">
<dt class="avrop-table__label">Utförande adress:</dt> <dt class="avrop-table__label">Utförande adress:</dt>
<dd *ngIf="avrop.utforandeAdress; else emptyText">{{avrop.utforandeAdress}}</dd> <dd *ngIf="avrop.utforandeAdress; else emptyText">{{avrop.utforandeAdress + ', ' + avrop.kommun}}</dd>
</dl> </dl>
<dl class="avrop-row__level"> <dl class="avrop-row__level">
<dt class="avrop-table__label">Spår/nivå:</dt> <dt class="avrop-table__label">Spår/nivå:</dt>

2
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-personal-information/deltagare-tab-personal-information.component.html
View File

@@ -67,7 +67,7 @@
<dt>Utförande verksamhet:</dt> <dt>Utförande verksamhet:</dt>
<dd *ngIf="avropInformation.utforandeVerksamhet; else emptyDD">{{ avropInformation.utforandeVerksamhet }}</dd> <dd *ngIf="avropInformation.utforandeVerksamhet; else emptyDD">{{ avropInformation.utforandeVerksamhet }}</dd>
<dt>Utförande adress:</dt> <dt>Utförande adress:</dt>
<dd *ngIf="avropInformation.utforandeAdress; else emptyDD">{{ avropInformation.utforandeAdress }}</dd> <dd *ngIf="avropInformation.utforandeAdress; else emptyDD">{{ avropInformation.utforandeAdress + ', ' + avropInformation.kommun }}</dd>
<dt>Genomförandereferens:</dt> <dt>Genomförandereferens:</dt>
<dd *ngIf="avropInformation.genomforandeReferens; else emptyDD">{{ avropInformation.genomforandeReferens }}</dd> <dd *ngIf="avropInformation.genomforandeReferens; else emptyDD">{{ avropInformation.genomforandeReferens }}</dd>
</dl> </dl>

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

@@ -12,6 +12,7 @@ export interface AvropCompact {
endDate: Date; // slutdatumAvrop endDate: Date; // slutdatumAvrop
tolkbehov: string; // tolkbehov tolkbehov: string; // tolkbehov
sprakstod: string; // sprakstod sprakstod: string; // sprakstod
kommun: string; // kommun
utforandeAdress: string; // adress utforandeAdress: string; // adress
trackCode: string; // sparkod trackCode: string; // sparkod
trackName: TrackName; // sparNamn trackName: TrackName; // sparNamn
@@ -44,6 +45,7 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop {
slutdatumAvrop, slutdatumAvrop,
tolkbehov, tolkbehov,
sprakstod, sprakstod,
kommun,
adress, adress,
sparkod, sparkod,
personnummer, personnummer,
@@ -65,6 +67,7 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop {
endDate: new Date(slutdatumAvrop), endDate: new Date(slutdatumAvrop),
tolkbehov: tolkbehov, tolkbehov: tolkbehov,
sprakstod: sprakstod, sprakstod: sprakstod,
kommun,
utforandeAdress: adress, utforandeAdress: adress,
trackCode: sparkod, trackCode: sparkod,
trackName: (TrackName[sparkod] || TrackName.UNKNOWN) as TrackName, trackName: (TrackName[sparkod] || TrackName.UNKNOWN) as TrackName,