Merge pull request #50 in TEA/dafa-web-monorepo from feature/TV-338 to develop
Squashed commit of the following:
commit e4a56f5e8afd00382810babfca258d31dbb30a15
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date: Mon Aug 16 02:48:58 2021 +0200
TV-338 lade in lite justeringar av mockAPI:et för att det ska gå att se om en användare har behörigheter eller inte i gränssnittet när man filtrerar listan
commit 52aacae80777358b2ffab8d03dc0664c974803dc
Merge: eacbb04 466abd1
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date: Fri Aug 13 06:21:16 2021 +0200
Merge branch 'develop-remote' into feature/TV-338
commit eacbb04bf17b87970efa2cfd1f27372928c1ca93
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date: Fri Aug 13 06:20:42 2021 +0200
TV-338 har lagt till en query-param i anropet för att hämta en lista av personal/anställda, får kolla med backend vad den bör heta. I formuläret finns den representerad som en checkbox.
This commit is contained in:
@@ -24,7 +24,7 @@ function generateEmployees(amount = 10) {
|
||||
)}`,
|
||||
organizations: [ORGANIZATIONS[Math.floor(Math.random() * ORGANIZATIONS.length)]],
|
||||
services: [TJANSTER[Math.floor(Math.random() * TJANSTER.length)]],
|
||||
authorizations: authorizations.generate(),
|
||||
authorizations: i % 2 === 0 ? authorizations.generate() : [],
|
||||
createdAt: Date.now(),
|
||||
};
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ server.use(
|
||||
'*sort=services*': '$1sort=services[0].name$2',
|
||||
'*sort=organizations*': '$1sort=organizations[0].address.city$2',
|
||||
'/employee*search=*': '/employee$1fullName_like=$2',
|
||||
'/employee*onlyEmployeesWithoutAuthorization=*': '/employee$1authorizations.length_gte=1',
|
||||
'/employee*': '/employees$1',
|
||||
'/participants': '/participants?_embed=employees',
|
||||
'/participant/:id': '/participants/:id?_embed=employees',
|
||||
@@ -72,6 +73,7 @@ router.render = (req, res) => {
|
||||
if (key === 'kommunCodes') {
|
||||
value = +value;
|
||||
}
|
||||
|
||||
newData.push(...data.filter(item => item[`related_${key}`].includes(value)));
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user