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

Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/mina-sidor-fa-web into develop

Browse Source
This commit is contained in:
Daniel Appelgren
2021-10-08 15:22:37 +02:00
parent d4cd5e0473 bd988236c5
commit 41495a0f3b
2 changed files with 73 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.html
View File

@@ -1,11 +1,12 @@
<msfa-layout> <msfa-layout>
<digi-typography> <digi-typography>
<section class="deltagare-card" *ngIf="activeTab$ | async as activeTab"> <section class="deltagare-card" *ngIf="activeTab$ | async as activeTab">
<ng-container *ngIf="contactInformation$ | async as contactInformation">
<header class="deltagare-card__header"> <header class="deltagare-card__header">
<msfa-back-link [route]="['/deltagare']">Tillbaka till deltagarlistan</msfa-back-link> <msfa-back-link [route]="['/deltagare']">Tillbaka till deltagarlistan</msfa-back-link>
<h1>Deltagarinformation</h1> <h1>{{contactInformation.fullName }}</h1>
</header> </header>
<digi-navigation-tabs af-aria-label="Deltagarinformation"> <digi-navigation-tabs [afAriaLabel]="'Deltagarinformation för ' + contactInformation.fullName">
<digi-navigation-tab <digi-navigation-tab
(afOnToggle)="setActiveTab(0)" (afOnToggle)="setActiveTab(0)"
af-aria-label="Deltagare & tjänst" af-aria-label="Deltagare & tjänst"
@@ -16,7 +17,7 @@
<msfa-deltagare-tab-personal-information <msfa-deltagare-tab-personal-information
*ngIf="(tab0Loading$ | async) === false; else loadingRef" *ngIf="(tab0Loading$ | async) === false; else loadingRef"
class="deltagare-card__tab-contents" class="deltagare-card__tab-contents"
[contactInformation]="contactInformation$ | async" [contactInformation]="contactInformation"
[avropInformation]="avropInformation$ | async" [avropInformation]="avropInformation$ | async"
[availableHandledare]="availableHandledare$ | async" [availableHandledare]="availableHandledare$ | async"
[handledarePickerVisible]="handledarePickerVisible" [handledarePickerVisible]="handledarePickerVisible"
@@ -74,6 +75,7 @@
</ng-container> </ng-container>
</digi-navigation-tab> </digi-navigation-tab>
</digi-navigation-tabs> </digi-navigation-tabs>
</ng-container>
</section> </section>
</digi-typography> </digi-typography>
</msfa-layout> </msfa-layout>

2
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/deltagare-card.component.ts
View File

@@ -113,7 +113,7 @@ export class DeltagareCardComponent {
private deltagareCardService: DeltagareCardService, private deltagareCardService: DeltagareCardService,
private handledareService: HandledareService, private handledareService: HandledareService,
private userService: UserService private userService: UserService
) {} ) { }
get deltagareTjanstVisible(): boolean { get deltagareTjanstVisible(): boolean {
return this._userRoles?.some( return this._userRoles?.some(