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

Merge pull request #231 in TEA/mina-sidor-fa-web from feature/TV-843-paginering-deltager-handelser to develop

Browse Source 
Squashed commit of the following:

commit dd1e022a5e0d5d5f8703aa33815c2e9835697187
Merge: 59c40138 7528fef6
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 16:38:55 2021 +0200

    fixed merge conflict

commit 59c4013834493d4ab8e87c442db85678a2c94a39
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 16:31:08 2021 +0200

    refactored code

commit 7fbfcae5b57f7c8b499f3298eade192f6651217d
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 15:56:24 2021 +0200

    removed unused import

commit e8c4f1e6d5400b668f58994f839de0a9cdcf18a2
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 15:12:34 2021 +0200

    corrected some typo

commit 148e734ef7362e9cf677c186a5ddc7ecdef46e09
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 15:10:33 2021 +0200

    moved some methods from api-service to their own service

commit c052f3e99425f47e8f86341734ed163b77bce784
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 14:38:19 2021 +0200

    added loader to show when data is being fetched from server

commit 9d1003a9ce6046f2f51916bb09bf71539df4a211
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 14:20:47 2021 +0200

    updated css variable import

commit b941806cbe5532b9e72d4ecac95487bcba94c98f
Merge: 5a548ac1 f857b1ae
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 13:53:38 2021 +0200

    Merge branch 'develop' into feature/TV-843-paginering-deltager-handelser

commit 5a548ac17a339f480ba53aca421fea3931497c9d
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 12:59:19 2021 +0200

    deltagare-handelser: implemented onDestroy method to reset the params when the dialog window is closed

commit af7c624e52085d72b9de1fef921bfebaafa712d9
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 12:50:04 2021 +0200

    implemented pagination to deltagare handelser

commit 4f77302fed3957addfb4aff0597473b0580f5d94
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Thu Oct 28 09:09:44 2021 +0200

    deltagare händelse - implement pagination
This commit is contained in:
Aden Hassan
2021-10-28 16:53:31 +02:00
parent 7528fef6bf
commit cc22c5cd5e
2 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,8 @@
<p>Genomförandereferens: <strong>{{deltagare?.genomforandeReferens}}</strong></p>
<ui-loader *ngIf="handelserLoading$ | async" uiType="absolute"></ui-loader>
<digi-table af-size="s" *ngIf="deltagareHandelser$ | async; let deltagareHandelser">
<ng-container *ngIf="deltagareHandelser.length > 0; else noEvents">
<digi-table af-size="s" *ngIf="deltagareHandelserData$ | async as deltagareHandelserData">
<ng-container *ngIf="deltagareHandelserData.data.length > 0; else noEvents">
<table>
<caption class="msfa__a11y-sr-only">
Lista med alla händelser för {{deltagare?.fullName}}
@@ -16,7 +16,7 @@
</tr>
</thead>
<tbody>
<tr *ngFor="let handelse of deltagareHandelser;">
<tr *ngFor="let handelse of deltagareHandelserData.data;">
<td class="deltagare-list-handelser__table-cell">
<digi-typography-time [afDateTime]="getHandelseDate(handelse, 'receivedDate')"></digi-typography-time>
</td>
@@ -39,22 +39,21 @@
</tbody>
</table>
</ng-container>
<ng-container *ngIf="deltagareHandelserData.meta as paginationMeta">
<digi-navigation-pagination
*ngIf="paginationMeta?.totalPage > 1"
class="deltagare-list-handelser__pagination"
[afTotalPages]="paginationMeta?.totalPage"
[afInitActivePage]="paginationMeta?.page"
[afCurrentResultStart]="currentResultStart(paginationMeta)"
[afCurrentResultEnd]="currentResultEnd(paginationMeta)"
[afTotalResults]="paginationMeta?.count"
(afOnPageChange)="setNewPage($event.detail)"
af-result-name="händelser"
>
</digi-navigation-pagination>
</ng-container>
</digi-table>
<ng-container *ngIf="paginationMeta$ | async as paginationMeta">
<digi-navigation-pagination
*ngIf="paginationMeta?.totalPage > 1"
class="deltagare-list-handelser__pagination"
[afTotalPages]="paginationMeta?.totalPage"
[afInitActivePage]="paginationMeta?.page"
[afCurrentResultStart]="currentResultStart(paginationMeta)"
[afCurrentResultEnd]="currentResultEnd(paginationMeta)"
[afTotalResults]="paginationMeta?.count"
(afOnPageChange)="setNewPage($event.detail)"
af-result-name="händelser"
>
</digi-navigation-pagination>
</ng-container>
</div>
<ng-template #noEvents> Inga händelser har inkommit. </ng-template>

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

@@ -1,5 +1,5 @@
import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
import { DeltagareHandelse } from '@msfa-models/deltagare-handelse.model';
import { DeltagareHandelse, DeltagareHandelseData } from '@msfa-models/deltagare-handelse.model';
import { Observable } from 'rxjs';
import { IconType } from '@msfa-enums/icon-type.enum';
import { DeltagareCompact } from '@msfa-models/deltagare.model';
@@ -16,8 +16,7 @@ import { DeltagareHandelserService } from '@msfa-services/deltagare-handelser.se
export class DeltagareListHandelserDialogComponent implements OnInit, OnDestroy {
@Input() deltagare: DeltagareCompact;
iconType = IconType;
deltagareHandelser$: Observable<DeltagareHandelse[]>;
paginationMeta$: Observable<PaginationMeta>;
deltagareHandelserData$: Observable<DeltagareHandelseData>;
handelserLoading$ = this.deltagareHandelserService.handelserLoading$;
constructor(private deltagareHandelserService: DeltagareHandelserService) {}
@@ -29,13 +28,7 @@ export class DeltagareListHandelserDialogComponent implements OnInit, OnDestroy
ngOnInit(): void {
if (this.deltagare) {
this.deltagareHandelserService.setGenomforandeReferens$(this.deltagare.genomforandeReferens);
this.deltagareHandelser$ = this.deltagareHandelserService.deltagareHandelserData$.pipe(
map(handelse => handelse.data)
);
this.paginationMeta$ = this.deltagareHandelserService.deltagareHandelserData$.pipe(
map(handelse => handelse.meta)
);
this.deltagareHandelserData$ = this.deltagareHandelserService.deltagareHandelserData$;
}
}