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

Separate RecentActivityTableRequest's offset to dmp and dataset offset (backend)

This commit is contained in:
George Kalampokis 2020-07-22 10:28:25 +03:00
parent a60151560b
commit f3c1244600
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java
View File

@ -224,7 +224,7 @@ public class DashBoardManager {
recentActivityModels.addAll(dmpList recentActivityModels.addAll(dmpList
.withHint(HintedModelFactory.getHint(RecentDmpModel.class)) .withHint(HintedModelFactory.getHint(RecentDmpModel.class))
.orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder()))) .orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
.skip(tableRequest.getOffset()) .skip(tableRequest.getDmpOffset())
.take(tableRequest.getLength()) .take(tableRequest.getLength())
.select(item -> { .select(item -> {
return new RecentDmpModel().fromEntity(item); return new RecentDmpModel().fromEntity(item);
@ -233,7 +233,7 @@ public class DashBoardManager {
recentActivityModels.addAll(datasetList recentActivityModels.addAll(datasetList
.withHint(HintedModelFactory.getHint(RecentDatasetModel.class)) .withHint(HintedModelFactory.getHint(RecentDatasetModel.class))
.orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder()))) .orderBy((builder, root) -> builder.desc(root.get(tableRequest.getCriteria().getOrder())))
.skip(tableRequest.getOffset()) .skip(tableRequest.getDatasetOffset())
.take(tableRequest.getLength()) .take(tableRequest.getLength())
.select(item -> { .select(item -> {
return new RecentDatasetModel().fromEntity(item); return new RecentDatasetModel().fromEntity(item);

19
dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/tablerequest/RecentActivityTableRequest.java
View File

@ -4,15 +4,24 @@ import eu.eudat.criteria.RecentActivityCriteria;
public class RecentActivityTableRequest { public class RecentActivityTableRequest {
private RecentActivityCriteria criteria; private RecentActivityCriteria criteria;
private int offset; private int dmpOffset;
private int datasetOffset;
private int length; private int length;
public int getOffset() { public int getDmpOffset() {
return offset; return dmpOffset;
} }
public void setOffset(int offset) { public void setDmpOffset(int dmpOffset) {
this.offset = offset; this.dmpOffset = dmpOffset;
}
public int getDatasetOffset() {
return datasetOffset;
}
public void setDatasetOffset(int datasetOffset) {
this.datasetOffset = datasetOffset;
} }
public int getLength() { public int getLength() {