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

Merge pull request #129 in TEA/mina-sidor-fa-web from feature/TV-606-corrections to develop

Browse Source 
Squashed commit of the following:

commit 40fd52f67264a76a43c3567c3d56c939c02d19e9
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Sep 24 13:35:03 2021 +0200

    Update server.js

commit 7db635ff6264d21a8377369d0f3da08cb0d9e7bc
Merge: 48a4d19 f624369
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Sep 24 13:30:53 2021 +0200

    Merge branch 'develop' into feature/TV-606-corrections

commit 48a4d199eac9c416c73470d22b0200268d8d5816
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Sep 24 13:27:36 2021 +0200

    fix comments

commit 8cf12e9a9a98c9686adc9133ab1128b7ec12fb6a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Sep 24 11:25:41 2021 +0200

    Update proxy.conf.api.json

commit 206f41f571b1f1df7e8f0a7583963d2abff4a150
Merge: 3c868a6 342102f
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Sep 24 11:23:38 2021 +0200

    Merge branch 'feature/TV-606-corrections' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into feature/TV-606-corrections

commit 3c868a6fdf66039779162b5f2d1e188b62166df2
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Sep 24 11:10:17 2021 +0200

    ändrade urler till apier och lade till felmeddelanden

commit 342102f40ea209d0418a4a0a46bb4966a188d816
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Sep 24 11:10:17 2021 +0200

    new api
This commit is contained in:
Daniel Appelgren
2021-09-24 13:39:05 +02:00
parent f6243693d4
commit 2d4849d9f1
4 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html
View File

@@ -3,31 +3,42 @@
Genomförandereferens: <strong>{{deltagare?.genomforandeReferens}}</strong> Genomförandereferens: <strong>{{deltagare?.genomforandeReferens}}</strong>
</p> </p>
<digi-table af-size="s"> <digi-table af-size="s" *ngIf="deltagareHandelser$ | async; let deltagareHandelser">
<table> <ng-container
<caption class="msfa__a11y-sr-only">Lista med alla händelser för {{deltagare?.fullName}}</caption> *ngIf="deltagareHandelser.length > 0; else noEvents"
<thead> >
<tr> <table>
<th scope="col" class="deltagare-list-handelser__heading-row">Inkom</th> <caption class="msfa__a11y-sr-only">Lista med alla händelser för {{deltagare?.fullName}}</caption>
<th scope="col" class="deltagare-list-handelser__heading-row">Händelse</th> <thead>
<th scope="col" class="deltagare-list-handelser__heading-row">Datum för händelse</th> <tr>
<th scope="col" class="deltagare-list-handelser__heading-row">Datum förklaring</th> <th scope="col" class="deltagare-list-handelser__heading-row">Inkom</th>
</tr> <th scope="col" class="deltagare-list-handelser__heading-row">Händelse</th>
</thead> <th scope="col" class="deltagare-list-handelser__heading-row">Datum för händelse</th>
<tbody> <th scope="col" class="deltagare-list-handelser__heading-row">Datum förklaring</th>
<tr *ngFor="let handelse of deltagareHandelser$ | async"> </tr>
<td class="deltagare-list-handelser__table-cell">{{handelse.receivedDate | date}}</td> </thead>
<td class="deltagare-list-handelser__table-cell" *ngIf="!handelse.isAvbrott; else isAvbrottCell"> <tbody>
{{handelse.description}}</td>
<td class="deltagare-list-handelser__table-cell">{{handelse.tidpunkt | date }}</td> <tr *ngFor="let handelse of deltagareHandelser;">
<td class="deltagare-list-handelser__table-cell">{{handelse.tidpunktDescription}}</td> <td class="deltagare-list-handelser__table-cell">{{handelse.receivedDate | date}}</td>
<ng-template #isAvbrottCell> <td class="deltagare-list-handelser__table-cell" *ngIf="!handelse.isAvbrott; else isAvbrottCell">
<td class="deltagare-list-handelser__avbrott-cell"> {{handelse.description}}</td>
<msfa-icon [icon]="iconType.WARNING" size="l"></msfa-icon> <td class="deltagare-list-handelser__table-cell">{{handelse.tidpunkt | date }}</td>
{{handelse.description}}</td> <td class="deltagare-list-handelser__table-cell">{{handelse.tidpunktDescription}}</td>
</ng-template> <ng-template #isAvbrottCell>
</tr> <td class="deltagare-list-handelser__avbrott-cell">
</tbody> <msfa-icon [icon]="iconType.WARNING" size="l"></msfa-icon>
</table> {{handelse.description}}</td>
</ng-template>
</tr>
</tbody>
</table>
</ng-container>
</digi-table> </digi-table>
</div> </div>
<ng-template #noEvents>
Inga händelser har inkommit.
</ng-template>

2
apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts
View File

@@ -20,7 +20,7 @@ export class DeltagareListHandelserDialogComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
if (this.deltagare) { if (this.deltagare) {
this.deltagareHandelser$ = this.deltagareHandelserApiService.fetchDeltagareHandelser( this.deltagareHandelser$ = this.deltagareHandelserApiService.fetchDeltagareHandelser$(
this.deltagare.genomforandeReferens this.deltagare.genomforandeReferens
); );
} }

10
apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts
View File

@@ -9,12 +9,16 @@ import { environment } from '@msfa-environment';
providedIn: 'root', providedIn: 'root',
}) })
export class DeltagareHandelserApiService { export class DeltagareHandelserApiService {
private _apiBaseUrl = `${environment.api.url}/deltagareHandelser`; private _apiBaseUrl = `${environment.api.url}`;
constructor(private httpClient: HttpClient) {} constructor(private httpClient: HttpClient) {}
fetchDeltagareHandelser(genomforandereferens: string): Observable<DeltagareHandelse[]> { fetchDeltagareHandelser$(genomforandeReferens: string): Observable<DeltagareHandelse[]> {
if (!genomforandeReferens) {
throw new Error('Genomförandereferens kunde inte hittas.');
}
return this.httpClient return this.httpClient
.get<DeltagareHandelseApiResponse>(`${this._apiBaseUrl}?genomforandereferens=${genomforandereferens}`) .get<DeltagareHandelseApiResponse>(`${this._apiBaseUrl}/deltagare/${genomforandeReferens}/handelser`)
.pipe( .pipe(
map(({ data }) => { map(({ data }) => {
if (data) { if (data) {

1
mock-api/mina-sidor-fa/server.js
View File

@@ -46,6 +46,7 @@ server.use(
'/avrop*tjanstKod*': '/avrop$1tjanstekod$2', '/avrop*tjanstKod*': '/avrop$1tjanstekod$2',
'/deltagare?*': '/avrop?$1', '/deltagare?*': '/avrop?$1',
'/deltagare/:sokandeId/avrop': '/avrop?sokandeId=:sokandeId', '/deltagare/:sokandeId/avrop': '/avrop?sokandeId=:sokandeId',
'/deltagare/:genomforandeReferens/handelser': '/deltagareHandelser?genomforandeReferens=:genomforandeReferens',
'/deltagare/:sokandeId/*': '/deltagare/:sokandeId', '/deltagare/:sokandeId/*': '/deltagare/:sokandeId',
'*page=*': '$1_page=$2', '*page=*': '$1_page=$2',
'*limit=*': '$1_limit=$2', '*limit=*': '$1_limit=$2',