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

Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring

This commit is contained in:
CITE\amentis 2024-09-11 18:22:18 +03:00
parent 898b18e104 b3d16ef8f0
commit d8943e7b02
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/app/ui/description/overview/description-overview.component.html
View File

@ -85,14 +85,14 @@
</div>
</div>
<ng-container *ngIf="referenceService.hasRerefenceOfTypes(description?.plan?.planReferences, [this.referenceTypeService.getGrantReferenceType()])">
<div class="row header">
<div class="row header mt-3">
<div class="col-auto">{{'DESCRIPTION-OVERVIEW.GRANT' | translate}}</div>
</div>
<div class="row description-label">
<div class="col-auto">{{referenceService.getReferencesForTypesFirstSafe(description?.plan?.planReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}</div>
</div>
</ng-container>
<div class="row header">
<div class="row header mt-3">
<div class="col-auto">{{'DESCRIPTION-OVERVIEW.RESEARCHERS' | translate}}</div>
</div>
<div class="row">
@ -115,7 +115,7 @@
<span *ngIf="!researchers || researchers.length === 0" class="material-icons">horizontal_rule</span>
</div>
</div>
<div class="row header">
<div class="row header mt-3">
<div class="col-auto">{{'DESCRIPTION-OVERVIEW.DESCRIPTION' | translate}}</div>
</div>
<div class="row" *ngIf="description.description">

4
frontend/src/app/ui/plan/overview/plan-overview.component.html
View File

@ -86,7 +86,7 @@
<div class="row header"><div class="col-auto">{{'PLAN-OVERVIEW.GRANT' | translate}}</div></div>
<div class="row plan-label"><div class="col-auto">{{referenceService.getReferencesForTypesFirstSafe(plan?.planReferences, [this.referenceTypeService.getGrantReferenceType()])?.reference?.label}}</div></div>
</ng-container>
<div class="row header"><div class="col-auto">{{'DESCRIPTION-OVERVIEW.RESEARCHERS' | translate}}</div></div>
<div class="row header mt-3"><div class="col-auto">{{'DESCRIPTION-OVERVIEW.RESEARCHERS' | translate}}</div></div>
<div class="row">
<div class="col-12">
<ng-container *ngFor="let planReference of researchers let last = last">
@ -109,7 +109,7 @@
</div>
<div *ngIf="!researchers || researchers.length === 0" class="col-12"><span class="material-icons">horizontal_rule</span></div>
</div>
<div class="row header"><div class="col-12">{{'PLAN-OVERVIEW.DESCRIPTION' | translate}}</div></div>
<div class="row header mt-3"><div class="col-12">{{'PLAN-OVERVIEW.DESCRIPTION' | translate}}</div></div>
<div class="row" *ngIf="plan.description">
<div class="col-12">
<p class="desc-txt" [innerHTML]="plan.description"></p>