hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 10:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

44024: pagination fixes and translation

Browse Source
This commit is contained in:
Lotte Hofstede
2017-08-25 15:01:32 +02:00
parent 1a3742d23a
commit 7f3d2ac581
8 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/shared/pagination/pagination.component.ts
View File

@@ -199,8 +199,8 @@ export class PaginationComponent implements OnDestroy, OnInit {
this.sortDirection = this.sortOptions.direction;
this.sortField = this.sortOptions.field;
}
this.setShowingDetail();
}));
this.setShowingDetail();
}
/**
@@ -246,6 +246,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
*/
public setPageSize(pageSize: number) {
this.pageSize = pageSize;
this.doPageChange(1);
this.updateRoute();
this.setShowingDetail();
this.pageSizeChange.emit(pageSize);
@@ -259,6 +260,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
*/
public setSortDirection(sortDirection: SortDirection) {
this.sortDirection = sortDirection;
this.doPageChange(1);
this.updateRoute();
this.setShowingDetail();
this.sortDirectionChange.emit(sortDirection);
@@ -272,6 +274,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
*/
public setSortField(field: string) {
this.sortField = field;
this.doPageChange(1);
this.updateRoute();
this.setShowingDetail();
this.sortFieldChange.emit(field);
@@ -298,11 +301,11 @@ export class PaginationComponent implements OnDestroy, OnInit {
private setShowingDetail() {
let firstItem;
let lastItem;
const lastPage = Math.round(this.collectionSize / this.pageSize);
const pageMax = this.pageSize * this.currentPage;
firstItem = this.pageSize * (this.currentPage - 1) + 1;
if (this.currentPage !== lastPage) {
lastItem = this.pageSize * this.currentPage;
if (this.collectionSize > pageMax) {
lastItem = pageMax;
} else {
lastItem = this.collectionSize;
}