From 8c23c4764579d4e1c7e1166b285e3ed22de96f8d Mon Sep 17 00:00:00 2001 From: Pratik Rajkotiya Date: Fri, 4 Feb 2022 17:37:34 +0530 Subject: [PATCH] [DSC-389] pagination data shown --- .../shared/pagination/pagination.component.html | 2 +- src/app/shared/pagination/pagination.component.ts | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html index 785d38af96..e2833fe212 100644 --- a/src/app/shared/pagination/pagination.component.html +++ b/src/app/shared/pagination/pagination.component.html @@ -1,7 +1,7 @@
-
+
{{ 'pagination.showing.label' | translate }} {{ 'pagination.showing.detail' | translate:(getShowingDetails(collectionSize)|async)}}
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts index 21f495956d..5531326514 100644 --- a/src/app/shared/pagination/pagination.component.ts +++ b/src/app/shared/pagination/pagination.component.ts @@ -19,7 +19,7 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options import { hasValue } from '../empty.util'; import { PageInfo } from '../../core/shared/page-info.model'; import { PaginationService } from '../../core/pagination/pagination.service'; -import { map } from 'rxjs/operators'; +import { map, take } from 'rxjs/operators'; import { RemoteData } from 'src/app/core/data/remote-data'; import { PaginatedList } from 'src/app/core/data/paginated-list.model'; import { ListableObject } from '../object-collection/shared/listable-object.model'; @@ -391,6 +391,7 @@ export class PaginationComponent implements OnDestroy, OnInit { */ goPrev() { this.prev.emit(true); + this.updatePagination(-1); } /** @@ -398,6 +399,17 @@ export class PaginationComponent implements OnDestroy, OnInit { */ goNext() { this.next.emit(true); + this.updatePagination(1); + } + + /** + * Update page when next or prev button is clicked + * @param value + */ + updatePagination(value: number) { + this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(take(1)).subscribe((currentPaginationOptions) => { + this.updateParams({page: (currentPaginationOptions.currentPage + value).toString()}); + }); } }