feat(employees): New component for utförande verksamheter and addresses inside employee card.(TV-361)
Squashed commit of the following: commit f75e29597c13b5d9c4232631e5c396974c6470fa Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 16:25:12 2021 +0200 Added name to employees-list component for listing names of utförandeverksamheter as the response have changed so utforandeVerksamheter contains more then just the name. commit a2665dc110243c3327bb4ee88099f7e19451456e Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 12:45:52 2021 +0200 Updated avrop.js to match new mock-api commit 71ac0c85c73615d6a638670250d390d90a673051 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 12:28:26 2021 +0200 Reverted some changes after comparison with develop. commit d96d3d6ae3390582d7a06a765b6667bf4733614a Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 12:17:43 2021 +0200 Added flag allaUtforandeVerksamheter to employee mock-api commit 833c32a63fc18a67cde498fd0e976483cff8f047 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 11:47:38 2021 +0200 - Splitted out utförandeverksamheter from organizations.js to utforande-verksamhet.js which is included in employees.js - Changed layout - Prepared markup for all utforande verksamheter permission. Needs to be changed to mock-api data-value when we get it from backend. commit 31d33010af049f8b3cf5ba7b7ea8e1f03cf38fb1 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 15:26:00 2021 +0200 Added name/organizationNumber commit 1037098f67ad9bfd4400a2b0de1daf7e969b378d Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 13:56:24 2021 +0200 Utforande verksamheter amends to work with changed api settings commit 436440fe3a8f2170029a4d7b418f10741e9e233a Merge: 5cbb694e6f8090Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 11:31:59 2021 +0200 Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget # Conflicts: # apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html # apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss # apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.ts # apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts # apps/mina-sidor-fa/src/app/shared/models/api/employee.response.model.ts # apps/mina-sidor-fa/src/app/shared/models/employee.model.ts # apps/mina-sidor-fa/src/app/shared/services/api/authentication.service.ts # apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts # apps/mina-sidor-fa/src/app/shared/services/api/user.service.ts # mock-api/mina-sidor-fa/scripts/employees.js # mock-api/mina-sidor-fa/scripts/generate-api.js # mock-api/mina-sidor-fa/scripts/tjanster.js # mock-api/mina-sidor-fa/server.js commit 5cbb694bb5b836f3826f7dadae300a0f7feba80f Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 11:19:02 2021 +0200 Reference name changes commit 387451b3168a101f94f2b49470521d74a4f30e65 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 10:42:56 2021 +0200 Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget # Conflicts: # apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html # mock-api/mina-sidor-fa/scripts/employees.js commit c7d31f6f926e52be9b5c4aec59eafd4d22d36e00 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 16:09:20 2021 +0200 Renamed organization to utforandeVerksamhet and changed referenses. commit 12d9f49f56d658da6a2082af46091eeb48b6031f Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 15:57:08 2021 +0200 Utforande verksamheter cards created commit e88962cd20394b54bad9904258d6876230d60f51 Merge: 5211885b7c7b6bAuthor: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 11:04:14 2021 +0200 Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget commit 52118858f20f7f63812cec44641753f1760e2300 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 10:58:40 2021 +0200 Updated mock-api commit 63da7e7f4cfc1b7cbd721899300357694103900b Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Tue Aug 17 10:28:57 2021 +0200 SKapat upp komponent
This commit is contained in:
@@ -5,6 +5,7 @@ export interface EmployeeCompactResponse {
|
||||
ciamUserId: string;
|
||||
name: string;
|
||||
tjanst: string[];
|
||||
allaUtforandeVerksamheter: boolean;
|
||||
utforandeVerksamhet: string[];
|
||||
}
|
||||
|
||||
@@ -16,6 +17,8 @@ export interface EmployeeResponse {
|
||||
personnummer: string;
|
||||
roles: RoleEnum[];
|
||||
tjansteKoder: string[];
|
||||
allaUtforandeVerksamheter: boolean;
|
||||
utforandeVerksamhet: string[];
|
||||
utforandeVerksamhetIds: number[];
|
||||
adressIds: number[];
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ export interface EmployeeCompact {
|
||||
id: string;
|
||||
fullName: string;
|
||||
tjanster: string[];
|
||||
allaUtforandeVerksamheter: boolean;
|
||||
utforandeVerksamheter: string[];
|
||||
}
|
||||
|
||||
@@ -20,6 +21,8 @@ export interface Employee {
|
||||
roles: RoleEnum[];
|
||||
tjanstCodes: string[];
|
||||
tjanster?: Tjanst[];
|
||||
allaUtforandeVerksamheter: boolean;
|
||||
utforandeVerksamhet: string[];
|
||||
utforandeVerksamhetIds: number[];
|
||||
utforandeAdressIds: number[];
|
||||
}
|
||||
@@ -33,12 +36,14 @@ export interface EmployeeRequestData {
|
||||
email: string;
|
||||
roles: string[];
|
||||
tjansteKoder: string[];
|
||||
allaUtforandeVerksamheter: boolean;
|
||||
utforandeVerksamhet: string[];
|
||||
utforandeVerksamhetIds: number[];
|
||||
adressIds: number[];
|
||||
}
|
||||
|
||||
export function mapEmployeeToRequestData(data: Employee): EmployeeRequestData {
|
||||
const { email, roles, tjanstCodes, utforandeVerksamhetIds, utforandeAdressIds } = data;
|
||||
const { email, roles, tjanstCodes, allaUtforandeVerksamheter, utforandeVerksamhet, utforandeVerksamhetIds, utforandeAdressIds } = data;
|
||||
|
||||
return {
|
||||
email,
|
||||
@@ -46,15 +51,18 @@ export function mapEmployeeToRequestData(data: Employee): EmployeeRequestData {
|
||||
tjansteKoder: tjanstCodes,
|
||||
utforandeVerksamhetIds,
|
||||
adressIds: utforandeAdressIds,
|
||||
allaUtforandeVerksamheter: allaUtforandeVerksamheter,
|
||||
utforandeVerksamhet: utforandeVerksamhet
|
||||
};
|
||||
}
|
||||
|
||||
export function mapResponseToEmployeeCompact(data: EmployeeCompactResponse): EmployeeCompact {
|
||||
const { ciamUserId, name, tjanst, utforandeVerksamhet } = data;
|
||||
const { ciamUserId, name, tjanst, allaUtforandeVerksamheter, utforandeVerksamhet } = data;
|
||||
return {
|
||||
id: ciamUserId,
|
||||
fullName: name,
|
||||
tjanster: tjanst || [],
|
||||
allaUtforandeVerksamheter: allaUtforandeVerksamheter,
|
||||
utforandeVerksamheter: utforandeVerksamhet || [],
|
||||
};
|
||||
}
|
||||
@@ -68,6 +76,8 @@ export function mapResponseToEmployee(data: EmployeeResponse): Employee {
|
||||
personnummer,
|
||||
roles,
|
||||
tjansteKoder,
|
||||
allaUtforandeVerksamheter,
|
||||
utforandeVerksamhet,
|
||||
utforandeVerksamhetIds,
|
||||
adressIds,
|
||||
} = data;
|
||||
@@ -80,6 +90,8 @@ export function mapResponseToEmployee(data: EmployeeResponse): Employee {
|
||||
ssn: personnummer,
|
||||
roles: roles || [],
|
||||
tjanstCodes: tjansteKoder || [],
|
||||
allaUtforandeVerksamheter,
|
||||
utforandeVerksamhet: utforandeVerksamhet || [],
|
||||
utforandeVerksamhetIds: utforandeVerksamhetIds || [],
|
||||
utforandeAdressIds: adressIds || [],
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user