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 @@
Utförande adress:
-
{{avrop.utforandeAdress}}
+
{{avrop.utforandeAdress + ', ' + avrop.kommun}}
Spår/nivå:
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 @@
Utförande verksamhet:
{{ avropInformation.utforandeVerksamhet }}
Utförande adress:
-
{{ avropInformation.utforandeAdress }}
+
{{ avropInformation.utforandeAdress + ', ' + avropInformation.kommun }}
Genomförandereferens:
{{ avropInformation.genomforandeReferens }}
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,