Merge pull request #90 in TEA/mina-sidor-fa-web from feature/TV-407 to develop

Squashed commit of the following: commit f4fe49b7e5602b7041573c70b85b22bd978d237b Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Sep 16 18:01:24 2021 +0200 TV-407 cleanup commit 141cd9afa8d73e5ad4860456da926ad1468de874 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Sep 16 16:32:07 2021 +0200 TV-407 updated heading text commit 2d778bd4dd7982e0736bc8c720a69499662a2164 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Sep 16 14:33:04 2021 +0200 TV-407 fixed run test issues, some refactoring commit 9f4cc2c3ad2572eef80923ae465e4d2218acb0cc Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 15 18:51:58 2021 +0200 TV-407 removed afInvalid on timepicker commit f10923c92ebab2c51593682de4748fc443699c28 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 15 17:54:49 2021 +0200 TV 407 service name commit cdf02cd956e9f75d8415d525645a5d2ecbeb7e41 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 15 17:51:39 2021 +0200 TV-407 changed api service name to AvvikelseApiService commit 0ebaddc235ba506aec7cf23ebf96c03cb7a0a79f Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 15 16:51:02 2021 +0200 TV-407 renaming service name to DeltagareAvvikelseService commit 60e59881099c99a550b70e310930b1f708fa7f70 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 15 16:40:57 2021 +0200 TV-407 digi-ng timepicker, fixed some pr reviews comments commit b80e79e915d3baa11d7850ddf9ef506b4dd1d1cd Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 15 01:42:42 2021 +0200 TV-407 restructoring files, some cleaning commit 1c92ccefa2f3441c55fd4beacbf38b2ce465aee0 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Sep 14 14:54:53 2021 +0200 TV-407 refactoring, cleaning commit 02904debb8f8dc70c817d2b18b79c0da1b9fd102 Merge: f1ad09a 2a37566 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Sep 14 11:51:31 2021 +0200 Merge branch 'develop' into feature/TV-407 commit f1ad09ac823a909b2d6503677314850235670838 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Sep 14 11:50:50 2021 +0200 TV-407 updating report-api service commit 1f766fba089ac0e1f9bd3e00d2a7f81bb5b979e9 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Sep 14 11:40:10 2021 +0200 TV-407 sorting franvaro, validating, cleaning commit f153e574007dfcfe7a65cbd5034370ed31202a34 Merge: ff4011c 92272e4 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Mon Sep 13 14:42:38 2021 +0200 Merge branch 'develop' into feature/TV-407 commit ff4011c86f1222c677b2d027ef479b2f82aff5e3 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Mon Sep 13 13:58:05 2021 +0200 TV-407 structoring code to reactive style, validation implemnted commit 25f9debe6216a7bf0a3c6d9a59e6b4499699e380 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 22:46:33 2021 +0200 TV-407 changed file structure and renaming commit 9f6f6d4a9f63698d7912668db542eefe285a3b83 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 20:11:20 2021 +0200 TV-407 conditions fixes commit 29c1a9536f799795712ded15a3ac746b807f8f94 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 15:02:26 2021 +0200 TV-407 reactive error messages, sokandeId to model, cleaning commit ba7a031b3e253cb05ecd1a96920bc8439884dec1 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 09:17:16 2021 +0200 TV-407 setTimeout, timepicker condition commit 2eb2c48bc89bc310d2b2e9de4e909fbb5f3bdcb4 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 09:03:41 2021 +0200 TV-407 corrections ... and 34 more commits
2021-09-16 18:04:37 +02:00
parent fc2916fb0d
commit 1b281be531
57 changed files with 1818 additions and 77 deletions
--- a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/andra-kanda-orsaker.js
+++ b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/andra-kanda-orsaker.js
@@ -0,0 +1,17 @@
+function generateAndraKandaOrsaker() {
+  const andraKandaOrsaker = [
+    { name: 'Läkarbesök/Tandläkarbesök', id: 1 },
+    { name: 'Familjeangelägenhet', id: 2 },
+    { name: 'Möte med myndighet', id: 3 },
+    { name: 'Anställningsintervju', id: 4 },
+    { name: 'Annan orsak', id: 5 },
+  ];
+
+  console.info('AndraKandaOrsaker generated...');
+
+  return andraKandaOrsaker;
+}
+
+export default {
+  generate: generateAndraKandaOrsaker,
+};
--- a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/avvikelse-orsaker.js
+++ b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/avvikelse-orsaker.js
@@ -0,0 +1,17 @@
+function generateAvvikelseOrsaker() {
+  const avvikelseOrsaker = [
+    { name: 'Tackat nej till insats eller aktivitet', id: 19 },
+    { name: 'Tackat nej till erbjudet arbete', id: 20 },
+    { name: 'Misskött sig eller stört verksamheten', id: 22 },
+    { name: 'Kan inte tillgodogöra sig programmet', id: 21 },
+    { name: 'Ser till att erbjudet arbete inte kommer till stånd', id: 28 },
+  ];
+
+  console.info('AvvikelseOrsaker generated...');
+
+  return avvikelseOrsaker;
+}
+
+export default {
+  generate: generateAvvikelseOrsaker,
+};
--- a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/fraga-for-avvikelse-orsak.js
+++ b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/fraga-for-avvikelse-orsak.js
@@ -0,0 +1,57 @@
+function generateFragorForAvvikelser() {
+  const fragaForAvvikelseOrsak = [
+    {
+      //  AvvikelseOrsaksKodEnum.TackatNejTillInsatsEllerAktivitet
+      name: 'Vilken insats eller aktivitet har deltagaren tackat nej till? Obligatoriskt',
+      id: '19.1',
+    },
+    {
+      //  AvvikelseOrsaksKodEnum.TackatNejTillInsatsEllerAktivitet
+      name: 'Motivering som deltagaren angett',
+      id: '19.2',
+    },
+    {
+      // AvvikelseOrsaksKodEnum.TackatNejTillErbjudetArbete
+      name: 'Vilket arbete har deltagaren tackat nej till? Obligatoriskt',
+      id: '20.1',
+    },
+    {
+      // AvvikelseOrsaksKodEnum.TackatNejTillErbjudetArbete
+      name: 'Motivering som deltagaren angett',
+      id: '20.2',
+    },
+    {
+      // AvvikelseOrsaksKodEnum.KanInteTillGodoGoraSigProgrammet
+      name: 'På vilket sätt kan deltagaren inte tillgodogöra sig programmet? Obigatoriskt',
+      id: '21.1',
+    },
+    {
+      // AvvikelseOrsaksKodEnum.KanInteTillGodoGoraSigProgrammet
+      name: 'Vad har ni gjort för att stötta deltagaren/anpassa programmet?',
+      id: '21.2',
+    },
+    {
+      // AvvikelseOrsaksKodEnum.MisskottSigEllerStortVerksamheten
+      name: 'På vilket sätt har deltagaren misskött sig eller stört verksamheten? Obligatoriskt',
+      id: '22.1',
+    },
+    {
+      // AvvikelseOrsaksKodEnum.MisskottSigEllerStortVerksamheten
+      name: 'Hur har ni försökt lösa problemet? Obligatoriskt',
+      id: '22.2',
+    },
+    {
+      // AvvikelseOrsaksKodEnumSerTillAttErbjudetArbeteInteKommerTillStand
+      name: 'På vilket sätt har deltagaren agerat för att inte få ett arbete?',
+      id: '28.1',
+    }
+  ];
+
+  console.info('FragaForAvvikelseOrsak generated...');
+
+  return fragaForAvvikelseOrsak;
+}
+
+export default {
+  generate: generateFragorForAvvikelser,
+};
--- a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/franvaro-orsaker.js
+++ b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/franvaro-orsaker.js
@@ -0,0 +1,18 @@
+function generateFranvaroOrsaker() {
+  const franvaroOrsaker = [
+    { name: 'Sjuk', id: 15 },
+    { name: 'VAB', id: 23 },
+    { name: 'Arbete', id: 16 },
+    { name: 'Utbildning', id: 24 },
+    { name: 'Annan känd orsak', id: 18 },
+    { name: 'Okänd orsak', id: 17 },
+  ];
+
+  console.info('FranvaroOrsaker generated...');
+
+  return franvaroOrsaker;
+}
+
+export default {
+  generate: generateFranvaroOrsaker,
+};
--- a/mock-api/mina-sidor-fa/scripts/generate-api.js
+++ b/mock-api/mina-sidor-fa/scripts/generate-api.js
@@ -1,6 +1,10 @@
 import fs from 'fs';
 import { authTokens } from './auth-tokens.js';
 import avrop from './avrop.js';
