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

fixes

This commit is contained in:
Diamantis Tziotzios 2024-01-31 17:55:08 +02:00
parent 5e5bd39313
commit a1ee9c82bc
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java
View File

@ -140,6 +140,7 @@ public class GrantManager {
grants.add(grant); grants.add(grant);
} }
grants = grants.stream().filter(grant -> grant.getLabel() != null).collect(Collectors.toList());
grants.sort(Comparator.comparing(Grant::getLabel)); grants.sort(Comparator.comparing(Grant::getLabel));
grants = grants.stream().filter(listHelper.distinctByKey(Grant::getLabel)).collect(Collectors.toList()); grants = grants.stream().filter(listHelper.distinctByKey(Grant::getLabel)).collect(Collectors.toList());
return grants; return grants;

6
dmp-frontend/src/app/ui/dashboard/dashboard.component.html
View File

@ -17,9 +17,9 @@
<button mat-raised-button type="button" class="col-auto align-self-center new-releases-btn">{{'NEW-RELEASE-NOTIFICATION.ACTIONS.LEARN-MORE' | translate}}</button> <button mat-raised-button type="button" class="col-auto align-self-center new-releases-btn">{{'NEW-RELEASE-NOTIFICATION.ACTIONS.LEARN-MORE' | translate}}</button>
</a> </a>
</div> </div>
<!-- <span class="col-auto ml-auto"> <span class="new-releases-logo">
<img class="laptop-img\6" src="../../../assets/images/dashboard-popup.png"> <img class="laptop-img\6" src="../../../assets/images/new-releases-logo.png">
</span> --> </span>
</div> </div>
</div> </div>
<div class="card col-auto mt-0" [style.display]="isVisible ? 'block' : 'none'"> <div class="card col-auto mt-0" [style.display]="isVisible ? 'block' : 'none'">

6
dmp-frontend/src/app/ui/dashboard/dashboard.component.scss
View File

@ -500,6 +500,12 @@ input[type="text"] {
opacity: 1; opacity: 1;
} }
.new-releases-logo {
position: absolute;
right: 0;
bottom: 0;
}
/* ::ng-deep .mat-tab-group { /* ::ng-deep .mat-tab-group {
height: 100%; height: 100%;
} }

2
dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.html
View File

@ -51,7 +51,7 @@
</div> </div>
</li> </li>
</ol> </ol>
<ul *ngIf="hasProfile(i)" class="add-dataset-option"> <ul *ngIf="dmp?.id && hasProfile(i)" class="add-dataset-option">
<li> <li>
<a class="add-dataset-action" [routerLink]="['/datasets/new/' + dmp.id + '/' + i]"> <a class="add-dataset-action" [routerLink]="['/datasets/new/' + dmp.id + '/' + i]">
<mat-icon>add</mat-icon>{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-FOR-SECTION' | translate}} <mat-icon>add</mat-icon>{{'DMP-LISTING.ACTIONS.ADD-DESCRIPTION-FOR-SECTION' | translate}}

2
dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor-blueprint.component.ts
View File

@ -486,7 +486,7 @@ export class DmpEditorBlueprintComponent extends CheckDeactivateBaseComponent im
} }
hasProfile(sectionIndex: number): boolean { hasProfile(sectionIndex: number): boolean {
return this.formGroup.get('profiles') && this.formGroup.get('profiles').value && this.formGroup.get('profiles').value.some(x => x.data.dmpSectionIndex.includes(sectionIndex)); return this.formGroup.get('profiles') && this.formGroup.get('profiles').value && this.formGroup.get('profiles').value.some(x => x.data?.dmpSectionIndex?.includes(sectionIndex));
} }
addDataset(dmpSectionIndex: number) { addDataset(dmpSectionIndex: number) {

BIN
dmp-frontend/src/assets/images/new-releases-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB