Merge pull request #67 in TEA/dafa-web-monorepo from feature/TV-386 to develop

Squashed commit of the following:

commit 3cf3d3cc0b6e69f0264779778ccd745a39017242
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 26 18:00:34 2021 +0200

    fixed broken code after merge and re-instated old breadcrumb for edit-employee-page

commit 661c51a775474eee2dececd5af18831cbf11bd16
Merge: e0cbda6 1f26e80
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 26 15:46:06 2021 +0200

    merged with the new changes in develop branch - resolved some merge conflicts

commit e0cbda6ccb61dc08e2f21c9bd695b35f99d2d696
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 26 09:07:08 2021 +0200

    re-used previous method to select and remove tjanster from selectedTjanster list (TV-386)

commit 005ff68d23994c62b3abb2f8a3460229f8fe2dcc
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Aug 26 08:57:46 2021 +0200

    renamed service-related variables and methods to tjanst/tjanster in edit-employee component

commit 073db3b8d8f05f33f74df1717017ed2ebfa77b1d
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Wed Aug 25 22:29:17 2021 +0200

    removed experimental code (TV-386)

commit 83628b1e972350ad29ee6471043e073aa990622d
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Wed Aug 25 22:26:29 2021 +0200

    minor change to make code shorter (TV-386)

commit 709e317b22efb10aec67341584dbdfbe096a7b87
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Wed Aug 25 13:47:41 2021 +0200

    added reset form default value after a service-tag is removed

commit 434020d7c64d7f9ab6bc1b324557c6c24ef8c519
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Wed Aug 25 13:39:11 2021 +0200

    removed unused imports and files (TV-386)

commit a09bcc90f5e800e084731a64748752a8bebeda4f
Merge: f1885dd 0661d22
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Wed Aug 25 13:34:08 2021 +0200

    Merge branch 'develop' into feature/TV-386

commit f1885dd194a0f8e39ed1654ae86e24b1a9ad8dd6
Merge: 93527ac 50a83f7
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Wed Aug 25 07:25:58 2021 +0200

    fixed conflict after mergeing in develop branch

commit 93527ac238cf4e282332abd8529b23bf4189019d
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Wed Aug 25 00:32:49 2021 +0200

    finalized re-implementation of service selection

commit f69d090a56f87f6df1849222e097b7558a1dbe39
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Tue Aug 24 17:01:25 2021 +0200

    re-writing code for editing roles some more

commit a95e01bc572b808d2a65efe4281813aba28fa340
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Tue Aug 24 16:32:22 2021 +0200

    re-writing code for editing services

commit 6a0759e551f863af507b952b09f3ace965c97903
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Tue Aug 24 14:08:54 2021 +0200

    fixed broken code and html and css to get roles-selection to work

commit cf3a75fb82c33c1081bd9645faac47bd3db1d33f
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Tue Aug 24 14:08:29 2021 +0200

    fixed broken code and html and css to get roles-selection to work

commit 3f4d8ddba0a76c3079a028042318a948c39b7fe8
Merge: c305aff 59ce393
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Tue Aug 24 12:35:20 2021 +0200

    merged in develope and added som fixes to broken code (TV-386)

commit c305aff00a0dedb7dc8988e80c85794331d58ce1
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Aug 23 09:25:00 2021 +0200

    re-arranged the breadcrumbs when visiting the edit-employee card (TV-386)

commit d73b6f97001a3ae36495dfebb14a554e23d1dff4
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Aug 23 08:25:40 2021 +0200

    minor corrections

commit 67f083bc31a5b7199eaf9d606e6cfb320b6a72e7
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Aug 23 07:52:45 2021 +0200

    cleared unused imports (TV-386)

commit 95c59bab20f5fa088f650af83dbf7b447a141636
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Aug 23 07:31:27 2021 +0200

    minor changes added (TV-386)

... and 3 more commits

