feat(employee): Showing employee-data inside employee-card page. (TV-341)

Squashed commit of the following: commit 4fd71e0d0655a0d75dda59151ac74e2361f187bc Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Aug 20 10:59:46 2021 +0200 Updated RoleEnum and mock-data för roles commit f05a93239727ce1245650ece3b48cf75dc7091ca Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Aug 20 08:34:20 2021 +0200 Fixed issue with mock-api commit c31e94da6b90e442fd84c5113789db245be81c6d Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Aug 20 08:26:14 2021 +0200 Fixed issue with tjanster commit a183a08f0446cdaea7d01c8935d88ac436b0438f Merge: eb310c1 1e2d925 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Aug 20 07:59:06 2021 +0200 Merge branch 'develop' into feature/TV-341-erik commit eb310c10bdf0f4b60032bdda97df75c19bdbf447 Merge: 877b68b fae7d9a Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Aug 20 07:21:39 2021 +0200 Merged develop and fixed conflicts commit 877b68b8827e89cfd230856c9d8247f1cd8db264 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Aug 19 15:01:55 2021 +0200 Now fetching tjanster from mock-api commit 1ecd26595b21ea46ce6fb0c193c6642f66250ae3 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Aug 19 14:24:11 2021 +0200 Some more changes to employee-card commit e42ae254e7aa7b994627fdccb7037493b116d6a2 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Aug 19 13:44:23 2021 +0200 Added new enum Role and fixed some issues mapping roles inside employee-card commit 7801831d83feae5ef5e5b92e6421b18863b2a1db Merge: c78f3f8 d6e4666 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Aug 19 12:37:56 2021 +0200 Merge branch 'develop' into feature/TV-341-fe-anpassa-personal-kortet-sa-att-den-ar-enligt-skiss commit c78f3f886752477d2dbc4af20356252af4128440 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Thu Aug 19 11:19:56 2021 +0200 Authorization commit 9c043720a9cfa5fd6943013f643d948a50c8f135 Merge: 77d6a9c ffeb372 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Thu Aug 19 11:19:43 2021 +0200 Merge branch 'develop' into feature/TV-341-fe-anpassa-personal-kortet-sa-att-den-ar-enligt-skiss # Conflicts: # 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-card/employee-card.module.ts # apps/mina-sidor-fa/src/app/shared/enums/employee-authorization.enum.ts commit 77d6a9c600e6b42e97fa5431ed37ad430c5febd3 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 10:22:45 2021 +0200 Moved subscription, added icons, refactured markup commit b43c18e28b5aabb8115fa659a98b4ae8c0a7bf40 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Tue Aug 17 10:50:02 2021 +0200 unsubscribed commit 9f48cddc75872fc3f740c53de998cd54666b0b1d Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 16 16:40:08 2021 +0200 Unsubscription behöver läggas till efter genomgång av hur unsubscribeOnDestroy fungerar commit b2cef346f18482e72c11c09d0a6e629370d01bd5 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 16 16:37:13 2021 +0200 Authorization commit 5fe0b5d5fc725551f9e794cbaa70dc0f077f8717 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 13 15:46:50 2021 +0200 - Changed first h2 to h3 - Changed link to routerLink commit fd1cb3c6249535ce84e61df035cae63352b1b00b Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 13 11:53:36 2021 +0200 Amends after PR commit 13e9881e3680bd829736205b3fef57b2228638d5 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 11 16:19:36 2021 +0200 Employee-card amends to look more like the sketch.
2021-08-20 11:01:23 +02:00
parent d4447933f8
commit e6f80901ea
22 changed files with 307 additions and 217 deletions
--- a/mock-api/mina-sidor-fa/scripts/authorizations.js
+++ b/mock-api/mina-sidor-fa/scripts/authorizations.js
@@ -25,4 +25,4 @@ function generateAuthorizations() {

 export default {
  generate: generateAuthorizations,
-};
+};
--- a/mock-api/mina-sidor-fa/scripts/employees.js
+++ b/mock-api/mina-sidor-fa/scripts/employees.js
@@ -7,6 +7,7 @@ faker.locale = 'sv';

 const TJANSTER = tjanster.generate();
 const ORGANIZATIONS = organizations.generate();
