From a1ee9c82bc5d292f4cfccb7dfe7bb22528d8c10f Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Wed, 31 Jan 2024 17:55:08 +0200 Subject: [PATCH] fixes --- .../eu/eudat/logic/managers/GrantManager.java | 1 + .../app/ui/dashboard/dashboard.component.html | 6 +++--- .../app/ui/dashboard/dashboard.component.scss | 6 ++++++ .../dmp-editor-blueprint.component.html | 2 +- .../dmp-editor-blueprint.component.ts | 2 +- .../src/assets/images/new-releases-logo.png | Bin 0 -> 4144 bytes 6 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 dmp-frontend/src/assets/images/new-releases-logo.png diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java index e020593ed..a668a811d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java @@ -140,6 +140,7 @@ public class GrantManager { grants.add(grant); } + grants = grants.stream().filter(grant -> grant.getLabel() != null).collect(Collectors.toList()); grants.sort(Comparator.comparing(Grant::getLabel)); grants = grants.stream().filter(listHelper.distinctByKey(Grant::getLabel)).collect(Collectors.toList()); return grants; diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html index 3dff5ab3b..68c75d293 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.html +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.html @@ -17,9 +17,9 @@ - +
diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss index afaf00182..7d642ec2c 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss @@ -500,6 +500,12 @@ input[type="text"] { opacity: 1; } +.new-releases-logo { + position: absolute; + right: 0; + bottom: 0; +} + /* ::ng-deep .mat-tab-group { height: 100%; } diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html index 2c24f8858..6ebf63eda 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html @@ -51,7 +51,7 @@
-