Merge pull request #17 in TEA/dafa-web-monorepo from feature/TV-227 to develop

Squashed commit of the following:

commit 1337b528d8234dd218805ecc75901755b20ed374
Merge: 92437fe 5a97ebf
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Tue Jun 15 12:56:40 2021 +0200

    fix: merged with latest from develp branch and resolved conflicts

commit 92437fe3ce83582d4a0c662f8dd4399795e8123d
Merge: 97b0089 48801a9
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Jun 14 08:28:42 2021 +0200

    Merge branch 'develop' into feature/TV-227

commit 97b0089d4910c47bde0d06e1df739affcf82b29f
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Jun 4 17:01:36 2021 +0200

    fix: minor css changes

commit c4f7088c652821f42685783227a5f794b606f3b8
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Jun 4 16:58:46 2021 +0200

    fix: placed auth-checkbox and read-more button inside a grid

commit dadc9abfde15890d7b5625f67cc51d6784b2fa72
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Jun 4 13:59:14 2021 +0200

    fix: removed an unused variable

commit 81861428174b63016026e95e55a5c7742e31d860
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Jun 4 13:52:31 2021 +0200

    fix: minor changes plus added aria-label to read-more button

commit be9b4edfadaefbc9728ce991e1361375c6acc238
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Jun 4 13:42:21 2021 +0200

    fix: minor changes to improve functionality

commit 3d2ac66bed2183ddc1346f0fb88d629de48ebe02
Merge: 86b0598 d91b3e6
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Jun 4 12:56:32 2021 +0200

    incoming changes through merge with develop-branch

commit 86b0598d00406ee3d65504f452a03235a59f4580
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Jun 3 12:01:29 2021 +0200

    fix: removed unnecessary variable

commit 81887c0e8b1ce4b25bc326e362909a200983898f
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Jun 3 11:43:02 2021 +0200

    Added modal-functionality to display authorization info when creating employee account

commit 9d37e01a3aea83a00f126647495292b558d5883b
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Jun 3 10:57:23 2021 +0200

    fix: changed name in autorizations.js in mock-api to go along with the current info
This commit is contained in:
Aden Hassan
2021-06-15 14:49:49 +02:00
parent 5a97ebff78
commit ba34b20227
5 changed files with 72 additions and 15 deletions

View File

@@ -6,19 +6,19 @@ function generateAuthorizations() {
return [
{
id: faker.datatype.uuid(),
name: 'Hantera behörigheter',
name: "Administrera behörigheter"
},
{
id: faker.datatype.uuid(),
name: 'Hantera användare',
name: "Ta emot deltagare"
},
{
id: faker.datatype.uuid(),
name: 'Hantera organisation',
name: "Rapportering, planering och information om deltagare"
},
{
id: faker.datatype.uuid(),
name: 'Hantera ekonomi',
name: "Administrera ordrar och fakturor",
},
];
}