+const ROLES = ['ReportAndPlanning', 'ReceiveDeltagare', 'AuthAdmin', 'ContactPerson'];

 function generateEmployees(amount = 10) {
  const employees = [];
@@ -31,10 +32,12 @@ function generateEmployees(amount = 10) {
        min: 1000,
        max: 9999,
      })}`,
-      email: '',
-      roles: hasBehorigheter ? ['Admin'] : [],
+      email: faker.internet.email(firstName.toLowerCase(), lastName.toLowerCase()),
+      roles: hasBehorigheter
+        ? ['OrganizationUser', ...chooseRandom(ROLES, faker.datatype.number({ min: 1, max: ROLES.length }))]
+        : ['OrganizationUser'],
      tjanst: hasBehorigheter ? currentTjanster.map(tjanst => tjanst.name) : [],
-      tjansteKoder: hasBehorigheter ? currentTjanster.map(tjanst => tjanst.code) : [],
+      tjansteKoder: hasBehorigheter ? currentTjanster.map(tjanst => tjanst.tjanstekod) : [],
      utforandeVerksamhet: hasBehorigheter ? currentOrganizations.map(organization => organization.name) : [],
      utforandeVerksamhetIds: hasBehorigheter ? currentOrganizations.map(organization => organization.id) : [],
    };
--- a/mock-api/mina-sidor-fa/scripts/generate-api.js
+++ b/mock-api/mina-sidor-fa/scripts/generate-api.js
@@ -1,23 +1,23 @@
 import fs from 'fs';
 import { authTokens } from './auth-tokens.js';
-import authorizations from './authorizations.js';
 import avrop from './avrop.js';
 import currentUser from './current-user.js';
 import deltagare from './deltagare.js';
 import employees from './employees.js';
 import languages from './languages.js';
 import participants from './participants.js';
+import tjanster from './tjanster.js';

 const generatedEmployees = employees.generate(50);
 const generatedDeltagare = deltagare.generate(50);
 const generatedAvrop = avrop.generate(10, generatedDeltagare.slice(0, 10));
-const auths = authorizations.generate();
-const tjanster = [];
+const generatedTjanster = tjanster.generate();
+const avropTjanster = [];
 const organizations = [];
 const kommuner = [];

 generatedAvrop.forEach(({ tjanstekod, tjansteNamn, utforandeVerksamhetId, utforandeverksamhet, kommunKod, kommun }) => {
-  const tjanstExists = tjanster.find(tjanst => tjanst.code === tjanstekod);
+  const tjanstExists = avropTjanster.find(tjanst => tjanst.code === tjanstekod);
  const organizationExists = organizations.find(organization => organization.id === utforandeVerksamhetId);
  const kommunExists = kommuner.find(kommun => kommun.kommunCode === kommunKod);

@@ -29,7 +29,7 @@ generatedAvrop.forEach(({ tjanstekod, tjansteNamn, utforandeVerksamhetId, utfora
      tjanstExists.related_kommunCodes.push(kommunKod);
    }
  } else {
-    tjanster.push({
+    avropTjanster.push({
      code: tjanstekod,
      name: tjansteNamn,
      related_utforandeverksamhetIds: [utforandeVerksamhetId],
@@ -72,7 +72,8 @@ const apiData = {
  languages: languages.generate(),
  employees: generatedEmployees,
  avrop: generatedAvrop,
-  tjanster,
+  avropTjanster,
+  tjanster: generatedTjanster,
  organizations,
  kommuner,
  deltagare: generatedDeltagare,
--- a/mock-api/mina-sidor-fa/scripts/tjanster.js
+++ b/mock-api/mina-sidor-fa/scripts/tjanster.js
@@ -5,24 +5,20 @@ faker.locale = 'sv';
 function generateTjanster() {
  const tjanster = [
    {
-      code: faker.datatype.uuid(),
+      id: 'A012',
      name: 'Kundval Rusta och matcha',
+      tjanstekod: 'A012',
+      tjanstId: 25,
+      count: 8, // Behövs för avrop-tjanst
+      label: 'Kundval Rusta och matcha', // Behövs för avrop-tjanst
    },
    // {
-    //   code: faker.datatype.uuid(),
+    //   id: 'KVL',
    //   name: 'Karriärvägledning',
-    // },
-    // {
-    //   code: faker.datatype.uuid(),
-    //   name: 'STOM',
-    // },
-    // {
-    //   code: faker.datatype.uuid(),
-    //   name: 'YSM',
-    // },
-    // {
-    //   code: faker.datatype.uuid(),
-    //   name: 'AUB',
+    //   tjanstekod: 'KVL',
+    //   tjanstId: 33,
+    //   count: 8, // Behövs för avrop-tjanst
+    //   label: 'Karriärvägledning', // Behövs för avrop-tjanst
    // },
  ];

--- a/mock-api/mina-sidor-fa/server.js
+++ b/mock-api/mina-sidor-fa/server.js
@@ -14,7 +14,7 @@ server.use(
    '/users/:id': '/employees?ciamUserId=:id',
    '/users*': '/employees$1',
    '/employees*search=*': '/employees$1fullName_like=$2',
-    '/employees*onlyEmployeesWithoutAuthorization=*': '/employees$1roles.length_lte=0',
+    '/employees*onlyEmployeesWithoutAuthorization=*': '/employees$1roles.length_lte=1',
    '/employees/invite': '/invites',
    '/employees*': '/employees$1',
    '/services*': '/tjanster$1',
@@ -22,7 +22,7 @@ server.use(
    '/participant/:id': '/participants/:id?_embed=employees',
    '/auth/userinfo': '/currentUser',
    '/auth/organizations': '/currentUser',
-    '/avrop/tjanster*': '/tjanster$1',
+    '/avrop/tjanster*': '/avropTjanster$1',
    '/avrop/utforandeverksamheter*': '/organizations$1',
    '/avrop/kommuner*': '/kommuner$1',
    '/deltagare?*': '/avrop?$1',