+import franvaroOrsaker from './avvikelse-alternative.js/franvaro-orsaker.js';
+import avvikelseOrsaker from './avvikelse-alternative.js/avvikelse-orsaker.js';
+import andraKandaOrsaker from './avvikelse-alternative.js/andra-kanda-orsaker.js';
+import fragaForAvvikelseOrsak from './avvikelse-alternative.js/fraga-for-avvikelse-orsak.js';
 import currentUser from './current-user.js';
 import userinfo from './userinfo.js';
 import deltagare from './deltagare.js';
@@ -30,6 +34,10 @@ const generatedUserinfo = {
 const avropTjanster = [];
 const utforandeVerksamheter = [];
 const avropKommuner = [];
+const generatedFranvaroOrsaker = franvaroOrsaker.generate();
+const generateAvvikelseOrsaker = avvikelseOrsaker.generate();
+const generateAndraKandaOrsaker = andraKandaOrsaker.generate();
+const generatefragaForAvvikelseOrsak = fragaForAvvikelseOrsak.generate();

 generatedAvrop.forEach(({ tjanstekod, tjansteNamn, utforandeVerksamhetId, utforandeverksamhet, kommunKod, kommun }) => {
  const tjanstExists = avropTjanster.find(tjanst => tjanst.id === tjanstekod);
@@ -113,6 +121,10 @@ const apiData = {
  userinfo: generatedUserinfo,
  getTokenFullAccess: authTokens.auth_code_from_CIAM_with_all_permissions,
  invites: [],
+  franvaroOrsaker: generatedFranvaroOrsaker,
+  avvikelseOrsaker: generateAvvikelseOrsaker,
+  andraKandaOrsaker: generateAndraKandaOrsaker,
+  fragaForAvvikelseOrsaker: generatefragaForAvvikelseOrsak,
  minaDeltagare: chooseRandom(generatedAvrop, 3),
 };

--- a/mock-api/mina-sidor-fa/server.js
+++ b/mock-api/mina-sidor-fa/server.js
@@ -47,6 +47,10 @@ server.use(
    '/deltagare?*': '/avrop?$1',
    '/deltagare/:sokandeId/avrop': '/avrop?sokandeId=:sokandeId',
    '/deltagare/:sokandeId/*': '/deltagare/:sokandeId',
+    '/franvaro/franvaroOrsaker': '/franvaroOrsaker',
+    '/avvikelse/avvikelseOrsaker': '/avvikelseOrsaker',
+    '/andraKandaOrsaker': '/andraKandaOrsaker',
+    '/fragaForAvvikelseOrsaker': '/fragaForAvvikelseOrsaker',
    '*page=*': '$1_page=$2',
    '*limit=*': '$1_limit=$2',
    '*sort=*': '$1_sort=$2',