apps/mina-sidor-fa/src/app/shared/models/form-tag.model.ts

@@ -0,0 +1,12 @@
+import { Tjanst } from "./tjanst.model";
+
+export interface FormTagData {
+    tjanstekod: string,
+    name: string;
+}
+
+
+export function mapTjanstToFormTag(tjanstData: Tjanst): FormTagData {
+    const { name, code } = tjanstData;
+    return { tjanstekod: code, name}
+}

apps/mina-sidor-fa/src/app/shared/models/participant.model.ts

@@ -1,5 +1,5 @@
 import { ParticipantStatus } from '@msfa-enums/participant-status.enum';
-import { Service } from '@msfa-enums/service.enum';
+import { ServiceEnum } from '@msfa-enums/service.enum';
 import { PaginationMeta } from './pagination-meta.model';
 
 export interface Participant {
@@ -10,7 +10,7 @@ export interface Participant {
   ssn: string;
   status: ParticipantStatus;
   nextStep: string;
-  service: Service;
+  service: ServiceEnum;
   errandNumber: number;
   startDate: Date;
   endDate: Date;
@@ -33,7 +33,7 @@ export interface ParticipantApiResponseData {
   ssn: string;
   status: ParticipantStatus;
   nextStep: string;
-  service: Service;
+  service: ServiceEnum;
   errandNumber: number;
   startDate: Date;
   endDate: Date;

apps/mina-sidor-fa/src/app/shared/models/role.model.ts

@@ -4,3 +4,35 @@ export interface Role {
   name: string;
   type: RoleEnum;
 }
+
+export function mapRoleResponseToRoleObject(type: string): Role {
+  switch(type) {
+    case 'OrganizationUser':
+      return {
+        name: 'Basanvändare', 
+        type: RoleEnum[type]
+      };
+    case 'ReportAndPlanning':
+      return {
+        name: 'Rapportering, planering och information om deltagare', 
+        type: RoleEnum[type]
+      };
+    case 'ReceiveDeltagare':
+      return {
+        name: 'Ta emot deltagare',
+        type: RoleEnum[RoleEnum[type]]
+      };
+    case 'AuthAdmin':
+      return {
+        name: 'Administrera behörigheter', 
+        type: RoleEnum[RoleEnum[type]]
+      };
+    case 'ContactPerson':
+      return {
+        name: 'Kontaktperson', 
+        type: RoleEnum[type]
+      };
+    default:
+      return;
+  }
+}

apps/mina-sidor-fa/src/app/shared/models/service.model.ts

@@ -1,8 +1,11 @@
-import { Service as ServiceEnum } from '@msfa-enums/service.enum';
+import { ServiceEnum } from '@msfa-enums/service.enum';
 
 export interface Service {
   id: string;
-  name: ServiceEnum;
+  name: string;
+  tjanstekod: string;
+  tjanstId: number;
+  type: ServiceEnum;
 }
 
 export interface ServiceApiResponse {
@@ -11,13 +14,32 @@ export interface ServiceApiResponse {
 
 export interface ServiceApiResponseData {
   id: string;
-  name: ServiceEnum;
+  name: string;
+  tjanstekod: string;
+  tjanstId: number;
+  type: ServiceEnum;
 }
 
 export function mapServiceApiResponseToService(data: ServiceApiResponseData): Service {
-  const { id, name } = data;
+  const { id, name, tjanstekod, tjanstId } = data;
   return {
     id,
     name,
+    tjanstekod,
+    tjanstId,
+    type: getServiceEnumType(name),
   };
 }
+
+export function getServiceEnumType(name: string):ServiceEnum {
+  switch (name) {
+    case 'Kundval Rusta och matcha':
+      return ServiceEnum.KROM;
+    case 'Karriärvägledning':
+      return ServiceEnum.KVL;
+    case 'Stöd och Matchning':
+      return ServiceEnum.STOM;
+    default:
+      break;
+  }
+}