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

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

@@ -1,79 +1,81 @@
<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">
<header class="deltagare-card__header"> <ng-container *ngIf="contactInformation$ | async as contactInformation">
<msfa-back-link [route]="['/deltagare']">Tillbaka till deltagarlistan</msfa-back-link> <header class="deltagare-card__header">
<h1>Deltagarinformation</h1> <msfa-back-link [route]="['/deltagare']">Tillbaka till deltagarlistan</msfa-back-link>
</header> <h1>{{contactInformation.fullName }}</h1>
<digi-navigation-tabs af-aria-label="Deltagarinformation"> </header>
<digi-navigation-tab <digi-navigation-tabs [afAriaLabel]="'Deltagarinformation för ' + contactInformation.fullName">
(afOnToggle)="setActiveTab(0)" <digi-navigation-tab
af-aria-label="Deltagare & tjänst" (afOnToggle)="setActiveTab(0)"
af-id="deltagare-card-personal-information" af-aria-label="Deltagare & tjänst"
*ngIf="deltagareTjanstVisible" af-id="deltagare-card-personal-information"
> *ngIf="deltagareTjanstVisible"
<ng-container *ngIf="activeTab === '0'"> >
<msfa-deltagare-tab-personal-information <ng-container *ngIf="activeTab === '0'">
*ngIf="(tab0Loading$ | async) === false; else loadingRef" <msfa-deltagare-tab-personal-information
class="deltagare-card__tab-contents" *ngIf="(tab0Loading$ | async) === false; else loadingRef"
[contactInformation]="contactInformation$ | async" class="deltagare-card__tab-contents"
[avropInformation]="avropInformation$ | async" [contactInformation]="contactInformation"
[availableHandledare]="availableHandledare$ | async" [avropInformation]="avropInformation$ | async"
[handledarePickerVisible]="handledarePickerVisible" [availableHandledare]="availableHandledare$ | async"
></msfa-deltagare-tab-personal-information> [handledarePickerVisible]="handledarePickerVisible"
</ng-container> ></msfa-deltagare-tab-personal-information>
</digi-navigation-tab> </ng-container>
</digi-navigation-tab>
<digi-navigation-tab <digi-navigation-tab
(afOnToggle)="setActiveTab(1)" (afOnToggle)="setActiveTab(1)"
af-aria-label="Rapportering" af-aria-label="Rapportering"
af-id="deltagare-card-reports" af-id="deltagare-card-reports"
*ngIf="reportingTabVisible" *ngIf="reportingTabVisible"
> >
<ng-container *ngIf="activeTab === '1'"> <ng-container *ngIf="activeTab === '1'">
<msfa-deltagare-tab-reports <msfa-deltagare-tab-reports
[reportsData]="reportsData$ | async" [reportsData]="reportsData$ | async"
[genomforandeReferens]="currentGenomforandeReferens$ | async" [genomforandeReferens]="currentGenomforandeReferens$ | async"
(reportsPaginated)="setNewPage($event)" (reportsPaginated)="setNewPage($event)"
></msfa-deltagare-tab-reports> ></msfa-deltagare-tab-reports>
</ng-container> </ng-container>
</digi-navigation-tab> </digi-navigation-tab>
<digi-navigation-tab <digi-navigation-tab
(afOnToggle)="setActiveTab(2)" (afOnToggle)="setActiveTab(2)"
af-aria-label="Erfarenheter" af-aria-label="Erfarenheter"
af-id="deltagare-card-experiences" af-id="deltagare-card-experiences"
*ngIf="experiencesVisible" *ngIf="experiencesVisible"
> >
<ng-container *ngIf="activeTab === '2'"> <ng-container *ngIf="activeTab === '2'">
<msfa-deltagare-tab-experiences <msfa-deltagare-tab-experiences
*ngIf="(tab2Loading$ | async) === false; else loadingRef" *ngIf="(tab2Loading$ | async) === false; else loadingRef"
class="deltagare-card__tab-contents" class="deltagare-card__tab-contents"
[workExperiences]="workExperiences$ | async" [workExperiences]="workExperiences$ | async"
[educations]="educations$ | async" [educations]="educations$ | async"
[highestEducation]="highestEducation$ | async" [highestEducation]="highestEducation$ | async"
[driversLicense]="driversLicense$ | async" [driversLicense]="driversLicense$ | async"
></msfa-deltagare-tab-experiences> ></msfa-deltagare-tab-experiences>
</ng-container> </ng-container>
</digi-navigation-tab> </digi-navigation-tab>
<digi-navigation-tab <digi-navigation-tab
(afOnToggle)="setActiveTab(3)" (afOnToggle)="setActiveTab(3)"
af-aria-label="Känsliga uppgifter" af-aria-label="Känsliga uppgifter"
af-id="deltagare-card-sensitive-information" af-id="deltagare-card-sensitive-information"
*ngIf="sensitiveDataVisible" *ngIf="sensitiveDataVisible"
> >
<ng-container *ngIf="activeTab === '3'"> <ng-container *ngIf="activeTab === '3'">
<msfa-deltagare-tab-sensitive-information <msfa-deltagare-tab-sensitive-information
*ngIf="(tab3Loading$ | async) === false; else loadingRef" *ngIf="(tab3Loading$ | async) === false; else loadingRef"
class="deltagare-card__tab-contents" class="deltagare-card__tab-contents"
[avropInformation]="avropInformation$ | async" [avropInformation]="avropInformation$ | async"
[workLanguages]="workLanguages$ | async" [workLanguages]="workLanguages$ | async"
[disabilities]="disabilities$ | async" [disabilities]="disabilities$ | async"
></msfa-deltagare-tab-sensitive-information> ></msfa-deltagare-tab-sensitive-information>
</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(