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:
Erik Tiekstra
2021-11-02 18:34:42 +01:00
parent c243634d1f b80d087ddc
commit c5bc308364
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.html
View File

@@ -15,17 +15,19 @@
<dd>{{report.hasOfferedJob ? 'Ja' : 'Nej' }}</dd>
<dt>Aktiviteter</dt>
<dd>
<ul class="periodisk-redovisning-view__activity-list">
<li class="periodisk-redovisning-view__activity-item" *ngFor="let activity of report.activities">
<dd *ngIf="report.activities.length === 0; else activityList">
Deltagaren har inte deltagit i några aktiviteter denna period
</dd>
<ng-template #activityList>
<dd *ngFor="let activity of report.activities" class="periodisk-redovisning-view__activity-item">
<digi-icon-check-circle
class="msfa__digi-icon periodisk-redovisning-view__activity-check"
aria-hidden="true"
></digi-icon-check-circle>
{{getActivityInfoAsString(activity)}}
</li>
</ul>
<span>{{getActivityInfoAsString(activity)}}</span>
</dd>
</ng-template>
</dl>
<footer class="periodisk-redovisning-view__footer">
<msfa-back-link route="../../">Tillbaka till deltagaren</msfa-back-link>

7
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-views/periodisk-redovisning-view/periodisk-redovisning-view.component.scss
View File

@@ -1,4 +1,3 @@
@import 'mixins/list';
@import 'variables/gutters';
.periodisk-redovisning-view {
@@ -7,16 +6,10 @@
flex-direction: column;
gap: $digi--layout--gutter--l;
&__activity-list {
@include msfa__reset-list;
margin-bottom: var(--digi--layout--gutter--s);
}
&__activity-item {
display: flex;
align-items: center;
gap: var(--digi--layout--gutter--s);
margin-top: var(--digi--layout--gutter--s);
}
&__activity-check {