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

Merge pull request #141 in TEA/mina-sidor-fa-web from bugfix/TV-691 to next

Browse Source 
Squashed commit of the following:

commit 82470de75a2543a7e7724d30905c38efe7bb8eef
Merge: 0b99bfa3 86a57347
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 28 09:33:38 2021 +0200

    Merged next and fixed CHANGELOG conflicts

commit 0b99bfa340d093fbfd6c8f015165cca9171b6ec8
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 28 09:03:32 2021 +0200

    Updated changelog

commit e77db83c6c46f2ee6764e2d50c00d79fd84a1924
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 28 08:58:12 2021 +0200

    Now showing track-name instead of code inside avrop
This commit is contained in:
Erik Tiekstra
2021-09-28 09:34:10 +02:00
parent 86a5734749
commit b4d2db5251
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/mina-sidor-fa/src/app/pages/avrop/components/avrop-row/avrop-row.component.html
View File

@@ -1,4 +1,4 @@
<digi-typography>
<digi-typography *ngIf="avrop">
<div
class="avrop-row"
[ngClass]="{'avrop-row--locked': isLocked, 'avrop-row--deletable': handledareConfirmed && !isSubmitted}"
@@ -12,41 +12,38 @@
</div>
<dl class="avrop-row__name">
<dt class="avrop-table__label">Namn:</dt>
<dd *ngIf="avrop?.fullName; else emptyText">{{avrop?.fullName}}</dd>
<dd *ngIf="avrop.fullName; else emptyText">{{avrop.fullName}}</dd>
</dl>
<dl class="avrop-row__tjanst">
<dt class="avrop-table__label">Tjänst:</dt>
<dd *ngIf="avrop?.tjanst; else emptyText">{{avrop?.tjanst}}</dd>
<dd *ngIf="avrop.tjanst; else emptyText">{{avrop.tjanst}}</dd>
</dl>
<dl class="avrop-row__start">
<dt class="avrop-table__label">Startdatum:</dt>
<dd>
<digi-typography-time
*ngIf="avrop?.startDate; else emptyText"
[afDateTime]="avrop?.startDate"
*ngIf="avrop.startDate; else emptyText"
[afDateTime]="avrop.startDate"
></digi-typography-time>
</dd>
</dl>
<dl class="avrop-row__end">
<dt class="avrop-table__label">Slutdatum:</dt>
<dd>
<digi-typography-time
*ngIf="avrop?.endDate; else emptyText"
[afDateTime]="avrop?.endDate"
></digi-typography-time>
<digi-typography-time *ngIf="avrop.endDate; else emptyText" [afDateTime]="avrop.endDate"></digi-typography-time>
</dd>
</dl>
<dl class="avrop-row__translator">
<dt class="avrop-table__label">Språkstöd/Tolk:</dt>
<dd>{{avrop?.sprakstod || '- '}}/{{avrop?.tolkbehov || ' -'}}</dd>
<dd>{{avrop.sprakstod || '- '}}/{{avrop.tolkbehov || ' -'}}</dd>
</dl>
<dl class="avrop-row__address">
<dt class="avrop-table__label">Utförande adress:</dt>
<dd *ngIf="avrop?.utforandeAdress; else emptyText">{{avrop?.utforandeAdress}}</dd>
<dd *ngIf="avrop.utforandeAdress; else emptyText">{{avrop.utforandeAdress}}</dd>
</dl>
<dl class="avrop-row__level">
<dt class="avrop-table__label">Spår/nivå:</dt>
<dd *ngIf="avrop?.trackCode; else emptyText">{{avrop?.trackCode}}</dd>
<dd *ngIf="avrop.trackCode; else emptyText">{{avrop.trackName}}</dd>
</dl>
<dl class="avrop-row__handledare" *ngIf="isLocked">
<dt class="avrop-table__label">Vald handledare:</dt>

6
apps/mina-sidor-fa/src/app/shared/enums/track-name.enum.ts Normal file
View File

@@ -0,0 +1,6 @@
export enum TrackName {
A012SP1 = 'Nivå A',
A012SP2 = 'Nivå B',
A012SP3 = 'Nivå C',
UNKNOWN = 'Info saknas',
}

3
apps/mina-sidor-fa/src/app/shared/models/avrop.model.ts
View File

@@ -1,3 +1,4 @@
import { TrackName } from '@msfa-enums/track-name.enum';
import { AvropResponse } from './api/avrop.response.model';
import { PaginationMeta } from './pagination-meta.model';
@@ -59,7 +60,7 @@ export function mapAvropResponseToAvrop(data: AvropResponse): Avrop {
sprakstod: sprakstod,
utforandeAdress: adress,
trackCode: sparkod,
trackName: sparNamn,
trackName: TrackName[sparkod] || TrackName.UNKNOWN,
genomforandeReferens,
participationFrequency: deltagandeGrad,
utforandeVerksamhet: utforandeverksamhet,

1
apps/mina-sidor-fa/src/assets/CHANGELOG.md
View File

@@ -4,6 +4,7 @@
- **deltagare:** Now fetching data using "genomforandeReferens" instead of "sokandeId" to avoid wrong data. [TV-692](https://jira.arbetsformedlingen.se/browse/TV-692)
- **authorization:** Whenever the API throws a "403 Forbidden" error we now show an unauthorized message. [TV-695](https://jira.arbetsformedlingen.se/browse/TV-695)
- **avrop:** Now showing spårnamn instead of spårkod inside avrop. [TV-691](https://jira.arbetsformedlingen.se/browse/TV-691)
- **avrop:** Fixed error-state on handledare select. [TV-699](https://jira.arbetsformedlingen.se/browse/TV-699)
## [2.0.0](https://bitbucket.arbetsformedlingen.se/projects/tea/repos/mina-sidor-fa-web/compare/diff?targetBranch=refs%2Ftags%2Fv1.5.0&sourceBranch=refs%2Ftags%2Fv2.0.0) (2021-09-24)