MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

bug fix

This commit is contained in:
Sofia Papacharalampous 2024-05-23 16:16:04 +03:00
parent 9fd8b680e4
commit cd241ec922
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
View File

@ -38,6 +38,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
currentPage: number = 0; currentPage: number = 0;
pageSize: number = 5; pageSize: number = 5;
listingItems: RecentActivityItem[]= []; listingItems: RecentActivityItem[]= [];
@Input() includeDescriptions: boolean = true; @Input() includeDescriptions: boolean = true;
@Input() includeDmps: boolean = true; @Input() includeDmps: boolean = true;
@ -145,8 +146,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
return this.authentication.currentAccountIsAuthenticated(); return this.authentication.currentAccountIsAuthenticated();
} }
refresh(resetPagination: boolean = false): void { refresh(): void {
if (resetPagination) this._resetPagination();
this.lookup.orderField = this.formGroup.get('order').value ?? this.order.UpdatedAt; this.lookup.orderField = this.formGroup.get('order').value ?? this.order.UpdatedAt;
this.lookup.like = this.formGroup.get('like').value; this.lookup.like = this.formGroup.get('like').value;
this.lookup.project = { this.lookup.project = {
@ -156,7 +156,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
] ]
}; };
const initItems = this.currentPage == 0; const initItems = this.currentPage == 0;
this.loadMore({ size: initItems ? this.pageSize : this.pageSize*this.currentPage, offset: 0 }, initItems); this.loadMore({ size: initItems ? this.pageSize : this.pageSize*this.currentPage, offset: 0 }, initItems);
} }
@ -206,13 +206,14 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
}) })
if (updatePage && response.length > 0 && this.listingItems.length >= this.currentPage*this.pageSize) this._setPage(this.currentPage+1); if (updatePage && response.length > 0 && this.listingItems.length >= this.currentPage*this.pageSize) this._setPage(this.currentPage+1);
else this.updateUrl(); else this._resetPagination();
}); });
} }
private _resetPagination(): void { private _resetPagination(): void {
this.pageSize = 5; if (this.listingItems.length == 0) this.currentPage = 0;
this.currentPage = 0; else this.currentPage = Math.ceil(this.listingItems.length/this.pageSize);
this.updateUrl();
} }
private _setPage(page: number) { private _setPage(page: number) {