feat(deltagare): Added deltagare list with data from api. Also adjusted mock-api to match the api. (TV-309)
Squashed commit of the following: commit 41560491305b61ba322fa653788411de6112cc7e Merge: a157e6903a2c7aAuthor: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Wed Aug 18 07:23:35 2021 +0200 Merged develop and fixed conflicts commit a157e69d6b4b18c9b8a806c4bbbc264b8b311b67 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 17 13:54:29 2021 +0200 Removed console.log commit 87a532eb63b9c68109a4f847cc9530a47a56b648 Merge: db2ff176d29baaAuthor: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 17 13:52:54 2021 +0200 Merged develop and fixed conflicts commit db2ff1758218c651cadf93de8ce0c5034d6994d3 Merge: 588adee01dc4b3Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Aug 16 13:09:33 2021 +0200 Merged develop and fixed conflicts commit 588adee5b17aeefcaf526aabdde02ca975c9c031 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Aug 16 11:11:57 2021 +0200 Added deltagarlist commit a0c378a8221a5d363f56ee644b9728d873ae1ff1 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Aug 16 07:19:49 2021 +0200 Updates after PR commit 479df238c712e2e14829d33b468ece91332f81c8 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Aug 13 15:18:23 2021 +0200 Updated tolkbehov inside deltagare-card commit df95ae2a8afbcc78ba546472ae9c1db141d1e642 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Aug 13 15:14:27 2021 +0200 Updated deltagare-kort after discussion with UX
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import { PaginationMeta } from '@msfa-models/pagination-meta.model';
|
||||
import { AvropResponse } from './avrop.response.model';
|
||||
import { ContactInformationResponse } from './contact-information.response.model';
|
||||
import { DisabilitiesResponse } from './disabilities.response.model';
|
||||
@@ -26,3 +27,8 @@ export interface DeltagareResponse {
|
||||
workExperiences: WorkExperiencesResponse;
|
||||
avropInformation: AvropResponse;
|
||||
}
|
||||
|
||||
export interface DeltagareCompactApiResponse {
|
||||
data: AvropResponse[];
|
||||
meta: PaginationMeta;
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import { Disability, mapResponseToDisability } from './disability.model';
|
||||
import { DriversLicense, mapResponseToDriversLicense } from './drivers-license.model';
|
||||
import { Education, mapResponseToEducation } from './education.model';
|
||||
import { HighestEducation, mapResponseToHighestEducation } from './highest-education.model';
|
||||
import { PaginationMeta } from './pagination-meta.model';
|
||||
import { PhoneNumber } from './phonenumber.model';
|
||||
import { mapResponseToWorkExperience, WorkExperience } from './work-experience.model';
|
||||
|
||||
@@ -15,6 +16,7 @@ export interface DeltagareCompact {
|
||||
fullName: string;
|
||||
utforandeVerksamhet: string;
|
||||
utforandeAdress: string;
|
||||
tjanst: string;
|
||||
}
|
||||
|
||||
export interface Deltagare {
|
||||
@@ -36,13 +38,19 @@ export interface Deltagare {
|
||||
avropInformation: Avrop;
|
||||
}
|
||||
|
||||
export interface DeltagareCompactData {
|
||||
data: DeltagareCompact[];
|
||||
meta: PaginationMeta;
|
||||
}
|
||||
|
||||
export function mapResponseToDeltagareCompact(data: AvropResponse): DeltagareCompact {
|
||||
const { sokandeId, deltagare, adress, utforandeverksamhet } = data;
|
||||
const { sokandeId, deltagare, adress, utforandeverksamhet, tjansteNamn } = data;
|
||||
return {
|
||||
id: sokandeId.toString(),
|
||||
fullName: deltagare,
|
||||
utforandeVerksamhet: utforandeverksamhet,
|
||||
utforandeAdress: adress,
|
||||
tjanst: tjansteNamn,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user