From b499a61a0d5cfbefca3d9e812782ca32597806fe Mon Sep 17 00:00:00 2001 From: Chingiz Esenbaev Date: Fri, 8 Oct 2021 14:25:15 +0200 Subject: [PATCH] Merge pull request #166 in TEA/mina-sidor-fa-web from bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande to develop Squashed commit of the following: commit 72fe0460be679ccbd89987a9a6b167c78cf1f950 Merge: 844a9447 3d941fdd Author: WP\holno Date: Wed Oct 6 10:21:33 2021 +0200 Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande commit 844a9447e3729e5d75df68eba893ff12a5dcd32e Author: WP\holno Date: Wed Oct 6 10:21:26 2021 +0200 Amends commit c601e1a02fa9b7976ee071e93b0c6623dd89588e Merge: 9f979e12 5cee9695 Author: WP\holno Date: Tue Oct 5 15:01:37 2021 +0200 Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande commit 9f979e12243328cdf5fbb19ee178115dcffbda12 Merge: a16b6c27 07ec3c4a Author: WP\holno Date: Tue Oct 5 11:10:36 2021 +0200 Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande commit a16b6c27d86f6c1442bc725485e5ebc1c532a6f5 Author: WP\holno Date: Tue Oct 5 11:03:36 2021 +0200 - Changed additional text to be more detailed and only accessible for screen-readers - Created a mixin for screen-reader only (sr-only) - reverted back accessibillity for selected organization for screen readers commit 253c64998d7b3ab8415af35a3d27423c69980d75 Author: WP\holno Date: Mon Oct 4 16:44:04 2021 +0200 Changed title to aria-labelledby commit 9ef22ec8f861a90c49d30ad1b1ab6e76082168a9 Author: WP\holno Date: Mon Oct 4 16:24:10 2021 +0200 Amends after PR commit a5dc1afc4c2bed922ddb5dcb29ee2dc5a0e43318 Merge: 7577640e d139f750 Author: WP\holno Date: Mon Oct 4 13:07:38 2021 +0200 Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande commit 7577640e80b4fc17be54d9fe9235abc3f1b792d4 Author: WP\holno Date: Fri Oct 1 14:08:44 2021 +0200 Accessibility adaptation --- .../employee-card.component.html | 18 +- .../employee-card/employee-card.component.ts | 4 + .../navigation/navigation.component.html | 2 +- mock-api/mina-sidor-fa/package-lock.json | 3179 ----------------- 4 files changed, 17 insertions(+), 3186 deletions(-) delete mode 100644 mock-api/mina-sidor-fa/package-lock.json diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html index 627684d..b9808d6 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html @@ -48,12 +48,15 @@

Här kan du se personalkontots behörigheter.

-

Tjänst

-
    +

    Tjänst

    +
    • + + {{ 'systemanvändaren har behörighet för tjänsten ' }} + {{ tjanst.name }}
    @@ -103,16 +106,16 @@
-

Roller

+

Roller

Här ser du systemanvändarens tilldelade roller. Rollen "Administrera behörigheter" gäller för hela organisationen medan de andra rollerna är begränsade till de utförande verksamheter och adresser som du tilldelat systemanvändaren.

-
    +
    • @@ -120,7 +123,10 @@ class="employee-card__authorization-icon employee-card__authorization-icon--unauthorized" > - {{role.name}} + + {{ hasAccess(employee, role) ? 'systemanvändaren har behörighet för rollen ' : 'systemanvändaren saknar behörighet för rollen ' }} + + {{ role.name }}
diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.ts b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.ts index de71911..f08da94 100644 --- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.ts @@ -51,4 +51,8 @@ export class EmployeeCardComponent implements OnDestroy { this.accordionsExpanded.push(currentId); } } + + hasAccess(employee: Employee, role: Role): boolean{ + return employee.roles.includes(role.type); + } } diff --git a/apps/mina-sidor-fa/src/app/shared/components/layout/components/navigation/navigation.component.html b/apps/mina-sidor-fa/src/app/shared/components/layout/components/navigation/navigation.component.html index 65f0526..d244a90 100644 --- a/apps/mina-sidor-fa/src/app/shared/components/layout/components/navigation/navigation.component.html +++ b/apps/mina-sidor-fa/src/app/shared/components/layout/components/navigation/navigation.component.html @@ -10,7 +10,7 @@