From e878310b72cce77f706c43f1800aff709062de97 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 17 Jul 2023 18:10:49 +0300 Subject: [PATCH] #8834: Home page: Drafts query for both Datasets and DMPs. 1. RecentActivityCriteria.java: Added in RecentActivityCriteria field "private Integer status;", to be able to get only drafts. 2. DashBoardManager.java: In method "getNewRecentActivity()", add in Dataset and DMP requests status in criteria. --- .../java/eu/eudat/criteria/RecentActivityCriteria.java | 9 +++++++++ .../java/eu/eudat/logic/managers/DashBoardManager.java | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/dmp-backend/web/src/main/java/eu/eudat/criteria/RecentActivityCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/criteria/RecentActivityCriteria.java index 40cf806c1..a7891b49f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/criteria/RecentActivityCriteria.java +++ b/dmp-backend/web/src/main/java/eu/eudat/criteria/RecentActivityCriteria.java @@ -3,6 +3,7 @@ package eu.eudat.criteria; public class RecentActivityCriteria { private String like; private String order; + private Integer status; public String getLike() { return like; @@ -19,4 +20,12 @@ public class RecentActivityCriteria { public void setOrder(String order) { this.order = order; } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } } 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 aded6d599..4f5c76f66 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 @@ -221,11 +221,17 @@ public class DashBoardManager { } DatasetCriteria datasetCriteria = new DatasetCriteria(); datasetCriteria.setLike(tableRequest.getCriteria().getLike()); + if(tableRequest.getCriteria().getStatus() != null) { + datasetCriteria.setStatus(tableRequest.getCriteria().getStatus()); + } datasetCriteria.setAllVersions(false); datasetCriteria.setIsPublic(!isAuthenticated); DataManagementPlanCriteria dataManagementPlanCriteria = new DataManagementPlanCriteria(); dataManagementPlanCriteria.setAllVersions(false); dataManagementPlanCriteria.setLike(tableRequest.getCriteria().getLike()); + if(tableRequest.getCriteria().getStatus() != null) { + dataManagementPlanCriteria.setStatus(tableRequest.getCriteria().getStatus()); + } dataManagementPlanCriteria.setIsPublic(!isAuthenticated); dataManagementPlanCriteria.setOnlyPublic(!isAuthenticated);