fix(deltagare): (Re)added educations to deltagare. (TV-711)
Squashed commit of the following: commit dc5e6e22fe08a248fe2675dff1811b51206d5667 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Sep 30 07:52:18 2021 +0200 Added educations to experiences tab
This commit is contained in:
@@ -1,12 +1,26 @@
|
|||||||
<div class="deltagare-tab-experiences">
|
<div class="deltagare-tab-experiences">
|
||||||
<div class="deltagare-tab-experiences__tab-column">
|
<div class="deltagare-tab-experiences__tab-column">
|
||||||
<h2>Arbetslivserfarenhet</h2>
|
<h2>Arbetslivserfarenhet</h2>
|
||||||
<ng-container *ngIf="firstVisibleWorkExperiences;">
|
<ul class="deltagare-tab-experiences__experience-list" *ngIf="firstVisibleWorkExperiences?.length; else emptyText;">
|
||||||
<ul
|
<li *ngFor="let workExperience of firstVisibleWorkExperiences">
|
||||||
class="deltagare-tab-experiences__experience-list"
|
<h3 class="deltagare-tab-experiences__subheading">{{ workExperience.employer }}</h3>
|
||||||
*ngIf="firstVisibleWorkExperiences.length; else emptyText;"
|
<digi-typography-time [afDateTime]="workExperience.dateFrom"></digi-typography-time> -
|
||||||
|
<digi-typography-time [afDateTime]="workExperience.dateTo"></digi-typography-time><br />
|
||||||
|
{{ workExperience.profession }}
|
||||||
|
<p>{{ workExperience.description }}</p>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<digi-ng-layout-expansion-panel
|
||||||
|
class="deltagare-tab-experiences__accordion"
|
||||||
|
[afExpanded]="accordionExpanded"
|
||||||
|
(click)="toggleAccordionExpanded()"
|
||||||
|
*ngIf="hiddenWorkExperiences?.length"
|
||||||
|
>
|
||||||
|
<span class="deltagare-tab-experiences__accordion-trigger" data-slot-trigger
|
||||||
|
>{{ accordionExpanded ? 'Dölj' : 'Visa' }} fler arbetsgivare</span
|
||||||
>
|
>
|
||||||
<li *ngFor="let workExperience of firstVisibleWorkExperiences">
|
<ul class="deltagare-tab-experiences__experience-list">
|
||||||
|
<li *ngFor="let workExperience of hiddenWorkExperiences">
|
||||||
<h3 class="deltagare-tab-experiences__subheading">{{ workExperience.employer }}</h3>
|
<h3 class="deltagare-tab-experiences__subheading">{{ workExperience.employer }}</h3>
|
||||||
<digi-typography-time [afDateTime]="workExperience.dateFrom"></digi-typography-time> -
|
<digi-typography-time [afDateTime]="workExperience.dateFrom"></digi-typography-time> -
|
||||||
<digi-typography-time [afDateTime]="workExperience.dateTo"></digi-typography-time><br />
|
<digi-typography-time [afDateTime]="workExperience.dateTo"></digi-typography-time><br />
|
||||||
@@ -14,44 +28,23 @@
|
|||||||
<p>{{ workExperience.description }}</p>
|
<p>{{ workExperience.description }}</p>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</ng-container>
|
</digi-ng-layout-expansion-panel>
|
||||||
<ng-container *ngIf="hiddenWorkExperiences">
|
|
||||||
<digi-ng-layout-expansion-panel
|
|
||||||
class="deltagare-tab-experiences__accordion"
|
|
||||||
[afExpanded]="accordionExpanded"
|
|
||||||
(click)="toggleAccordionExpanded()"
|
|
||||||
*ngIf="hiddenWorkExperiences.length"
|
|
||||||
>
|
|
||||||
<span class="deltagare-tab-experiences__accordion-trigger" data-slot-trigger
|
|
||||||
>{{ accordionExpanded ? 'Dölj' : 'Visa' }} fler arbetsgivare</span
|
|
||||||
>
|
|
||||||
<ul class="deltagare-tab-experiences__experience-list">
|
|
||||||
<li *ngFor="let workExperience of hiddenWorkExperiences">
|
|
||||||
<h3 class="deltagare-tab-experiences__subheading">{{ workExperience.employer }}</h3>
|
|
||||||
<digi-typography-time [afDateTime]="workExperience.dateFrom"></digi-typography-time> -
|
|
||||||
<digi-typography-time [afDateTime]="workExperience.dateTo"></digi-typography-time><br />
|
|
||||||
{{ workExperience.profession }}
|
|
||||||
<p>{{ workExperience.description }}</p>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</digi-ng-layout-expansion-panel>
|
|
||||||
</ng-container>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="deltagare-tab-experiences__tab-column">
|
<div class="deltagare-tab-experiences__tab-column">
|
||||||
<h2>Utbildning</h2>
|
<h2>Utbildning</h2>
|
||||||
<dl *ngIf="highestEducation">
|
<dl>
|
||||||
<dt>Högsta utbildningsnivå:</dt>
|
<dt>Högsta utbildningsnivå:</dt>
|
||||||
<dd>
|
<dd>
|
||||||
<ng-container *ngIf="highestEducation.level; else emptyText">
|
<ng-container *ngIf="highestEducation?.level; else emptyText">
|
||||||
{{ highestEducation.level.description }}: {{ highestEducation.sunKod.description }}
|
{{ highestEducation.level.description }}: {{ highestEducation.sunKod.description }}
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</dd>
|
</dd>
|
||||||
|
|
||||||
<ng-container *ngIf="educations">
|
<ng-container>
|
||||||
<h3 class="deltagare-tab-experiences__subheading deltagare-tab-experiences__subheading--with-margin">
|
<h3 class="deltagare-tab-experiences__subheading deltagare-tab-experiences__subheading--with-margin">
|
||||||
Utbildningar:
|
Utbildningar:
|
||||||
</h3>
|
</h3>
|
||||||
<ul class="deltagare-tab-experiences__experience-list" *ngIf="educations.length; else emptyText">
|
<ul class="deltagare-tab-experiences__experience-list" *ngIf="educations?.length; else emptyText">
|
||||||
<li *ngFor="let education of educations">
|
<li *ngFor="let education of educations">
|
||||||
<h4 class="deltagare-tab-experiences__subheading">{{ education.organizer }}</h4>
|
<h4 class="deltagare-tab-experiences__subheading">{{ education.organizer }}</h4>
|
||||||
<digi-typography-time [afDateTime]="education.dateFrom"></digi-typography-time> -
|
<digi-typography-time [afDateTime]="education.dateFrom"></digi-typography-time> -
|
||||||
|
|||||||
@@ -44,6 +44,7 @@
|
|||||||
*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"
|
||||||
[highestEducation]="highestEducation$ | async"
|
[highestEducation]="highestEducation$ | async"
|
||||||
[driversLicense]="driversLicense$ | async"
|
[driversLicense]="driversLicense$ | async"
|
||||||
></msfa-deltagare-tab-experiences>
|
></msfa-deltagare-tab-experiences>
|
||||||
|
|||||||
Reference in New Issue
Block a user