arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(deltagare): Added avrop-information to deltagare card. (TV-324)

Browse Source 
Squashed commit of the following:

commit 7ed848709ff02565de4d7377e75dee804b2752ff
Merge: 1dd9593 35213d6
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Aug 12 13:24:28 2021 +0200

    Merged develop and resolved conflict

commit 1dd959342bd93110339db56035552c9560451b09
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Aug 12 08:39:52 2021 +0200

    Refactored custom error mapping

commit a456ddc6a3df6851b9bb894c6bf1af9884cc4870
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Aug 11 15:52:04 2021 +0200

    Updates regarding fetching deltagare

commit c320848ada6082ae06e8789d7b2569b269032a10
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Wed Aug 11 07:00:30 2021 +0200

    Added some error-handling for deltagare service

commit b5591427114f080083026babd9c60ae7e8eec4a3
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Aug 10 11:30:40 2021 +0200

    Added mock-data and request inside service. Also changed view with updated properties
This commit is contained in:
Erik Tiekstra
2021-08-12 15:28:33 +02:00
parent 35213d6aba
commit b4b71efe2c
9 changed files with 170 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mock-api/dafa-web/scripts/avrop.js
View File

@@ -25,7 +25,7 @@ function generateAvrop(amount = 10, deltagare) {
avrop.push({
id: faker.datatype.uuid(),
deltagare: currentDeltagare.fullName,
deltagare: `${currentDeltagare.contact.fornamn} ${currentDeltagare.contact.efternamn}`,
genomforandeReferens: faker.datatype.number({ min: 100000000, max: 999999999 }),
orgId: faker.datatype.uuid(),
leverantorId: faker.datatype.number({ min: 1000, max: 99999 }),

11
mock-api/dafa-web/server.js
View File

@@ -21,6 +21,7 @@ server.use(
'/avrop/tjanster*': '/tjanster$1',
'/avrop/utforandeverksamheter*': '/organizations$1',
'/avrop/kommuner*': '/kommuner$1',
'/avrop/:sokandeId': '/avrop?sokandeId=:sokandeId',
'*page=*': '$1_page=$2',
'*limit=*': '$1_limit=$2',
'*sort=*': '$1_sort=$2',
@@ -57,7 +58,7 @@ router.render = (req, res) => {
let data = res.locals.data;
const deltagareRegex = /(?:\/customerinfo\/)(contact|driverlicense|education\/highest|education|translator|work\/disability|work\/languages|work\/experience)/g;
const isDeltagarePath = deltagareRegex.exec(pathname);
const avropRegex = /(?:\/avrop\/)(tjanster|utforandeverksamheter|kommuner)/g;
const avropRegex = /(?:\/avrop\/)(tjanster|utforandeverksamheter|kommuner|\d)/g;
const isAvropPath = avropRegex.exec(pathname);
if (isDeltagarePath) {
@@ -75,6 +76,8 @@ router.render = (req, res) => {
});
data = newData.filter((value, index, arr) => arr.findIndex(item => item.code === value.code) === index);
} else if (isAvropPath[1]) {
data = data[0];
}
}
@@ -91,9 +94,9 @@ server.listen(8000, () => {
});
function appendMetaData(params, res) {
if (params && params.has('_page')) {
const limit = +params.get('_limit');
const page = +params.get('_page');
if (params && params.has('page')) {
const limit = +params.get('limit');
const page = +params.get('page');
const count = res.get('X-Total-Count');
const totalPages = Math.ceil(count / limit);
return {