From f6243693d42811ee628cb60c5f70422fc29b65ba Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Fri, 24 Sep 2021 13:19:56 +0200 Subject: [PATCH] Added text if no deltagare could be found --- .../deltagare-list.component.html | 102 +++++++++--------- .../pages/deltagare/deltagare.component.html | 27 +++-- .../pages/deltagare/deltagare.component.ts | 1 + .../services/api/deltagare.api.service.ts | 8 +- .../app/shared/services/deltagare.service.ts | 1 + 5 files changed, 79 insertions(+), 60 deletions(-) diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list.component.html index 731d9dd..416342e 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list.component.html +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list.component.html @@ -1,57 +1,59 @@
- + - - - + + + - - - - - - - - + + + + + + + +
Tabell med de deltagare som tillhör organistaionen. + Tabell med de deltagare som tillhör organistaionen. +
- -
+ +
- {{ singleDeltagare.fullName }} - {{ singleDeltagare.tjanst }}{{ singleDeltagare.utforandeVerksamhet }}{{ singleDeltagare.startdatumAvrop | date }} - {{ singleDeltagare.slutdatumAvrop | date }} -
- - Avbrott -
- 		- - - Visa händelser - -
+ {{ singleDeltagare.fullName }} + {{ singleDeltagare.tjanst }}{{ singleDeltagare.utforandeVerksamhet }}{{ singleDeltagare.startdatumAvrop | date }} + {{ singleDeltagare.slutdatumAvrop | date }} +
+ + Avbrott +
+ 		+ + + Visa händelser + +
@@ -66,9 +68,7 @@ [afPrimaryButtonText]="'Stäng'" id="deltagareHandelser" > - +
- + + + + + @@ -32,3 +36,10 @@ + + +

+ Inga deltagare hittades{{(onlyMyDeltagare$ | async) ? '. Bocka ur "Visa endast mina tilldelade deltagare" för att se + deltagare som tillhör din organisation.' : ' som tillhör din organisation.' }} +

+ diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/deltagare.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/deltagare.component.ts index cdd18c2..2e7710a 100644 --- a/apps/mina-sidor-fa/src/app/pages/deltagare/deltagare.component.ts +++ b/apps/mina-sidor-fa/src/app/pages/deltagare/deltagare.component.ts @@ -14,6 +14,7 @@ export class DeltagareComponent { allDeltagareData$: Observable = this.deltagareService.allDeltagareData$; sort$: Observable> = this.deltagareService.sort$; onlyMyDeltagare$: Observable = this.deltagareService.onlyMyDeltagare$; + deltagareLoading$: Observable = this.deltagareService.deltagareLoading$; constructor(private deltagareService: DeltagareService) {} diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.api.service.ts index 600ebd8..cec94c9 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.api.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare.api.service.ts @@ -24,7 +24,7 @@ import { ReportsData } from '@msfa-models/reports.model'; import { Sort } from '@msfa-models/sort.model'; import { mapResponseToWorkExperience, WorkExperience } from '@msfa-models/work-experience.model'; import { sortFromToDates } from '@msfa-utils/sort.util'; -import { Observable, of } from 'rxjs'; +import { BehaviorSubject, Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; @Injectable({ @@ -32,6 +32,8 @@ import { catchError, map } from 'rxjs/operators'; }) export class DeltagareApiService { private _apiBaseUrl = `${environment.api.url}/deltagare`; + private _deltagareLoading$ = new BehaviorSubject(false); + public deltagareLoading$: Observable = this._deltagareLoading$.asObservable(); constructor(private httpClient: HttpClient) {} @@ -51,12 +53,16 @@ export class DeltagareApiService { if (onlyMyDeltagare) { params.onlyMyDeltagare = onlyMyDeltagare.toString(); } + + this._deltagareLoading$.next(true); + return this.httpClient .get(this._apiBaseUrl, { params, }) .pipe( map(({ data, meta }) => { + this._deltagareLoading$.next(false); return { data: data.map(deltagare => mapResponseToDeltagareCompact(deltagare)), meta }; }), catchError((error: Error) => { diff --git a/apps/mina-sidor-fa/src/app/shared/services/deltagare.service.ts b/apps/mina-sidor-fa/src/app/shared/services/deltagare.service.ts index 284fa83..e415d04 100644 --- a/apps/mina-sidor-fa/src/app/shared/services/deltagare.service.ts +++ b/apps/mina-sidor-fa/src/app/shared/services/deltagare.service.ts @@ -16,6 +16,7 @@ export class DeltagareService { public sort$: Observable> = this._sort$.asObservable(); private _onlyMyDeltagare$ = new BehaviorSubject(false); public onlyMyDeltagare$: Observable = this._onlyMyDeltagare$.asObservable(); + public deltagareLoading$: Observable = this.deltagareApiService.deltagareLoading$; public allDeltagareData$: Observable = combineLatest([ this._limit$, this._page$,