From 2d4849d9f1d6acb0b2b1f00bf675927b5be96b37 Mon Sep 17 00:00:00 2001 From: Daniel Appelgren Date: Fri, 24 Sep 2021 13:39:05 +0200 Subject: [PATCH] Merge pull request #129 in TEA/mina-sidor-fa-web from feature/TV-606-corrections to develop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squashed commit of the following: commit 40fd52f67264a76a43c3567c3d56c939c02d19e9 Author: Daniel Appelgren Date: Fri Sep 24 13:35:03 2021 +0200 Update server.js commit 7db635ff6264d21a8377369d0f3da08cb0d9e7bc Merge: 48a4d19 f624369 Author: Daniel Appelgren Date: Fri Sep 24 13:30:53 2021 +0200 Merge branch 'develop' into feature/TV-606-corrections commit 48a4d199eac9c416c73470d22b0200268d8d5816 Author: Daniel Appelgren Date: Fri Sep 24 13:27:36 2021 +0200 fix comments commit 8cf12e9a9a98c9686adc9133ab1128b7ec12fb6a Author: Daniel Appelgren Date: Fri Sep 24 11:25:41 2021 +0200 Update proxy.conf.api.json commit 206f41f571b1f1df7e8f0a7583963d2abff4a150 Merge: 3c868a6 342102f Author: Daniel Appelgren 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 Date: Fri Sep 24 11:10:17 2021 +0200 ändrade urler till apier och lade till felmeddelanden commit 342102f40ea209d0418a4a0a46bb4966a188d816 Author: Daniel Appelgren Date: Fri Sep 24 11:10:17 2021 +0200 new api --- ...agare-list-handelser-dialog.component.html | 63 +++++++++++-------- ...ltagare-list-handelser-dialog.component.ts | 2 +- .../api/deltagare-handelser-api.service.ts | 10 ++- mock-api/mina-sidor-fa/server.js | 1 + 4 files changed, 46 insertions(+), 30 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html index 4e0f62a..b530f48 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html @@ -3,31 +3,42 @@ Genomförandereferens: {{deltagare?.genomforandeReferens}}

- - - - - - - - - - - - - - - - - - - - - - -
Lista med alla händelser för {{deltagare?.fullName}}
InkomHändelseDatum för händelseDatum förklaring
{{handelse.receivedDate | date}} - {{handelse.description}}{{handelse.tidpunkt | date }}{{handelse.tidpunktDescription}} - - {{handelse.description}}
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Lista med alla händelser för {{deltagare?.fullName}}
InkomHändelseDatum för händelseDatum förklaring
{{handelse.receivedDate | date}} + {{handelse.description}}{{handelse.tidpunkt | date }}{{handelse.tidpunktDescription}} + + {{handelse.description}}
+ + + + Inga händelser har inkommit. + diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts index 1ac4328..005c648 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts @@ -20,7 +20,7 @@ export class DeltagareListHandelserDialogComponent implements OnInit { ngOnInit(): void { if (this.deltagare) { - this.deltagareHandelser$ = this.deltagareHandelserApiService.fetchDeltagareHandelser( + this.deltagareHandelser$ = this.deltagareHandelserApiService.fetchDeltagareHandelser$( this.deltagare.genomforandeReferens ); } diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts index 1d1c80c..617da18 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts @@ -9,12 +9,16 @@ import { environment } from '@msfa-environment'; providedIn: 'root', }) export class DeltagareHandelserApiService { - private _apiBaseUrl = `${environment.api.url}/deltagareHandelser`; + private _apiBaseUrl = `${environment.api.url}`; constructor(private httpClient: HttpClient) {} - fetchDeltagareHandelser(genomforandereferens: string): Observable { + fetchDeltagareHandelser$(genomforandeReferens: string): Observable { + if (!genomforandeReferens) { + throw new Error('Genomförandereferens kunde inte hittas.'); + } + return this.httpClient - .get(`${this._apiBaseUrl}?genomforandereferens=${genomforandereferens}`) + .get(`${this._apiBaseUrl}/deltagare/${genomforandeReferens}/handelser`) .pipe( map(({ data }) => { if (data) { diff --git a/mock-api/mina-sidor-fa/server.js b/mock-api/mina-sidor-fa/server.js index 8b53b0e..1c6b2d6 100644 --- a/mock-api/mina-sidor-fa/server.js +++ b/mock-api/mina-sidor-fa/server.js @@ -46,6 +46,7 @@ server.use( '/avrop*tjanstKod*': '/avrop$1tjanstekod$2', '/deltagare?*': '/avrop?$1', '/deltagare/:sokandeId/avrop': '/avrop?sokandeId=:sokandeId', + '/deltagare/:genomforandeReferens/handelser': '/deltagareHandelser?genomforandeReferens=:genomforandeReferens', '/deltagare/:sokandeId/*': '/deltagare/:sokandeId', '*page=*': '$1_page=$2', '*limit=*': '$1_limit=$2',