feat(avrop): Added additional functionality to avrop-flow. (TV-411)
Squashed commit of the following: commit b174dd7480baa5e5e4b7f4bea4c9fc674d344c0c Merge: e1f9d2d0661d22Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Aug 26 11:50:11 2021 +0200 Merged develop and resolved conflicts commit e1f9d2d49e279e704b760a3cbe45941cdcfb81d9 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Aug 26 11:41:45 2021 +0200 Now fetching handledare and patching through API commit cc017fdc6eb5d9620399eee011341a0307fe5658 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Wed Aug 25 16:02:20 2021 +0200 Updated some functionality commit 345712842c12af08dd4a956d0d2fdfd2592ab3de Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Wed Aug 25 15:32:22 2021 +0200 Implmented pagination and select all commit 95f9be3fae6d3f3b258897be9b78f49442ee0747 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Wed Aug 25 13:03:41 2021 +0200 Renamed avrop-table instances to avrop-list and avrop-table-row to avrop-row commit 5f1e11bff74c942e2c8b9e62892f043dc299f612 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Wed Aug 25 12:54:56 2021 +0200 Added some changes to mock-api related to parameter changes inside avrop commit 71b199744a31b2a4b8bcaa6870094fd900851030 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Wed Aug 25 12:23:57 2021 +0200 added qp to avrop requests commit dc0e34b4971ddfd3d683d482502439b961df8852 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 24 16:02:31 2021 +0200 Renamed multiple variablenames inside avrop-api commit 8a4d5471cf637db7d90c6659c893f6841ec9c961 Merge: be9e9b350a83f7Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 24 13:57:50 2021 +0200 Merged develop and fixed conflicts commit be9e9b323aee76493b5035cd79f6058781ae4c1a Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 24 13:27:16 2021 +0200 Moved around elements inside avrop component commit 7ede2d00cd7ed105ef12be88e2ab788841329f00 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 24 09:34:57 2021 +0200 Moved around some components and other files to match project-structure commit 7d1396216de643388a5690f2fa2733f127623b6c Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 24 09:04:28 2021 +0200 Fixed issues with utforande verksamheter model and mock-data commit 22baca18c25bd4ce8dcc713e91126214882cf017 Merge: 4ba3c1c59ce393Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 24 08:56:02 2021 +0200 Merged develop and fixed conflicts commit 4ba3c1ce9dac206602de9651a98aecfd5857a0e5 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 24 08:48:21 2021 +0200 Fixed issues with tjanst model and mock-data commit 50d8c698778fa64cedd4249f6852715d038b450c Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Tue Aug 24 08:40:25 2021 +0200 Fixed issues with kommun-model and mock-data
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
export interface AvropTjanstResponse {
|
||||
code: string;
|
||||
name: string;
|
||||
id: string;
|
||||
label: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { PaginationMeta } from '@msfa-models/pagination-meta.model';
|
||||
|
||||
export interface AvropResponse {
|
||||
id: string;
|
||||
deltagare: string;
|
||||
@@ -28,3 +30,8 @@ export interface AvropResponse {
|
||||
supervisorId: number;
|
||||
recievedTimestamp: string;
|
||||
}
|
||||
|
||||
export interface AvropApiResponse {
|
||||
data: AvropResponse[];
|
||||
meta: PaginationMeta;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export interface HandledareResponse {
|
||||
id: number;
|
||||
name: string
|
||||
ciamUserId: string;
|
||||
namn: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export interface KommunResponse {
|
||||
kommunCode: number;
|
||||
kommun: string;
|
||||
id: string;
|
||||
label: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
export interface Params {
|
||||
[param: string]: string | string[];
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
export interface UtforandeVerksamhetResponse {
|
||||
id: number;
|
||||
name: string;
|
||||
id: string;
|
||||
label: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
import { AvropTjanstResponse } from './api/avrop-tjanst.response.model';
|
||||
|
||||
export interface AvropTjanst {
|
||||
code: string;
|
||||
name: string;
|
||||
id: string;
|
||||
label: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
export function mapResponseToAvropTjanst(data: AvropTjanstResponse): AvropTjanst {
|
||||
const { code, name } = data;
|
||||
const { id, label, count } = data;
|
||||
|
||||
return {
|
||||
code,
|
||||
name,
|
||||
id,
|
||||
label,
|
||||
count,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { AvropResponse } from './api/avrop.response.model';
|
||||
import { PaginationMeta } from './pagination-meta.model';
|
||||
|
||||
export interface AvropCompact {
|
||||
id: string; // id
|
||||
@@ -20,6 +21,11 @@ export interface Avrop extends AvropCompact {
|
||||
utforandeVerksamhet: string; // utforandeverksamhet
|
||||
}
|
||||
|
||||
export interface AvropCompactData {
|
||||
data: AvropCompact[];
|
||||
meta: PaginationMeta;
|
||||
}
|
||||
|
||||
export function mapAvropResponseToAvrop(data: AvropResponse): Avrop {
|
||||
const {
|
||||
id,
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
import { HandledareResponse } from './api/handledare.response.model';
|
||||
|
||||
export interface Handledare {
|
||||
id: number;
|
||||
name: string;
|
||||
ciamUserId: string;
|
||||
fullName: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
export function mapHandledareResponseToHandledare(
|
||||
data: HandledareResponse
|
||||
): Handledare {
|
||||
const { id, name } = data;
|
||||
export function mapHandledareResponseToHandledare(data: HandledareResponse): Handledare {
|
||||
const { ciamUserId, namn, count } = data;
|
||||
|
||||
return {
|
||||
id,
|
||||
name
|
||||
}
|
||||
ciamUserId,
|
||||
fullName: namn,
|
||||
count,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
import { KommunResponse } from './api/kommun.response.model';
|
||||
|
||||
export interface Kommun {
|
||||
id: number;
|
||||
name: string;
|
||||
id: string;
|
||||
label: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
export function mapKommunResponseToKommun(data: KommunResponse): Kommun {
|
||||
const { kommunCode, kommun } = data;
|
||||
const { id, label, count } = data;
|
||||
|
||||
return {
|
||||
id: kommunCode,
|
||||
name: kommun
|
||||
id,
|
||||
label,
|
||||
count,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,5 +2,5 @@ export interface PaginationMeta {
|
||||
count: number;
|
||||
limit: number;
|
||||
page: number;
|
||||
totalPages: number;
|
||||
totalPage: number;
|
||||
}
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
import { UtforandeVerksamhetResponse } from './api/utforande-verksamhet.response.model';
|
||||
|
||||
export interface UtforandeVerksamhet {
|
||||
id: number;
|
||||
name: string;
|
||||
id: string;
|
||||
label: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
export function mapUtforandeVerksamhetResponseToUtforandeVerksamhet(
|
||||
data: UtforandeVerksamhetResponse
|
||||
): UtforandeVerksamhet {
|
||||
const { id, name } = data;
|
||||
const { id, label, count } = data;
|
||||
|
||||
return {
|
||||
id,
|
||||
name,
|
||||
label,
|
||||
count,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user