From a28bca739cfbec93ab2cdf6612ea7071f60fde94 Mon Sep 17 00:00:00 2001 From: Nicolas Fuentes Maturana Date: Mon, 20 Sep 2021 13:52:55 +0200 Subject: [PATCH] Merge pull request #105 in TEA/mina-sidor-fa-web from bugfix/TV-621 to develop Squashed commit of the following: commit b86ee7b9994b647c4ad7616ad0e989cffb2581af Author: fueno Date: Mon Sep 20 12:26:13 2021 +0200 TV-621 deleted path from server.js, updated path name in generate commit 4370d39e401021d6cde9f47d2da22078ce6fd626 Author: fueno Date: Fri Sep 17 17:14:47 2021 +0200 TV-621: updated mock data for avvikelserapporter --- .../fragor-for-avvikelser.js} | 6 ++--- .../kanda-avvikelse-koder.js} | 10 ++++---- .../orsaks-koder-avvikelse.js} | 10 ++++---- .../orsaks-koder-franvaro.js} | 10 ++++---- .../mina-sidor-fa/scripts/generate-api.js | 24 +++++++++---------- mock-api/mina-sidor-fa/server.js | 4 ---- 6 files changed, 30 insertions(+), 34 deletions(-) rename mock-api/mina-sidor-fa/scripts/{avvikelse-alternative.js/fraga-for-avvikelse-orsak.js => avvikelse-alternative/fragor-for-avvikelser.js} (93%) rename mock-api/mina-sidor-fa/scripts/{avvikelse-alternative.js/andra-kanda-orsaker.js => avvikelse-alternative/kanda-avvikelse-koder.js} (56%) rename mock-api/mina-sidor-fa/scripts/{avvikelse-alternative.js/avvikelse-orsaker.js => avvikelse-alternative/orsaks-koder-avvikelse.js} (63%) rename mock-api/mina-sidor-fa/scripts/{avvikelse-alternative.js/franvaro-orsaker.js => avvikelse-alternative/orsaks-koder-franvaro.js} (54%) diff --git a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/fraga-for-avvikelse-orsak.js b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative/fragor-for-avvikelser.js similarity index 93% rename from mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/fraga-for-avvikelse-orsak.js rename to mock-api/mina-sidor-fa/scripts/avvikelse-alternative/fragor-for-avvikelser.js index 57f3d44..473aa9c 100644 --- a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/fraga-for-avvikelse-orsak.js +++ b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative/fragor-for-avvikelser.js @@ -1,5 +1,5 @@ function generateFragorForAvvikelser() { - const fragaForAvvikelseOrsak = [ + const fragorForAvvikelser = [ { // AvvikelseOrsaksKodEnum.TackatNejTillInsatsEllerAktivitet name: 'Vilken insats eller aktivitet har deltagaren tackat nej till? Obligatoriskt', @@ -47,9 +47,9 @@ function generateFragorForAvvikelser() { } ]; - console.info('FragaForAvvikelseOrsak generated...'); + console.info('FragorForAvvikelser generated...'); - return fragaForAvvikelseOrsak; + return fragorForAvvikelser; } export default { diff --git a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/andra-kanda-orsaker.js b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative/kanda-avvikelse-koder.js similarity index 56% rename from mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/andra-kanda-orsaker.js rename to mock-api/mina-sidor-fa/scripts/avvikelse-alternative/kanda-avvikelse-koder.js index 0fced1f..9e3d3db 100644 --- a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/andra-kanda-orsaker.js +++ b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative/kanda-avvikelse-koder.js @@ -1,5 +1,5 @@ -function generateAndraKandaOrsaker() { - const andraKandaOrsaker = [ +function generateKandaAvvikelseKoder() { + const kandaAvvikelseKoder = [ { name: 'Läkarbesök/Tandläkarbesök', id: 1 }, { name: 'Familjeangelägenhet', id: 2 }, { name: 'Möte med myndighet', id: 3 }, @@ -7,11 +7,11 @@ function generateAndraKandaOrsaker() { { name: 'Annan orsak', id: 5 }, ]; - console.info('AndraKandaOrsaker generated...'); + console.info('KandaAvvikelseKoder generated...'); - return andraKandaOrsaker; + return kandaAvvikelseKoder; } export default { - generate: generateAndraKandaOrsaker, + generate: generateKandaAvvikelseKoder, }; diff --git a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/avvikelse-orsaker.js b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative/orsaks-koder-avvikelse.js similarity index 63% rename from mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/avvikelse-orsaker.js rename to mock-api/mina-sidor-fa/scripts/avvikelse-alternative/orsaks-koder-avvikelse.js index 2715124..1374f91 100644 --- a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/avvikelse-orsaker.js +++ b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative/orsaks-koder-avvikelse.js @@ -1,5 +1,5 @@ -function generateAvvikelseOrsaker() { - const avvikelseOrsaker = [ +function generateOrsaksKoderAvvikelse() { + const orsaksKoderAvvikelse = [ { 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 }, @@ -7,11 +7,11 @@ function generateAvvikelseOrsaker() { { name: 'Ser till att erbjudet arbete inte kommer till stånd', id: 28 }, ]; - console.info('AvvikelseOrsaker generated...'); + console.info('OrsaksKoderAvvikelse generated...'); - return avvikelseOrsaker; + return orsaksKoderAvvikelse; } export default { - generate: generateAvvikelseOrsaker, + generate: generateOrsaksKoderAvvikelse, }; diff --git a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/franvaro-orsaker.js b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative/orsaks-koder-franvaro.js similarity index 54% rename from mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/franvaro-orsaker.js rename to mock-api/mina-sidor-fa/scripts/avvikelse-alternative/orsaks-koder-franvaro.js index 49acc6b..6609133 100644 --- a/mock-api/mina-sidor-fa/scripts/avvikelse-alternative.js/franvaro-orsaker.js +++ b/mock-api/mina-sidor-fa/scripts/avvikelse-alternative/orsaks-koder-franvaro.js @@ -1,5 +1,5 @@ -function generateFranvaroOrsaker() { - const franvaroOrsaker = [ +function generateOrsaksKoderFranvaro() { + const orsaksKoderFranvaro = [ { name: 'Sjuk', id: 15 }, { name: 'VAB', id: 23 }, { name: 'Arbete', id: 16 }, @@ -8,11 +8,11 @@ function generateFranvaroOrsaker() { { name: 'Okänd orsak', id: 17 }, ]; - console.info('FranvaroOrsaker generated...'); + console.info('OrsaksKoderFranvaro generated...'); - return franvaroOrsaker; + return orsaksKoderFranvaro; } export default { - generate: generateFranvaroOrsaker, + generate: generateOrsaksKoderFranvaro, }; diff --git a/mock-api/mina-sidor-fa/scripts/generate-api.js b/mock-api/mina-sidor-fa/scripts/generate-api.js index 5f60950..0a17809 100644 --- a/mock-api/mina-sidor-fa/scripts/generate-api.js +++ b/mock-api/mina-sidor-fa/scripts/generate-api.js @@ -1,10 +1,6 @@ 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'; @@ -15,6 +11,10 @@ import participants from './participants.js'; import tjanster from './tjanster.js'; import chooseRandom from './utils/choose-random.util.js'; import organizations from './organizations.js'; +import orsaksKoderFranvaro from './avvikelse-alternative/orsaks-koder-franvaro.js'; +import orsaksKoderAvvikelse from './avvikelse-alternative/orsaks-koder-avvikelse.js'; +import kandaAvvikelseKoder from './avvikelse-alternative/kanda-avvikelse-koder.js'; +import fragorForAvvikelser from './avvikelse-alternative/fragor-for-avvikelser.js'; const ORGANIZATIONS = organizations.generate(); const AUTHORIZATIONS = ['Hantera användare', 'Hantera origisation', 'Hantera ekonomi']; @@ -34,10 +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(); +const generateOrsaksKoderFranvaro = orsaksKoderFranvaro.generate(); +const generateOrsaksKoderAvvikelse = orsaksKoderAvvikelse.generate(); +const generateKandaAvvikelseKoder = kandaAvvikelseKoder.generate(); +const generateFragorForAvvikelser = fragorForAvvikelser.generate(); generatedAvrop.forEach(({ tjanstekod, tjansteNamn, utforandeVerksamhetId, utforandeverksamhet, kommunKod, kommun }) => { const tjanstExists = avropTjanster.find(tjanst => tjanst.id === tjanstekod); @@ -121,10 +121,10 @@ const apiData = { userinfo: generatedUserinfo, getTokenFullAccess: authTokens.auth_code_from_CIAM_with_all_permissions, invites: [], - franvaroOrsaker: generatedFranvaroOrsaker, - avvikelseOrsaker: generateAvvikelseOrsaker, - andraKandaOrsaker: generateAndraKandaOrsaker, - fragaForAvvikelseOrsaker: generatefragaForAvvikelseOrsak, + orsakskoderfranvaro: generateOrsaksKoderFranvaro, + orsakskoderavvikelse: generateOrsaksKoderAvvikelse, + kandaavvikelsekoder: generateKandaAvvikelseKoder, + fragorforavvikelser: generateFragorForAvvikelser, minaDeltagare: chooseRandom(generatedAvrop, 3), }; diff --git a/mock-api/mina-sidor-fa/server.js b/mock-api/mina-sidor-fa/server.js index 39873bd..012bf0d 100644 --- a/mock-api/mina-sidor-fa/server.js +++ b/mock-api/mina-sidor-fa/server.js @@ -47,10 +47,6 @@ 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',