diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java index f0c494c12..7eaecee3f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java @@ -224,7 +224,7 @@ public class DashBoardManager { recentActivityModels.addAll(dmpList .withHint(HintedModelFactory.getHint(RecentDmpModel.class)) .orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder()))) - .skip(tableRequest.getOffset()) + .skip(tableRequest.getDmpOffset()) .take(tableRequest.getLength()) .select(item -> { return new RecentDmpModel().fromEntity(item); @@ -233,7 +233,7 @@ public class DashBoardManager { recentActivityModels.addAll(datasetList .withHint(HintedModelFactory.getHint(RecentDatasetModel.class)) .orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder()))) - .skip(tableRequest.getOffset()) + .skip(tableRequest.getDatasetOffset()) .take(tableRequest.getLength()) .select(item -> { return new RecentDatasetModel().fromEntity(item); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java index 43a68c822..39ce2933e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java @@ -4,15 +4,24 @@ import eu.eudat.criteria.RecentActivityCriteria; public class RecentActivityTableRequest { private RecentActivityCriteria criteria; - private int offset; + private int dmpOffset; + private int datasetOffset; private int length; - public int getOffset() { - return offset; + public int getDmpOffset() { + return dmpOffset; } - public void setOffset(int offset) { - this.offset = offset; + public void setDmpOffset(int dmpOffset) { + this.dmpOffset = dmpOffset; + } + + public int getDatasetOffset() { + return datasetOffset; + } + + public void setDatasetOffset(int datasetOffset) { + this.datasetOffset = datasetOffset; } public int getLength() {