From 8ea64c6ce07cb3da214a4c521defbff72906d7f2 Mon Sep 17 00:00:00 2001
From: Nicolas Fuentes Maturana
 <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date: Tue, 2 Nov 2021 09:30:41 +0100
Subject: [PATCH] Merge pull request #242 in TEA/mina-sidor-fa-web from
 feature/TV-823 to develop

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
---
 .../pages/avrop/components/avrop-row/avrop-row.component.html  | 2 +-
 .../deltagare-tab-personal-information.component.html          | 2 +-
 apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts        | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html b/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html
index 002869b..321f518 100644
--- a/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html
@@ -39,7 +39,7 @@
     </dl>
     <dl class="avrop-row__address">
       <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 class="avrop-row__level">
       <dt class="avrop-table__label">Spår/nivå:</dt>
diff --git a/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 b/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
index 8104df4..c60195e 100644
--- a/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
+++ b/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
@@ -67,7 +67,7 @@
         <dt>Utförande verksamhet:</dt>
         <dd *ngIf="avropInformation.utforandeVerksamhet; else emptyDD">{{ avropInformation.utforandeVerksamhet }}</dd>
         <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>
         <dd *ngIf="avropInformation.genomforandeReferens; else emptyDD">{{ avropInformation.genomforandeReferens }}</dd>
       </dl>
diff --git a/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts b/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts
index 636e645..5b3ed9c 100644
--- a/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts
+++ b/apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts
@@ -12,6 +12,7 @@ export interface AvropCompact {
   endDate: Date; // slutdatumAvrop
   tolkbehov: string; // tolkbehov
   sprakstod: string; // sprakstod
+  kommun: string; // kommun
   utforandeAdress: string; // adress
   trackCode: string; // sparkod
   trackName: TrackName; // sparNamn
@@ -44,6 +45,7 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop {
     slutdatumAvrop,
     tolkbehov,
     sprakstod,
+    kommun,
     adress,
     sparkod,
     personnummer,
@@ -65,6 +67,7 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop {
     endDate: new Date(slutdatumAvrop),
     tolkbehov: tolkbehov,
     sprakstod: sprakstod,
+    kommun,
     utforandeAdress: adress,
     trackCode: sparkod,
     trackName: (TrackName[sparkod] || TrackName.UNKNOWN) as TrackName,